From db02227cc467ac9b9abcd9ee28bb10b2ef62cf4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Wed, 20 May 2020 23:15:16 +0100
Subject: [PATCH 001/844] ci: add gitlab ci
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 .gitlab-ci.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..d463b109
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+image: archlinux
+
+before_script:
+  - pacman -Syu --noconfirm --noprogressbar --needed
+           base-devel git gpgme protobuf pyalpm python-mysql-connector
+           python-pygit2 python-srcinfo python-bleach python-markdown
+           python-sqlalchemy python-alembic python-pytest python-werkzeug
+           python-pytest-tap
+
+test:
+  script:
+    - make -C test

From 23f6dd16a7c8b6f81c229e2307838edd213d6149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Wed, 20 May 2020 23:27:50 +0100
Subject: [PATCH 002/844] ci: add cache to gitlab ci
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d463b109..74784fce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,13 @@
 image: archlinux
 
+cache:
+  key: system-v1
+  paths:
+    # For some reason Gitlab CI only supports storing cache/artifacts in a path relative to the build directory
+    - .pkg-cache
+
 before_script:
-  - pacman -Syu --noconfirm --noprogressbar --needed
+  - pacman -Syu --noconfirm --noprogressbar --needed --cachedir .pkg-cache
            base-devel git gpgme protobuf pyalpm python-mysql-connector
            python-pygit2 python-srcinfo python-bleach python-markdown
            python-sqlalchemy python-alembic python-pytest python-werkzeug

From 8a13500535942a1c99b97ae4de46e5a1c0297cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Sun, 19 Apr 2020 20:11:02 +0200
Subject: [PATCH 003/844] Create aurweb.spawn for spawing the test server
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This program makes it easier for developers to spawn the PHP server
since it fetches automatically what it needs from the configuration
file, rather than having the user explicitly pass arguments to the php
executable.

When the setup gets more complicated as we introduce Python,
aurweb.spawn will keep providing the same interface, while under the
hood it is planned to support running multiple sub-processes.

Its Python interface provides an way for the test suite to spawn the
test server when it needs to perform HTTP requests to the test server.

The current implementation is somewhat weak as it doesn’t detect when a
child process dies, but this is not supposed to happen often, and it is
only meant for aurweb developers.

In the long term, aurweb.spawn will eventually become obsolete, and
replaced by Docker or Flask’s tools.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 TESTING              |   7 +--
 aurweb/spawn.py      | 107 +++++++++++++++++++++++++++++++++++++++++++
 conf/config.defaults |   3 ++
 3 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 aurweb/spawn.py

diff --git a/TESTING b/TESTING
index 4a1e6f4c..a5e08cb8 100644
--- a/TESTING
+++ b/TESTING
@@ -17,7 +17,8 @@ INSTALL.
    Ensure to enable the pdo_sqlite extension in php.ini.
 
 3) Copy conf/config.defaults to conf/config and adjust the configuration
-   (pay attention to disable_http_login, enable_maintenance and aur_location).
+   Pay attention to disable_http_login, enable_maintenance, aur_location and
+   htmldir.
 
    Be sure to change backend to sqlite and name to the file location of your
    created test database.
@@ -31,6 +32,6 @@ INSTALL.
     $ ./gendummydata.py out.sql
     $ sqlite3 path/to/aurweb.sqlite3 < out.sql
 
-5) Run the PHP built-in web server:
+5) Run the test server:
 
-   $ AUR_CONFIG='/path/to/aurweb/conf/config' php -S localhost:8080 -t /path/to/aurweb/web/html
+   $ AUR_CONFIG='/path/to/aurweb/conf/config' python -m aurweb.spawn
diff --git a/aurweb/spawn.py b/aurweb/spawn.py
new file mode 100644
index 00000000..5fa646b5
--- /dev/null
+++ b/aurweb/spawn.py
@@ -0,0 +1,107 @@
+"""
+Provide an automatic way of spawing an HTTP test server running aurweb.
+
+It can be called from the command-line or from another Python module.
+
+This module uses a global state, since you can’t open two servers with the same
+configuration anyway.
+"""
+
+
+import atexit
+import argparse
+import subprocess
+import sys
+import time
+import urllib
+
+import aurweb.config
+import aurweb.schema
+
+
+children = []
+verbosity = 0
+
+
+class ProcessExceptions(Exception):
+    """
+    Compound exception used by stop() to list all the errors that happened when
+    terminating child processes.
+    """
+    def __init__(self, message, exceptions):
+        self.message = message
+        self.exceptions = exceptions
+        messages = [message] + [str(e) for e in exceptions]
+        super().__init__("\n- ".join(messages))
+
+
+def spawn_child(args):
+    """Open a subprocess and add it to the global state."""
+    if verbosity >= 1:
+        print(f"Spawning {args}", file=sys.stderr)
+    children.append(subprocess.Popen(args))
+
+
+def start():
+    """
+    Spawn the test server. If it is already running, do nothing.
+
+    The server can be stopped with stop(), or is automatically stopped when the
+    Python process ends using atexit.
+    """
+    if children:
+        return
+    atexit.register(stop)
+    aur_location = aurweb.config.get("options", "aur_location")
+    aur_location_parts = urllib.parse.urlsplit(aur_location)
+    htmldir = aurweb.config.get("options", "htmldir")
+    spawn_child(["php", "-S", aur_location_parts.netloc, "-t", htmldir])
+
+
+def stop():
+    """
+    Stop all the child processes.
+
+    If an exception occurs during the process, the process continues anyway
+    because we don’t want to leave runaway processes around, and all the
+    exceptions are finally raised as a single ProcessExceptions.
+    """
+    global children
+    atexit.unregister(stop)
+    exceptions = []
+    for p in children:
+        try:
+            p.terminate()
+            if verbosity >= 1:
+                print(f"Sent SIGTERM to {p.args}", file=sys.stderr)
+        except Exception as e:
+            exceptions.append(e)
+    for p in children:
+        try:
+            rc = p.wait()
+            if rc != 0 and rc != -15:
+                # rc = -15 indicates the process was terminated with SIGTERM,
+                # which is to be expected since we called terminate on them.
+                raise Exception(f"Process {p.args} exited with {rc}")
+        except Exception as e:
+            exceptions.append(e)
+    children = []
+    if exceptions:
+        raise ProcessExceptions("Errors terminating the child processes:",
+                                exceptions)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        prog='python -m aurweb.spawn',
+        description='Start aurweb\'s test server.')
+    parser.add_argument('-v', '--verbose', action='count', default=0,
+                        help='increase verbosity')
+    args = parser.parse_args()
+    verbosity = args.verbose
+    start()
+    try:
+        while True:
+            time.sleep(60)
+    except KeyboardInterrupt:
+        stop()
diff --git a/conf/config.defaults b/conf/config.defaults
index 447dacac..86fe765c 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -41,6 +41,9 @@ cache = none
 cache_pkginfo_ttl = 86400
 memcache_servers = 127.0.0.1:11211
 
+; Directory containing aurweb's PHP code, required by aurweb.spawn.
+;htmldir = /path/to/web/html
+
 [ratelimit]
 request_limit = 4000
 window_length = 86400

From 48b58b1c2f74df0906231d2affd9f2b352a8e330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Sat, 23 May 2020 17:54:07 +0100
Subject: [PATCH 004/844] ci: remove Travis CI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are are moving to Gitlab CI.

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 .travis.yml | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5bbfda1f..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-language: python
-
-python: 3.6
-
-addons:
-    apt:
-        packages:
-        - bsdtar
-        - libarchive-dev
-        - libgpgme11-dev
-        - libprotobuf-dev
-
-install:
-    - curl https://codeload.github.com/libgit2/libgit2/tar.gz/v0.26.0 | tar -xz
-    - curl https://sources.archlinux.org/other/pacman/pacman-5.0.2.tar.gz | tar -xz
-    - curl https://git.archlinux.org/pyalpm.git/snapshot/pyalpm-0.8.1.tar.gz | tar -xz
-    - ( cd libgit2-0.26.0 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr && make && sudo make install )
-    - ( cd pacman-5.0.2 && ./configure --prefix=/usr && make && sudo make install )
-    - ( cd pyalpm-0.8.1 && python setup.py build && python setup.py install )
-    - pip install mysql-connector-python-rf pygit2==0.26 srcinfo
-    - pip install bleach Markdown
-
-script: make -C test

From 8d1be7ea8a8d7c270f692a6c375ef2614c5ac601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Mon, 1 Jun 2020 23:35:25 +0100
Subject: [PATCH 005/844] Refactor code to comply with flake8 and isort
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/git/auth.py              |   3 +-
 aurweb/git/serve.py             |  14 +-
 aurweb/git/update.py            |   6 +-
 aurweb/initdb.py                |   7 +-
 aurweb/l10n.py                  |   2 +-
 aurweb/schema.py                |   4 +-
 aurweb/scripts/aurblup.py       |   3 +-
 aurweb/scripts/rendercomment.py |   6 +-
 migrations/env.py               |   9 +-
 schema/gendummydata.py          | 346 ++++++++++++++++----------------
 setup.py                        |   3 +-
 11 files changed, 206 insertions(+), 197 deletions(-)

diff --git a/aurweb/git/auth.py b/aurweb/git/auth.py
index 3b1e485f..abecd276 100755
--- a/aurweb/git/auth.py
+++ b/aurweb/git/auth.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 
-import os
-import shlex
 import re
+import shlex
 import sys
 
 import aurweb.config
diff --git a/aurweb/git/serve.py b/aurweb/git/serve.py
index 64d51b9e..b91f1a13 100755
--- a/aurweb/git/serve.py
+++ b/aurweb/git/serve.py
@@ -175,11 +175,11 @@ def pkgbase_set_comaintainers(pkgbase, userlist, user, privileged):
         i += 1
 
     for userid in uids_rem:
-            cur = conn.execute("DELETE FROM PackageComaintainers " +
-                               "WHERE PackageBaseID = ? AND UsersID = ?",
-                               [pkgbase_id, userid])
-            subprocess.Popen((notify_cmd, 'comaintainer-remove',
-                              str(userid), str(pkgbase_id)))
+        cur = conn.execute("DELETE FROM PackageComaintainers " +
+                           "WHERE PackageBaseID = ? AND UsersID = ?",
+                           [pkgbase_id, userid])
+        subprocess.Popen((notify_cmd, 'comaintainer-remove',
+                         str(userid), str(pkgbase_id)))
 
     conn.commit()
     conn.close()
@@ -268,7 +268,7 @@ def pkgbase_disown(pkgbase, user, privileged):
     cur = conn.execute("SELECT ID FROM Users WHERE Username = ?", [user])
     userid = cur.fetchone()[0]
     if userid == 0:
-            raise aurweb.exceptions.InvalidUserException(user)
+        raise aurweb.exceptions.InvalidUserException(user)
 
     subprocess.Popen((notify_cmd, 'disown', str(userid), str(pkgbase_id)))
 
@@ -472,7 +472,7 @@ def checkarg(cmdargv, *argdesc):
     checkarg_atmost(cmdargv, *argdesc)
 
 
-def serve(action, cmdargv, user, privileged, remote_addr):
+def serve(action, cmdargv, user, privileged, remote_addr):  # noqa: C901
     if enable_maintenance:
         if remote_addr not in maintenance_exc:
             raise aurweb.exceptions.MaintenanceException
diff --git a/aurweb/git/update.py b/aurweb/git/update.py
index 39128f8b..929b254e 100755
--- a/aurweb/git/update.py
+++ b/aurweb/git/update.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 
 import os
-import pygit2
 import re
 import subprocess
 import sys
 import time
 
+import pygit2
 import srcinfo.parse
 import srcinfo.utils
 
@@ -75,7 +75,7 @@ def create_pkgbase(conn, pkgbase, user):
     return pkgbase_id
 
 
-def save_metadata(metadata, conn, user):
+def save_metadata(metadata, conn, user):  # noqa: C901
     # Obtain package base ID and previous maintainer.
     pkgbase = metadata['pkgbase']
     cur = conn.execute("SELECT ID, MaintainerUID FROM PackageBases "
@@ -232,7 +232,7 @@ def die_commit(msg, commit):
     exit(1)
 
 
-def main():
+def main():  # noqa: C901
     repo = pygit2.Repository(repo_path)
 
     user = os.environ.get("AUR_USER")
diff --git a/aurweb/initdb.py b/aurweb/initdb.py
index 91777f7e..c8d0b2ae 100644
--- a/aurweb/initdb.py
+++ b/aurweb/initdb.py
@@ -1,11 +1,12 @@
-import aurweb.db
-import aurweb.schema
+import argparse
 
 import alembic.command
 import alembic.config
-import argparse
 import sqlalchemy
 
+import aurweb.db
+import aurweb.schema
+
 
 def feed_initial_data(conn):
     conn.execute(aurweb.schema.AccountTypes.insert(), [
diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index a7c0103e..492200b3 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -16,4 +16,4 @@ class Translator:
                                                          self._localedir,
                                                          languages=[lang])
         self._translator[lang].install()
-        return _(s)
+        return _(s)  # _ is not defined, what is this?  # noqa: F821
diff --git a/aurweb/schema.py b/aurweb/schema.py
index 6792cf1d..20f3e5ce 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -6,7 +6,7 @@ usually be automatically generated. See `migrations/README` for details.
 """
 
 
-from sqlalchemy import CHAR, Column, ForeignKey, Index, MetaData, String, TIMESTAMP, Table, Text, text
+from sqlalchemy import CHAR, TIMESTAMP, Column, ForeignKey, Index, MetaData, String, Table, Text, text
 from sqlalchemy.dialects.mysql import BIGINT, DECIMAL, INTEGER, TINYINT
 from sqlalchemy.ext.compiler import compiles
 
@@ -24,7 +24,7 @@ def compile_bigint_sqlite(type_, compiler, **kw):
     to INTEGER. Aside from that, BIGINT is the same as INTEGER for SQLite.
 
     See https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#allowing-autoincrement-behavior-sqlalchemy-types-other-than-integer-integer
-    """
+    """  # noqa: E501
     return 'INTEGER'
 
 
diff --git a/aurweb/scripts/aurblup.py b/aurweb/scripts/aurblup.py
index a7d43f12..e32937ce 100755
--- a/aurweb/scripts/aurblup.py
+++ b/aurweb/scripts/aurblup.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-import pyalpm
 import re
 
+import pyalpm
+
 import aurweb.config
 import aurweb.db
 
diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index 76865d27..422dd33b 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-import re
-import pygit2
 import sys
+
 import bleach
 import markdown
+import pygit2
 
 import aurweb.config
 import aurweb.db
@@ -47,7 +47,7 @@ class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor):
 
 class FlysprayLinksExtension(markdown.extensions.Extension):
     def extendMarkdown(self, md, md_globals):
-        processor = FlysprayLinksInlineProcessor(r'\bFS#(\d+)\b',md)
+        processor = FlysprayLinksInlineProcessor(r'\bFS#(\d+)\b', md)
         md.inlinePatterns.register(processor, 'flyspray-links', 118)
 
 
diff --git a/migrations/env.py b/migrations/env.py
index 1627e693..c2ff58c1 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -1,10 +1,11 @@
-import aurweb.db
-import aurweb.schema
-
-from alembic import context
 import logging.config
+
 import sqlalchemy
 
+from alembic import context
+
+import aurweb.db
+import aurweb.schema
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index 1f3d0476..b3a73ef2 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -10,33 +10,32 @@ usage: gendummydata.py outputfilename.sql
 # insert these users/packages into the AUR database.
 #
 import hashlib
-import random
-import time
-import os
-import sys
-import io
 import logging
+import os
+import random
+import sys
+import time
 
-LOG_LEVEL = logging.DEBUG # logging level. set to logging.INFO to reduce output
+LOG_LEVEL = logging.DEBUG  # logging level. set to logging.INFO to reduce output
 SEED_FILE = "/usr/share/dict/words"
-DB_HOST   = os.getenv("DB_HOST", "localhost")
-DB_NAME   = os.getenv("DB_NAME", "AUR")
-DB_USER   = os.getenv("DB_USER", "aur")
-DB_PASS   = os.getenv("DB_PASS", "aur")
-USER_ID   = 5          # Users.ID of first bogus user
-PKG_ID    = 1          # Packages.ID of first package
+DB_HOST = os.getenv("DB_HOST", "localhost")
+DB_NAME = os.getenv("DB_NAME", "AUR")
+DB_USER = os.getenv("DB_USER", "aur")
+DB_PASS = os.getenv("DB_PASS", "aur")
+USER_ID = 5            # Users.ID of first bogus user
+PKG_ID = 1             # Packages.ID of first package
 MAX_USERS = 300        # how many users to 'register'
-MAX_DEVS  = .1         # what percentage of MAX_USERS are Developers
-MAX_TUS   = .2         # what percentage of MAX_USERS are Trusted Users
-MAX_PKGS  = 900       # how many packages to load
-PKG_DEPS  = (1, 15)    # min/max depends a package has
-PKG_RELS  = (1, 5)     # min/max relations a package has
-PKG_SRC   = (1, 3)     # min/max sources a package has
+MAX_DEVS = .1          # what percentage of MAX_USERS are Developers
+MAX_TUS = .2           # what percentage of MAX_USERS are Trusted Users
+MAX_PKGS = 900         # how many packages to load
+PKG_DEPS = (1, 15)     # min/max depends a package has
+PKG_RELS = (1, 5)      # min/max relations a package has
+PKG_SRC = (1, 3)       # min/max sources a package has
 PKG_CMNTS = (1, 5)     # min/max number of comments a package has
 CATEGORIES_COUNT = 17  # the number of categories from aur-schema
-VOTING    = (0, .30)   # percentage range for package voting
-OPEN_PROPOSALS = 5 # number of open trusted user proposals
-CLOSE_PROPOSALS = 15 # number of closed trusted user proposals
+VOTING = (0, .30)      # percentage range for package voting
+OPEN_PROPOSALS = 5     # number of open trusted user proposals
+CLOSE_PROPOSALS = 15   # number of closed trusted user proposals
 RANDOM_TLDS = ("edu", "com", "org", "net", "tw", "ru", "pl", "de", "es")
 RANDOM_URL = ("http://www.", "ftp://ftp.", "http://", "ftp://")
 RANDOM_LOCS = ("pub", "release", "files", "downloads", "src")
@@ -48,20 +47,20 @@ logging.basicConfig(format=logformat, level=LOG_LEVEL)
 log = logging.getLogger()
 
 if len(sys.argv) != 2:
-	log.error("Missing output filename argument")
-	raise SystemExit
+    log.error("Missing output filename argument")
+    raise SystemExit
 
 # make sure the seed file exists
 #
 if not os.path.exists(SEED_FILE):
-	log.error("Please install the 'words' Arch package")
-	raise SystemExit
+    log.error("Please install the 'words' Arch package")
+    raise SystemExit
 
 # make sure comments can be created
 #
 if not os.path.exists(FORTUNE_FILE):
-	log.error("Please install the 'fortune-mod' Arch package")
-	raise SystemExit
+    log.error("Please install the 'fortune-mod' Arch package")
+    raise SystemExit
 
 # track what users/package names have been used
 #
@@ -69,21 +68,28 @@ seen_users = {}
 seen_pkgs = {}
 user_keys = []
 
+
 # some functions to generate random data
 #
 def genVersion():
-	ver = []
-	ver.append("%d" % random.randrange(0,10))
-	ver.append("%d" % random.randrange(0,20))
-	if random.randrange(0,2) == 0:
-		ver.append("%d" % random.randrange(0,100))
-	return ".".join(ver) + "-%d" % random.randrange(1,11)
+    ver = []
+    ver.append("%d" % random.randrange(0, 10))
+    ver.append("%d" % random.randrange(0, 20))
+    if random.randrange(0, 2) == 0:
+        ver.append("%d" % random.randrange(0, 100))
+    return ".".join(ver) + "-%d" % random.randrange(1, 11)
+
+
 def genCategory():
-	return random.randrange(1,CATEGORIES_COUNT)
+    return random.randrange(1, CATEGORIES_COUNT)
+
+
 def genUID():
-	return seen_users[user_keys[random.randrange(0,len(user_keys))]]
+    return seen_users[user_keys[random.randrange(0, len(user_keys))]]
+
+
 def genFortune():
-	return fortunes[random.randrange(0,len(fortunes))].replace("'", "")
+    return fortunes[random.randrange(0, len(fortunes))].replace("'", "")
 
 
 # load the words, and make sure there are enough words for users/pkgs
@@ -93,25 +99,25 @@ fp = open(SEED_FILE, "r", encoding="utf-8")
 contents = fp.readlines()
 fp.close()
 if MAX_USERS > len(contents):
-	MAX_USERS = len(contents)
+    MAX_USERS = len(contents)
 if MAX_PKGS > len(contents):
-	MAX_PKGS = len(contents)
+    MAX_PKGS = len(contents)
 if len(contents) - MAX_USERS > MAX_PKGS:
-	need_dupes = 0
+    need_dupes = 0
 else:
-	need_dupes = 1
+    need_dupes = 1
 
 # select random usernames
 #
 log.debug("Generating random user names...")
 user_id = USER_ID
 while len(seen_users) < MAX_USERS:
-	user = random.randrange(0, len(contents))
-	word = contents[user].replace("'", "").replace(".","").replace(" ", "_")
-	word = word.strip().lower()
-	if word not in seen_users:
-		seen_users[word] = user_id
-		user_id += 1
+    user = random.randrange(0, len(contents))
+    word = contents[user].replace("'", "").replace(".", "").replace(" ", "_")
+    word = word.strip().lower()
+    if word not in seen_users:
+        seen_users[word] = user_id
+        user_id += 1
 user_keys = list(seen_users.keys())
 
 # select random package names
@@ -119,17 +125,17 @@ user_keys = list(seen_users.keys())
 log.debug("Generating random package names...")
 num_pkgs = PKG_ID
 while len(seen_pkgs) < MAX_PKGS:
-	pkg = random.randrange(0, len(contents))
-	word = contents[pkg].replace("'", "").replace(".","").replace(" ", "_")
-	word = word.strip().lower()
-	if not need_dupes:
-		if word not in seen_pkgs and word not in seen_users:
-			seen_pkgs[word] = num_pkgs
-			num_pkgs += 1
-	else:
-		if word not in seen_pkgs:
-			seen_pkgs[word] = num_pkgs
-			num_pkgs += 1
+    pkg = random.randrange(0, len(contents))
+    word = contents[pkg].replace("'", "").replace(".", "").replace(" ", "_")
+    word = word.strip().lower()
+    if not need_dupes:
+        if word not in seen_pkgs and word not in seen_users:
+            seen_pkgs[word] = num_pkgs
+            num_pkgs += 1
+    else:
+        if word not in seen_pkgs:
+            seen_pkgs[word] = num_pkgs
+            num_pkgs += 1
 
 # free up contents memory
 #
@@ -151,32 +157,32 @@ out.write("BEGIN;\n")
 #
 log.debug("Creating SQL statements for users.")
 for u in user_keys:
-	account_type = 1  # default to normal user
-	if not has_devs or not has_tus:
-		account_type = random.randrange(1, 4)
-		if account_type == 3 and not has_devs:
-			# this will be a dev account
-			#
-			developers.append(seen_users[u])
-			if len(developers) >= MAX_DEVS * MAX_USERS:
-				has_devs = 1
-		elif account_type == 2 and not has_tus:
-			# this will be a trusted user account
-			#
-			trustedusers.append(seen_users[u])
-			if len(trustedusers) >= MAX_TUS * MAX_USERS:
-				has_tus = 1
-		else:
-			# a normal user account
-			#
-			pass
+    account_type = 1  # default to normal user
+    if not has_devs or not has_tus:
+        account_type = random.randrange(1, 4)
+        if account_type == 3 and not has_devs:
+            # this will be a dev account
+            #
+            developers.append(seen_users[u])
+            if len(developers) >= MAX_DEVS * MAX_USERS:
+                has_devs = 1
+        elif account_type == 2 and not has_tus:
+            # this will be a trusted user account
+            #
+            trustedusers.append(seen_users[u])
+            if len(trustedusers) >= MAX_TUS * MAX_USERS:
+                has_tus = 1
+        else:
+            # a normal user account
+            #
+            pass
 
-	h = hashlib.new('md5')
-	h.update(u.encode());
-	s = ("INSERT INTO Users (ID, AccountTypeID, Username, Email, Passwd)"
-		 " VALUES (%d, %d, '%s', '%s@example.com', '%s');\n")
-	s = s % (seen_users[u], account_type, u, u, h.hexdigest())
-	out.write(s)
+    h = hashlib.new('md5')
+    h.update(u.encode())
+    s = ("INSERT INTO Users (ID, AccountTypeID, Username, Email, Passwd)"
+         " VALUES (%d, %d, '%s', '%s@example.com', '%s');\n")
+    s = s % (seen_users[u], account_type, u, u, h.hexdigest())
+    out.write(s)
 
 log.debug("Number of developers: %d" % len(developers))
 log.debug("Number of trusted users: %d" % len(trustedusers))
@@ -193,123 +199,123 @@ fp.close()
 log.debug("Creating SQL statements for packages.")
 count = 0
 for p in list(seen_pkgs.keys()):
-	NOW = int(time.time())
-	if count % 2 == 0:
-		muid = developers[random.randrange(0,len(developers))]
-		puid = developers[random.randrange(0,len(developers))]
-	else:
-		muid = trustedusers[random.randrange(0,len(trustedusers))]
-		puid = trustedusers[random.randrange(0,len(trustedusers))]
-	if count % 20 == 0: # every so often, there are orphans...
-		muid = "NULL"
+    NOW = int(time.time())
+    if count % 2 == 0:
+        muid = developers[random.randrange(0, len(developers))]
+        puid = developers[random.randrange(0, len(developers))]
+    else:
+        muid = trustedusers[random.randrange(0, len(trustedusers))]
+        puid = trustedusers[random.randrange(0, len(trustedusers))]
+    if count % 20 == 0:  # every so often, there are orphans...
+        muid = "NULL"
 
-	uuid = genUID() # the submitter/user
+    uuid = genUID()  # the submitter/user
 
-	s = ("INSERT INTO PackageBases (ID, Name, FlaggerComment, SubmittedTS, ModifiedTS, "
+    s = ("INSERT INTO PackageBases (ID, Name, FlaggerComment, SubmittedTS, ModifiedTS, "
          "SubmitterUID, MaintainerUID, PackagerUID) VALUES (%d, '%s', '', %d, %d, %d, %s, %s);\n")
-	s = s % (seen_pkgs[p], p, NOW, NOW, uuid, muid, puid)
-	out.write(s)
+    s = s % (seen_pkgs[p], p, NOW, NOW, uuid, muid, puid)
+    out.write(s)
 
-	s = ("INSERT INTO Packages (ID, PackageBaseID, Name, Version) VALUES "
+    s = ("INSERT INTO Packages (ID, PackageBaseID, Name, Version) VALUES "
          "(%d, %d, '%s', '%s');\n")
-	s = s % (seen_pkgs[p], seen_pkgs[p], p, genVersion())
-	out.write(s)
+    s = s % (seen_pkgs[p], seen_pkgs[p], p, genVersion())
+    out.write(s)
 
-	count += 1
+    count += 1
 
-	# create random comments for this package
-	#
-	num_comments = random.randrange(PKG_CMNTS[0], PKG_CMNTS[1])
-	for i in range(0, num_comments):
-		now = NOW + random.randrange(400, 86400*3)
-		s = ("INSERT INTO PackageComments (PackageBaseID, UsersID,"
-			 " Comments, RenderedComment, CommentTS) VALUES (%d, %d, '%s', '', %d);\n")
-		s = s % (seen_pkgs[p], genUID(), genFortune(), now)
-		out.write(s)
+    # create random comments for this package
+    #
+    num_comments = random.randrange(PKG_CMNTS[0], PKG_CMNTS[1])
+    for i in range(0, num_comments):
+        now = NOW + random.randrange(400, 86400*3)
+        s = ("INSERT INTO PackageComments (PackageBaseID, UsersID,"
+             " Comments, RenderedComment, CommentTS) VALUES (%d, %d, '%s', '', %d);\n")
+        s = s % (seen_pkgs[p], genUID(), genFortune(), now)
+        out.write(s)
 
 # Cast votes
 #
 track_votes = {}
 log.debug("Casting votes for packages.")
 for u in user_keys:
-	num_votes = random.randrange(int(len(seen_pkgs)*VOTING[0]),
-			int(len(seen_pkgs)*VOTING[1]))
-	pkgvote = {}
-	for v in range(num_votes):
-		pkg = random.randrange(1, len(seen_pkgs) + 1)
-		if pkg not in pkgvote:
-			s = ("INSERT INTO PackageVotes (UsersID, PackageBaseID)"
-				 " VALUES (%d, %d);\n")
-			s = s % (seen_users[u], pkg)
-			pkgvote[pkg] = 1
-			if pkg not in track_votes:
-				track_votes[pkg] = 0
-			track_votes[pkg] += 1
-			out.write(s)
+    num_votes = random.randrange(int(len(seen_pkgs)*VOTING[0]),
+                                 int(len(seen_pkgs)*VOTING[1]))
+    pkgvote = {}
+    for v in range(num_votes):
+        pkg = random.randrange(1, len(seen_pkgs) + 1)
+        if pkg not in pkgvote:
+            s = ("INSERT INTO PackageVotes (UsersID, PackageBaseID)"
+                 " VALUES (%d, %d);\n")
+            s = s % (seen_users[u], pkg)
+            pkgvote[pkg] = 1
+            if pkg not in track_votes:
+                track_votes[pkg] = 0
+            track_votes[pkg] += 1
+            out.write(s)
 
 # Update statements for package votes
 #
 for p in list(track_votes.keys()):
-	s = "UPDATE PackageBases SET NumVotes = %d WHERE ID = %d;\n"
-	s = s % (track_votes[p], p)
-	out.write(s)
+    s = "UPDATE PackageBases SET NumVotes = %d WHERE ID = %d;\n"
+    s = s % (track_votes[p], p)
+    out.write(s)
 
 # Create package dependencies and sources
 #
 log.debug("Creating statements for package depends/sources.")
 for p in list(seen_pkgs.keys()):
-	num_deps = random.randrange(PKG_DEPS[0], PKG_DEPS[1])
-	for i in range(0, num_deps):
-		dep = random.choice([k for k in seen_pkgs])
-		deptype = random.randrange(1, 5)
-		if deptype == 4:
-			dep += ": for " + random.choice([k for k in seen_pkgs])
-		s = "INSERT INTO PackageDepends(PackageID, DepTypeID, DepName) VALUES (%d, %d, '%s');\n"
-		s = s % (seen_pkgs[p], deptype, dep)
-		out.write(s)
+    num_deps = random.randrange(PKG_DEPS[0], PKG_DEPS[1])
+    for i in range(0, num_deps):
+        dep = random.choice([k for k in seen_pkgs])
+        deptype = random.randrange(1, 5)
+        if deptype == 4:
+            dep += ": for " + random.choice([k for k in seen_pkgs])
+        s = "INSERT INTO PackageDepends(PackageID, DepTypeID, DepName) VALUES (%d, %d, '%s');\n"
+        s = s % (seen_pkgs[p], deptype, dep)
+        out.write(s)
 
-	num_rels = random.randrange(PKG_RELS[0], PKG_RELS[1])
-	for i in range(0, num_deps):
-		rel = random.choice([k for k in seen_pkgs])
-		reltype = random.randrange(1, 4)
-		s = "INSERT INTO PackageRelations(PackageID, RelTypeID, RelName) VALUES (%d, %d, '%s');\n"
-		s = s % (seen_pkgs[p], reltype, rel)
-		out.write(s)
+    num_rels = random.randrange(PKG_RELS[0], PKG_RELS[1])
+    for i in range(0, num_deps):
+        rel = random.choice([k for k in seen_pkgs])
+        reltype = random.randrange(1, 4)
+        s = "INSERT INTO PackageRelations(PackageID, RelTypeID, RelName) VALUES (%d, %d, '%s');\n"
+        s = s % (seen_pkgs[p], reltype, rel)
+        out.write(s)
 
-	num_sources = random.randrange(PKG_SRC[0], PKG_SRC[1])
-	for i in range(num_sources):
-		src_file = user_keys[random.randrange(0, len(user_keys))]
-		src = "%s%s.%s/%s/%s-%s.tar.gz" % (
-				RANDOM_URL[random.randrange(0,len(RANDOM_URL))],
-				p, RANDOM_TLDS[random.randrange(0,len(RANDOM_TLDS))],
-				RANDOM_LOCS[random.randrange(0,len(RANDOM_LOCS))],
-				src_file, genVersion())
-		s = "INSERT INTO PackageSources(PackageID, Source) VALUES (%d, '%s');\n"
-		s = s % (seen_pkgs[p], src)
-		out.write(s)
+    num_sources = random.randrange(PKG_SRC[0], PKG_SRC[1])
+    for i in range(num_sources):
+        src_file = user_keys[random.randrange(0, len(user_keys))]
+        src = "%s%s.%s/%s/%s-%s.tar.gz" % (
+                RANDOM_URL[random.randrange(0, len(RANDOM_URL))],
+                p, RANDOM_TLDS[random.randrange(0, len(RANDOM_TLDS))],
+                RANDOM_LOCS[random.randrange(0, len(RANDOM_LOCS))],
+                src_file, genVersion())
+        s = "INSERT INTO PackageSources(PackageID, Source) VALUES (%d, '%s');\n"
+        s = s % (seen_pkgs[p], src)
+        out.write(s)
 
 # Create trusted user proposals
 #
 log.debug("Creating SQL statements for trusted user proposals.")
-count=0
+count = 0
 for t in range(0, OPEN_PROPOSALS+CLOSE_PROPOSALS):
-	now = int(time.time())
-	if count < CLOSE_PROPOSALS:
-		start =  now - random.randrange(3600*24*7, 3600*24*21)
-		end = now - random.randrange(0, 3600*24*7)
-	else:
-		start = now
-		end = now + random.randrange(3600*24, 3600*24*7)
-	if count % 5 == 0: # Don't make the vote about anyone once in a while
-		user = ""
-	else:
-		user = user_keys[random.randrange(0,len(user_keys))]
-	suid = trustedusers[random.randrange(0,len(trustedusers))]
-	s = ("INSERT INTO TU_VoteInfo (Agenda, User, Submitted, End,"
-	" Quorum, SubmitterID) VALUES ('%s', '%s', %d, %d, 0.0, %d);\n")
-	s = s % (genFortune(), user, start, end, suid)
-	out.write(s)
-	count += 1
+    now = int(time.time())
+    if count < CLOSE_PROPOSALS:
+        start = now - random.randrange(3600*24*7, 3600*24*21)
+        end = now - random.randrange(0, 3600*24*7)
+    else:
+        start = now
+        end = now + random.randrange(3600*24, 3600*24*7)
+    if count % 5 == 0:  # Don't make the vote about anyone once in a while
+        user = ""
+    else:
+        user = user_keys[random.randrange(0, len(user_keys))]
+    suid = trustedusers[random.randrange(0, len(trustedusers))]
+    s = ("INSERT INTO TU_VoteInfo (Agenda, User, Submitted, End,"
+         " Quorum, SubmitterID) VALUES ('%s', '%s', %d, %d, 0.0, %d);\n")
+    s = s % (genFortune(), user, start, end, suid)
+    out.write(s)
+    count += 1
 
 # close output file
 #
diff --git a/setup.py b/setup.py
index ca26f0d8..cf88488c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,8 @@
 import re
-from setuptools import setup, find_packages
 import sys
 
+from setuptools import find_packages, setup
+
 version = None
 with open('web/lib/version.inc.php', 'r') as f:
     for line in f.readlines():

From 4cf94816ae022be88540a25356a3abbe10a452eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Mon, 1 Jun 2020 23:35:26 +0100
Subject: [PATCH 006/844] flake8: add initial config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 setup.cfg | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 setup.cfg

diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..04f5b8ba
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,4 @@
+[flake8]
+max-line-length = 127
+max-complexity = 10
+

From 8f47b8d731e0d650ea671e169cddaafa64c44055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Mon, 1 Jun 2020 23:35:27 +0100
Subject: [PATCH 007/844] isort: add initial config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 setup.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 04f5b8ba..b868c096 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,3 +2,7 @@
 max-line-length = 127
 max-complexity = 10
 
+[isort]
+line_length = 127
+lines_between_types = 1
+

From 41a84934114f5d77f51d7064c4a64b2e279c1ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Mon, 1 Jun 2020 23:35:28 +0100
Subject: [PATCH 008/844] pre-commit: add initial config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 .pre-commit-config.yaml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..525c7eb8
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,24 @@
+hooks:
+  - &base
+    language: python
+    types: [python]
+    require_serial: true
+    exclude: ^migrations/versions
+  - &flake8
+    id: flake8
+    name: flake8
+    entry: flake8
+    <<: *base
+  - &isort
+    id: isort
+    name: isort
+    entry: isort
+    <<: *base
+
+repos:
+  - repo: local
+    hooks:
+      - <<: *flake8
+      - <<: *isort
+        args: ['--check-only', '--diff']
+

From d4abe0b72d1215906806ee84474115961e79f7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Mon, 1 Jun 2020 23:35:29 +0100
Subject: [PATCH 009/844] Add CONTRIBUTING.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 CONTRIBUTING.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..a37d980a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,10 @@
+# Contributing
+
+Patches should be sent to the [aur-dev@archlinux.org][1] mailing list.
+
+Before sending patched you are recomended to run the `flake8` and `isort`.
+
+You can add git hook to do this by installing `python-pre-install` and running
+`pre-install install`.
+
+[1] https://lists.archlinux.org/listinfo/aur-dev

From 5be07a8a9e9777d54cf7122be52aa0a7b1b51e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 1 Jun 2020 18:49:37 +0200
Subject: [PATCH 010/844] aurweb.spawn: Integrate FastAPI and nginx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

aurweb.spawn used to launch only PHP’s built-in server. Now it spawns a
dummy FastAPI application too. Since both stacks spawn their own HTTP
server, aurweb.spawn also spawns nginx as a reverse proxy to mount them
under the same base URL, defined by aur_location in the configuration.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 .gitlab-ci.yml       |  2 +-
 TESTING              |  3 +-
 aurweb/asgi.py       |  8 +++++
 aurweb/spawn.py      | 80 +++++++++++++++++++++++++++++++++++++-------
 conf/config.defaults |  7 ++++
 5 files changed, 86 insertions(+), 14 deletions(-)
 create mode 100644 aurweb/asgi.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74784fce..f6260ebb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ before_script:
            base-devel git gpgme protobuf pyalpm python-mysql-connector
            python-pygit2 python-srcinfo python-bleach python-markdown
            python-sqlalchemy python-alembic python-pytest python-werkzeug
-           python-pytest-tap
+           python-pytest-tap python-fastapi uvicorn nginx
 
 test:
   script:
diff --git a/TESTING b/TESTING
index a5e08cb8..31e3bcbd 100644
--- a/TESTING
+++ b/TESTING
@@ -12,7 +12,8 @@ INSTALL.
 2) Install the necessary packages:
 
     # pacman -S --needed php php-sqlite sqlite words fortune-mod \
-                         python python-sqlalchemy python-alembic
+                         python python-sqlalchemy python-alembic \
+                         python-fastapi uvicorn nginx
 
    Ensure to enable the pdo_sqlite extension in php.ini.
 
diff --git a/aurweb/asgi.py b/aurweb/asgi.py
new file mode 100644
index 00000000..5f30471a
--- /dev/null
+++ b/aurweb/asgi.py
@@ -0,0 +1,8 @@
+from fastapi import FastAPI
+
+app = FastAPI()
+
+
+@app.get("/hello/")
+async def hello():
+    return {"message": "Hello from FastAPI!"}
diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 5fa646b5..0506afa4 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -10,8 +10,10 @@ configuration anyway.
 
 import atexit
 import argparse
+import os
 import subprocess
 import sys
+import tempfile
 import time
 import urllib
 
@@ -20,6 +22,7 @@ import aurweb.schema
 
 
 children = []
+temporary_dir = None
 verbosity = 0
 
 
@@ -35,10 +38,42 @@ class ProcessExceptions(Exception):
         super().__init__("\n- ".join(messages))
 
 
+def generate_nginx_config():
+    """
+    Generate an nginx configuration based on aurweb's configuration.
+    The file is generated under `temporary_dir`.
+    Returns the path to the created configuration file.
+    """
+    aur_location = aurweb.config.get("options", "aur_location")
+    aur_location_parts = urllib.parse.urlsplit(aur_location)
+    config_path = os.path.join(temporary_dir, "nginx.conf")
+    config = open(config_path, "w")
+    # We double nginx's braces because they conflict with Python's f-strings.
+    config.write(f"""
+        events {{}}
+        daemon off;
+        error_log /dev/stderr info;
+        pid {os.path.join(temporary_dir, "nginx.pid")};
+        http {{
+            access_log /dev/stdout;
+            server {{
+                listen {aur_location_parts.netloc};
+                location / {{
+                    proxy_pass http://{aurweb.config.get("php", "bind_address")};
+                }}
+                location /hello {{
+                    proxy_pass http://{aurweb.config.get("fastapi", "bind_address")};
+                }}
+            }}
+        }}
+    """)
+    return config_path
+
+
 def spawn_child(args):
     """Open a subprocess and add it to the global state."""
     if verbosity >= 1:
-        print(f"Spawning {args}", file=sys.stderr)
+        print(f":: Spawning {args}", file=sys.stderr)
     children.append(subprocess.Popen(args))
 
 
@@ -52,10 +87,29 @@ def start():
     if children:
         return
     atexit.register(stop)
-    aur_location = aurweb.config.get("options", "aur_location")
-    aur_location_parts = urllib.parse.urlsplit(aur_location)
-    htmldir = aurweb.config.get("options", "htmldir")
-    spawn_child(["php", "-S", aur_location_parts.netloc, "-t", htmldir])
+
+    print("{ruler}\n"
+          "Spawing PHP and FastAPI, then nginx as a reverse proxy.\n"
+          "Check out {aur_location}\n"
+          "Hit ^C to terminate everything.\n"
+          "{ruler}"
+          .format(ruler=("-" * os.get_terminal_size().columns),
+                  aur_location=aurweb.config.get('options', 'aur_location')))
+
+    # PHP
+    php_address = aurweb.config.get("php", "bind_address")
+    htmldir = aurweb.config.get("php", "htmldir")
+    spawn_child(["php", "-S", php_address, "-t", htmldir])
+
+    # FastAPI
+    host, port = aurweb.config.get("fastapi", "bind_address").rsplit(":", 1)
+    spawn_child(["python", "-m", "uvicorn",
+                 "--host", host,
+                 "--port", port,
+                 "aurweb.asgi:app"])
+
+    # nginx
+    spawn_child(["nginx", "-p", temporary_dir, "-c", generate_nginx_config()])
 
 
 def stop():
@@ -73,7 +127,7 @@ def stop():
         try:
             p.terminate()
             if verbosity >= 1:
-                print(f"Sent SIGTERM to {p.args}", file=sys.stderr)
+                print(f":: Sent SIGTERM to {p.args}", file=sys.stderr)
         except Exception as e:
             exceptions.append(e)
     for p in children:
@@ -99,9 +153,11 @@ if __name__ == '__main__':
                         help='increase verbosity')
     args = parser.parse_args()
     verbosity = args.verbose
-    start()
-    try:
-        while True:
-            time.sleep(60)
-    except KeyboardInterrupt:
-        stop()
+    with tempfile.TemporaryDirectory(prefix="aurweb-") as tmpdirname:
+        temporary_dir = tmpdirname
+        start()
+        try:
+            while True:
+                time.sleep(60)
+        except KeyboardInterrupt:
+            stop()
diff --git a/conf/config.defaults b/conf/config.defaults
index 86fe765c..ed495168 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -41,9 +41,16 @@ cache = none
 cache_pkginfo_ttl = 86400
 memcache_servers = 127.0.0.1:11211
 
+[php]
+; Address PHP should bind when spawned in development mode by aurweb.spawn.
+bind_address = 127.0.0.1:8081
 ; Directory containing aurweb's PHP code, required by aurweb.spawn.
 ;htmldir = /path/to/web/html
 
+[fastapi]
+; Address uvicorn should bind when spawned in development mode by aurweb.spawn.
+bind_address = 127.0.0.1:8082
+
 [ratelimit]
 request_limit = 4000
 window_length = 86400

From 8c868e088c8becc7640327db2e5e2a1cb10bab41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Wed, 3 Jun 2020 02:04:02 +0200
Subject: [PATCH 011/844] Introduce conf/config.dev for development
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

conf/config.dev’s purpose is to provide a lighter configuration template
for developers, and split development-specific options off the default
configuration file.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 TESTING              | 11 ++++++-----
 conf/config.defaults | 10 ----------
 conf/config.dev      | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 conf/config.dev

diff --git a/TESTING b/TESTING
index 31e3bcbd..7261df92 100644
--- a/TESTING
+++ b/TESTING
@@ -17,12 +17,13 @@ INSTALL.
 
    Ensure to enable the pdo_sqlite extension in php.ini.
 
-3) Copy conf/config.defaults to conf/config and adjust the configuration
-   Pay attention to disable_http_login, enable_maintenance, aur_location and
-   htmldir.
+3) Copy conf/config.dev to conf/config and replace YOUR_AUR_ROOT by the absolute
+   path to the root of your aurweb clone. sed can do both tasks for you:
 
-   Be sure to change backend to sqlite and name to the file location of your
-   created test database.
+    $ sed -e "s;YOUR_AUR_ROOT;$PWD;g" conf/config.dev > conf/config
+
+   Note that when the upstream config.dev is updated, you should compare it to
+   your conf/config, or regenerate your configuration with the command above.
 
 4) Prepare the testing database:
 
diff --git a/conf/config.defaults b/conf/config.defaults
index ed495168..447dacac 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -41,16 +41,6 @@ cache = none
 cache_pkginfo_ttl = 86400
 memcache_servers = 127.0.0.1:11211
 
-[php]
-; Address PHP should bind when spawned in development mode by aurweb.spawn.
-bind_address = 127.0.0.1:8081
-; Directory containing aurweb's PHP code, required by aurweb.spawn.
-;htmldir = /path/to/web/html
-
-[fastapi]
-; Address uvicorn should bind when spawned in development mode by aurweb.spawn.
-bind_address = 127.0.0.1:8082
-
 [ratelimit]
 request_limit = 4000
 window_length = 86400
diff --git a/conf/config.dev b/conf/config.dev
new file mode 100644
index 00000000..d752f61f
--- /dev/null
+++ b/conf/config.dev
@@ -0,0 +1,32 @@
+; Configuration file for aurweb development.
+;
+; Options are implicitly inherited from conf/config.defaults, which lists all
+; available options for productions, and their default values. This current file
+; overrides only options useful for development, and introduces
+; development-specific options too.
+
+[database]
+backend = sqlite
+name = YOUR_AUR_ROOT/aurweb.sqlite3
+
+; Alternative MySQL configuration
+;backend = mysql
+;name = aurweb
+;user = aur
+;password = aur
+
+[options]
+aur_location = http://127.0.0.1:8080
+disable_http_login = 0
+enable-maintenance = 0
+
+[php]
+; Address PHP should bind when spawned in development mode by aurweb.spawn.
+bind_address = 127.0.0.1:8081
+
+; Directory containing aurweb's PHP code, required by aurweb.spawn.
+htmldir = YOUR_AUR_ROOT/web/html
+
+[fastapi]
+; Address uvicorn should bind when spawned in development mode by aurweb.spawn.
+bind_address = 127.0.0.1:8082

From 0e3bd8b5969f3c3d6ba9273b15ae1e093fc934e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Thu, 4 Jun 2020 21:59:34 +0200
Subject: [PATCH 012/844] Remove the FastAPI /hello test route

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/asgi.py  | 5 -----
 aurweb/spawn.py | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 5f30471a..9bb71ecc 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,8 +1,3 @@
 from fastapi import FastAPI
 
 app = FastAPI()
-
-
-@app.get("/hello/")
-async def hello():
-    return {"message": "Hello from FastAPI!"}
diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 0506afa4..7fe59e65 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -61,9 +61,6 @@ def generate_nginx_config():
                 location / {{
                     proxy_pass http://{aurweb.config.get("php", "bind_address")};
                 }}
-                location /hello {{
-                    proxy_pass http://{aurweb.config.get("fastapi", "bind_address")};
-                }}
             }}
         }}
     """)

From b1300117ac6fc0f5e9cf1048576db8fb97470bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Thu, 4 Jun 2020 21:59:48 +0200
Subject: [PATCH 013/844] aurweb.spawn: Fix isort errors

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/spawn.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 7fe59e65..e86f29fe 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -8,8 +8,8 @@ configuration anyway.
 """
 
 
-import atexit
 import argparse
+import atexit
 import os
 import subprocess
 import sys
@@ -20,7 +20,6 @@ import urllib
 import aurweb.config
 import aurweb.schema
 
-
 children = []
 temporary_dir = None
 verbosity = 0

From 3b347d3989592293661a47a5bac7645afb8d61d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Thu, 4 Jun 2020 22:00:20 +0200
Subject: [PATCH 014/844] Crude OpenID Connect client using Authlib

Developers can go to /sso/login to get redirected to the SSO. On
successful login, the ID token is displayed.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 .gitlab-ci.yml             |  3 ++-
 TESTING                    |  3 ++-
 aurweb/asgi.py             | 13 +++++++++++++
 aurweb/routers/__init__.py |  5 +++++
 aurweb/routers/sso.py      | 30 ++++++++++++++++++++++++++++++
 aurweb/spawn.py            |  3 +++
 conf/config.defaults       |  8 ++++++++
 conf/config.dev            |  9 +++++++++
 8 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 aurweb/routers/__init__.py
 create mode 100644 aurweb/routers/sso.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6260ebb..9dc951aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,8 @@ before_script:
            base-devel git gpgme protobuf pyalpm python-mysql-connector
            python-pygit2 python-srcinfo python-bleach python-markdown
            python-sqlalchemy python-alembic python-pytest python-werkzeug
-           python-pytest-tap python-fastapi uvicorn nginx
+           python-pytest-tap python-fastapi uvicorn nginx python-authlib
+           python-itsdangerous python-httpx
 
 test:
   script:
diff --git a/TESTING b/TESTING
index 7261df92..d7df3672 100644
--- a/TESTING
+++ b/TESTING
@@ -13,7 +13,8 @@ INSTALL.
 
     # pacman -S --needed php php-sqlite sqlite words fortune-mod \
                          python python-sqlalchemy python-alembic \
-                         python-fastapi uvicorn nginx
+                         python-fastapi uvicorn nginx \
+                         python-authlib python-itsdangerous python-httpx
 
    Ensure to enable the pdo_sqlite extension in php.ini.
 
diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 9bb71ecc..60c7ade7 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,3 +1,16 @@
 from fastapi import FastAPI
+from starlette.middleware.sessions import SessionMiddleware
+
+import aurweb.config
+
+from aurweb.routers import sso
 
 app = FastAPI()
+
+session_secret = aurweb.config.get("fastapi", "session_secret")
+if not session_secret:
+    raise Exception("[fastapi] session_secret must not be empty")
+
+app.add_middleware(SessionMiddleware, secret_key=session_secret)
+
+app.include_router(sso.router)
diff --git a/aurweb/routers/__init__.py b/aurweb/routers/__init__.py
new file mode 100644
index 00000000..35d43c03
--- /dev/null
+++ b/aurweb/routers/__init__.py
@@ -0,0 +1,5 @@
+"""
+API routers for FastAPI.
+
+See https://fastapi.tiangolo.com/tutorial/bigger-applications/
+"""
diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
new file mode 100644
index 00000000..b16edffb
--- /dev/null
+++ b/aurweb/routers/sso.py
@@ -0,0 +1,30 @@
+import fastapi
+
+from authlib.integrations.starlette_client import OAuth
+from starlette.requests import Request
+
+import aurweb.config
+
+router = fastapi.APIRouter()
+
+oauth = OAuth()
+oauth.register(
+    name="sso",
+    server_metadata_url=aurweb.config.get("sso", "openid_configuration"),
+    client_kwargs={"scope": "openid"},
+    client_id=aurweb.config.get("sso", "client_id"),
+    client_secret=aurweb.config.get("sso", "client_secret"),
+)
+
+
+@router.get("/sso/login")
+async def login(request: Request):
+    redirect_uri = aurweb.config.get("options", "aur_location") + "/sso/authenticate"
+    return await oauth.sso.authorize_redirect(request, redirect_uri, prompt="login")
+
+
+@router.get("/sso/authenticate")
+async def authenticate(request: Request):
+    token = await oauth.sso.authorize_access_token(request)
+    user = await oauth.sso.parse_id_token(request, token)
+    return dict(user)
diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index e86f29fe..5da8587e 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -60,6 +60,9 @@ def generate_nginx_config():
                 location / {{
                     proxy_pass http://{aurweb.config.get("php", "bind_address")};
                 }}
+                location /sso {{
+                    proxy_pass http://{aurweb.config.get("fastapi", "bind_address")};
+                }}
             }}
         }}
     """)
diff --git a/conf/config.defaults b/conf/config.defaults
index 447dacac..49259754 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -68,6 +68,14 @@ username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$
 git-serve-cmd = /usr/local/bin/aurweb-git-serve
 ssh-options = restrict
 
+[sso]
+openid_configuration =
+client_id =
+client_secret =
+
+[fastapi]
+session_secret =
+
 [serve]
 repo-path = /srv/http/aurweb/aur.git/
 repo-regex = [a-z0-9][a-z0-9.+_-]*$
diff --git a/conf/config.dev b/conf/config.dev
index d752f61f..893e8fd6 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -20,6 +20,12 @@ aur_location = http://127.0.0.1:8080
 disable_http_login = 0
 enable-maintenance = 0
 
+; Single sign-on
+[sso]
+openid_configuration = http://127.0.0.1:8083/auth/realms/aurweb/.well-known/openid-configuration
+client_id = aurweb
+client_secret =
+
 [php]
 ; Address PHP should bind when spawned in development mode by aurweb.spawn.
 bind_address = 127.0.0.1:8081
@@ -30,3 +36,6 @@ htmldir = YOUR_AUR_ROOT/web/html
 [fastapi]
 ; Address uvicorn should bind when spawned in development mode by aurweb.spawn.
 bind_address = 127.0.0.1:8082
+
+; Passphrase FastAPI uses to sign client-side sessions.
+session_secret = secret

From 2b439b819908a7f6e9cbd9029d82de617230312f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Thu, 4 Jun 2020 22:00:34 +0200
Subject: [PATCH 015/844] Guide to setting up Keycloak for the SSO

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 conf/config.dev |  2 +-
 doc/sso.txt     | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 doc/sso.txt

diff --git a/conf/config.dev b/conf/config.dev
index 893e8fd6..37f38c45 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -20,7 +20,7 @@ aur_location = http://127.0.0.1:8080
 disable_http_login = 0
 enable-maintenance = 0
 
-; Single sign-on
+; Single sign-on; see doc/sso.txt.
 [sso]
 openid_configuration = http://127.0.0.1:8083/auth/realms/aurweb/.well-known/openid-configuration
 client_id = aurweb
diff --git a/doc/sso.txt b/doc/sso.txt
new file mode 100644
index 00000000..1b0b1f7d
--- /dev/null
+++ b/doc/sso.txt
@@ -0,0 +1,38 @@
+Single Sign-On (SSO)
+====================
+
+This guide will walk you through setting up Keycloak for use with aurweb. For
+extensive documentation, see <https://www.keycloak.org/documentation.html>.
+
+Installing Keycloak
+-------------------
+
+Keycloak is in the official Arch repositories:
+
+    # pacman -S keycloak
+
+The default port is 8080, which conflicts with aurweb’s default port. You need
+to edit `/etc/keycloak/standalone.xml`, looking for this line:
+
+    <socket-binding name="http" port="${jboss.http.port:8080}"/>
+
+The default developer configuration assumes it is set to 8083. Alternatively,
+you may customize [options] aur_location and [sso] openid_configuration in
+`conf/config`.
+
+You may then start `keycloak.service` through systemd.
+
+See also ArchWiki <https://wiki.archlinux.org/index.php/Keycloak>.
+
+Configuring a realm
+-------------------
+
+Go to <http://127.0.0.1:8083/auth> and log in as administrator. Then, hover the
+text right below the Keycloak logo at the top left, by default *Master*. Click
+*Add realm* and name it *aurweb*.
+
+Open the *Clients* tab, and create a new *openid-connect* client. Call it
+*aurweb*, and set the root URL to <http://127.0.0.1:8080> (your aur_location).
+
+Create a user from the *Users* tab and try logging in from
+<http://127.0.0.1:8083/auth/realms/aurweb/account/>.

From 3f31d149a6dd736007c6583a6162aeda1bcc37b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Tue, 9 Jun 2020 20:25:22 +0200
Subject: [PATCH 016/844] aurweb.l10n: Translate without side effects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The install method in Python’s gettext API aliases the translator’s
gettext method to an application-global _(). We don’t use that anywhere,
and it’s clear from aurweb’s Translator interface that we want to
translate a piece of text without affecting any global namespace.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/l10n.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index 492200b3..51b56abb 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -15,5 +15,4 @@ class Translator:
             self._translator[lang] = gettext.translation("aurweb",
                                                          self._localedir,
                                                          languages=[lang])
-        self._translator[lang].install()
-        return _(s)  # _ is not defined, what is this?  # noqa: F821
+        return self._translator[lang].gettext(s)

From a5554c19a9712ede5fe5a996bd1bec11cfc9f66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 8 Jun 2020 20:16:27 +0200
Subject: [PATCH 017/844] Add SSO account ID in table Users

This column holds a user ID issed by the single sign-on provider. For
Keycloak, it is an UUID. For more flexibility, we will be using a
standardly-sized VARCHAR field.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/schema.py                              |  1 +
 ...6e1cd_add_sso_account_id_in_table_users.py | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py

diff --git a/aurweb/schema.py b/aurweb/schema.py
index 20f3e5ce..a1d56281 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -67,6 +67,7 @@ Users = Table(
     Column('CommentNotify', TINYINT(1), nullable=False, server_default=text("1")),
     Column('UpdateNotify', TINYINT(1), nullable=False, server_default=text("0")),
     Column('OwnershipNotify', TINYINT(1), nullable=False, server_default=text("1")),
+    Column('SSOAccountID', String(255), nullable=True, unique=True),
     Index('UsersAccountTypeID', 'AccountTypeID'),
     mysql_engine='InnoDB',
 )
diff --git a/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py b/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
new file mode 100644
index 00000000..9e125165
--- /dev/null
+++ b/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
@@ -0,0 +1,30 @@
+"""Add SSO account ID in table Users
+
+Revision ID: ef39fcd6e1cd
+Revises: f47cad5d6d03
+Create Date: 2020-06-08 10:04:13.898617
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ef39fcd6e1cd'
+down_revision = 'f47cad5d6d03'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('Users', sa.Column('SSOAccountID', sa.String(length=255), nullable=True))
+    op.create_unique_constraint(None, 'Users', ['SSOAccountID'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'Users', type_='unique')
+    op.drop_column('Users', 'SSOAccountID')
+    # ### end Alembic commands ###

From c77e9d1de0d14253ab3c3b958f459b04b233aeb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 8 Jun 2020 20:16:36 +0200
Subject: [PATCH 018/844] Integrate SQLAlchemy into FastAPI

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/db.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/aurweb/db.py b/aurweb/db.py
index 1ccd9a07..02aeba38 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -10,6 +10,8 @@ except ImportError:
 
 import aurweb.config
 
+engine = None  # See get_engine
+
 
 def get_sqlalchemy_url():
     """
@@ -38,6 +40,34 @@ def get_sqlalchemy_url():
         raise ValueError('unsupported database backend')
 
 
+def get_engine():
+    """
+    Return the global SQLAlchemy engine.
+
+    The engine is created on the first call to get_engine and then stored in the
+    `engine` global variable for the next calls.
+    """
+    from sqlalchemy import create_engine
+    global engine
+    if engine is None:
+        engine = create_engine(get_sqlalchemy_url(),
+                               # check_same_thread is for a SQLite technicality
+                               # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
+                               connect_args={"check_same_thread": False})
+    return engine
+
+
+def connect():
+    """
+    Return an SQLAlchemy connection. Connections are usually pooled. See
+    <https://docs.sqlalchemy.org/en/13/core/connections.html>.
+
+    Since SQLAlchemy connections are context managers too, you should use it
+    with Python’s `with` operator, or with FastAPI’s dependency injection.
+    """
+    return get_engine().connect()
+
+
 class Connection:
     _conn = None
     _paramstyle = None

From 42f8f160b6c556a8c2006788a25b6fafe7be1c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 8 Jun 2020 20:16:49 +0200
Subject: [PATCH 019/844] Open AUR sessions from SSO

Only the core functionality is implemented here. See the TODOs.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 51 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index b16edffb..d0802c34 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -1,9 +1,18 @@
+import time
+import uuid
+
 import fastapi
 
 from authlib.integrations.starlette_client import OAuth
+from fastapi import Depends, HTTPException
+from fastapi.responses import RedirectResponse
+from sqlalchemy.sql import select
 from starlette.requests import Request
 
 import aurweb.config
+import aurweb.db
+
+from aurweb.schema import Sessions, Users
 
 router = fastapi.APIRouter()
 
@@ -23,8 +32,46 @@ async def login(request: Request):
     return await oauth.sso.authorize_redirect(request, redirect_uri, prompt="login")
 
 
+def open_session(conn, user_id):
+    """
+    Create a new user session into the database. Return its SID.
+    """
+    # TODO check for account suspension
+    # TODO apply [options] max_sessions_per_user
+    sid = uuid.uuid4().hex
+    conn.execute(Sessions.insert().values(
+        UsersID=user_id,
+        SessionID=sid,
+        LastUpdateTS=time.time(),
+    ))
+    # TODO update Users.LastLogin and Users.LastLoginIPAddress
+    return sid
+
+
 @router.get("/sso/authenticate")
-async def authenticate(request: Request):
+async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
+    """
+    Receive an OpenID Connect ID token, validate it, then process it to create
+    an new AUR session.
+    """
+    # TODO check for banned IPs
     token = await oauth.sso.authorize_access_token(request)
     user = await oauth.sso.parse_id_token(request, token)
-    return dict(user)
+    sub = user.get("sub")  # this is the SSO account ID in JWT terminology
+    if not sub:
+        raise HTTPException(status_code=400, detail="JWT is missing its `sub` field.")
+
+    aur_accounts = conn.execute(select([Users.c.ID]).where(Users.c.SSOAccountID == sub)) \
+                       .fetchall()
+    if not aur_accounts:
+        return "Sorry, we don’t seem to know you Sir " + sub
+    elif len(aur_accounts) == 1:
+        sid = open_session(conn, aur_accounts[0][Users.c.ID])
+        response = RedirectResponse("/")
+        # TODO redirect to the referrer
+        response.set_cookie(key="AURSID", value=sid, httponly=True,
+                            secure=request.url.scheme == "https")
+        return response
+    else:
+        # We’ve got a severe integrity violation.
+        raise Exception("Multiple accounts found for SSO account " + sub)

From 8d5244d0c0c3b38f29b9b087c5e85082f0bb1f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 13 Jul 2020 17:05:37 +0200
Subject: [PATCH 020/844] Fix typos in CONTRIBUTING.md

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a37d980a..7b9ff466 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,9 +2,9 @@
 
 Patches should be sent to the [aur-dev@archlinux.org][1] mailing list.
 
-Before sending patched you are recomended to run the `flake8` and `isort`.
+Before sending patches, you are recommended to run `flake8` and `isort`.
 
-You can add git hook to do this by installing `python-pre-install` and running
-`pre-install install`.
+You can add a git hook to do this by installing `python-pre-commit` and running
+`pre-commit install`.
 
 [1] https://lists.archlinux.org/listinfo/aur-dev

From 4bf8228324e4c3811b48069a4b2ae7fd840c78a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Tue, 14 Jul 2020 15:34:06 +0200
Subject: [PATCH 021/844] SSO: Explain the rationale behind prompt=login

We might reconsider it in the future.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index d0802c34..e1ec7efe 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -28,6 +28,13 @@ oauth.register(
 
 @router.get("/sso/login")
 async def login(request: Request):
+    """
+    Redirect the user to the SSO provider’s login page.
+
+    We specify prompt=login to force the user to input their credentials even
+    if they’re already logged on the SSO. This is less practical, but given AUR
+    has the potential to impact many users, better safe than sorry.
+    """
     redirect_uri = aurweb.config.get("options", "aur_location") + "/sso/authenticate"
     return await oauth.sso.authorize_redirect(request, redirect_uri, prompt="login")
 

From d12ea08fcaa62211cbf4d83bba91124b90f861cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Tue, 14 Jul 2020 15:34:23 +0200
Subject: [PATCH 022/844] SSO: Add an SSO option in the login page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We’ll probably change the whole login page in the future, but this makes
development easier.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/html/login.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/html/login.php b/web/html/login.php
index 01454414..3a146f60 100644
--- a/web/html/login.php
+++ b/web/html/login.php
@@ -40,6 +40,9 @@ html_header('AUR ' . __("Login"));
 			<p>
 				<input type="submit" class="button" value="<?php  print __("Login"); ?>" />
 				<a href="<?= get_uri('/passreset/') ?>">[<?= __('Forgot Password') ?>]</a>
+				<?php if (config_get('sso', 'openid_configuration')): ?>
+				<a href="<?= get_uri('/sso/login') ?>">[<?= __('Login through SSO') ?>]</a>
+				<?php endif; ?>
 				<?php if (in_request('referer') !== ""): ?>
 				<input id="id_referer" type="hidden" name="referer" value="<?= htmlspecialchars(in_request('referer'), ENT_QUOTES) ?>" />
 				<?php elseif (isset($_SERVER['HTTP_REFERER'])): ?>

From 4d0f2d2279ed9fcdf6bb76015ac0da9c6e938d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Tue, 14 Jul 2020 15:35:05 +0200
Subject: [PATCH 023/844] Implement SSO logout

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 18 ++++++++++++++++++
 web/html/logout.php   | 14 +++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index e1ec7efe..a8d4b141 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -1,6 +1,8 @@
 import time
 import uuid
 
+from urllib.parse import urlencode
+
 import fastapi
 
 from authlib.integrations.starlette_client import OAuth
@@ -82,3 +84,19 @@ async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
     else:
         # We’ve got a severe integrity violation.
         raise Exception("Multiple accounts found for SSO account " + sub)
+
+
+@router.get("/sso/logout")
+async def logout():
+    """
+    Disconnect the user from the SSO provider, potentially affecting every
+    other Arch service. AUR logout is performed by `/logout`, before it
+    redirects to `/sso/logout`.
+
+    Based on the OpenID Connect Session Management specification:
+    https://openid.net/specs/openid-connect-session-1_0.html#RPLogout
+    """
+    metadata = await oauth.sso.load_server_metadata()
+    # TODO Supply id_token_hint to the end session endpoint.
+    query = urlencode({'post_logout_redirect_uri': aurweb.config.get('options', 'aur_location')})
+    return RedirectResponse(metadata["end_session_endpoint"] + '?' + query)
diff --git a/web/html/logout.php b/web/html/logout.php
index 14022001..9fd63943 100644
--- a/web/html/logout.php
+++ b/web/html/logout.php
@@ -5,16 +5,28 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 include_once("aur.inc.php");         # access AUR common functions
 include_once("acctfuncs.inc.php");         # access AUR common functions
 
+$redirect_uri = '/';
+
 # if they've got a cookie, log them out - need to do this before
 # sending any HTML output.
 #
 if (isset($_COOKIE["AURSID"])) {
+	$uid = uid_from_sid($_COOKIE['AURSID']);
 	delete_session_id($_COOKIE["AURSID"]);
 	# setting expiration to 1 means '1 second after midnight January 1, 1970'
 	setcookie("AURSID", "", 1, "/", null, !empty($_SERVER['HTTPS']), true);
 	unset($_COOKIE['AURSID']);
 	clear_expired_sessions();
+
+	# If the account is linked to an SSO account, disconnect the user from the SSO too.
+	if (isset($uid)) {
+		$dbh = DB::connect();
+		$sso_account_id = $dbh->query("SELECT SSOAccountID FROM Users WHERE ID = " . $dbh->quote($uid))
+		                      ->fetchColumn();
+		if ($sso_account_id)
+			$redirect_uri = '/sso/logout';
+	}
 }
 
-header('Location: /');
+header("Location: $redirect_uri");
 

From 357dba87b3ee784a4201a7bb56befb105b81bbf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Tue, 14 Jul 2020 15:35:24 +0200
Subject: [PATCH 024/844] Save id_token for the SSO logout

As far as I can see, Keycloak ignores it entirely. I can login in as SSO
user A, then disconnect from the SSO directly and reconnect as user B,
but when I disconnect user A from AUR, Keycloak disconnects B even
though AUR passed it an ID token for A.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index a8d4b141..04ecdca6 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -80,6 +80,11 @@ async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
         # TODO redirect to the referrer
         response.set_cookie(key="AURSID", value=sid, httponly=True,
                             secure=request.url.scheme == "https")
+        if "id_token" in token:
+            # We save the id_token for the SSO logout. It’s not too important
+            # though, so if we can’t find it, we can live without it.
+            response.set_cookie(key="SSO_ID_TOKEN", value=token["id_token"], path="/sso/",
+                                httponly=True, secure=request.url.scheme == "https")
         return response
     else:
         # We’ve got a severe integrity violation.
@@ -87,7 +92,7 @@ async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
 
 
 @router.get("/sso/logout")
-async def logout():
+async def logout(request: Request):
     """
     Disconnect the user from the SSO provider, potentially affecting every
     other Arch service. AUR logout is performed by `/logout`, before it
@@ -96,7 +101,13 @@ async def logout():
     Based on the OpenID Connect Session Management specification:
     https://openid.net/specs/openid-connect-session-1_0.html#RPLogout
     """
+    id_token = request.cookies.get("SSO_ID_TOKEN")
+    if not id_token:
+        return RedirectResponse("/")
+
     metadata = await oauth.sso.load_server_metadata()
-    # TODO Supply id_token_hint to the end session endpoint.
-    query = urlencode({'post_logout_redirect_uri': aurweb.config.get('options', 'aur_location')})
-    return RedirectResponse(metadata["end_session_endpoint"] + '?' + query)
+    query = urlencode({'post_logout_redirect_uri': aurweb.config.get('options', 'aur_location'),
+                       'id_token_hint': id_token})
+    response = RedirectResponse(metadata["end_session_endpoint"] + '?' + query)
+    response.delete_cookie("SSO_ID_TOKEN", path="/sso/")
+    return response

From 0e08b151e5c3606e573b1f7113466b5dd6efdcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 20 Jul 2020 16:25:11 +0200
Subject: [PATCH 025/844] SSO: Port IP ban checking

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index 04ecdca6..efd4462c 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -14,7 +14,7 @@ from starlette.requests import Request
 import aurweb.config
 import aurweb.db
 
-from aurweb.schema import Sessions, Users
+from aurweb.schema import Bans, Sessions, Users
 
 router = fastapi.APIRouter()
 
@@ -57,13 +57,28 @@ def open_session(conn, user_id):
     return sid
 
 
+def is_ip_banned(conn, ip):
+    """
+    Check if an IP is banned. `ip` is a string and may be an IPv4 as well as an
+    IPv6, depending on the server’s configuration.
+    """
+    result = conn.execute(Bans.select().where(Bans.c.IPAddress == ip))
+    return result.fetchone() is not None
+
+
 @router.get("/sso/authenticate")
 async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
     """
     Receive an OpenID Connect ID token, validate it, then process it to create
     an new AUR session.
     """
-    # TODO check for banned IPs
+    # TODO Handle translations
+    if is_ip_banned(conn, request.client.host):
+        raise HTTPException(
+            status_code=403,
+            detail='The login form is currently disabled for your IP address, '
+                   'probably due to sustained spam attacks. Sorry for the '
+                   'inconvenience.')
     token = await oauth.sso.authorize_access_token(request)
     user = await oauth.sso.parse_id_token(request, token)
     sub = user.get("sub")  # this is the SSO account ID in JWT terminology

From e323156947a93ba65a99f927ed2d99c738c34f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 20 Jul 2020 16:25:22 +0200
Subject: [PATCH 026/844] SSO: Port account suspension

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index efd4462c..3e3b743d 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -41,11 +41,20 @@ async def login(request: Request):
     return await oauth.sso.authorize_redirect(request, redirect_uri, prompt="login")
 
 
+def is_account_suspended(conn, user_id):
+    row = conn.execute(select([Users.c.Suspended]).where(Users.c.ID == user_id)).fetchone()
+    return row is not None and bool(row[0])
+
+
 def open_session(conn, user_id):
     """
     Create a new user session into the database. Return its SID.
     """
-    # TODO check for account suspension
+    # TODO Handle translations.
+    if is_account_suspended(conn, user_id):
+        raise HTTPException(status_code=403, detail='Account suspended')
+        # TODO This is a terrible message because it could imply the attempt at
+        #      logging in just caused the suspension.
     # TODO apply [options] max_sessions_per_user
     sid = uuid.uuid4().hex
     conn.execute(Sessions.insert().values(

From 239988def7479cba6407901ee4671b6794d0b2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 20 Jul 2020 16:25:28 +0200
Subject: [PATCH 027/844] Build a translation facility for FastAPI

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/l10n.py        | 22 ++++++++++++++++++++++
 aurweb/routers/sso.py | 20 +++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index 51b56abb..a476ecd8 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -16,3 +16,25 @@ class Translator:
                                                          self._localedir,
                                                          languages=[lang])
         return self._translator[lang].gettext(s)
+
+
+def get_translator_for_request(request):
+    """
+    Determine the preferred language from a FastAPI request object and build a
+    translator function for it.
+
+    Example:
+    ```python
+    _ = get_translator_for_request(request)
+    print(_("Hello"))
+    ```
+    """
+    lang = request.cookies.get("AURLANG")
+    if lang is None:
+        lang = aurweb.config.get("options", "default_lang")
+    translator = Translator()
+
+    def translate(message):
+        return translator.translate(message, lang)
+
+    return translate
diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index 3e3b743d..7b9c67c8 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -14,6 +14,7 @@ from starlette.requests import Request
 import aurweb.config
 import aurweb.db
 
+from aurweb.l10n import get_translator_for_request
 from aurweb.schema import Bans, Sessions, Users
 
 router = fastapi.APIRouter()
@@ -46,13 +47,13 @@ def is_account_suspended(conn, user_id):
     return row is not None and bool(row[0])
 
 
-def open_session(conn, user_id):
+def open_session(request, conn, user_id):
     """
     Create a new user session into the database. Return its SID.
     """
-    # TODO Handle translations.
     if is_account_suspended(conn, user_id):
-        raise HTTPException(status_code=403, detail='Account suspended')
+        _ = get_translator_for_request(request)
+        raise HTTPException(status_code=403, detail=_('Account suspended'))
         # TODO This is a terrible message because it could imply the attempt at
         #      logging in just caused the suspension.
     # TODO apply [options] max_sessions_per_user
@@ -81,25 +82,26 @@ async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
     Receive an OpenID Connect ID token, validate it, then process it to create
     an new AUR session.
     """
-    # TODO Handle translations
     if is_ip_banned(conn, request.client.host):
+        _ = get_translator_for_request(request)
         raise HTTPException(
             status_code=403,
-            detail='The login form is currently disabled for your IP address, '
-                   'probably due to sustained spam attacks. Sorry for the '
-                   'inconvenience.')
+            detail=_('The login form is currently disabled for your IP address, '
+                     'probably due to sustained spam attacks. Sorry for the '
+                     'inconvenience.'))
     token = await oauth.sso.authorize_access_token(request)
     user = await oauth.sso.parse_id_token(request, token)
     sub = user.get("sub")  # this is the SSO account ID in JWT terminology
     if not sub:
-        raise HTTPException(status_code=400, detail="JWT is missing its `sub` field.")
+        _ = get_translator_for_request(request)
+        raise HTTPException(status_code=400, detail=_("JWT is missing its `sub` field."))
 
     aur_accounts = conn.execute(select([Users.c.ID]).where(Users.c.SSOAccountID == sub)) \
                        .fetchall()
     if not aur_accounts:
         return "Sorry, we don’t seem to know you Sir " + sub
     elif len(aur_accounts) == 1:
-        sid = open_session(conn, aur_accounts[0][Users.c.ID])
+        sid = open_session(request, conn, aur_accounts[0][Users.c.ID])
         response = RedirectResponse("/")
         # TODO redirect to the referrer
         response.set_cookie(key="AURSID", value=sid, httponly=True,

From efe99dc16f2a94be1d4e5917a07fee2260f3d547 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr.gtalk@gmail.com>
Date: Sun, 5 Jul 2020 18:19:06 -0700
Subject: [PATCH 028/844] Support conjunctive keyword search in RPC interface

Newly supported API Version 6 modifies `type=search` for _by_ type
`name-desc`: it now behaves the same as `name-desc` search through the
https://aur.archlinux.org/packages/ search page.

Search for packages containing the literal keyword `blah blah` AND `haha`:
https://aur.archlinux.org/rpc/?v=6&type=search&arg="blah blah"%20haha

Search for packages containing the literal keyword `abc 123`:
https://aur.archlinux.org/rpc/?v=6&type=search&arg="abc 123"

The following example searches for packages that contain `blah` AND `abc`:
https://aur.archlinux.org/rpc/?v=6&type=search&arg=blah%20abc

The legacy method still searches for packages that contain `blah abc`:
https://aur.archlinux.org/rpc/?v=5&type=search&arg=blah%20abc
https://aur.archlinux.org/rpc/?v=5&type=search&arg=blah%20abc

API Version 6 is currently only considered during a `search` of `name-desc`.

Note: This change was written as a solution to
https://bugs.archlinux.org/task/49133.

PS: + Some spacing issues fixed in comments.

Signed-off-by: Kevin Morris <kevr.gtalk@gmail.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 doc/rpc.txt               |  4 ++++
 web/lib/aurjson.class.php | 29 +++++++++++++++++++----------
 web/lib/pkgfuncs.inc.php  | 34 ++++++++++++++++++++--------------
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/doc/rpc.txt b/doc/rpc.txt
index 3148ebea..b0f5c4e1 100644
--- a/doc/rpc.txt
+++ b/doc/rpc.txt
@@ -39,6 +39,10 @@ Examples
   `/rpc/?v=5&type=search&by=makedepends&arg=boost`
 `search` with callback::
   `/rpc/?v=5&type=search&arg=foobar&callback=jsonp1192244621103`
+`search` with API Version 6 for packages containing `cookie` AND `milk`::
+  `/rpc/?v=6&type=search&arg=cookie%20milk`
+`search` with API Version 6 for packages containing `cookie milk`::
+  `/rpc/?v=6&type=search&arg="cookie milk"`
 `info`::
   `/rpc/?v=5&type=info&arg[]=foobar`
 `info` with multiple packages::
diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php
index 0ac586fe..86eae22b 100644
--- a/web/lib/aurjson.class.php
+++ b/web/lib/aurjson.class.php
@@ -1,6 +1,7 @@
 <?php
 
 include_once("aur.inc.php");
+include_once("pkgfuncs.inc.php");
 
 /*
  * This class defines a remote interface for fetching data from the AUR using
@@ -80,7 +81,7 @@ class AurJSON {
 		if (isset($http_data['v'])) {
 			$this->version = intval($http_data['v']);
 		}
-		if ($this->version < 1 || $this->version > 5) {
+		if ($this->version < 1 || $this->version > 6) {
 			return $this->json_error('Invalid version specified.');
 		}
 
@@ -140,7 +141,7 @@ class AurJSON {
 	}
 
 	/*
-	 * Check if an IP needs to be  rate limited.
+	 * Check if an IP needs to be rate limited.
 	 *
 	 * @param $ip IP of the current request
 	 *
@@ -192,7 +193,7 @@ class AurJSON {
 		$value = get_cache_value('ratelimit-ws:' . $ip, $status);
 		if (!$status || ($status && $value < $deletion_time)) {
 			if (set_cache_value('ratelimit-ws:' . $ip, $time, $window_length) &&
-			    set_cache_value('ratelimit:' . $ip, 1, $window_length)) {
+				set_cache_value('ratelimit:' . $ip, 1, $window_length)) {
 				return;
 			}
 		} else {
@@ -370,7 +371,7 @@ class AurJSON {
 		} elseif ($this->version >= 2) {
 			if ($this->version == 2 || $this->version == 3) {
 				$fields = implode(',', self::$fields_v2);
-			} else if ($this->version == 4 || $this->version == 5) {
+			} else if ($this->version >= 4 && $this->version <= 6) {
 				$fields = implode(',', self::$fields_v4);
 			}
 			$query = "SELECT {$fields} " .
@@ -492,13 +493,21 @@ class AurJSON {
 			if (strlen($keyword_string) < 2) {
 				return $this->json_error('Query arg too small.');
 			}
-			$keyword_string = $this->dbh->quote("%" . addcslashes($keyword_string, '%_') . "%");
 
-			if ($search_by === 'name') {
-				$where_condition = "(Packages.Name LIKE $keyword_string)";
-			} else if ($search_by === 'name-desc') {
-				$where_condition = "(Packages.Name LIKE $keyword_string OR ";
-				$where_condition .= "Description LIKE $keyword_string)";
+			if ($this->version >= 6 && $search_by === 'name-desc') {
+				$where_condition = construct_keyword_search($this->dbh,
+					$keyword_string, true, false);
+			} else {
+				$keyword_string = $this->dbh->quote(
+					"%" . addcslashes($keyword_string, '%_') . "%");
+
+				if ($search_by === 'name') {
+					$where_condition = "(Packages.Name LIKE $keyword_string)";
+				} else if ($search_by === 'name-desc') {
+					$where_condition = "(Packages.Name LIKE $keyword_string ";
+					$where_condition .= "OR Description LIKE $keyword_string)";
+				}
+
 			}
 		} else if ($search_by === 'maintainer') {
 			if (empty($keyword_string)) {
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 80758005..ac5c8cfe 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -696,8 +696,10 @@ function pkg_search_page($params, $show_headers=true, $SID="") {
 			$q_where .= "AND (PackageBases.Name LIKE " . $dbh->quote($K) . ") ";
 		}
 		elseif (isset($params["SeB"]) && $params["SeB"] == "k") {
-			/* Search by keywords. */
-			$q_where .= construct_keyword_search($dbh, $params['K'], false);
+			/* Search by name. */
+			$q_where .= "AND (";
+			$q_where .= construct_keyword_search($dbh, $params['K'], false, true);
+			$q_where .= ") ";
 		}
 		elseif (isset($params["SeB"]) && $params["SeB"] == "N") {
 			/* Search by name (exact match). */
@@ -709,7 +711,9 @@ function pkg_search_page($params, $show_headers=true, $SID="") {
 		}
 		else {
 			/* Keyword search (default). */
-			$q_where .= construct_keyword_search($dbh, $params['K'], true);
+			$q_where .= "AND (";
+			$q_where .= construct_keyword_search($dbh, $params['K'], true, true);
+			$q_where .= ") ";
 		}
 	}
 
@@ -832,10 +836,11 @@ function pkg_search_page($params, $show_headers=true, $SID="") {
  * @param handle $dbh Database handle
  * @param string $keywords The search term
  * @param bool $namedesc Search name and description fields
+ * @param bool $keyword Search packages with a matching PackageBases.Keyword
  *
  * @return string WHERE part of the SQL clause
  */
-function construct_keyword_search($dbh, $keywords, $namedesc) {
+function construct_keyword_search($dbh, $keywords, $namedesc, $keyword=false) {
 	$count = 0;
 	$where_part = "";
 	$q_keywords = "";
@@ -860,13 +865,18 @@ function construct_keyword_search($dbh, $keywords, $namedesc) {
 
 		$term = "%" . addcslashes($term, '%_') . "%";
 		$q_keywords .= $op . " (";
+		$q_keywords .= "Packages.Name LIKE " . $dbh->quote($term) . " ";
 		if ($namedesc) {
-			$q_keywords .= "Packages.Name LIKE " . $dbh->quote($term) . " OR ";
-			$q_keywords .= "Description LIKE " . $dbh->quote($term) . " OR ";
+			$q_keywords .= "OR Description LIKE " . $dbh->quote($term) . " ";
+		}
+
+		if ($keyword) {
+			$q_keywords .= "OR EXISTS (SELECT * FROM PackageKeywords WHERE ";
+			$q_keywords .= "PackageKeywords.PackageBaseID = Packages.PackageBaseID AND ";
+			$q_keywords .= "PackageKeywords.Keyword LIKE " . $dbh->quote($term) . ")) ";
+		} else {
+			$q_keywords .= ") ";
 		}
-		$q_keywords .= "EXISTS (SELECT * FROM PackageKeywords WHERE ";
-		$q_keywords .= "PackageKeywords.PackageBaseID = Packages.PackageBaseID AND ";
-		$q_keywords .= "PackageKeywords.Keyword LIKE " . $dbh->quote($term) . ")) ";
 
 		$count++;
 		if ($count >= 20) {
@@ -875,11 +885,7 @@ function construct_keyword_search($dbh, $keywords, $namedesc) {
 		$op = "AND ";
 	}
 
-	if (!empty($q_keywords)) {
-		$where_part = "AND (" . $q_keywords . ") ";
-	}
-
-	return $where_part;
+	return $q_keywords;
 }
 
 /**

From 445a991ef1b8c76fb1d51837c4fb692dbfb080e6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr.gtalk@gmail.com>
Date: Wed, 15 Jul 2020 11:45:54 -0700
Subject: [PATCH 029/844] Exclude suspended Users from being notified

The existing notify.py script was grabbing entries regardless
of user suspension. This has been modified to only send notifications
to unsuspended users.

This change was written as a solution to
https://bugs.archlinux.org/task/65554.

Signed-off-by: Kevin Morris <kevr.gtalk@gmail.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/scripts/notify.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index edae76f8..7f8e7168 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -126,7 +126,7 @@ class ResetKeyNotification(Notification):
     def __init__(self, conn, uid):
         cur = conn.execute('SELECT UserName, Email, BackupEmail, ' +
                            'LangPreference, ResetKey ' +
-                           'FROM Users WHERE ID = ?', [uid])
+                           'FROM Users WHERE ID = ? AND Suspended = 0', [uid])
         self._username, self._to, self._backup, self._lang, self._resetkey = cur.fetchone()
         super().__init__()
 
@@ -173,7 +173,8 @@ class CommentNotification(Notification):
                            'ON PackageNotifications.UserID = Users.ID WHERE ' +
                            'Users.CommentNotify = 1 AND ' +
                            'PackageNotifications.UserID != ? AND ' +
-                           'PackageNotifications.PackageBaseID = ?',
+                           'PackageNotifications.PackageBaseID = ? AND ' +
+                           'Users.Suspended = 0',
                            [uid, pkgbase_id])
         self._recipients = cur.fetchall()
         cur = conn.execute('SELECT Comments FROM PackageComments WHERE ID = ?',
@@ -220,7 +221,8 @@ class UpdateNotification(Notification):
                            'ON PackageNotifications.UserID = Users.ID WHERE ' +
                            'Users.UpdateNotify = 1 AND ' +
                            'PackageNotifications.UserID != ? AND ' +
-                           'PackageNotifications.PackageBaseID = ?',
+                           'PackageNotifications.PackageBaseID = ? AND ' +
+                           'Users.Suspended = 0',
                            [uid, pkgbase_id])
         self._recipients = cur.fetchall()
         super().__init__()
@@ -266,7 +268,8 @@ class FlagNotification(Notification):
                            'INNER JOIN PackageBases ' +
                            'ON PackageBases.MaintainerUID = Users.ID OR ' +
                            'PackageBases.ID = PackageComaintainers.PackageBaseID ' +
-                           'WHERE PackageBases.ID = ?', [pkgbase_id])
+                           'WHERE PackageBases.ID = ? AND ' +
+                           'Users.Suspended = 0', [pkgbase_id])
         self._recipients = cur.fetchall()
         cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' +
                            'ID = ?', [pkgbase_id])
@@ -304,7 +307,8 @@ class OwnershipEventNotification(Notification):
                            'ON PackageNotifications.UserID = Users.ID WHERE ' +
                            'Users.OwnershipNotify = 1 AND ' +
                            'PackageNotifications.UserID != ? AND ' +
-                           'PackageNotifications.PackageBaseID = ?',
+                           'PackageNotifications.PackageBaseID = ? AND ' +
+                           'Users.Suspended = 0',
                            [uid, pkgbase_id])
         self._recipients = cur.fetchall()
         cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' +
@@ -343,7 +347,7 @@ class ComaintainershipEventNotification(Notification):
     def __init__(self, conn, uid, pkgbase_id):
         self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
         cur = conn.execute('SELECT Email, LangPreference FROM Users ' +
-                           'WHERE ID = ?', [uid])
+                           'WHERE ID = ? AND Suspended = 0', [uid])
         self._to, self._lang = cur.fetchone()
         super().__init__()
 
@@ -386,7 +390,8 @@ class DeleteNotification(Notification):
                            'INNER JOIN PackageNotifications ' +
                            'ON PackageNotifications.UserID = Users.ID WHERE ' +
                            'PackageNotifications.UserID != ? AND ' +
-                           'PackageNotifications.PackageBaseID = ?',
+                           'PackageNotifications.PackageBaseID = ? AND ' +
+                           'Users.Suspended = 0',
                            [uid, old_pkgbase_id])
         self._recipients = cur.fetchall()
         super().__init__()
@@ -433,7 +438,8 @@ class RequestOpenNotification(Notification):
                            'INNER JOIN Users ' +
                            'ON Users.ID = PackageRequests.UsersID ' +
                            'OR Users.ID = PackageBases.MaintainerUID ' +
-                           'WHERE PackageRequests.ID = ?', [reqid])
+                           'WHERE PackageRequests.ID = ? AND ' +
+                           'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
         self._cc = [row[0] for row in cur.fetchall()]
         cur = conn.execute('SELECT Comments FROM PackageRequests WHERE ID = ?',
@@ -489,7 +495,8 @@ class RequestCloseNotification(Notification):
                            'INNER JOIN Users ' +
                            'ON Users.ID = PackageRequests.UsersID ' +
                            'OR Users.ID = PackageBases.MaintainerUID ' +
-                           'WHERE PackageRequests.ID = ?', [reqid])
+                           'WHERE PackageRequests.ID = ? AND ' +
+                           'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
         self._cc = [row[0] for row in cur.fetchall()]
         cur = conn.execute('SELECT PackageRequests.ClosureComment, ' +
@@ -547,7 +554,8 @@ class TUVoteReminderNotification(Notification):
         cur = conn.execute('SELECT Email, LangPreference FROM Users ' +
                            'WHERE AccountTypeID IN (2, 4) AND ID NOT IN ' +
                            '(SELECT UserID FROM TU_Votes ' +
-                           'WHERE TU_Votes.VoteID = ?)', [vote_id])
+                           'WHERE TU_Votes.VoteID = ?) AND ' +
+                           'Users.Suspended = 0', [vote_id])
         self._recipients = cur.fetchall()
         super().__init__()
 

From a1a742b518b7ead1ea32b13dd52d5ea5248e8bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 27 Jul 2020 14:43:48 +0200
Subject: [PATCH 030/844] aurweb.spawn: Support stdout redirections to non-tty
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Only ttys have a terminal size. If we can’t obtain it, we’ll just use 80
as a sane default.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/spawn.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 5da8587e..46d534d9 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -87,12 +87,16 @@ def start():
         return
     atexit.register(stop)
 
+    try:
+        terminal_width = os.get_terminal_size().columns
+    except OSError:
+        terminal_width = 80
     print("{ruler}\n"
           "Spawing PHP and FastAPI, then nginx as a reverse proxy.\n"
           "Check out {aur_location}\n"
           "Hit ^C to terminate everything.\n"
           "{ruler}"
-          .format(ruler=("-" * os.get_terminal_size().columns),
+          .format(ruler=("-" * terminal_width),
                   aur_location=aurweb.config.get('options', 'aur_location')))
 
     # PHP

From 9290eee1385b4ac9e09fec4a784868789ea5a15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 27 Jul 2020 14:44:03 +0200
Subject: [PATCH 031/844] Stop redirecting stderr with proc_open
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Error outputs were piped to a temporary buffer that wasn’t read by
anyone, making debugging hard because errors were completely silenced.
By not explicitly redirecting stderr on proc_open, the subprocess
inherits its parent stderr.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/lib/acctfuncs.inc.php    | 2 --
 web/lib/pkgbasefuncs.inc.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index 752abe97..b3822eaf 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -1347,7 +1347,6 @@ function notify($params) {
 	$descspec = array(
 		0 => array('pipe', 'r'),
 		1 => array('pipe', 'w'),
-		2 => array('pipe', 'w')
 	);
 
 	$p = proc_open($cmd, $descspec, $pipes);
@@ -1358,7 +1357,6 @@ function notify($params) {
 
 	fclose($pipes[0]);
 	fclose($pipes[1]);
-	fclose($pipes[2]);
 
 	return proc_close($p);
 }
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 4c8abba7..4a49898c 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -96,7 +96,6 @@ function render_comment($id) {
 	$descspec = array(
 		0 => array('pipe', 'r'),
 		1 => array('pipe', 'w'),
-		2 => array('pipe', 'w')
 	);
 
 	$p = proc_open($cmd, $descspec, $pipes);
@@ -107,7 +106,6 @@ function render_comment($id) {
 
 	fclose($pipes[0]);
 	fclose($pipes[1]);
-	fclose($pipes[2]);
 
 	return proc_close($p);
 }

From 202ffd8923bc3a08bc6d4f18ac6d91441b0b0cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Tue, 28 Jul 2020 16:33:12 +0200
Subject: [PATCH 032/844] Update last login information on SSO login

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index 7b9c67c8..817adadb 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -63,7 +63,13 @@ def open_session(request, conn, user_id):
         SessionID=sid,
         LastUpdateTS=time.time(),
     ))
-    # TODO update Users.LastLogin and Users.LastLoginIPAddress
+
+    # Update user’s last login information.
+    conn.execute(Users.update()
+                      .where(Users.c.ID == user_id)
+                      .values(LastLogin=int(time.time()),
+                              LastLoginIPAddress=request.client.host))
+
     return sid
 
 

From 5fb4fc12de1dc374395340724d192271d4aa31f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Tue, 28 Jul 2020 16:33:27 +0200
Subject: [PATCH 033/844] HTML error pages for FastAPI

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/asgi.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 60c7ade7..9293ed77 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,4 +1,7 @@
-from fastapi import FastAPI
+import http
+
+from fastapi import FastAPI, HTTPException
+from fastapi.responses import HTMLResponse
 from starlette.middleware.sessions import SessionMiddleware
 
 import aurweb.config
@@ -14,3 +17,14 @@ if not session_secret:
 app.add_middleware(SessionMiddleware, secret_key=session_secret)
 
 app.include_router(sso.router)
+
+
+@app.exception_handler(HTTPException)
+async def http_exception_handler(request, exc):
+    """
+    Dirty HTML error page to replace the default JSON error responses.
+    In the future this should use a proper Arch-themed HTML template.
+    """
+    phrase = http.HTTPStatus(exc.status_code).phrase
+    return HTMLResponse(f"<h1>{exc.status_code} {phrase}</h1><p>{exc.detail}</p>",
+                        status_code=exc.status_code)

From be31675b6589e66c8b10a64b44591b594d2eb735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Tue, 28 Jul 2020 16:33:41 +0200
Subject: [PATCH 034/844] Guard OAuth exceptions to provide better messages

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index 817adadb..2e4fbacc 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -5,7 +5,7 @@ from urllib.parse import urlencode
 
 import fastapi
 
-from authlib.integrations.starlette_client import OAuth
+from authlib.integrations.starlette_client import OAuth, OAuthError
 from fastapi import Depends, HTTPException
 from fastapi.responses import RedirectResponse
 from sqlalchemy.sql import select
@@ -95,8 +95,18 @@ async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
             detail=_('The login form is currently disabled for your IP address, '
                      'probably due to sustained spam attacks. Sorry for the '
                      'inconvenience.'))
-    token = await oauth.sso.authorize_access_token(request)
-    user = await oauth.sso.parse_id_token(request, token)
+
+    try:
+        token = await oauth.sso.authorize_access_token(request)
+        user = await oauth.sso.parse_id_token(request, token)
+    except OAuthError:
+        # Here, most OAuth errors should be caused by forged or expired tokens.
+        # Let’s give attackers as little information as possible.
+        _ = get_translator_for_request(request)
+        raise HTTPException(
+            status_code=400,
+            detail=_('Bad OAuth token. Please retry logging in from the start.'))
+
     sub = user.get("sub")  # this is the SSO account ID in JWT terminology
     if not sub:
         _ = get_translator_for_request(request)

From 87815d37c078c315ac3254741973cfba2bfccace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Wed, 29 Jul 2020 13:46:10 +0200
Subject: [PATCH 035/844] Remove the per-user session limit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This feature was originally introduced by
f961ffd9c7f2d3d51d3e3b060990a4fef9e56c1b as a fix for FS#12898
<https://bugs.archlinux.org/task/12898>.

As of today, it is broken because of the `q.SessionID IS NULL` condition
in the WHERE clause, which can’t be true because SessionID is not
nullable. As a consequence, the session limit was not applied.

The fact the absence of the session limit hasn’t caused any issue so
far, and hadn’t even been noticed, suggests the feature is unneeded.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py     |  2 +-
 conf/config.defaults      |  1 -
 web/lib/acctfuncs.inc.php | 15 ---------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index 2e4fbacc..73c884a4 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -56,7 +56,7 @@ def open_session(request, conn, user_id):
         raise HTTPException(status_code=403, detail=_('Account suspended'))
         # TODO This is a terrible message because it could imply the attempt at
         #      logging in just caused the suspension.
-    # TODO apply [options] max_sessions_per_user
+
     sid = uuid.uuid4().hex
     conn.execute(Sessions.insert().values(
         UsersID=user_id,
diff --git a/conf/config.defaults b/conf/config.defaults
index 49259754..98e033b7 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -13,7 +13,6 @@ passwd_min_len = 8
 default_lang = en
 default_timezone = UTC
 sql_debug = 0
-max_sessions_per_user = 8
 login_timeout = 7200
 persistent_cookie_timeout = 2592000
 max_filesize_uncompressed = 8388608
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index b3822eaf..bc603d3b 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -596,21 +596,6 @@ function try_login() {
 
 	/* Generate a session ID and store it. */
 	while (!$logged_in && $num_tries < 5) {
-		$session_limit = config_get_int('options', 'max_sessions_per_user');
-		if ($session_limit) {
-			/*
-			 * Delete all user sessions except the
-			 * last ($session_limit - 1).
-			 */
-			$q = "DELETE FROM Sessions ";
-			$q.= "WHERE UsersId = " . $userID . " ";
-			$q.= "AND SessionID NOT IN (SELECT SessionID FROM Sessions ";
-			$q.= "WHERE UsersID = " . $userID . " ";
-			$q.= "ORDER BY LastUpdateTS DESC ";
-			$q.= "LIMIT " . ($session_limit - 1) . ")";
-			$dbh->query($q);
-		}
-
 		$new_sid = new_sid();
 		$q = "INSERT INTO Sessions (UsersID, SessionID, LastUpdateTS)"
 		  ." VALUES (" . $userID . ", '" . $new_sid . "', " . strval(time()) . ")";

From 8c28ba6e7f1c99f4b16c651857224b1d19f93466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Wed, 29 Jul 2020 17:25:44 +0200
Subject: [PATCH 036/844] Redirect to referer after SSO login

Introduce a `redirect` query argument to SSO login endpoints so that
users are redirected to the page they were originally on when they
clicked the Login link.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/routers/sso.py | 23 +++++++++++++++++------
 web/html/login.php    | 18 ++++++++++++------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index 73c884a4..4b12b932 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -30,16 +30,21 @@ oauth.register(
 
 
 @router.get("/sso/login")
-async def login(request: Request):
+async def login(request: Request, redirect: str = None):
     """
     Redirect the user to the SSO provider’s login page.
 
     We specify prompt=login to force the user to input their credentials even
     if they’re already logged on the SSO. This is less practical, but given AUR
     has the potential to impact many users, better safe than sorry.
+
+    The `redirect` argument is a query parameter specifying the post-login
+    redirect URL.
     """
-    redirect_uri = aurweb.config.get("options", "aur_location") + "/sso/authenticate"
-    return await oauth.sso.authorize_redirect(request, redirect_uri, prompt="login")
+    authenticate_url = aurweb.config.get("options", "aur_location") + "/sso/authenticate"
+    if redirect:
+        authenticate_url = authenticate_url + "?" + urlencode([("redirect", redirect)])
+    return await oauth.sso.authorize_redirect(request, authenticate_url, prompt="login")
 
 
 def is_account_suspended(conn, user_id):
@@ -82,8 +87,15 @@ def is_ip_banned(conn, ip):
     return result.fetchone() is not None
 
 
+def is_aur_url(url):
+    aur_location = aurweb.config.get("options", "aur_location")
+    if not aur_location.endswith("/"):
+        aur_location = aur_location + "/"
+    return url.startswith(aur_location)
+
+
 @router.get("/sso/authenticate")
-async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
+async def authenticate(request: Request, redirect: str = None, conn=Depends(aurweb.db.connect)):
     """
     Receive an OpenID Connect ID token, validate it, then process it to create
     an new AUR session.
@@ -118,8 +130,7 @@ async def authenticate(request: Request, conn=Depends(aurweb.db.connect)):
         return "Sorry, we don’t seem to know you Sir " + sub
     elif len(aur_accounts) == 1:
         sid = open_session(request, conn, aur_accounts[0][Users.c.ID])
-        response = RedirectResponse("/")
-        # TODO redirect to the referrer
+        response = RedirectResponse(redirect if redirect and is_aur_url(redirect) else "/")
         response.set_cookie(key="AURSID", value=sid, httponly=True,
                             secure=request.url.scheme == "https")
         if "id_token" in token:
diff --git a/web/html/login.php b/web/html/login.php
index 3a146f60..3f3d66cc 100644
--- a/web/html/login.php
+++ b/web/html/login.php
@@ -9,6 +9,10 @@ if (!$disable_http_login || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) {
 	$login_error = $login['error'];
 }
 
+$referer = in_request('referer');
+if ($referer === '')
+	$referer = $_SERVER['HTTP_REFERER'];
+
 html_header('AUR ' . __("Login"));
 ?>
 <div id="dev-login" class="box">
@@ -40,13 +44,15 @@ html_header('AUR ' . __("Login"));
 			<p>
 				<input type="submit" class="button" value="<?php  print __("Login"); ?>" />
 				<a href="<?= get_uri('/passreset/') ?>">[<?= __('Forgot Password') ?>]</a>
-				<?php if (config_get('sso', 'openid_configuration')): ?>
-				<a href="<?= get_uri('/sso/login') ?>">[<?= __('Login through SSO') ?>]</a>
+				<?php if (config_get('sso', 'openid_configuration')):
+					$sso_login_url = get_uri('/sso/login');
+					if (isset($referer))
+						$sso_login_url .= '?redirect=' . urlencode($referer);
+				?>
+				<a href="<?= htmlspecialchars($sso_login_url, ENT_QUOTES) ?>">[<?= __('Login through SSO') ?>]</a>
 				<?php endif; ?>
-				<?php if (in_request('referer') !== ""): ?>
-				<input id="id_referer" type="hidden" name="referer" value="<?= htmlspecialchars(in_request('referer'), ENT_QUOTES) ?>" />
-				<?php elseif (isset($_SERVER['HTTP_REFERER'])): ?>
-				<input id="id_referer" type="hidden" name="referer" value="<?= htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES) ?>" />
+				<?php if (isset($referer)): ?>
+				<input id="id_referer" type="hidden" name="referer" value="<?= htmlspecialchars($referer, ENT_QUOTES) ?>" />
 				<?php endif; ?>
 			</p>
 		</fieldset>

From 83d228d9e8c2b067dfd5565d22437363f7590d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Thu, 13 Aug 2020 15:45:58 +0100
Subject: [PATCH 037/844] spawn: expand AUR_CONFIG to the full path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows using a relative path for the config. PHP didn't play well
with it.

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 aurweb/spawn.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 46d534d9..3c5130d7 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -11,6 +11,7 @@ configuration anyway.
 import argparse
 import atexit
 import os
+import os.path
 import subprocess
 import sys
 import tempfile
@@ -87,6 +88,9 @@ def start():
         return
     atexit.register(stop)
 
+    if 'AUR_CONFIG' in os.environ:
+        os.environ['AUR_CONFIG'] = os.path.realpath(os.environ['AUR_CONFIG'])
+
     try:
         terminal_width = os.get_terminal_size().columns
     except OSError:

From 4e4f5855f17acc2bd353093566ea853aa523f933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Thu, 13 Aug 2020 15:46:00 +0100
Subject: [PATCH 038/844] doc: fix AUR_CONFIG in TESTING
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 TESTING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TESTING b/TESTING
index d7df3672..17c6fbc7 100644
--- a/TESTING
+++ b/TESTING
@@ -29,7 +29,7 @@ INSTALL.
 4) Prepare the testing database:
 
     $ cd /path/to/aurweb/
-    $ python -m aurweb.initdb
+    $ AUR_CONFIG=conf/config python -m aurweb.initdb
 
     $ cd /path/to/aurweb/schema
     $ ./gendummydata.py out.sql
@@ -37,4 +37,4 @@ INSTALL.
 
 5) Run the test server:
 
-   $ AUR_CONFIG='/path/to/aurweb/conf/config' python -m aurweb.spawn
+   $ AUR_CONFIG=conf/config python -m aurweb.spawn

From e62d472708e722e6123f9bfa01d2c32ec9838755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Thu, 13 Aug 2020 15:46:01 +0100
Subject: [PATCH 039/844] doc: add missing gendummydata.py dependencies in
 TESTING
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 TESTING | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/TESTING b/TESTING
index 17c6fbc7..d666b3ca 100644
--- a/TESTING
+++ b/TESTING
@@ -14,7 +14,8 @@ INSTALL.
     # pacman -S --needed php php-sqlite sqlite words fortune-mod \
                          python python-sqlalchemy python-alembic \
                          python-fastapi uvicorn nginx \
-                         python-authlib python-itsdangerous python-httpx
+                         python-authlib python-itsdangerous python-httpx \
+                         words fortune-mod
 
    Ensure to enable the pdo_sqlite extension in php.ini.
 

From db75a5528e45c13a427813c177bf9657a1cb8350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@archlinux.org>
Date: Thu, 13 Aug 2020 15:46:02 +0100
Subject: [PATCH 040/844] doc: simplify database setup instructions in TESTING
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@archlinux.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 TESTING | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TESTING b/TESTING
index d666b3ca..972bce2c 100644
--- a/TESTING
+++ b/TESTING
@@ -30,11 +30,11 @@ INSTALL.
 4) Prepare the testing database:
 
     $ cd /path/to/aurweb/
+
     $ AUR_CONFIG=conf/config python -m aurweb.initdb
 
-    $ cd /path/to/aurweb/schema
-    $ ./gendummydata.py out.sql
-    $ sqlite3 path/to/aurweb.sqlite3 < out.sql
+    $ schema/gendummydata.py data.sql
+    $ sqlite3 aurweb.sqlite3 < data.sql
 
 5) Run the test server:
 

From 92e315465b19e18b67ba7bff0b14c9658db579f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <j.l.k@gmx.com>
Date: Fri, 4 Sep 2020 23:06:43 +0200
Subject: [PATCH 041/844] gendummydata.py: remove unused database connection
 variables

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 schema/gendummydata.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index b3a73ef2..8b15ac69 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -18,10 +18,6 @@ import time
 
 LOG_LEVEL = logging.DEBUG  # logging level. set to logging.INFO to reduce output
 SEED_FILE = "/usr/share/dict/words"
-DB_HOST = os.getenv("DB_HOST", "localhost")
-DB_NAME = os.getenv("DB_NAME", "AUR")
-DB_USER = os.getenv("DB_USER", "aur")
-DB_PASS = os.getenv("DB_PASS", "aur")
 USER_ID = 5            # Users.ID of first bogus user
 PKG_ID = 1             # Packages.ID of first package
 MAX_USERS = 300        # how many users to 'register'

From 879c0622d66a04b38b281f879ebbf06ba97c62c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <j.l.k@gmx.com>
Date: Fri, 4 Sep 2020 23:13:56 +0200
Subject: [PATCH 042/844] gendummydata.py: set exit code to 1 when there is an
 error

Of course the default exit code is 0...

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 schema/gendummydata.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index 8b15ac69..224c82e5 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -44,19 +44,19 @@ log = logging.getLogger()
 
 if len(sys.argv) != 2:
     log.error("Missing output filename argument")
-    raise SystemExit
+    raise SystemExit(1)
 
 # make sure the seed file exists
 #
 if not os.path.exists(SEED_FILE):
     log.error("Please install the 'words' Arch package")
-    raise SystemExit
+    raise SystemExit(1)
 
 # make sure comments can be created
 #
 if not os.path.exists(FORTUNE_FILE):
     log.error("Please install the 'fortune-mod' Arch package")
-    raise SystemExit
+    raise SystemExit(1)
 
 # track what users/package names have been used
 #

From 51a353582010a45b2121c25a5ad995111f1842a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <j.l.k@gmx.com>
Date: Fri, 4 Sep 2020 23:10:20 +0200
Subject: [PATCH 043/844] gendummydata.py: set MAX_USERS and MAX_PKGS to more
 realistic values

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 schema/gendummydata.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index 224c82e5..91a580c2 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -20,16 +20,16 @@ LOG_LEVEL = logging.DEBUG  # logging level. set to logging.INFO to reduce output
 SEED_FILE = "/usr/share/dict/words"
 USER_ID = 5            # Users.ID of first bogus user
 PKG_ID = 1             # Packages.ID of first package
-MAX_USERS = 300        # how many users to 'register'
+MAX_USERS = 76000      # how many users to 'register'
 MAX_DEVS = .1          # what percentage of MAX_USERS are Developers
 MAX_TUS = .2           # what percentage of MAX_USERS are Trusted Users
-MAX_PKGS = 900         # how many packages to load
+MAX_PKGS = 64000       # how many packages to load
 PKG_DEPS = (1, 15)     # min/max depends a package has
 PKG_RELS = (1, 5)      # min/max relations a package has
 PKG_SRC = (1, 3)       # min/max sources a package has
 PKG_CMNTS = (1, 5)     # min/max number of comments a package has
 CATEGORIES_COUNT = 17  # the number of categories from aur-schema
-VOTING = (0, .30)      # percentage range for package voting
+VOTING = (0, .001)     # percentage range for package voting
 OPEN_PROPOSALS = 5     # number of open trusted user proposals
 CLOSE_PROPOSALS = 15   # number of closed trusted user proposals
 RANDOM_TLDS = ("edu", "com", "org", "net", "tw", "ru", "pl", "de", "es")

From 3062a78a92d32144f423fdb460e96a309732d9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <j.l.k@gmx.com>
Date: Fri, 4 Sep 2020 23:53:07 +0200
Subject: [PATCH 044/844] gendummydata.py: optimize iteration for big numbers
 of pkgs

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 schema/gendummydata.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index 91a580c2..c7b3a06d 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -259,20 +259,23 @@ for p in list(track_votes.keys()):
 # Create package dependencies and sources
 #
 log.debug("Creating statements for package depends/sources.")
-for p in list(seen_pkgs.keys()):
+# the keys of seen_pkgs are accessed many times by random.choice,
+# so the list has to be created outside the loops to keep it efficient
+seen_pkgs_keys = list(seen_pkgs.keys())
+for p in seen_pkgs_keys:
     num_deps = random.randrange(PKG_DEPS[0], PKG_DEPS[1])
     for i in range(0, num_deps):
-        dep = random.choice([k for k in seen_pkgs])
+        dep = random.choice(seen_pkgs_keys)
         deptype = random.randrange(1, 5)
         if deptype == 4:
-            dep += ": for " + random.choice([k for k in seen_pkgs])
+            dep += ": for " + random.choice(seen_pkgs_keys)
         s = "INSERT INTO PackageDepends(PackageID, DepTypeID, DepName) VALUES (%d, %d, '%s');\n"
         s = s % (seen_pkgs[p], deptype, dep)
         out.write(s)
 
     num_rels = random.randrange(PKG_RELS[0], PKG_RELS[1])
     for i in range(0, num_deps):
-        rel = random.choice([k for k in seen_pkgs])
+        rel = random.choice(seen_pkgs_keys)
         reltype = random.randrange(1, 4)
         s = "INSERT INTO PackageRelations(PackageID, RelTypeID, RelName) VALUES (%d, %d, '%s');\n"
         s = s % (seen_pkgs[p], reltype, rel)

From bc972089a158459005700a7eaa8cee3ba666e2d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <j.l.k@gmx.com>
Date: Sat, 5 Sep 2020 22:15:22 +0200
Subject: [PATCH 045/844] Fix WHERE clause for keyword search queries with
 empty keywords

When the keyword parameter is empty, the AND clause has to be omitted,
otherwise we get an SQL syntax error:

... WHERE PackageBases.PackagerUID IS NOT NULL AND () ...

This got broken in commit 9e30013aa4fc6ce3a3c9f6f83a6fe789c1fc2456
Author: Kevin Morris <kevr.gtalk@gmail.com>
Date:   Sun Jul 5 18:19:06 2020 -0700

Support conjunctive keyword search in RPC interface

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/lib/pkgfuncs.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index ac5c8cfe..eb3afab6 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -697,9 +697,7 @@ function pkg_search_page($params, $show_headers=true, $SID="") {
 		}
 		elseif (isset($params["SeB"]) && $params["SeB"] == "k") {
 			/* Search by name. */
-			$q_where .= "AND (";
 			$q_where .= construct_keyword_search($dbh, $params['K'], false, true);
-			$q_where .= ") ";
 		}
 		elseif (isset($params["SeB"]) && $params["SeB"] == "N") {
 			/* Search by name (exact match). */
@@ -711,9 +709,7 @@ function pkg_search_page($params, $show_headers=true, $SID="") {
 		}
 		else {
 			/* Keyword search (default). */
-			$q_where .= "AND (";
 			$q_where .= construct_keyword_search($dbh, $params['K'], true, true);
-			$q_where .= ") ";
 		}
 	}
 
@@ -885,7 +881,11 @@ function construct_keyword_search($dbh, $keywords, $namedesc, $keyword=false) {
 		$op = "AND ";
 	}
 
-	return $q_keywords;
+	if (!empty($q_keywords)) {
+		$where_part = "AND (" . $q_keywords . ") ";
+	}
+
+	return $where_part;
 }
 
 /**

From 568e0d2fa33d17ea4c45d046d9870d8ba0376789 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Thu, 19 Nov 2020 23:16:17 +0100
Subject: [PATCH 046/844] RSS: Add atom self link

https://validator.w3.org/feed/docs/warning/MissingAtomSelfLink.html
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/lib/feedcreator.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/lib/feedcreator.class.php b/web/lib/feedcreator.class.php
index 802eebbe..e881f252 100644
--- a/web/lib/feedcreator.class.php
+++ b/web/lib/feedcreator.class.php
@@ -906,12 +906,13 @@ class RSSCreator091 extends FeedCreator {
 		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
 		$feed.= $this->_createGeneratorComment();
 		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<rss version=\"".$this->RSSVersion."\">\n"; 
+		$feed.= "<rss version=\"".$this->RSSVersion."\" xmlns:atom=\"http://www.w3.org/2005/Atom\">\n";
 		$feed.= "    <channel>\n";
 		$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
 		$this->descriptionTruncSize = 500;
 		$feed.= "        <description>".$this->getDescription()."</description>\n";
 		$feed.= "        <link>".$this->link."</link>\n";
+		$feed.= "        <atom:link href=\"".$this->syndicationURL."\" rel=\"self\" type=\"application/rss+xml\" />\n";
 		$now = new FeedDate();
 		$feed.= "        <lastBuildDate>".htmlspecialchars($now->rfc822())."</lastBuildDate>\n";
 		$feed.= "        <generator>".FEEDCREATOR_VERSION."</generator>\n";

From 78dbbd3dfa916e0b054a231ff7cd56049ff7dc2f Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Thu, 19 Nov 2020 23:17:49 +0100
Subject: [PATCH 047/844] RSS: Set proper content type header

https://validator.w3.org/feed/docs/warning/UnexpectedContentType.html
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/html/rss.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/html/rss.php b/web/html/rss.php
index d6e7825a..245a2171 100644
--- a/web/html/rss.php
+++ b/web/html/rss.php
@@ -11,6 +11,8 @@ $host = $_SERVER['HTTP_HOST'];
 
 $feed_key = 'pkg-feed-' . $protocol;
 
+header("Content-Type: application/rss+xml");
+
 $bool = false;
 $ret = get_cache_value($feed_key, $bool);
 if ($bool) {

From 1d0c6ffe24c692d4279ce6ad6cb03aeb38a2303e Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Thu, 19 Nov 2020 23:18:33 +0100
Subject: [PATCH 048/844] RSS: Make sure image title matches channel title

https://validator.w3.org/feed/docs/warning/ImageTitleDoesntMatch.html
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/html/rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/html/rss.php b/web/html/rss.php
index 245a2171..5720d3d1 100644
--- a/web/html/rss.php
+++ b/web/html/rss.php
@@ -33,7 +33,7 @@ $rss->description = "The latest and greatest packages in the AUR";
 $rss->link = "${protocol}://{$host}";
 $rss->syndicationURL = "{$protocol}://{$host}" . get_uri('/rss/');
 $image = new FeedImage();
-$image->title = "AUR";
+$image->title = "AUR Newest Packages";
 $image->url = "{$protocol}://{$host}/css/archnavbar/aurlogo.png";
 $image->link = $rss->link;
 $image->description = "AUR Newest Packages Feed";

From eb11943fed16462e089891b128fd01f9e460b114 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Thu, 19 Nov 2020 23:22:11 +0100
Subject: [PATCH 049/844] RSS: Always provide a GUID

https://validator.w3.org/feed/docs/warning/MissingGuid.html
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/html/rss.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/html/rss.php b/web/html/rss.php
index 5720d3d1..b67f862d 100644
--- a/web/html/rss.php
+++ b/web/html/rss.php
@@ -50,6 +50,7 @@ foreach ($packages as $indx => $row) {
 	$item->date = intval($row["SubmittedTS"]);
 	$item->source = "{$protocol}://{$host}";
 	$item->author = username_from_id($row["MaintainerUID"]);
+	$item->guid = $item->link;
 	$rss->addItem($item);
 }
 

From d5d333005eafb338fc5aefff9d4426cc23dbd84c Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Thu, 19 Nov 2020 23:27:21 +0100
Subject: [PATCH 050/844] RSS: Decrease cache time and increase item count

I think after 10-15 years we might want to adjust those values. With a
30min cache and 20 items per creation I would bet some new AUR packages
might be swept under the carpet.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/html/rss.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/html/rss.php b/web/html/rss.php
index b67f862d..1e6335cf 100644
--- a/web/html/rss.php
+++ b/web/html/rss.php
@@ -40,7 +40,7 @@ $image->description = "AUR Newest Packages Feed";
 $rss->image = $image;
 
 #Get the latest packages and add items for them
-$packages = latest_pkgs(20);
+$packages = latest_pkgs(100);
 
 foreach ($packages as $indx => $row) {
 	$item = new FeedItem();
@@ -56,6 +56,6 @@ foreach ($packages as $indx => $row) {
 
 #save it so that useCached() can find it
 $feedContent = $rss->createFeed();
-set_cache_value($feed_key, $feedContent, 1800);
+set_cache_value($feed_key, $feedContent, 600);
 echo $feedContent;
 ?>

From 62b413f6b76fd852abf728897f9929c4bf7024ea Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Sun, 27 Dec 2020 19:38:48 -0500
Subject: [PATCH 051/844] .gitignore: add test/trash directory*

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7c9fa60b..4d961d13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ aur.git/
 __pycache__/
 *.py[cod]
 test/test-results/
+test/trash directory*
 schema/aur-schema-sqlite.sql

From 933d2705f935011035ee661e4a7acac37cd7aca3 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Mon, 28 Dec 2020 13:03:24 -0500
Subject: [PATCH 052/844] Fetch Transifex image from https://www.transifex.com

Fixes GitLab issue #3.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f7285a51..77f3b13d 100644
--- a/README.md
+++ b/README.md
@@ -45,4 +45,4 @@ Translations
 Translations are welcome via our Transifex project at
 https://www.transifex.com/lfleischer/aurweb; see `doc/i18n.txt` for details.
 
-![Transifex](http://www.transifex.net/projects/p/aurweb/chart/image_png)
+![Transifex](https://www.transifex.com/projects/p/aurweb/chart/image_png)

From 21c457817fe8ec5db60a10e2270f9fcf951aca5f Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Sat, 23 Jan 2021 00:43:57 +0800
Subject: [PATCH 053/844] Use jsDelivr instead of Google CDN for jquery

jsdelivr is another free CDN service for open source projects.

The main motivation for this change is that it is the only one that works fairly
well across the globe. The Google CDN service is known to be hardly
accessible in mainland China, unfortunately.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/html/home.php            | 2 +-
 web/html/packages.php        | 2 +-
 web/html/pkgmerge.php        | 2 +-
 web/template/pkgreq_form.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/html/home.php b/web/html/home.php
index 0ce89f40..8fb05246 100644
--- a/web/html/home.php
+++ b/web/html/home.php
@@ -202,7 +202,7 @@ if (isset($_COOKIE["AURSID"])) {
 	<?php endif; ?>
 
 </div>
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="/js/bootstrap-typeahead.min.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/web/html/packages.php b/web/html/packages.php
index db9606d9..a989428e 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -46,7 +46,7 @@ if (isset($pkgname)) {
 html_header($title, $details);
 ?>
 
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js"></script>
 <script type="text/javascript">
 function collapseDependsList(list) {
 	list = $(list);
diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php
index 6ee7423d..d583c239 100644
--- a/web/html/pkgmerge.php
+++ b/web/html/pkgmerge.php
@@ -33,7 +33,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 			<?php if (isset($_GET['via'])): ?>
 			<input type="hidden" name="via" value="<?= intval($_GET['via']) ?>" />
 			<?php endif; ?>
-			<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
+			<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js"></script>
 			<script type="text/javascript" src="/js/bootstrap-typeahead.min.js"></script>
 			<script type="text/javascript">
 			$(document).ready(function() {
diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php
index 904ab48f..d80a422c 100644
--- a/web/template/pkgreq_form.php
+++ b/web/template/pkgreq_form.php
@@ -24,7 +24,7 @@
 					<?php endif; ?>
 				</select>
 			</p>
-			<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
+			<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js"></script>
 			<script type="text/javascript" src="/js/bootstrap-typeahead.min.js"></script>
 			<script type="text/javascript">
 			function showHideMergeSection() {

From d668ef0bcda232d740f371a94afcd2cd4e462b3c Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@vdwaa.nl>
Date: Mon, 29 Mar 2021 22:54:10 +0200
Subject: [PATCH 054/844] Resolve SQL Error when deleting an account

The account deletion code tries to remove user from PackageNotifications
using the wrong column UsersID to identify the user by id. In the
PackagePackageNotifications table the foreign key is called UserID. In
the future ideally this would be unified into UserID for all tables.

Closes: #12
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/lib/acctfuncs.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index bc603d3b..df016c6d 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -940,7 +940,7 @@ function user_delete($id) {
 	$fields_delete = array(
 		array("Sessions", "UsersID"),
 		array("PackageVotes", "UsersID"),
-		array("PackageNotifications", "UsersID")
+		array("PackageNotifications", "UserID")
 	);
 
 	$fields_set_null = array(

From c3035a9039b0adbce30e3ec5872cff46ab510317 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Wed, 28 Apr 2021 18:02:34 -0400
Subject: [PATCH 055/844] add https://EditorConfig.org setup to ensure
 consistent style

Mostly here to make sure people continue to use tabbed indents for php
and the TAP tests, since that is what they are currently using.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 .editorconfig | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..5a751aad
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# EditorConfig configuration for aurweb
+# https://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.{php,t}]
+indent_style = tab

From 8ec170b3e0ba386eb135c9a2957d983ca937c302 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Sun, 2 May 2021 11:54:58 -0400
Subject: [PATCH 056/844] dos2unix a file with Windows linebreaks that editors
 and human reviewers hate

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 web/lib/feedcreator.class.php | 3084 ++++++++++++++++-----------------
 1 file changed, 1542 insertions(+), 1542 deletions(-)

diff --git a/web/lib/feedcreator.class.php b/web/lib/feedcreator.class.php
index e881f252..a1fe24c9 100644
--- a/web/lib/feedcreator.class.php
+++ b/web/lib/feedcreator.class.php
@@ -1,1542 +1,1542 @@
-<?php
-/***************************************************************************
-
-FeedCreator class v1.7.2
-originally (c) Kai Blankenhorn
-www.bitfolge.de
-kaib@bitfolge.de
-v1.3 work by Scott Reynen (scott@randomchaos.com) and Kai Blankenhorn
-v1.5 OPML support by Dirk Clemens
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-****************************************************************************
-
-
-Changelog:
-
-v1.7.2	10-11-04
-	license changed to LGPL
-
-v1.7.1
-	fixed a syntax bug
-	fixed left over debug code
-
-v1.7	07-18-04
-	added HTML and JavaScript feeds (configurable via CSS) (thanks to Pascal Van Hecke)
-	added HTML descriptions for all feed formats (thanks to Pascal Van Hecke)
-	added a switch to select an external stylesheet (thanks to Pascal Van Hecke)
-	changed default content-type to application/xml
-	added character encoding setting
-	fixed numerous smaller bugs (thanks to S�ren Fuhrmann of golem.de)
-	improved changing ATOM versions handling (thanks to August Trometer)
-	improved the UniversalFeedCreator's useCached method (thanks to S�ren Fuhrmann of golem.de)
-	added charset output in HTTP headers (thanks to S�ren Fuhrmann of golem.de)
-	added Slashdot namespace to RSS 1.0 (thanks to S�ren Fuhrmann of golem.de)
-
-v1.6	05-10-04
-	added stylesheet to RSS 1.0 feeds
-	fixed generator comment (thanks Kevin L. Papendick and Tanguy Pruvot)
-	fixed RFC822 date bug (thanks Tanguy Pruvot)
-	added TimeZone customization for RFC8601 (thanks Tanguy Pruvot)
-	fixed Content-type could be empty (thanks Tanguy Pruvot)
-	fixed author/creator in RSS1.0 (thanks Tanguy Pruvot)
-
-v1.6 beta	02-28-04
-	added Atom 0.3 support (not all features, though)
-	improved OPML 1.0 support (hopefully - added more elements)
-	added support for arbitrary additional elements (use with caution)
-	code beautification :-)
-	considered beta due to some internal changes
-
-v1.5.1	01-27-04
-	fixed some RSS 1.0 glitches (thanks to St�phane Vanpoperynghe)
-	fixed some inconsistencies between documentation and code (thanks to Timothy Martin)
-
-v1.5	01-06-04
-	added support for OPML 1.0
-	added more documentation
-
-v1.4	11-11-03
-	optional feed saving and caching
-	improved documentation
-	minor improvements
-
-v1.3    10-02-03
-	renamed to FeedCreator, as it not only creates RSS anymore
-	added support for mbox
-	tentative support for echo/necho/atom/pie/???
-        
-v1.2    07-20-03
-	intelligent auto-truncating of RSS 0.91 attributes
-	don't create some attributes when they're not set
-	documentation improved
-	fixed a real and a possible bug with date conversions
-	code cleanup
-
-v1.1    06-29-03
-	added images to feeds
-	now includes most RSS 0.91 attributes
-	added RSS 2.0 feeds
-
-v1.0    06-24-03
-	initial release
-
-
-
-***************************************************************************/
-
-/*** GENERAL USAGE *********************************************************
-
-include("feedcreator.class.php"); 
-
-$rss = new UniversalFeedCreator(); 
-$rss->useCached(); // use cached version if age<1 hour
-$rss->title = "PHP news"; 
-$rss->description = "daily news from the PHP scripting world"; 
-
-//optional
-$rss->descriptionTruncSize = 500;
-$rss->descriptionHtmlSyndicated = true;
-
-$rss->link = "http://www.dailyphp.net/news"; 
-$rss->syndicationURL = "http://www.dailyphp.net/".$_SERVER["PHP_SELF"]; 
-
-$image = new FeedImage(); 
-$image->title = "dailyphp.net logo"; 
-$image->url = "http://www.dailyphp.net/images/logo.gif"; 
-$image->link = "http://www.dailyphp.net"; 
-$image->description = "Feed provided by dailyphp.net. Click to visit."; 
-
-//optional
-$image->descriptionTruncSize = 500;
-$image->descriptionHtmlSyndicated = true;
-
-$rss->image = $image; 
-
-// get your news items from somewhere, e.g. your database: 
-mysql_select_db($dbHost, $dbUser, $dbPass); 
-$res = mysql_query("SELECT * FROM news ORDER BY newsdate DESC"); 
-while ($data = mysql_fetch_object($res)) { 
-    $item = new FeedItem(); 
-    $item->title = $data->title; 
-    $item->link = $data->url; 
-    $item->description = $data->short; 
-    
-    //optional
-    item->descriptionTruncSize = 500;
-    item->descriptionHtmlSyndicated = true;
-
-    $item->date = $data->newsdate; 
-    $item->source = "http://www.dailyphp.net"; 
-    $item->author = "John Doe"; 
-     
-    $rss->addItem($item); 
-} 
-
-// valid format strings are: RSS0.91, RSS1.0, RSS2.0, PIE0.1 (deprecated),
-// MBOX, OPML, ATOM, ATOM0.3, HTML, JS
-echo $rss->saveFeed("RSS1.0", "news/feed.xml");
-
-
-***************************************************************************
-*          A little setup                                                 *
-**************************************************************************/
-
-// your local timezone, set to "" to disable or for GMT
-define("TIME_ZONE","+01:00");
-
-
-
-
-/**
- * Version string.
- **/
-define("FEEDCREATOR_VERSION", "FeedCreator 1.7.2");
-
-
-
-/**
- * A FeedItem is a part of a FeedCreator feed.
- *
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- * @since 1.3
- */
-class FeedItem extends HtmlDescribable {
-	/**
-	 * Mandatory attributes of an item.
-	 */
-	var $title, $description, $link;
-	
-	/**
-	 * Optional attributes of an item.
-	 */
-	var $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
-	
-	/**
-	 * Publishing date of an item. May be in one of the following formats:
-	 *
-	 *	RFC 822:
-	 *	"Mon, 20 Jan 03 18:05:41 +0400"
-	 *	"20 Jan 03 18:05:41 +0000"
-	 *
-	 *	ISO 8601:
-	 *	"2003-01-20T18:05:41+04:00"
-	 *
-	 *	Unix:
-	 *	1043082341
-	 */
-	var $date;
-	
-	/**
-	 * Any additional elements to include as an assiciated array. All $key => $value pairs
-	 * will be included unencoded in the feed item in the form
-	 *     <$key>$value</$key>
-	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
-	 * if $value contains markup. This may be abused to embed tags not implemented by
-	 * the FeedCreator class used.
-	 */
-	var $additionalElements = Array();
-
-	// on hold
-	// var $source;
-}
-
-
-
-/**
- * An FeedImage may be added to a FeedCreator feed.
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- * @since 1.3
- */
-class FeedImage extends HtmlDescribable {
-	/**
-	 * Mandatory attributes of an image.
-	 */
-	var $title, $url, $link;
-	
-	/**
-	 * Optional attributes of an image.
-	 */
-	var $width, $height, $description;
-}
-
-
-
-/**
- * An HtmlDescribable is an item within a feed that can have a description that may
- * include HTML markup.
- */
-class HtmlDescribable {
-	/**
-	 * Indicates whether the description field should be rendered in HTML.
-	 */
-	var $descriptionHtmlSyndicated;
-	
-	/**
-	 * Indicates whether and to how many characters a description should be truncated.
-	 */
-	var $descriptionTruncSize;
-	
-	/**
-	 * Returns a formatted description field, depending on descriptionHtmlSyndicated and
-	 * $descriptionTruncSize properties
-	 * @return    string    the formatted description  
-	 */
-	function getDescription() {
-		$descriptionField = new FeedHtmlField($this->description);
-		$descriptionField->syndicateHtml = $this->descriptionHtmlSyndicated;
-		$descriptionField->truncSize = $this->descriptionTruncSize;
-		return $descriptionField->output();
-	}
-
-}
-
-
-/**
- * An FeedHtmlField describes and generates
- * a feed, item or image html field (probably a description). Output is 
- * generated based on $truncSize, $syndicateHtml properties.
- * @author Pascal Van Hecke <feedcreator.class.php@vanhecke.info>
- * @version 1.6
- */
-class FeedHtmlField {
-	/**
-	 * Mandatory attributes of a FeedHtmlField.
-	 */
-	var $rawFieldContent;
-	
-	/**
-	 * Optional attributes of a FeedHtmlField.
-	 * 
-	 */
-	var $truncSize, $syndicateHtml;
-	
-	/**
-	 * Creates a new instance of FeedHtmlField.
-	 * @param  $string: if given, sets the rawFieldContent property
-	 */
-	function FeedHtmlField($parFieldContent) {
-		if ($parFieldContent) {
-			$this->rawFieldContent = $parFieldContent;
-		}
-	}
-		
-		
-	/**
-	 * Creates the right output, depending on $truncSize, $syndicateHtml properties.
-	 * @return string    the formatted field
-	 */
-	function output() {
-		// when field available and syndicated in html we assume 
-		// - valid html in $rawFieldContent and we enclose in CDATA tags
-		// - no truncation (truncating risks producing invalid html)
-		if (!$this->rawFieldContent) {
-			$result = "";
-		}	elseif ($this->syndicateHtml) {
-			$result = "<![CDATA[".$this->rawFieldContent."]]>";
-		} else {
-			if ($this->truncSize and is_int($this->truncSize)) {
-				$result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent),$this->truncSize);
-			} else {
-				$result = htmlspecialchars($this->rawFieldContent);
-			}
-		}
-		return $result;
-	}
-
-}
-
-
-
-/**
- * UniversalFeedCreator lets you choose during runtime which
- * format to build.
- * For general usage of a feed class, see the FeedCreator class
- * below or the example above.
- *
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class UniversalFeedCreator extends FeedCreator {
-	var $_feed;
-	
-	function _setFormat($format) {
-		switch (strtoupper($format)) {
-			
-			case "2.0":
-				// fall through
-			case "RSS2.0":
-				$this->_feed = new RSSCreator20();
-				break;
-			
-			case "1.0":
-				// fall through
-			case "RSS1.0":
-				$this->_feed = new RSSCreator10();
-				break;
-			
-			case "0.91":
-				// fall through
-			case "RSS0.91":
-				$this->_feed = new RSSCreator091();
-				break;
-			
-			case "PIE0.1":
-				$this->_feed = new PIECreator01();
-				break;
-			
-			case "MBOX":
-				$this->_feed = new MBOXCreator();
-				break;
-			
-			case "OPML":
-				$this->_feed = new OPMLCreator();
-				break;
-				
-			case "ATOM":
-				// fall through: always the latest ATOM version
-				
-			case "ATOM0.3":
-				$this->_feed = new AtomCreator03();
-				break;
-				
-			case "HTML":
-				$this->_feed = new HTMLCreator();
-				break;
-			
-			case "JS":
-				// fall through
-			case "JAVASCRIPT":
-				$this->_feed = new JSCreator();
-				break;
-			
-			default:
-				$this->_feed = new RSSCreator091();
-				break;
-		}
-        
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			// prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself
-			if (!in_array($key, array("_feed", "contentType", "encoding"))) {
-				$this->_feed->{$key} = $this->{$key};
-			}
-		}
-	}
-	
-	/**
-	 * Creates a syndication feed based on the items previously added.
-	 *
-	 * @see        FeedCreator::addItem()
-	 * @param    string    format    format the feed should comply to. Valid values are:
-	 *			"PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS"
-	 * @return    string    the contents of the feed.
-	 */
-	function createFeed($format = "RSS0.91") {
-		$this->_setFormat($format);
-		return $this->_feed->createFeed();
-	}
-	
-	
-	
-	/**
-	 * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect
-	 * header may be sent to redirect the use to the newly created file.
-	 * @since 1.4
-	 * 
-	 * @param	string	format	format the feed should comply to. Valid values are:
-	 *			"PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS"
-	 * @param	string	filename	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-	 * @param	boolean	displayContents	optional	send the content of the file or not. If true, the file will be sent in the body of the response.
-	 */
-	function saveFeed($format="RSS0.91", $filename="", $displayContents=true) {
-		$this->_setFormat($format);
-		$this->_feed->saveFeed($filename, $displayContents);
-	}
-
-
-   /**
-    * Turns on caching and checks if there is a recent version of this feed in the cache.
-    * If there is, an HTTP redirect header is sent.
-    * To effectively use caching, you should create the FeedCreator object and call this method
-    * before anything else, especially before you do the time consuming task to build the feed
-    * (web fetching, for example).
-    *
-    * @param   string   format   format the feed should comply to. Valid values are:
-    *       "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
-    * @param filename   string   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-    * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
-    */
-   function useCached($format="RSS0.91", $filename="", $timeout=3600) {
-      $this->_setFormat($format);
-      $this->_feed->useCached($filename, $timeout);
-   }
-
-}
-
-
-/**
- * FeedCreator is the abstract base implementation for concrete
- * implementations that implement a specific format of syndication.
- *
- * @abstract
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- * @since 1.4
- */
-class FeedCreator extends HtmlDescribable {
-
-	/**
-	 * Mandatory attributes of a feed.
-	 */
-	var $title, $description, $link;
-	
-	
-	/**
-	 * Optional attributes of a feed.
-	 */
-	var $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
-
-	/**
-	* The url of the external xsl stylesheet used to format the naked rss feed.
-	* Ignored in the output when empty.
-	*/
-	var $xslStyleSheet = "";
-	
-	
-	/**
-	 * @access private
-	 */
-	var $items = Array();
- 	
-	
-	/**
-	 * This feed's MIME content type.
-	 * @since 1.4
-	 * @access private
-	 */
-	var $contentType = "application/xml";
-	
-	
-	/**
-	 * This feed's character encoding.
-	 * @since 1.6.1
-	 **/
-	var $encoding = "ISO-8859-1";
-	
-	
-	/**
-	 * Any additional elements to include as an assiciated array. All $key => $value pairs
-	 * will be included unencoded in the feed in the form
-	 *     <$key>$value</$key>
-	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
-	 * if $value contains markup. This may be abused to embed tags not implemented by
-	 * the FeedCreator class used.
-	 */
-	var $additionalElements = Array();
-   
-    
-	/**
-	 * Adds an FeedItem to the feed.
-	 *
-	 * @param object FeedItem $item The FeedItem to add to the feed.
-	 * @access public
-	 */
-	function addItem($item) {
-		$this->items[] = $item;
-	}
-	
-	
-	/**
-	 * Truncates a string to a certain length at the most sensible point.
-	 * First, if there's a '.' character near the end of the string, the string is truncated after this character.
-	 * If there is no '.', the string is truncated after the last ' ' character.
-	 * If the string is truncated, " ..." is appended.
-	 * If the string is already shorter than $length, it is returned unchanged.
-	 * 
-	 * @static
-	 * @param string    string A string to be truncated.
-	 * @param int        length the maximum length the string should be truncated to
-	 * @return string    the truncated string
-	 */
-	function iTrunc($string, $length) {
-		if (strlen($string)<=$length) {
-			return $string;
-		}
-		
-		$pos = strrpos($string,".");
-		if ($pos>=$length-4) {
-			$string = substr($string,0,$length-4);
-			$pos = strrpos($string,".");
-		}
-		if ($pos>=$length*0.4) {
-			return substr($string,0,$pos+1)." ...";
-		}
-		
-		$pos = strrpos($string," ");
-		if ($pos>=$length-4) {
-			$string = substr($string,0,$length-4);
-			$pos = strrpos($string," ");
-		}
-		if ($pos>=$length*0.4) {
-			return substr($string,0,$pos)." ...";
-		}
-		
-		return substr($string,0,$length-4)." ...";
-			
-	}
-	
-	
-	/**
-	 * Creates a comment indicating the generator of this feed.
-	 * The format of this comment seems to be recognized by
-	 * Syndic8.com.
-	 */
-	function _createGeneratorComment() {
-		return "<!-- generator=\"".FEEDCREATOR_VERSION."\" -->\n";
-	}
-	
-	
-	/**
-	 * Creates a string containing all additional elements specified in
-	 * $additionalElements.
-	 * @param	elements	array	an associative array containing key => value pairs
-	 * @param indentString	string	a string that will be inserted before every generated line
-	 * @return    string    the XML tags corresponding to $additionalElements
-	 */
-	function _createAdditionalElements($elements, $indentString="") {
-		$ae = "";
-		if (is_array($elements)) {
-			foreach($elements AS $key => $value) {
-				$ae.= $indentString."<$key>$value</$key>\n";
-			}
-		}
-		return $ae;
-	}
-	
-	function _createStylesheetReferences() {
-		$xml = "";
-		if ($this->cssStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->cssStyleSheet."\" type=\"text/css\"?>\n";
-		if ($this->xslStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->xslStyleSheet."\" type=\"text/xsl\"?>\n";
-		return $xml;
-	}
-	
-	
-	/**
-	 * Builds the feed's text.
-	 * @abstract
-	 * @return    string    the feed's complete text 
-	 */
-	function createFeed() {
-	}
-	
-	/**
-	 * Generate a filename for the feed cache file. The result will be $_SERVER["PHP_SELF"] with the extension changed to .xml.
-	 * For example:
-	 * 
-	 * echo $_SERVER["PHP_SELF"]."\n";
-	 * echo FeedCreator::_generateFilename();
-	 * 
-	 * would produce:
-	 * 
-	 * /rss/latestnews.php
-	 * latestnews.xml
-	 *
-	 * @return string the feed cache filename
-	 * @since 1.4
-	 * @access private
-	 */
-	function _generateFilename() {
-		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".xml";
-	}
-	
-	
-	/**
-	 * @since 1.4
-	 * @access private
-	 */
-	function _redirect($filename) {
-		// attention, heavily-commented-out-area
-		
-		// maybe use this in addition to file time checking
-		//Header("Expires: ".date("r",time()+$this->_timeout));
-		
-		/* no caching at all, doesn't seem to work as good:
-		Header("Cache-Control: no-cache");
-		Header("Pragma: no-cache");
-		*/
-		
-		// HTTP redirect, some feed readers' simple HTTP implementations don't follow it
-		//Header("Location: ".$filename);
-
-		Header("Content-Type: ".$this->contentType."; charset=".$this->encoding."; filename=".basename($filename));
-		Header("Content-Disposition: inline; filename=".basename($filename));
-		readfile($filename, "r");
-		die();
-	}
-    
-	/**
-	 * Turns on caching and checks if there is a recent version of this feed in the cache.
-	 * If there is, an HTTP redirect header is sent.
-	 * To effectively use caching, you should create the FeedCreator object and call this method
-	 * before anything else, especially before you do the time consuming task to build the feed
-	 * (web fetching, for example).
-	 * @since 1.4
-	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-	 * @param timeout	int		optional	the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
-	 */
-	function useCached($filename="", $timeout=3600) {
-		$this->_timeout = $timeout;
-		if ($filename=="") {
-			$filename = $this->_generateFilename();
-		}
-		if (file_exists($filename) AND (time()-filemtime($filename) < $timeout)) {
-			$this->_redirect($filename);
-		}
-	}
-	
-	
-	/**
-	 * Saves this feed as a file on the local disk. After the file is saved, a redirect
-	 * header may be sent to redirect the user to the newly created file.
-	 * @since 1.4
-	 * 
-	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-	 * @param redirect	boolean	optional	send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
-	 */
-	function saveFeed($filename="", $displayContents=true) {
-		if ($filename=="") {
-			$filename = $this->_generateFilename();
-		}
-		$feedFile = fopen($filename, "w+");
-		if ($feedFile) {
-			fputs($feedFile,$this->createFeed());
-			fclose($feedFile);
-			if ($displayContents) {
-				$this->_redirect($filename);
-			}
-		} else {
-			echo "<br /><strong>Error creating feed file, please check write permissions.</strong><br />";
-		}
-	}
-	
-}
-
-
-/**
- * FeedDate is an internal class that stores a date for a feed or feed item.
- * Usually, you won't need to use this.
- */
-class FeedDate {
-	var $unix;
-	
-	/**
-	 * Creates a new instance of FeedDate representing a given date.
-	 * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
-	 * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used.
-	 */
-	function FeedDate($dateString="") {
-		if ($dateString=="") $dateString = date("r");
-		
-		if (is_integer($dateString)) {
-			$this->unix = $dateString;
-			return;
-		}
-		if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",$dateString,$matches)) {
-			$months = Array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12);
-			$this->unix = mktime($matches[4],$matches[5],$matches[6],$months[$matches[2]],$matches[1],$matches[3]);
-			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
-				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
-			} else {
-				if (strlen($matches[7])==1) {
-					$oneHour = 3600;
-					$ord = ord($matches[7]);
-					if ($ord < ord("M")) {
-						$tzOffset = (ord("A") - $ord - 1) * $oneHour;
-					} elseif ($ord >= ord("M") AND $matches[7]!="Z") {
-						$tzOffset = ($ord - ord("M")) * $oneHour;
-					} elseif ($matches[7]=="Z") {
-						$tzOffset = 0;
-					}
-				}
-				switch ($matches[7]) {
-					case "UT":
-					case "GMT":	$tzOffset = 0;
-				}
-			}
-			$this->unix += $tzOffset;
-			return;
-		}
-		if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~",$dateString,$matches)) {
-			$this->unix = mktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
-			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
-				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
-			} else {
-				if ($matches[7]=="Z") {
-					$tzOffset = 0;
-				}
-			}
-			$this->unix += $tzOffset;
-			return;
-		}
-		$this->unix = 0;
-	}
-
-	/**
-	 * Gets the date stored in this FeedDate as an RFC 822 date.
-	 *
-	 * @return a date in RFC 822 format
-	 */
-	function rfc822() {
-		//return gmdate("r",$this->unix);
-		$date = gmdate("D, d M Y H:i:s", $this->unix);
-		if (TIME_ZONE!="") $date .= " ".str_replace(":","",TIME_ZONE);
-		return $date;
-	}
-	
-	/**
-	 * Gets the date stored in this FeedDate as an ISO 8601 date.
-	 *
-	 * @return a date in ISO 8601 format
-	 */
-	function iso8601() {
-		$date = gmdate("Y-m-d\TH:i:sO",$this->unix);
-		$date = substr($date,0,22) . ':' . substr($date,-2);
-		if (TIME_ZONE!="") $date = str_replace("+00:00",TIME_ZONE,$date);
-		return $date;
-	}
-	
-	/**
-	 * Gets the date stored in this FeedDate as unix time stamp.
-	 *
-	 * @return a date as a unix time stamp
-	 */
-	function unix() {
-		return $this->unix;
-	}
-}
-
-
-/**
- * RSSCreator10 is a FeedCreator that implements RDF Site Summary (RSS) 1.0.
- *
- * @see http://www.purl.org/rss/1.0/
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class RSSCreator10 extends FeedCreator {
-
-	/**
-	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
-	 * The feed will contain all items previously added in the same order.
-	 * @return    string    the feed's complete text 
-	 */
-	function createFeed() {     
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		if ($this->cssStyleSheet=="") {
-			$cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css";
-		}
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<rdf:RDF\n";
-		$feed.= "    xmlns=\"http://purl.org/rss/1.0/\"\n";
-		$feed.= "    xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n"; 
-		$feed.= "    xmlns:slash=\"http://purl.org/rss/1.0/modules/slash/\"\n";
-		$feed.= "    xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
-		$feed.= "    <channel rdf:about=\"".$this->syndicationURL."\">\n";
-		$feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
-		$feed.= "        <description>".htmlspecialchars($this->description)."</description>\n";
-		$feed.= "        <link>".$this->link."</link>\n";
-		if ($this->image!=null) {
-			$feed.= "        <image rdf:resource=\"".$this->image->url."\" />\n";
-		}
-		$now = new FeedDate();
-		$feed.= "       <dc:date>".htmlspecialchars($now->iso8601())."</dc:date>\n";
-		$feed.= "        <items>\n";
-		$feed.= "            <rdf:Seq>\n";
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "                <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
-		}
-		$feed.= "            </rdf:Seq>\n";
-		$feed.= "        </items>\n";
-		$feed.= "    </channel>\n";
-		if ($this->image!=null) {
-			$feed.= "    <image rdf:about=\"".$this->image->url."\">\n";
-			$feed.= "        <title>".$this->image->title."</title>\n";
-			$feed.= "        <link>".$this->image->link."</link>\n";
-			$feed.= "        <url>".$this->image->url."</url>\n";
-			$feed.= "    </image>\n";
-		}
-		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
-		
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
-			//$feed.= "        <dc:type>Posting</dc:type>\n";
-			$feed.= "        <dc:format>text/html</dc:format>\n";
-			if ($this->items[$i]->date!=null) {
-				$itemDate = new FeedDate($this->items[$i]->date);
-				$feed.= "        <dc:date>".htmlspecialchars($itemDate->iso8601())."</dc:date>\n";
-			}
-			if ($this->items[$i]->source!="") {
-				$feed.= "        <dc:source>".htmlspecialchars($this->items[$i]->source)."</dc:source>\n";
-			}
-			if ($this->items[$i]->author!="") {
-				$feed.= "        <dc:creator>".htmlspecialchars($this->items[$i]->author)."</dc:creator>\n";
-			}
-			$feed.= "        <title>".htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")))."</title>\n";
-			$feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
-			$feed.= "        <description>".htmlspecialchars($this->items[$i]->description)."</description>\n";
-			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
-			$feed.= "    </item>\n";
-		}
-		$feed.= "</rdf:RDF>\n";
-		return $feed;
-	}
-}
-
-
-
-/**
- * RSSCreator091 is a FeedCreator that implements RSS 0.91 Spec, revision 3.
- *
- * @see http://my.netscape.com/publish/formats/rss-spec-0.91.html
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class RSSCreator091 extends FeedCreator {
-
-	/**
-	 * Stores this RSS feed's version number.
-	 * @access private
-	 */
-	var $RSSVersion;
-
-	function RSSCreator091() {
-		$this->_setRSSVersion("0.91");
-		$this->contentType = "application/rss+xml";
-	}
-	
-	/**
-	 * Sets this RSS feed's version number.
-	 * @access private
-	 */
-	function _setRSSVersion($version) {
-		$this->RSSVersion = $version;
-	}
-
-	/**
-	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
-	 * The feed will contain all items previously added in the same order.
-	 * @return    string    the feed's complete text 
-	 */
-	function createFeed() {
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<rss version=\"".$this->RSSVersion."\" xmlns:atom=\"http://www.w3.org/2005/Atom\">\n";
-		$feed.= "    <channel>\n";
-		$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
-		$this->descriptionTruncSize = 500;
-		$feed.= "        <description>".$this->getDescription()."</description>\n";
-		$feed.= "        <link>".$this->link."</link>\n";
-		$feed.= "        <atom:link href=\"".$this->syndicationURL."\" rel=\"self\" type=\"application/rss+xml\" />\n";
-		$now = new FeedDate();
-		$feed.= "        <lastBuildDate>".htmlspecialchars($now->rfc822())."</lastBuildDate>\n";
-		$feed.= "        <generator>".FEEDCREATOR_VERSION."</generator>\n";
-
-		if ($this->image!=null) {
-			$feed.= "        <image>\n";
-			$feed.= "            <url>".$this->image->url."</url>\n"; 
-			$feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars($this->image->title),100)."</title>\n"; 
-			$feed.= "            <link>".$this->image->link."</link>\n";
-			if ($this->image->width!="") {
-				$feed.= "            <width>".$this->image->width."</width>\n";
-			}
-			if ($this->image->height!="") {
-				$feed.= "            <height>".$this->image->height."</height>\n";
-			}
-			if ($this->image->description!="") {
-				$feed.= "            <description>".$this->image->getDescription()."</description>\n";
-			}
-			$feed.= "        </image>\n";
-		}
-		if ($this->language!="") {
-			$feed.= "        <language>".$this->language."</language>\n";
-		}
-		if ($this->copyright!="") {
-			$feed.= "        <copyright>".FeedCreator::iTrunc(htmlspecialchars($this->copyright),100)."</copyright>\n";
-		}
-		if ($this->editor!="") {
-			$feed.= "        <managingEditor>".FeedCreator::iTrunc(htmlspecialchars($this->editor),100)."</managingEditor>\n";
-		}
-		if ($this->webmaster!="") {
-			$feed.= "        <webMaster>".FeedCreator::iTrunc(htmlspecialchars($this->webmaster),100)."</webMaster>\n";
-		}
-		if ($this->pubDate!="") {
-			$pubDate = new FeedDate($this->pubDate);
-			$feed.= "        <pubDate>".htmlspecialchars($pubDate->rfc822())."</pubDate>\n";
-		}
-		if ($this->category!="") {
-			$feed.= "        <category>".htmlspecialchars($this->category)."</category>\n";
-		}
-		if ($this->docs!="") {
-			$feed.= "        <docs>".FeedCreator::iTrunc(htmlspecialchars($this->docs),500)."</docs>\n";
-		}
-		if ($this->ttl!="") {
-			$feed.= "        <ttl>".htmlspecialchars($this->ttl)."</ttl>\n";
-		}
-		if ($this->rating!="") {
-			$feed.= "        <rating>".FeedCreator::iTrunc(htmlspecialchars($this->rating),500)."</rating>\n";
-		}
-		if ($this->skipHours!="") {
-			$feed.= "        <skipHours>".htmlspecialchars($this->skipHours)."</skipHours>\n";
-		}
-		if ($this->skipDays!="") {
-			$feed.= "        <skipDays>".htmlspecialchars($this->skipDays)."</skipDays>\n";
-		}
-		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
-
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "        <item>\n";
-			$feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
-			$feed.= "            <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
-			$feed.= "            <description>".$this->items[$i]->getDescription()."</description>\n";
-			
-			if ($this->items[$i]->author!="") {
-				$feed.= "            <author>".htmlspecialchars($this->items[$i]->author)."</author>\n";
-			}
-			/*
-			// on hold
-			if ($this->items[$i]->source!="") {
-					$feed.= "            <source>".htmlspecialchars($this->items[$i]->source)."</source>\n";
-			}
-			*/
-			if ($this->items[$i]->category!="") {
-				$feed.= "            <category>".htmlspecialchars($this->items[$i]->category)."</category>\n";
-			}
-			if ($this->items[$i]->comments!="") {
-				$feed.= "            <comments>".htmlspecialchars($this->items[$i]->comments)."</comments>\n";
-			}
-			if ($this->items[$i]->date!="") {
-			$itemDate = new FeedDate($this->items[$i]->date);
-				$feed.= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
-			}
-			if ($this->items[$i]->guid!="") {
-				$feed.= "            <guid>".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
-			}
-			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
-			$feed.= "        </item>\n";
-		}
-		$feed.= "    </channel>\n";
-		$feed.= "</rss>\n";
-		return $feed;
-	}
-}
-
-
-
-/**
- * RSSCreator20 is a FeedCreator that implements RDF Site Summary (RSS) 2.0.
- *
- * @see http://backend.userland.com/rss
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class RSSCreator20 extends RSSCreator091 {
-
-    function RSSCreator20() {
-        parent::_setRSSVersion("2.0");
-    }
-    
-}
-
-
-/**
- * PIECreator01 is a FeedCreator that implements the emerging PIE specification,
- * as in http://intertwingly.net/wiki/pie/Syntax.
- *
- * @deprecated
- * @since 1.3
- * @author Scott Reynen <scott@randomchaos.com> and Kai Blankenhorn <kaib@bitfolge.de>
- */
-class PIECreator01 extends FeedCreator {
-	
-	function PIECreator01() {
-		$this->encoding = "utf-8";
-	}
-    
-	function createFeed() {
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n"; 
-		$feed.= "    <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
-		$this->truncSize = 500;
-		$feed.= "    <subtitle>".$this->getDescription()."</subtitle>\n";
-		$feed.= "    <link>".$this->link."</link>\n";
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <entry>\n";
-			$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
-			$feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
-			$itemDate = new FeedDate($this->items[$i]->date);
-			$feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
-			$feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
-			$feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
-			$feed.= "        <id>".htmlspecialchars($this->items[$i]->guid)."</id>\n";
-			if ($this->items[$i]->author!="") {
-				$feed.= "        <author>\n";
-				$feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
-				if ($this->items[$i]->authorEmail!="") {
-					$feed.= "            <email>".$this->items[$i]->authorEmail."</email>\n";
-				}
-				$feed.="        </author>\n";
-			}
-			$feed.= "        <content type=\"text/html\" xml:lang=\"en-us\">\n";
-			$feed.= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">".$this->items[$i]->getDescription()."</div>\n";
-			$feed.= "        </content>\n";
-			$feed.= "    </entry>\n";
-		}
-		$feed.= "</feed>\n";
-		return $feed;
-	}
-}
-
-
-/**
- * AtomCreator03 is a FeedCreator that implements the atom specification,
- * as in http://www.intertwingly.net/wiki/pie/FrontPage.
- * Please note that just by using AtomCreator03 you won't automatically
- * produce valid atom files. For example, you have to specify either an editor
- * for the feed or an author for every single feed item.
- *
- * Some elements have not been implemented yet. These are (incomplete list):
- * author URL, item author's email and URL, item contents, alternate links, 
- * other link content types than text/html. Some of them may be created with
- * AtomCreator03::additionalElements.
- *
- * @see FeedCreator#additionalElements
- * @since 1.6
- * @author Kai Blankenhorn <kaib@bitfolge.de>, Scott Reynen <scott@randomchaos.com>
- */
-class AtomCreator03 extends FeedCreator {
-
-	function AtomCreator03() {
-		$this->contentType = "application/atom+xml";
-		$this->encoding = "utf-8";
-	}
-	
-	function createFeed() {
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\"";
-		if ($this->language!="") {
-			$feed.= " xml:lang=\"".$this->language."\"";
-		}
-		$feed.= ">\n"; 
-		$feed.= "    <title>".htmlspecialchars($this->title)."</title>\n";
-		$feed.= "    <tagline>".htmlspecialchars($this->description)."</tagline>\n";
-		$feed.= "    <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->link)."\"/>\n";
-		$feed.= "    <id>".htmlspecialchars($this->link)."</id>\n";
-		$now = new FeedDate();
-		$feed.= "    <modified>".htmlspecialchars($now->iso8601())."</modified>\n";
-		if ($this->editor!="") {
-			$feed.= "    <author>\n";
-			$feed.= "        <name>".$this->editor."</name>\n";
-			if ($this->editorEmail!="") {
-				$feed.= "        <email>".$this->editorEmail."</email>\n";
-			}
-			$feed.= "    </author>\n";
-		}
-		$feed.= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
-		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <entry>\n";
-			$feed.= "        <title>".htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n";
-			$feed.= "        <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
-			if ($this->items[$i]->date=="") {
-				$this->items[$i]->date = time();
-			}
-			$itemDate = new FeedDate($this->items[$i]->date);
-			$feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
-			$feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
-			$feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
-			$feed.= "        <id>".htmlspecialchars($this->items[$i]->link)."</id>\n";
-			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
-			if ($this->items[$i]->author!="") {
-				$feed.= "        <author>\n";
-				$feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
-				$feed.= "        </author>\n";
-			}
-			if ($this->items[$i]->description!="") {
-				$feed.= "        <summary>".htmlspecialchars($this->items[$i]->description)."</summary>\n";
-			}
-			$feed.= "    </entry>\n";
-		}
-		$feed.= "</feed>\n";
-		return $feed;
-	}
-}
-
-
-/**
- * MBOXCreator is a FeedCreator that implements the mbox format
- * as described in http://www.qmail.org/man/man5/mbox.html
- *
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class MBOXCreator extends FeedCreator {
-
-	function MBOXCreator() {
-		$this->contentType = "text/plain";
-		$this->encoding = "ISO-8859-15";
-	}
-    
-	function qp_enc($input = "", $line_max = 76) { 
-		$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); 
-		$lines = preg_split("/(?:\r\n|\r|\n)/", $input); 
-		$eol = "\r\n"; 
-		$escape = "="; 
-		$output = ""; 
-		while( list(, $line) = each($lines) ) { 
-			//$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary 
-			$linlen = strlen($line); 
-			$newline = ""; 
-			for($i = 0; $i < $linlen; $i++) { 
-				$c = substr($line, $i, 1); 
-				$dec = ord($c); 
-				if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only 
-					$c = "=20"; 
-				} elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required 
-					$h2 = floor($dec/16); $h1 = floor($dec%16); 
-					$c = $escape.$hex["$h2"].$hex["$h1"]; 
-				} 
-				if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted 
-					$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay 
-					$newline = ""; 
-				} 
-				$newline .= $c; 
-			} // end of for 
-			$output .= $newline.$eol; 
-		} 
-		return trim($output); 
-	}
-	
-
-	/**
-	 * Builds the MBOX contents.
-	 * @return    string    the feed's complete text 
-	 */
-	function createFeed() {
-		for ($i=0;$i<count($this->items);$i++) {
-			if ($this->items[$i]->author!="") {
-				$from = $this->items[$i]->author;
-			} else {
-				$from = $this->title;
-			}
-			$itemDate = new FeedDate($this->items[$i]->date);
-			$feed.= "From ".strtr(MBOXCreator::qp_enc($from)," ","_")." ".date("D M d H:i:s Y",$itemDate->unix())."\n";
-			$feed.= "Content-Type: text/plain;\n";
-			$feed.= "	charset=\"".$this->encoding."\"\n";
-			$feed.= "Content-Transfer-Encoding: quoted-printable\n";
-			$feed.= "Content-Type: text/plain\n";
-			$feed.= "From: \"".MBOXCreator::qp_enc($from)."\"\n";
-			$feed.= "Date: ".$itemDate->rfc822()."\n";
-			$feed.= "Subject: ".MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title,100))."\n";
-			$feed.= "\n";
-			$body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description));
-			$feed.= preg_replace("~\nFrom ([^\n]*)(\n?)~","\n>From $1$2\n",$body);
-			$feed.= "\n";
-			$feed.= "\n";
-		}
-		return $feed;
-	}
-	
-	/**
-	 * Generate a filename for the feed cache file. Overridden from FeedCreator to prevent XML data types.
-	 * @return string the feed cache filename
-	 * @since 1.4
-	 * @access private
-	 */
-	function _generateFilename() {
-		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".mbox";
-	}
-}
-
-
-/**
- * OPMLCreator is a FeedCreator that implements OPML 1.0.
- * 
- * @see http://opml.scripting.com/spec
- * @author Dirk Clemens, Kai Blankenhorn
- * @since 1.5
- */
-class OPMLCreator extends FeedCreator {
-
-	function OPMLCreator() {
-		$this->encoding = "utf-8";
-	}
-    
-	function createFeed() {     
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<opml xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
-		$feed.= "    <head>\n";
-		$feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
-		if ($this->pubDate!="") {
-			$date = new FeedDate($this->pubDate);
-			$feed.= "         <dateCreated>".$date->rfc822()."</dateCreated>\n";
-		}
-		if ($this->lastBuildDate!="") {
-			$date = new FeedDate($this->lastBuildDate);
-			$feed.= "         <dateModified>".$date->rfc822()."</dateModified>\n";
-		}
-		if ($this->editor!="") {
-			$feed.= "         <ownerName>".$this->editor."</ownerName>\n";
-		}
-		if ($this->editorEmail!="") {
-			$feed.= "         <ownerEmail>".$this->editorEmail."</ownerEmail>\n";
-		}
-		$feed.= "    </head>\n";
-		$feed.= "    <body>\n";
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <outline type=\"rss\" ";
-			$title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")));
-			$feed.= " title=\"".$title."\"";
-			$feed.= " text=\"".$title."\"";
-			//$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\"";
-			$feed.= " url=\"".htmlspecialchars($this->items[$i]->link)."\"";
-			$feed.= "/>\n";
-		}
-		$feed.= "    </body>\n";
-		$feed.= "</opml>\n";
-		return $feed;
-	}
-}
-
-
-
-/**
- * HTMLCreator is a FeedCreator that writes an HTML feed file to a specific 
- * location, overriding the createFeed method of the parent FeedCreator.
- * The HTML produced can be included over http by scripting languages, or serve
- * as the source for an IFrame.
- * All output by this class is embedded in <div></div> tags to enable formatting
- * using CSS. 
- *
- * @author Pascal Van Hecke
- * @since 1.7
- */
-class HTMLCreator extends FeedCreator {
-
-	var $contentType = "text/html";
-	
-	/**
-	 * Contains HTML to be output at the start of the feed's html representation.
-	 */
-	var $header;
-	
-	/**
-	 * Contains HTML to be output at the end of the feed's html representation.
-	 */
-	var $footer ;
-	
-	/**
-	 * Contains HTML to be output between entries. A separator is only used in 
-	 * case of multiple entries.
-	 */
-	var $separator;
-	
-	/**
-	 * Used to prefix the stylenames to make sure they are unique 
-	 * and do not clash with stylenames on the users' page.
-	 */
-	var $stylePrefix;
-	
-	/**
-	 * Determines whether the links open in a new window or not.
-	 */
-	var $openInNewWindow = true;
-	
-	var $imageAlign ="right";
-	
-	/**
-	 * In case of very simple output you may want to get rid of the style tags,
-	 * hence this variable.  There's no equivalent on item level, but of course you can 
-	 * add strings to it while iterating over the items ($this->stylelessOutput .= ...)
-	 * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored
-	 * in the function createFeed().
-	 */
-	var $stylelessOutput ="";
-
-	/**
-	 * Writes the HTML.
-	 * @return    string    the scripts's complete text 
-	 */
-	function createFeed() {
-		// if there is styleless output, use the content of this variable and ignore the rest
-		if ($this->stylelessOutput!="") {
-			return $this->stylelessOutput;
-		}
-		
-		//if no stylePrefix is set, generate it yourself depending on the script name
-		if ($this->stylePrefix=="") {
-			$this->stylePrefix = str_replace(".", "_", $this->_generateFilename())."_";
-		}
-
-		//set an openInNewWindow_token_to be inserted or not
-		if ($this->openInNewWindow) {
-			$targetInsert = " target='_blank'";
-		}
-		
-		// use this array to put the lines in and implode later with "document.write" javascript
-		$feedArray = array();
-		if ($this->image!=null) {
-			$imageStr = "<a href='".$this->image->link."'".$targetInsert.">".
-							"<img src='".$this->image->url."' border='0' alt='".
-							FeedCreator::iTrunc(htmlspecialchars($this->image->title),100).
-							"' align='".$this->imageAlign."' ";
-			if ($this->image->width) {
-				$imageStr .=" width='".$this->image->width. "' ";
-			}
-			if ($this->image->height) {
-				$imageStr .=" height='".$this->image->height."' ";
-			}
-			$imageStr .="/></a>";
-			$feedArray[] = $imageStr;
-		}
-		
-		if ($this->title) {
-			$feedArray[] = "<div class='".$this->stylePrefix."title'><a href='".$this->link."' ".$targetInsert." class='".$this->stylePrefix."title'>".
-				FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</a></div>";
-		}
-		if ($this->getDescription()) {
-			$feedArray[] = "<div class='".$this->stylePrefix."description'>".
-				str_replace("]]>", "", str_replace("<![CDATA[", "", $this->getDescription())).
-				"</div>";
-		}
-		
-		if ($this->header) {
-			$feedArray[] = "<div class='".$this->stylePrefix."header'>".$this->header."</div>";
-		}
-		
-		for ($i=0;$i<count($this->items);$i++) {
-			if ($this->separator and $i > 0) {
-				$feedArray[] = "<div class='".$this->stylePrefix."separator'>".$this->separator."</div>";
-			}
-			
-			if ($this->items[$i]->title) {
-				if ($this->items[$i]->link) {
-					$feedArray[] = 
-						"<div class='".$this->stylePrefix."item_title'><a href='".$this->items[$i]->link."' class='".$this->stylePrefix.
-						"item_title'".$targetInsert.">".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
-						"</a></div>";
-				} else {
-					$feedArray[] = 
-						"<div class='".$this->stylePrefix."item_title'>".
-						FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
-						"</div>";
-				}
-			}
-			if ($this->items[$i]->getDescription()) {
-				$feedArray[] = 
-				"<div class='".$this->stylePrefix."item_description'>".
-					str_replace("]]>", "", str_replace("<![CDATA[", "", $this->items[$i]->getDescription())).
-					"</div>";
-			}
-		}
-		if ($this->footer) {
-			$feedArray[] = "<div class='".$this->stylePrefix."footer'>".$this->footer."</div>";
-		}
-		
-		$feed= "".join($feedArray, "\r\n");
-		return $feed;
-	}
-    
-	/**
-	 * Overrrides parent to produce .html extensions
-	 *
-	 * @return string the feed cache filename
-	 * @since 1.4
-	 * @access private
-	 */
-	function _generateFilename() {
-		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".html";
-	}
-}	
-
-
-/**
- * JSCreator is a class that writes a js file to a specific 
- * location, overriding the createFeed method of the parent HTMLCreator.
- *
- * @author Pascal Van Hecke
- */
-class JSCreator extends HTMLCreator {
-	var $contentType = "text/javascript";
-	
-	/**
-	 * writes the javascript
-	 * @return    string    the scripts's complete text 
-	 */
-	function createFeed() 
-	{
-		$feed = parent::createFeed();
-		$feedArray = explode("\n",$feed);
-		
-		$jsFeed = "";
-		foreach ($feedArray as $value) {
-			$jsFeed .= "document.write('".trim(addslashes($value))."');\n";
-		}
-		return $jsFeed;
-	}
-    
-	/**
-	 * Overrrides parent to produce .js extensions
-	 *
-	 * @return string the feed cache filename
-	 * @since 1.4
-	 * @access private
-	 */
-	function _generateFilename() {
-		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".js";
-	}
-	
-}	
-
-
-
-/*** TEST SCRIPT *********************************************************
-
-//include("feedcreator.class.php"); 
-
-$rss = new UniversalFeedCreator(); 
-$rss->useCached(); 
-$rss->title = "PHP news"; 
-$rss->description = "daily news from the PHP scripting world"; 
-
-//optional
-//$rss->descriptionTruncSize = 500;
-//$rss->descriptionHtmlSyndicated = true;
-//$rss->xslStyleSheet = "http://feedster.com/rss20.xsl";
-
-$rss->link = "http://www.dailyphp.net/news"; 
-$rss->feedURL = "http://www.dailyphp.net/".$PHP_SELF; 
-
-$image = new FeedImage(); 
-$image->title = "dailyphp.net logo"; 
-$image->url = "http://www.dailyphp.net/images/logo.gif"; 
-$image->link = "http://www.dailyphp.net"; 
-$image->description = "Feed provided by dailyphp.net. Click to visit."; 
-
-//optional
-$image->descriptionTruncSize = 500;
-$image->descriptionHtmlSyndicated = true;
-
-$rss->image = $image; 
-
-// get your news items from somewhere, e.g. your database: 
-//mysql_select_db($dbHost, $dbUser, $dbPass); 
-//$res = mysql_query("SELECT * FROM news ORDER BY newsdate DESC"); 
-//while ($data = mysql_fetch_object($res)) { 
-	$item = new FeedItem(); 
-	$item->title = "This is an the test title of an item"; 
-	$item->link = "http://localhost/item/"; 
-	$item->description = "<b>description in </b><br/>HTML"; 
-	
-	//optional
-	//item->descriptionTruncSize = 500;
-	$item->descriptionHtmlSyndicated = true;
-	
-	$item->date = time(); 
-	$item->source = "http://www.dailyphp.net"; 
-	$item->author = "John Doe"; 
-	 
-	$rss->addItem($item); 
-//} 
-
-// valid format strings are: RSS0.91, RSS1.0, RSS2.0, PIE0.1, MBOX, OPML, ATOM0.3, HTML, JS
-echo $rss->saveFeed("RSS0.91", "feed.xml"); 
-
-
-
-***************************************************************************/
-
-?>
+<?php
+/***************************************************************************
+
+FeedCreator class v1.7.2
+originally (c) Kai Blankenhorn
+www.bitfolge.de
+kaib@bitfolge.de
+v1.3 work by Scott Reynen (scott@randomchaos.com) and Kai Blankenhorn
+v1.5 OPML support by Dirk Clemens
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+****************************************************************************
+
+
+Changelog:
+
+v1.7.2	10-11-04
+	license changed to LGPL
+
+v1.7.1
+	fixed a syntax bug
+	fixed left over debug code
+
+v1.7	07-18-04
+	added HTML and JavaScript feeds (configurable via CSS) (thanks to Pascal Van Hecke)
+	added HTML descriptions for all feed formats (thanks to Pascal Van Hecke)
+	added a switch to select an external stylesheet (thanks to Pascal Van Hecke)
+	changed default content-type to application/xml
+	added character encoding setting
+	fixed numerous smaller bugs (thanks to S�ren Fuhrmann of golem.de)
+	improved changing ATOM versions handling (thanks to August Trometer)
+	improved the UniversalFeedCreator's useCached method (thanks to S�ren Fuhrmann of golem.de)
+	added charset output in HTTP headers (thanks to S�ren Fuhrmann of golem.de)
+	added Slashdot namespace to RSS 1.0 (thanks to S�ren Fuhrmann of golem.de)
+
+v1.6	05-10-04
+	added stylesheet to RSS 1.0 feeds
+	fixed generator comment (thanks Kevin L. Papendick and Tanguy Pruvot)
+	fixed RFC822 date bug (thanks Tanguy Pruvot)
+	added TimeZone customization for RFC8601 (thanks Tanguy Pruvot)
+	fixed Content-type could be empty (thanks Tanguy Pruvot)
+	fixed author/creator in RSS1.0 (thanks Tanguy Pruvot)
+
+v1.6 beta	02-28-04
+	added Atom 0.3 support (not all features, though)
+	improved OPML 1.0 support (hopefully - added more elements)
+	added support for arbitrary additional elements (use with caution)
+	code beautification :-)
+	considered beta due to some internal changes
+
+v1.5.1	01-27-04
+	fixed some RSS 1.0 glitches (thanks to St�phane Vanpoperynghe)
+	fixed some inconsistencies between documentation and code (thanks to Timothy Martin)
+
+v1.5	01-06-04
+	added support for OPML 1.0
+	added more documentation
+
+v1.4	11-11-03
+	optional feed saving and caching
+	improved documentation
+	minor improvements
+
+v1.3    10-02-03
+	renamed to FeedCreator, as it not only creates RSS anymore
+	added support for mbox
+	tentative support for echo/necho/atom/pie/???
+
+v1.2    07-20-03
+	intelligent auto-truncating of RSS 0.91 attributes
+	don't create some attributes when they're not set
+	documentation improved
+	fixed a real and a possible bug with date conversions
+	code cleanup
+
+v1.1    06-29-03
+	added images to feeds
+	now includes most RSS 0.91 attributes
+	added RSS 2.0 feeds
+
+v1.0    06-24-03
+	initial release
+
+
+
+***************************************************************************/
+
+/*** GENERAL USAGE *********************************************************
+
+include("feedcreator.class.php");
+
+$rss = new UniversalFeedCreator();
+$rss->useCached(); // use cached version if age<1 hour
+$rss->title = "PHP news";
+$rss->description = "daily news from the PHP scripting world";
+
+//optional
+$rss->descriptionTruncSize = 500;
+$rss->descriptionHtmlSyndicated = true;
+
+$rss->link = "http://www.dailyphp.net/news";
+$rss->syndicationURL = "http://www.dailyphp.net/".$_SERVER["PHP_SELF"];
+
+$image = new FeedImage();
+$image->title = "dailyphp.net logo";
+$image->url = "http://www.dailyphp.net/images/logo.gif";
+$image->link = "http://www.dailyphp.net";
+$image->description = "Feed provided by dailyphp.net. Click to visit.";
+
+//optional
+$image->descriptionTruncSize = 500;
+$image->descriptionHtmlSyndicated = true;
+
+$rss->image = $image;
+
+// get your news items from somewhere, e.g. your database:
+mysql_select_db($dbHost, $dbUser, $dbPass);
+$res = mysql_query("SELECT * FROM news ORDER BY newsdate DESC");
+while ($data = mysql_fetch_object($res)) {
+    $item = new FeedItem();
+    $item->title = $data->title;
+    $item->link = $data->url;
+    $item->description = $data->short;
+
+    //optional
+    item->descriptionTruncSize = 500;
+    item->descriptionHtmlSyndicated = true;
+
+    $item->date = $data->newsdate;
+    $item->source = "http://www.dailyphp.net";
+    $item->author = "John Doe";
+
+    $rss->addItem($item);
+}
+
+// valid format strings are: RSS0.91, RSS1.0, RSS2.0, PIE0.1 (deprecated),
+// MBOX, OPML, ATOM, ATOM0.3, HTML, JS
+echo $rss->saveFeed("RSS1.0", "news/feed.xml");
+
+
+***************************************************************************
+*          A little setup                                                 *
+**************************************************************************/
+
+// your local timezone, set to "" to disable or for GMT
+define("TIME_ZONE","+01:00");
+
+
+
+
+/**
+ * Version string.
+ **/
+define("FEEDCREATOR_VERSION", "FeedCreator 1.7.2");
+
+
+
+/**
+ * A FeedItem is a part of a FeedCreator feed.
+ *
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.3
+ */
+class FeedItem extends HtmlDescribable {
+	/**
+	 * Mandatory attributes of an item.
+	 */
+	var $title, $description, $link;
+
+	/**
+	 * Optional attributes of an item.
+	 */
+	var $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
+
+	/**
+	 * Publishing date of an item. May be in one of the following formats:
+	 *
+	 *	RFC 822:
+	 *	"Mon, 20 Jan 03 18:05:41 +0400"
+	 *	"20 Jan 03 18:05:41 +0000"
+	 *
+	 *	ISO 8601:
+	 *	"2003-01-20T18:05:41+04:00"
+	 *
+	 *	Unix:
+	 *	1043082341
+	 */
+	var $date;
+
+	/**
+	 * Any additional elements to include as an assiciated array. All $key => $value pairs
+	 * will be included unencoded in the feed item in the form
+	 *     <$key>$value</$key>
+	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
+	 * if $value contains markup. This may be abused to embed tags not implemented by
+	 * the FeedCreator class used.
+	 */
+	var $additionalElements = Array();
+
+	// on hold
+	// var $source;
+}
+
+
+
+/**
+ * An FeedImage may be added to a FeedCreator feed.
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.3
+ */
+class FeedImage extends HtmlDescribable {
+	/**
+	 * Mandatory attributes of an image.
+	 */
+	var $title, $url, $link;
+
+	/**
+	 * Optional attributes of an image.
+	 */
+	var $width, $height, $description;
+}
+
+
+
+/**
+ * An HtmlDescribable is an item within a feed that can have a description that may
+ * include HTML markup.
+ */
+class HtmlDescribable {
+	/**
+	 * Indicates whether the description field should be rendered in HTML.
+	 */
+	var $descriptionHtmlSyndicated;
+
+	/**
+	 * Indicates whether and to how many characters a description should be truncated.
+	 */
+	var $descriptionTruncSize;
+
+	/**
+	 * Returns a formatted description field, depending on descriptionHtmlSyndicated and
+	 * $descriptionTruncSize properties
+	 * @return    string    the formatted description
+	 */
+	function getDescription() {
+		$descriptionField = new FeedHtmlField($this->description);
+		$descriptionField->syndicateHtml = $this->descriptionHtmlSyndicated;
+		$descriptionField->truncSize = $this->descriptionTruncSize;
+		return $descriptionField->output();
+	}
+
+}
+
+
+/**
+ * An FeedHtmlField describes and generates
+ * a feed, item or image html field (probably a description). Output is
+ * generated based on $truncSize, $syndicateHtml properties.
+ * @author Pascal Van Hecke <feedcreator.class.php@vanhecke.info>
+ * @version 1.6
+ */
+class FeedHtmlField {
+	/**
+	 * Mandatory attributes of a FeedHtmlField.
+	 */
+	var $rawFieldContent;
+
+	/**
+	 * Optional attributes of a FeedHtmlField.
+	 *
+	 */
+	var $truncSize, $syndicateHtml;
+
+	/**
+	 * Creates a new instance of FeedHtmlField.
+	 * @param  $string: if given, sets the rawFieldContent property
+	 */
+	function FeedHtmlField($parFieldContent) {
+		if ($parFieldContent) {
+			$this->rawFieldContent = $parFieldContent;
+		}
+	}
+
+
+	/**
+	 * Creates the right output, depending on $truncSize, $syndicateHtml properties.
+	 * @return string    the formatted field
+	 */
+	function output() {
+		// when field available and syndicated in html we assume
+		// - valid html in $rawFieldContent and we enclose in CDATA tags
+		// - no truncation (truncating risks producing invalid html)
+		if (!$this->rawFieldContent) {
+			$result = "";
+		}	elseif ($this->syndicateHtml) {
+			$result = "<![CDATA[".$this->rawFieldContent."]]>";
+		} else {
+			if ($this->truncSize and is_int($this->truncSize)) {
+				$result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent),$this->truncSize);
+			} else {
+				$result = htmlspecialchars($this->rawFieldContent);
+			}
+		}
+		return $result;
+	}
+
+}
+
+
+
+/**
+ * UniversalFeedCreator lets you choose during runtime which
+ * format to build.
+ * For general usage of a feed class, see the FeedCreator class
+ * below or the example above.
+ *
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class UniversalFeedCreator extends FeedCreator {
+	var $_feed;
+
+	function _setFormat($format) {
+		switch (strtoupper($format)) {
+
+			case "2.0":
+				// fall through
+			case "RSS2.0":
+				$this->_feed = new RSSCreator20();
+				break;
+
+			case "1.0":
+				// fall through
+			case "RSS1.0":
+				$this->_feed = new RSSCreator10();
+				break;
+
+			case "0.91":
+				// fall through
+			case "RSS0.91":
+				$this->_feed = new RSSCreator091();
+				break;
+
+			case "PIE0.1":
+				$this->_feed = new PIECreator01();
+				break;
+
+			case "MBOX":
+				$this->_feed = new MBOXCreator();
+				break;
+
+			case "OPML":
+				$this->_feed = new OPMLCreator();
+				break;
+
+			case "ATOM":
+				// fall through: always the latest ATOM version
+
+			case "ATOM0.3":
+				$this->_feed = new AtomCreator03();
+				break;
+
+			case "HTML":
+				$this->_feed = new HTMLCreator();
+				break;
+
+			case "JS":
+				// fall through
+			case "JAVASCRIPT":
+				$this->_feed = new JSCreator();
+				break;
+
+			default:
+				$this->_feed = new RSSCreator091();
+				break;
+		}
+
+		$vars = get_object_vars($this);
+		foreach ($vars as $key => $value) {
+			// prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself
+			if (!in_array($key, array("_feed", "contentType", "encoding"))) {
+				$this->_feed->{$key} = $this->{$key};
+			}
+		}
+	}
+
+	/**
+	 * Creates a syndication feed based on the items previously added.
+	 *
+	 * @see        FeedCreator::addItem()
+	 * @param    string    format    format the feed should comply to. Valid values are:
+	 *			"PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS"
+	 * @return    string    the contents of the feed.
+	 */
+	function createFeed($format = "RSS0.91") {
+		$this->_setFormat($format);
+		return $this->_feed->createFeed();
+	}
+
+
+
+	/**
+	 * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect
+	 * header may be sent to redirect the use to the newly created file.
+	 * @since 1.4
+	 *
+	 * @param	string	format	format the feed should comply to. Valid values are:
+	 *			"PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS"
+	 * @param	string	filename	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param	boolean	displayContents	optional	send the content of the file or not. If true, the file will be sent in the body of the response.
+	 */
+	function saveFeed($format="RSS0.91", $filename="", $displayContents=true) {
+		$this->_setFormat($format);
+		$this->_feed->saveFeed($filename, $displayContents);
+	}
+
+
+   /**
+    * Turns on caching and checks if there is a recent version of this feed in the cache.
+    * If there is, an HTTP redirect header is sent.
+    * To effectively use caching, you should create the FeedCreator object and call this method
+    * before anything else, especially before you do the time consuming task to build the feed
+    * (web fetching, for example).
+    *
+    * @param   string   format   format the feed should comply to. Valid values are:
+    *       "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
+    * @param filename   string   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+    * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+    */
+   function useCached($format="RSS0.91", $filename="", $timeout=3600) {
+      $this->_setFormat($format);
+      $this->_feed->useCached($filename, $timeout);
+   }
+
+}
+
+
+/**
+ * FeedCreator is the abstract base implementation for concrete
+ * implementations that implement a specific format of syndication.
+ *
+ * @abstract
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.4
+ */
+class FeedCreator extends HtmlDescribable {
+
+	/**
+	 * Mandatory attributes of a feed.
+	 */
+	var $title, $description, $link;
+
+
+	/**
+	 * Optional attributes of a feed.
+	 */
+	var $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
+
+	/**
+	* The url of the external xsl stylesheet used to format the naked rss feed.
+	* Ignored in the output when empty.
+	*/
+	var $xslStyleSheet = "";
+
+
+	/**
+	 * @access private
+	 */
+	var $items = Array();
+
+
+	/**
+	 * This feed's MIME content type.
+	 * @since 1.4
+	 * @access private
+	 */
+	var $contentType = "application/xml";
+
+
+	/**
+	 * This feed's character encoding.
+	 * @since 1.6.1
+	 **/
+	var $encoding = "ISO-8859-1";
+
+
+	/**
+	 * Any additional elements to include as an assiciated array. All $key => $value pairs
+	 * will be included unencoded in the feed in the form
+	 *     <$key>$value</$key>
+	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
+	 * if $value contains markup. This may be abused to embed tags not implemented by
+	 * the FeedCreator class used.
+	 */
+	var $additionalElements = Array();
+
+
+	/**
+	 * Adds an FeedItem to the feed.
+	 *
+	 * @param object FeedItem $item The FeedItem to add to the feed.
+	 * @access public
+	 */
+	function addItem($item) {
+		$this->items[] = $item;
+	}
+
+
+	/**
+	 * Truncates a string to a certain length at the most sensible point.
+	 * First, if there's a '.' character near the end of the string, the string is truncated after this character.
+	 * If there is no '.', the string is truncated after the last ' ' character.
+	 * If the string is truncated, " ..." is appended.
+	 * If the string is already shorter than $length, it is returned unchanged.
+	 *
+	 * @static
+	 * @param string    string A string to be truncated.
+	 * @param int        length the maximum length the string should be truncated to
+	 * @return string    the truncated string
+	 */
+	function iTrunc($string, $length) {
+		if (strlen($string)<=$length) {
+			return $string;
+		}
+
+		$pos = strrpos($string,".");
+		if ($pos>=$length-4) {
+			$string = substr($string,0,$length-4);
+			$pos = strrpos($string,".");
+		}
+		if ($pos>=$length*0.4) {
+			return substr($string,0,$pos+1)." ...";
+		}
+
+		$pos = strrpos($string," ");
+		if ($pos>=$length-4) {
+			$string = substr($string,0,$length-4);
+			$pos = strrpos($string," ");
+		}
+		if ($pos>=$length*0.4) {
+			return substr($string,0,$pos)." ...";
+		}
+
+		return substr($string,0,$length-4)." ...";
+
+	}
+
+
+	/**
+	 * Creates a comment indicating the generator of this feed.
+	 * The format of this comment seems to be recognized by
+	 * Syndic8.com.
+	 */
+	function _createGeneratorComment() {
+		return "<!-- generator=\"".FEEDCREATOR_VERSION."\" -->\n";
+	}
+
+
+	/**
+	 * Creates a string containing all additional elements specified in
+	 * $additionalElements.
+	 * @param	elements	array	an associative array containing key => value pairs
+	 * @param indentString	string	a string that will be inserted before every generated line
+	 * @return    string    the XML tags corresponding to $additionalElements
+	 */
+	function _createAdditionalElements($elements, $indentString="") {
+		$ae = "";
+		if (is_array($elements)) {
+			foreach($elements AS $key => $value) {
+				$ae.= $indentString."<$key>$value</$key>\n";
+			}
+		}
+		return $ae;
+	}
+
+	function _createStylesheetReferences() {
+		$xml = "";
+		if ($this->cssStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->cssStyleSheet."\" type=\"text/css\"?>\n";
+		if ($this->xslStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->xslStyleSheet."\" type=\"text/xsl\"?>\n";
+		return $xml;
+	}
+
+
+	/**
+	 * Builds the feed's text.
+	 * @abstract
+	 * @return    string    the feed's complete text
+	 */
+	function createFeed() {
+	}
+
+	/**
+	 * Generate a filename for the feed cache file. The result will be $_SERVER["PHP_SELF"] with the extension changed to .xml.
+	 * For example:
+	 *
+	 * echo $_SERVER["PHP_SELF"]."\n";
+	 * echo FeedCreator::_generateFilename();
+	 *
+	 * would produce:
+	 *
+	 * /rss/latestnews.php
+	 * latestnews.xml
+	 *
+	 * @return string the feed cache filename
+	 * @since 1.4
+	 * @access private
+	 */
+	function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".xml";
+	}
+
+
+	/**
+	 * @since 1.4
+	 * @access private
+	 */
+	function _redirect($filename) {
+		// attention, heavily-commented-out-area
+
+		// maybe use this in addition to file time checking
+		//Header("Expires: ".date("r",time()+$this->_timeout));
+
+		/* no caching at all, doesn't seem to work as good:
+		Header("Cache-Control: no-cache");
+		Header("Pragma: no-cache");
+		*/
+
+		// HTTP redirect, some feed readers' simple HTTP implementations don't follow it
+		//Header("Location: ".$filename);
+
+		Header("Content-Type: ".$this->contentType."; charset=".$this->encoding."; filename=".basename($filename));
+		Header("Content-Disposition: inline; filename=".basename($filename));
+		readfile($filename, "r");
+		die();
+	}
+
+	/**
+	 * Turns on caching and checks if there is a recent version of this feed in the cache.
+	 * If there is, an HTTP redirect header is sent.
+	 * To effectively use caching, you should create the FeedCreator object and call this method
+	 * before anything else, especially before you do the time consuming task to build the feed
+	 * (web fetching, for example).
+	 * @since 1.4
+	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param timeout	int		optional	the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+	 */
+	function useCached($filename="", $timeout=3600) {
+		$this->_timeout = $timeout;
+		if ($filename=="") {
+			$filename = $this->_generateFilename();
+		}
+		if (file_exists($filename) AND (time()-filemtime($filename) < $timeout)) {
+			$this->_redirect($filename);
+		}
+	}
+
+
+	/**
+	 * Saves this feed as a file on the local disk. After the file is saved, a redirect
+	 * header may be sent to redirect the user to the newly created file.
+	 * @since 1.4
+	 *
+	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param redirect	boolean	optional	send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
+	 */
+	function saveFeed($filename="", $displayContents=true) {
+		if ($filename=="") {
+			$filename = $this->_generateFilename();
+		}
+		$feedFile = fopen($filename, "w+");
+		if ($feedFile) {
+			fputs($feedFile,$this->createFeed());
+			fclose($feedFile);
+			if ($displayContents) {
+				$this->_redirect($filename);
+			}
+		} else {
+			echo "<br /><strong>Error creating feed file, please check write permissions.</strong><br />";
+		}
+	}
+
+}
+
+
+/**
+ * FeedDate is an internal class that stores a date for a feed or feed item.
+ * Usually, you won't need to use this.
+ */
+class FeedDate {
+	var $unix;
+
+	/**
+	 * Creates a new instance of FeedDate representing a given date.
+	 * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
+	 * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used.
+	 */
+	function FeedDate($dateString="") {
+		if ($dateString=="") $dateString = date("r");
+
+		if (is_integer($dateString)) {
+			$this->unix = $dateString;
+			return;
+		}
+		if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",$dateString,$matches)) {
+			$months = Array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12);
+			$this->unix = mktime($matches[4],$matches[5],$matches[6],$months[$matches[2]],$matches[1],$matches[3]);
+			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
+				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
+			} else {
+				if (strlen($matches[7])==1) {
+					$oneHour = 3600;
+					$ord = ord($matches[7]);
+					if ($ord < ord("M")) {
+						$tzOffset = (ord("A") - $ord - 1) * $oneHour;
+					} elseif ($ord >= ord("M") AND $matches[7]!="Z") {
+						$tzOffset = ($ord - ord("M")) * $oneHour;
+					} elseif ($matches[7]=="Z") {
+						$tzOffset = 0;
+					}
+				}
+				switch ($matches[7]) {
+					case "UT":
+					case "GMT":	$tzOffset = 0;
+				}
+			}
+			$this->unix += $tzOffset;
+			return;
+		}
+		if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~",$dateString,$matches)) {
+			$this->unix = mktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
+			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
+				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
+			} else {
+				if ($matches[7]=="Z") {
+					$tzOffset = 0;
+				}
+			}
+			$this->unix += $tzOffset;
+			return;
+		}
+		$this->unix = 0;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as an RFC 822 date.
+	 *
+	 * @return a date in RFC 822 format
+	 */
+	function rfc822() {
+		//return gmdate("r",$this->unix);
+		$date = gmdate("D, d M Y H:i:s", $this->unix);
+		if (TIME_ZONE!="") $date .= " ".str_replace(":","",TIME_ZONE);
+		return $date;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as an ISO 8601 date.
+	 *
+	 * @return a date in ISO 8601 format
+	 */
+	function iso8601() {
+		$date = gmdate("Y-m-d\TH:i:sO",$this->unix);
+		$date = substr($date,0,22) . ':' . substr($date,-2);
+		if (TIME_ZONE!="") $date = str_replace("+00:00",TIME_ZONE,$date);
+		return $date;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as unix time stamp.
+	 *
+	 * @return a date as a unix time stamp
+	 */
+	function unix() {
+		return $this->unix;
+	}
+}
+
+
+/**
+ * RSSCreator10 is a FeedCreator that implements RDF Site Summary (RSS) 1.0.
+ *
+ * @see http://www.purl.org/rss/1.0/
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator10 extends FeedCreator {
+
+	/**
+	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
+	 * The feed will contain all items previously added in the same order.
+	 * @return    string    the feed's complete text
+	 */
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		if ($this->cssStyleSheet=="") {
+			$cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css";
+		}
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<rdf:RDF\n";
+		$feed.= "    xmlns=\"http://purl.org/rss/1.0/\"\n";
+		$feed.= "    xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n";
+		$feed.= "    xmlns:slash=\"http://purl.org/rss/1.0/modules/slash/\"\n";
+		$feed.= "    xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
+		$feed.= "    <channel rdf:about=\"".$this->syndicationURL."\">\n";
+		$feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
+		$feed.= "        <description>".htmlspecialchars($this->description)."</description>\n";
+		$feed.= "        <link>".$this->link."</link>\n";
+		if ($this->image!=null) {
+			$feed.= "        <image rdf:resource=\"".$this->image->url."\" />\n";
+		}
+		$now = new FeedDate();
+		$feed.= "       <dc:date>".htmlspecialchars($now->iso8601())."</dc:date>\n";
+		$feed.= "        <items>\n";
+		$feed.= "            <rdf:Seq>\n";
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "                <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+		}
+		$feed.= "            </rdf:Seq>\n";
+		$feed.= "        </items>\n";
+		$feed.= "    </channel>\n";
+		if ($this->image!=null) {
+			$feed.= "    <image rdf:about=\"".$this->image->url."\">\n";
+			$feed.= "        <title>".$this->image->title."</title>\n";
+			$feed.= "        <link>".$this->image->link."</link>\n";
+			$feed.= "        <url>".$this->image->url."</url>\n";
+			$feed.= "    </image>\n";
+		}
+		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "    <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
+			//$feed.= "        <dc:type>Posting</dc:type>\n";
+			$feed.= "        <dc:format>text/html</dc:format>\n";
+			if ($this->items[$i]->date!=null) {
+				$itemDate = new FeedDate($this->items[$i]->date);
+				$feed.= "        <dc:date>".htmlspecialchars($itemDate->iso8601())."</dc:date>\n";
+			}
+			if ($this->items[$i]->source!="") {
+				$feed.= "        <dc:source>".htmlspecialchars($this->items[$i]->source)."</dc:source>\n";
+			}
+			if ($this->items[$i]->author!="") {
+				$feed.= "        <dc:creator>".htmlspecialchars($this->items[$i]->author)."</dc:creator>\n";
+			}
+			$feed.= "        <title>".htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")))."</title>\n";
+			$feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+			$feed.= "        <description>".htmlspecialchars($this->items[$i]->description)."</description>\n";
+			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+			$feed.= "    </item>\n";
+		}
+		$feed.= "</rdf:RDF>\n";
+		return $feed;
+	}
+}
+
+
+
+/**
+ * RSSCreator091 is a FeedCreator that implements RSS 0.91 Spec, revision 3.
+ *
+ * @see http://my.netscape.com/publish/formats/rss-spec-0.91.html
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator091 extends FeedCreator {
+
+	/**
+	 * Stores this RSS feed's version number.
+	 * @access private
+	 */
+	var $RSSVersion;
+
+	function RSSCreator091() {
+		$this->_setRSSVersion("0.91");
+		$this->contentType = "application/rss+xml";
+	}
+
+	/**
+	 * Sets this RSS feed's version number.
+	 * @access private
+	 */
+	function _setRSSVersion($version) {
+		$this->RSSVersion = $version;
+	}
+
+	/**
+	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
+	 * The feed will contain all items previously added in the same order.
+	 * @return    string    the feed's complete text
+	 */
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<rss version=\"".$this->RSSVersion."\" xmlns:atom=\"http://www.w3.org/2005/Atom\">\n";
+		$feed.= "    <channel>\n";
+		$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
+		$this->descriptionTruncSize = 500;
+		$feed.= "        <description>".$this->getDescription()."</description>\n";
+		$feed.= "        <link>".$this->link."</link>\n";
+		$feed.= "        <atom:link href=\"".$this->syndicationURL."\" rel=\"self\" type=\"application/rss+xml\" />\n";
+		$now = new FeedDate();
+		$feed.= "        <lastBuildDate>".htmlspecialchars($now->rfc822())."</lastBuildDate>\n";
+		$feed.= "        <generator>".FEEDCREATOR_VERSION."</generator>\n";
+
+		if ($this->image!=null) {
+			$feed.= "        <image>\n";
+			$feed.= "            <url>".$this->image->url."</url>\n";
+			$feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars($this->image->title),100)."</title>\n";
+			$feed.= "            <link>".$this->image->link."</link>\n";
+			if ($this->image->width!="") {
+				$feed.= "            <width>".$this->image->width."</width>\n";
+			}
+			if ($this->image->height!="") {
+				$feed.= "            <height>".$this->image->height."</height>\n";
+			}
+			if ($this->image->description!="") {
+				$feed.= "            <description>".$this->image->getDescription()."</description>\n";
+			}
+			$feed.= "        </image>\n";
+		}
+		if ($this->language!="") {
+			$feed.= "        <language>".$this->language."</language>\n";
+		}
+		if ($this->copyright!="") {
+			$feed.= "        <copyright>".FeedCreator::iTrunc(htmlspecialchars($this->copyright),100)."</copyright>\n";
+		}
+		if ($this->editor!="") {
+			$feed.= "        <managingEditor>".FeedCreator::iTrunc(htmlspecialchars($this->editor),100)."</managingEditor>\n";
+		}
+		if ($this->webmaster!="") {
+			$feed.= "        <webMaster>".FeedCreator::iTrunc(htmlspecialchars($this->webmaster),100)."</webMaster>\n";
+		}
+		if ($this->pubDate!="") {
+			$pubDate = new FeedDate($this->pubDate);
+			$feed.= "        <pubDate>".htmlspecialchars($pubDate->rfc822())."</pubDate>\n";
+		}
+		if ($this->category!="") {
+			$feed.= "        <category>".htmlspecialchars($this->category)."</category>\n";
+		}
+		if ($this->docs!="") {
+			$feed.= "        <docs>".FeedCreator::iTrunc(htmlspecialchars($this->docs),500)."</docs>\n";
+		}
+		if ($this->ttl!="") {
+			$feed.= "        <ttl>".htmlspecialchars($this->ttl)."</ttl>\n";
+		}
+		if ($this->rating!="") {
+			$feed.= "        <rating>".FeedCreator::iTrunc(htmlspecialchars($this->rating),500)."</rating>\n";
+		}
+		if ($this->skipHours!="") {
+			$feed.= "        <skipHours>".htmlspecialchars($this->skipHours)."</skipHours>\n";
+		}
+		if ($this->skipDays!="") {
+			$feed.= "        <skipDays>".htmlspecialchars($this->skipDays)."</skipDays>\n";
+		}
+		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "        <item>\n";
+			$feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
+			$feed.= "            <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+			$feed.= "            <description>".$this->items[$i]->getDescription()."</description>\n";
+
+			if ($this->items[$i]->author!="") {
+				$feed.= "            <author>".htmlspecialchars($this->items[$i]->author)."</author>\n";
+			}
+			/*
+			// on hold
+			if ($this->items[$i]->source!="") {
+					$feed.= "            <source>".htmlspecialchars($this->items[$i]->source)."</source>\n";
+			}
+			*/
+			if ($this->items[$i]->category!="") {
+				$feed.= "            <category>".htmlspecialchars($this->items[$i]->category)."</category>\n";
+			}
+			if ($this->items[$i]->comments!="") {
+				$feed.= "            <comments>".htmlspecialchars($this->items[$i]->comments)."</comments>\n";
+			}
+			if ($this->items[$i]->date!="") {
+			$itemDate = new FeedDate($this->items[$i]->date);
+				$feed.= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
+			}
+			if ($this->items[$i]->guid!="") {
+				$feed.= "            <guid>".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
+			}
+			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+			$feed.= "        </item>\n";
+		}
+		$feed.= "    </channel>\n";
+		$feed.= "</rss>\n";
+		return $feed;
+	}
+}
+
+
+
+/**
+ * RSSCreator20 is a FeedCreator that implements RDF Site Summary (RSS) 2.0.
+ *
+ * @see http://backend.userland.com/rss
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator20 extends RSSCreator091 {
+
+    function RSSCreator20() {
+        parent::_setRSSVersion("2.0");
+    }
+
+}
+
+
+/**
+ * PIECreator01 is a FeedCreator that implements the emerging PIE specification,
+ * as in http://intertwingly.net/wiki/pie/Syntax.
+ *
+ * @deprecated
+ * @since 1.3
+ * @author Scott Reynen <scott@randomchaos.com> and Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class PIECreator01 extends FeedCreator {
+
+	function PIECreator01() {
+		$this->encoding = "utf-8";
+	}
+
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n";
+		$feed.= "    <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
+		$this->truncSize = 500;
+		$feed.= "    <subtitle>".$this->getDescription()."</subtitle>\n";
+		$feed.= "    <link>".$this->link."</link>\n";
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "    <entry>\n";
+			$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
+			$feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
+			$feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
+			$feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
+			$feed.= "        <id>".htmlspecialchars($this->items[$i]->guid)."</id>\n";
+			if ($this->items[$i]->author!="") {
+				$feed.= "        <author>\n";
+				$feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
+				if ($this->items[$i]->authorEmail!="") {
+					$feed.= "            <email>".$this->items[$i]->authorEmail."</email>\n";
+				}
+				$feed.="        </author>\n";
+			}
+			$feed.= "        <content type=\"text/html\" xml:lang=\"en-us\">\n";
+			$feed.= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">".$this->items[$i]->getDescription()."</div>\n";
+			$feed.= "        </content>\n";
+			$feed.= "    </entry>\n";
+		}
+		$feed.= "</feed>\n";
+		return $feed;
+	}
+}
+
+
+/**
+ * AtomCreator03 is a FeedCreator that implements the atom specification,
+ * as in http://www.intertwingly.net/wiki/pie/FrontPage.
+ * Please note that just by using AtomCreator03 you won't automatically
+ * produce valid atom files. For example, you have to specify either an editor
+ * for the feed or an author for every single feed item.
+ *
+ * Some elements have not been implemented yet. These are (incomplete list):
+ * author URL, item author's email and URL, item contents, alternate links,
+ * other link content types than text/html. Some of them may be created with
+ * AtomCreator03::additionalElements.
+ *
+ * @see FeedCreator#additionalElements
+ * @since 1.6
+ * @author Kai Blankenhorn <kaib@bitfolge.de>, Scott Reynen <scott@randomchaos.com>
+ */
+class AtomCreator03 extends FeedCreator {
+
+	function AtomCreator03() {
+		$this->contentType = "application/atom+xml";
+		$this->encoding = "utf-8";
+	}
+
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\"";
+		if ($this->language!="") {
+			$feed.= " xml:lang=\"".$this->language."\"";
+		}
+		$feed.= ">\n";
+		$feed.= "    <title>".htmlspecialchars($this->title)."</title>\n";
+		$feed.= "    <tagline>".htmlspecialchars($this->description)."</tagline>\n";
+		$feed.= "    <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->link)."\"/>\n";
+		$feed.= "    <id>".htmlspecialchars($this->link)."</id>\n";
+		$now = new FeedDate();
+		$feed.= "    <modified>".htmlspecialchars($now->iso8601())."</modified>\n";
+		if ($this->editor!="") {
+			$feed.= "    <author>\n";
+			$feed.= "        <name>".$this->editor."</name>\n";
+			if ($this->editorEmail!="") {
+				$feed.= "        <email>".$this->editorEmail."</email>\n";
+			}
+			$feed.= "    </author>\n";
+		}
+		$feed.= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
+		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "    <entry>\n";
+			$feed.= "        <title>".htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n";
+			$feed.= "        <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+			if ($this->items[$i]->date=="") {
+				$this->items[$i]->date = time();
+			}
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
+			$feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
+			$feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
+			$feed.= "        <id>".htmlspecialchars($this->items[$i]->link)."</id>\n";
+			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+			if ($this->items[$i]->author!="") {
+				$feed.= "        <author>\n";
+				$feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
+				$feed.= "        </author>\n";
+			}
+			if ($this->items[$i]->description!="") {
+				$feed.= "        <summary>".htmlspecialchars($this->items[$i]->description)."</summary>\n";
+			}
+			$feed.= "    </entry>\n";
+		}
+		$feed.= "</feed>\n";
+		return $feed;
+	}
+}
+
+
+/**
+ * MBOXCreator is a FeedCreator that implements the mbox format
+ * as described in http://www.qmail.org/man/man5/mbox.html
+ *
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class MBOXCreator extends FeedCreator {
+
+	function MBOXCreator() {
+		$this->contentType = "text/plain";
+		$this->encoding = "ISO-8859-15";
+	}
+
+	function qp_enc($input = "", $line_max = 76) {
+		$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+		$lines = preg_split("/(?:\r\n|\r|\n)/", $input);
+		$eol = "\r\n";
+		$escape = "=";
+		$output = "";
+		while( list(, $line) = each($lines) ) {
+			//$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary
+			$linlen = strlen($line);
+			$newline = "";
+			for($i = 0; $i < $linlen; $i++) {
+				$c = substr($line, $i, 1);
+				$dec = ord($c);
+				if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+					$c = "=20";
+				} elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
+					$h2 = floor($dec/16); $h1 = floor($dec%16);
+					$c = $escape.$hex["$h2"].$hex["$h1"];
+				}
+				if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+					$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
+					$newline = "";
+				}
+				$newline .= $c;
+			} // end of for
+			$output .= $newline.$eol;
+		}
+		return trim($output);
+	}
+
+
+	/**
+	 * Builds the MBOX contents.
+	 * @return    string    the feed's complete text
+	 */
+	function createFeed() {
+		for ($i=0;$i<count($this->items);$i++) {
+			if ($this->items[$i]->author!="") {
+				$from = $this->items[$i]->author;
+			} else {
+				$from = $this->title;
+			}
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed.= "From ".strtr(MBOXCreator::qp_enc($from)," ","_")." ".date("D M d H:i:s Y",$itemDate->unix())."\n";
+			$feed.= "Content-Type: text/plain;\n";
+			$feed.= "	charset=\"".$this->encoding."\"\n";
+			$feed.= "Content-Transfer-Encoding: quoted-printable\n";
+			$feed.= "Content-Type: text/plain\n";
+			$feed.= "From: \"".MBOXCreator::qp_enc($from)."\"\n";
+			$feed.= "Date: ".$itemDate->rfc822()."\n";
+			$feed.= "Subject: ".MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title,100))."\n";
+			$feed.= "\n";
+			$body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description));
+			$feed.= preg_replace("~\nFrom ([^\n]*)(\n?)~","\n>From $1$2\n",$body);
+			$feed.= "\n";
+			$feed.= "\n";
+		}
+		return $feed;
+	}
+
+	/**
+	 * Generate a filename for the feed cache file. Overridden from FeedCreator to prevent XML data types.
+	 * @return string the feed cache filename
+	 * @since 1.4
+	 * @access private
+	 */
+	function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".mbox";
+	}
+}
+
+
+/**
+ * OPMLCreator is a FeedCreator that implements OPML 1.0.
+ *
+ * @see http://opml.scripting.com/spec
+ * @author Dirk Clemens, Kai Blankenhorn
+ * @since 1.5
+ */
+class OPMLCreator extends FeedCreator {
+
+	function OPMLCreator() {
+		$this->encoding = "utf-8";
+	}
+
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<opml xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
+		$feed.= "    <head>\n";
+		$feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
+		if ($this->pubDate!="") {
+			$date = new FeedDate($this->pubDate);
+			$feed.= "         <dateCreated>".$date->rfc822()."</dateCreated>\n";
+		}
+		if ($this->lastBuildDate!="") {
+			$date = new FeedDate($this->lastBuildDate);
+			$feed.= "         <dateModified>".$date->rfc822()."</dateModified>\n";
+		}
+		if ($this->editor!="") {
+			$feed.= "         <ownerName>".$this->editor."</ownerName>\n";
+		}
+		if ($this->editorEmail!="") {
+			$feed.= "         <ownerEmail>".$this->editorEmail."</ownerEmail>\n";
+		}
+		$feed.= "    </head>\n";
+		$feed.= "    <body>\n";
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "    <outline type=\"rss\" ";
+			$title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")));
+			$feed.= " title=\"".$title."\"";
+			$feed.= " text=\"".$title."\"";
+			//$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\"";
+			$feed.= " url=\"".htmlspecialchars($this->items[$i]->link)."\"";
+			$feed.= "/>\n";
+		}
+		$feed.= "    </body>\n";
+		$feed.= "</opml>\n";
+		return $feed;
+	}
+}
+
+
+
+/**
+ * HTMLCreator is a FeedCreator that writes an HTML feed file to a specific
+ * location, overriding the createFeed method of the parent FeedCreator.
+ * The HTML produced can be included over http by scripting languages, or serve
+ * as the source for an IFrame.
+ * All output by this class is embedded in <div></div> tags to enable formatting
+ * using CSS.
+ *
+ * @author Pascal Van Hecke
+ * @since 1.7
+ */
+class HTMLCreator extends FeedCreator {
+
+	var $contentType = "text/html";
+
+	/**
+	 * Contains HTML to be output at the start of the feed's html representation.
+	 */
+	var $header;
+
+	/**
+	 * Contains HTML to be output at the end of the feed's html representation.
+	 */
+	var $footer ;
+
+	/**
+	 * Contains HTML to be output between entries. A separator is only used in
+	 * case of multiple entries.
+	 */
+	var $separator;
+
+	/**
+	 * Used to prefix the stylenames to make sure they are unique
+	 * and do not clash with stylenames on the users' page.
+	 */
+	var $stylePrefix;
+
+	/**
+	 * Determines whether the links open in a new window or not.
+	 */
+	var $openInNewWindow = true;
+
+	var $imageAlign ="right";
+
+	/**
+	 * In case of very simple output you may want to get rid of the style tags,
+	 * hence this variable.  There's no equivalent on item level, but of course you can
+	 * add strings to it while iterating over the items ($this->stylelessOutput .= ...)
+	 * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored
+	 * in the function createFeed().
+	 */
+	var $stylelessOutput ="";
+
+	/**
+	 * Writes the HTML.
+	 * @return    string    the scripts's complete text
+	 */
+	function createFeed() {
+		// if there is styleless output, use the content of this variable and ignore the rest
+		if ($this->stylelessOutput!="") {
+			return $this->stylelessOutput;
+		}
+
+		//if no stylePrefix is set, generate it yourself depending on the script name
+		if ($this->stylePrefix=="") {
+			$this->stylePrefix = str_replace(".", "_", $this->_generateFilename())."_";
+		}
+
+		//set an openInNewWindow_token_to be inserted or not
+		if ($this->openInNewWindow) {
+			$targetInsert = " target='_blank'";
+		}
+
+		// use this array to put the lines in and implode later with "document.write" javascript
+		$feedArray = array();
+		if ($this->image!=null) {
+			$imageStr = "<a href='".$this->image->link."'".$targetInsert.">".
+							"<img src='".$this->image->url."' border='0' alt='".
+							FeedCreator::iTrunc(htmlspecialchars($this->image->title),100).
+							"' align='".$this->imageAlign."' ";
+			if ($this->image->width) {
+				$imageStr .=" width='".$this->image->width. "' ";
+			}
+			if ($this->image->height) {
+				$imageStr .=" height='".$this->image->height."' ";
+			}
+			$imageStr .="/></a>";
+			$feedArray[] = $imageStr;
+		}
+
+		if ($this->title) {
+			$feedArray[] = "<div class='".$this->stylePrefix."title'><a href='".$this->link."' ".$targetInsert." class='".$this->stylePrefix."title'>".
+				FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</a></div>";
+		}
+		if ($this->getDescription()) {
+			$feedArray[] = "<div class='".$this->stylePrefix."description'>".
+				str_replace("]]>", "", str_replace("<![CDATA[", "", $this->getDescription())).
+				"</div>";
+		}
+
+		if ($this->header) {
+			$feedArray[] = "<div class='".$this->stylePrefix."header'>".$this->header."</div>";
+		}
+
+		for ($i=0;$i<count($this->items);$i++) {
+			if ($this->separator and $i > 0) {
+				$feedArray[] = "<div class='".$this->stylePrefix."separator'>".$this->separator."</div>";
+			}
+
+			if ($this->items[$i]->title) {
+				if ($this->items[$i]->link) {
+					$feedArray[] =
+						"<div class='".$this->stylePrefix."item_title'><a href='".$this->items[$i]->link."' class='".$this->stylePrefix.
+						"item_title'".$targetInsert.">".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
+						"</a></div>";
+				} else {
+					$feedArray[] =
+						"<div class='".$this->stylePrefix."item_title'>".
+						FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
+						"</div>";
+				}
+			}
+			if ($this->items[$i]->getDescription()) {
+				$feedArray[] =
+				"<div class='".$this->stylePrefix."item_description'>".
+					str_replace("]]>", "", str_replace("<![CDATA[", "", $this->items[$i]->getDescription())).
+					"</div>";
+			}
+		}
+		if ($this->footer) {
+			$feedArray[] = "<div class='".$this->stylePrefix."footer'>".$this->footer."</div>";
+		}
+
+		$feed= "".join($feedArray, "\r\n");
+		return $feed;
+	}
+
+	/**
+	 * Overrrides parent to produce .html extensions
+	 *
+	 * @return string the feed cache filename
+	 * @since 1.4
+	 * @access private
+	 */
+	function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".html";
+	}
+}
+
+
+/**
+ * JSCreator is a class that writes a js file to a specific
+ * location, overriding the createFeed method of the parent HTMLCreator.
+ *
+ * @author Pascal Van Hecke
+ */
+class JSCreator extends HTMLCreator {
+	var $contentType = "text/javascript";
+
+	/**
+	 * writes the javascript
+	 * @return    string    the scripts's complete text
+	 */
+	function createFeed()
+	{
+		$feed = parent::createFeed();
+		$feedArray = explode("\n",$feed);
+
+		$jsFeed = "";
+		foreach ($feedArray as $value) {
+			$jsFeed .= "document.write('".trim(addslashes($value))."');\n";
+		}
+		return $jsFeed;
+	}
+
+	/**
+	 * Overrrides parent to produce .js extensions
+	 *
+	 * @return string the feed cache filename
+	 * @since 1.4
+	 * @access private
+	 */
+	function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".js";
+	}
+
+}
+
+
+
+/*** TEST SCRIPT *********************************************************
+
+//include("feedcreator.class.php");
+
+$rss = new UniversalFeedCreator();
+$rss->useCached();
+$rss->title = "PHP news";
+$rss->description = "daily news from the PHP scripting world";
+
+//optional
+//$rss->descriptionTruncSize = 500;
+//$rss->descriptionHtmlSyndicated = true;
+//$rss->xslStyleSheet = "http://feedster.com/rss20.xsl";
+
+$rss->link = "http://www.dailyphp.net/news";
+$rss->feedURL = "http://www.dailyphp.net/".$PHP_SELF;
+
+$image = new FeedImage();
+$image->title = "dailyphp.net logo";
+$image->url = "http://www.dailyphp.net/images/logo.gif";
+$image->link = "http://www.dailyphp.net";
+$image->description = "Feed provided by dailyphp.net. Click to visit.";
+
+//optional
+$image->descriptionTruncSize = 500;
+$image->descriptionHtmlSyndicated = true;
+
+$rss->image = $image;
+
+// get your news items from somewhere, e.g. your database:
+//mysql_select_db($dbHost, $dbUser, $dbPass);
+//$res = mysql_query("SELECT * FROM news ORDER BY newsdate DESC");
+//while ($data = mysql_fetch_object($res)) {
+	$item = new FeedItem();
+	$item->title = "This is an the test title of an item";
+	$item->link = "http://localhost/item/";
+	$item->description = "<b>description in </b><br/>HTML";
+
+	//optional
+	//item->descriptionTruncSize = 500;
+	$item->descriptionHtmlSyndicated = true;
+
+	$item->date = time();
+	$item->source = "http://www.dailyphp.net";
+	$item->author = "John Doe";
+
+	$rss->addItem($item);
+//}
+
+// valid format strings are: RSS0.91, RSS1.0, RSS2.0, PIE0.1, MBOX, OPML, ATOM0.3, HTML, JS
+echo $rss->saveFeed("RSS0.91", "feed.xml");
+
+
+
+***************************************************************************/
+
+?>

From bab74dd307f160813c1bd78cf14d3a9a092e071c Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Sun, 9 May 2021 23:51:06 +0200
Subject: [PATCH 057/844] Update wiki links to the new short URL

Done with: find -type f -exec sed -Ee ':wiki.archlinux.org: s:(wiki.archlinux.org)/index.php/:\1/title/:g' -i {} \;

Fixes #16

[1] https://gitlab.archlinux.org/archlinux/infrastructure/-/merge_requests/335

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 doc/sso.txt                      |  2 +-
 web/html/home.php                | 10 +++++-----
 web/template/pkgbase_actions.php |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/sso.txt b/doc/sso.txt
index 1b0b1f7d..481166cf 100644
--- a/doc/sso.txt
+++ b/doc/sso.txt
@@ -22,7 +22,7 @@ you may customize [options] aur_location and [sso] openid_configuration in
 
 You may then start `keycloak.service` through systemd.
 
-See also ArchWiki <https://wiki.archlinux.org/index.php/Keycloak>.
+See also ArchWiki <https://wiki.archlinux.org/title/Keycloak>.
 
 Configuring a realm
 -------------------
diff --git a/web/html/home.php b/web/html/home.php
index 8fb05246..be37e970 100644
--- a/web/html/home.php
+++ b/web/html/home.php
@@ -74,9 +74,9 @@ if (isset($_COOKIE["AURSID"])) {
 			<?php
 			echo __(
 				'Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information.',
-				'<a href="https://wiki.archlinux.org/index.php/AUR_User_Guidelines">',
+				'<a href="https://wiki.archlinux.org/title/AUR_User_Guidelines">',
 				'</a>',
-				'<a href="https://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">',
+				'<a href="https://wiki.archlinux.org/title/AUR_Trusted_User_Guidelines">',
 				'</a>'
 				);
 			?>
@@ -84,7 +84,7 @@ if (isset($_COOKIE["AURSID"])) {
 			echo __(
 				'Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!',
 				'<strong>', '</strong>',
-				'<a href="https://wiki.archlinux.org/index.php/Arch_Packaging_Standards">',
+				'<a href="https://wiki.archlinux.org/title/Arch_Packaging_Standards">',
 				'</a>'
 				);
 			?>
@@ -95,7 +95,7 @@ if (isset($_COOKIE["AURSID"])) {
 			<?= __('DISCLAIMER') ?>:
 			<?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.'); ?>
 			</p>
-			<p class="readmore"><a href="https://wiki.archlinux.org/index.php/AUR"><?= __('Learn more...') ?></a></p>
+			<p class="readmore"><a href="https://wiki.archlinux.org/title/AUR"><?= __('Learn more...') ?></a></p>
 		</div>
 		<div id="news">
 			<h3><a><?= __('Support') ?></a><span class="arrow"></span></h3>
@@ -131,7 +131,7 @@ if (isset($_COOKIE["AURSID"])) {
 			<?php
 			echo __(
 				'Git over SSH is now used to submit packages to the AUR. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details.',
-				'<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#Submitting_packages">',
+				'<a href="https://wiki.archlinux.org/title/Arch_User_Repository#Submitting_packages">',
 				'</a>'
 				);
 			?>
diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php
index 5eee5478..3d208328 100644
--- a/web/template/pkgbase_actions.php
+++ b/web/template/pkgbase_actions.php
@@ -7,7 +7,7 @@
 				<a href="<?= $log_uri ?>"><?= __('View Changes') ?></a>
 			</li>
 			<li><a href="<?= $snapshot_uri ?>"><?= __('Download snapshot') ?></a>
-			<li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li>
+			<li><a href="https://wiki.archlinux.org/title/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li>
 			<li><span class="flagged"><?= $row["OutOfDateTS"] !== NULL ? html_action_link($base_uri . 'flag-comment/', __('Flagged out-of-date (%s)', "$out_of_date_time")) : "" ?></span></li>
 			<?php if ($row["OutOfDateTS"] === NULL): ?>
 			<li><?= html_action_link($base_uri . 'flag/', __('Flag package out-of-date')) ?></li>

From 19652d6cbe1fc4f48c52e23d1e69ff51bab3a534 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 23 Dec 2020 12:53:28 -0800
Subject: [PATCH 058/844] swap uvicorn out for hypercorn

uvicorn is subjectively nicer to play with for local dev work, but
hypercorn is required in order to do HTTP/2 which is fairly
performance-important.

Signed-off-by: Kevin Morris <kevr@0cost.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
Co-authored-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 .gitlab-ci.yml  |  2 +-
 INSTALL         |  3 ++-
 aurweb/spawn.py | 14 ++++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dc951aa..aff18a83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ before_script:
            base-devel git gpgme protobuf pyalpm python-mysql-connector
            python-pygit2 python-srcinfo python-bleach python-markdown
            python-sqlalchemy python-alembic python-pytest python-werkzeug
-           python-pytest-tap python-fastapi uvicorn nginx python-authlib
+           python-pytest-tap python-fastapi hypercorn nginx python-authlib
            python-itsdangerous python-httpx
 
 test:
diff --git a/INSTALL b/INSTALL
index 7087aca2..a32d6f5a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -48,7 +48,8 @@ read the instructions below.
 4) Install Python modules and dependencies:
 
     # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy \
-                python-bleach python-markdown python-alembic
+                python-bleach python-markdown python-alembic python-jinja \
+                python-itsdangerous python-authlib python-httpx hypercorn
     # python3 setup.py install
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 3c5130d7..f7c07dd7 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -24,6 +24,7 @@ import aurweb.schema
 children = []
 temporary_dir = None
 verbosity = 0
+asgi_backend = ''
 
 
 class ProcessExceptions(Exception):
@@ -31,6 +32,7 @@ class ProcessExceptions(Exception):
     Compound exception used by stop() to list all the errors that happened when
     terminating child processes.
     """
+
     def __init__(self, message, exceptions):
         self.message = message
         self.exceptions = exceptions
@@ -110,10 +112,11 @@ def start():
 
     # FastAPI
     host, port = aurweb.config.get("fastapi", "bind_address").rsplit(":", 1)
-    spawn_child(["python", "-m", "uvicorn",
-                 "--host", host,
-                 "--port", port,
-                 "aurweb.asgi:app"])
+    if asgi_backend == "hypercorn":
+        portargs = ["-b", f"{host}:{port}"]
+    elif asgi_backend == "uvicorn":
+        portargs = ["--host", host, "--port", port]
+    spawn_child(["python", "-m", asgi_backend] + portargs + ["aurweb.asgi:app"])
 
     # nginx
     spawn_child(["nginx", "-p", temporary_dir, "-c", generate_nginx_config()])
@@ -158,8 +161,11 @@ if __name__ == '__main__':
         description='Start aurweb\'s test server.')
     parser.add_argument('-v', '--verbose', action='count', default=0,
                         help='increase verbosity')
+    parser.add_argument('-b', '--backend', choices=['hypercorn', 'uvicorn'], default='hypercorn',
+                        help='asgi backend used to launch the python server')
     args = parser.parse_args()
     verbosity = args.verbose
+    asgi_backend = args.backend
     with tempfile.TemporaryDirectory(prefix="aurweb-") as tmpdirname:
         temporary_dir = tmpdirname
         start()

From e454a0200ccb68197724877c0557bca60e5c30a2 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Tue, 16 Mar 2021 16:55:58 -0400
Subject: [PATCH 059/844] git update hook: gracefully error on completely
 broken .SRCINFO

I've seen this happen a bunch of times now. Someone cannot push to the
AUR, and the error report is some traceback with a KeyError which is
difficult to understand without context:

remote: Traceback (most recent call last):
remote:   File "/srv/http/aurweb/aur.git/hooks/update", line 33, in <module>
remote:     sys.exit(load_entry_point('aurweb==5.0.0', 'console_scripts', 'aurweb-git-update')())
remote:   File "/usr/lib/python3.9/site-packages/aurweb-5.0.0-py3.9.egg/aurweb/git/update.py", line 306, in main
remote: KeyError: 'pkgbase'

Eventually it turns out that their .SRCINFO file is... badly corrupted.
Generally, they managed to accidentally commit an *empty* file instead
of a .SRCINFO, and in all cases, the problem was on the very first
lookup for 'pkgbase'.

Point people to the actual failing commit, and have a nicely formatted
message indicating that the .SRCINFO is completely invalid.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 aurweb/git/update.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aurweb/git/update.py b/aurweb/git/update.py
index 929b254e..3c9c3785 100755
--- a/aurweb/git/update.py
+++ b/aurweb/git/update.py
@@ -303,7 +303,11 @@ def main():  # noqa: C901
                                      error['line'], err))
             exit(1)
 
-        metadata_pkgbase = metadata['pkgbase']
+        try:
+            metadata_pkgbase = metadata['pkgbase']
+        except KeyError as e:
+            die_commit('invalid .SRCINFO, does not contain a pkgbase (is the file empty?)',
+                    str(commit.id))
         if not re.match(repo_regex, metadata_pkgbase):
             die_commit('invalid pkgbase: {:s}'.format(metadata_pkgbase),
                        str(commit.id))

From 4fa220850f5eaeb51e6f14c1c3eb362f4bb47afe Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus@tojoma.se>
Date: Fri, 7 May 2021 18:50:41 +0200
Subject: [PATCH 060/844] Add error color when package is orphaned

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 web/template/pkg_search_results.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 7c5ad03b..61335560 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -96,7 +96,7 @@ if (!$result): ?>
 		<a href="<?= get_uri('/packages/'); ?>?K=<?= htmlspecialchars($row['Maintainer'], ENT_QUOTES) ?>&amp;SeB=m"><?= htmlspecialchars($row['Maintainer']) ?></a>
 		<?php endif; ?>
 		<?php else: ?>
-		<span><?= __("orphan") ?></span>
+		<span class="error"><?= __("orphan") ?></span>
 		<?php endif; ?>
 		</td>
 	</tr>

From 25393dc326bdc09f4b63670050ada5582928b0e5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 13 May 2021 21:05:34 -0700
Subject: [PATCH 061/844] Fix incorrect construction of MySQL SQLAlchemy URL

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 02aeba38..1a708562 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -28,7 +28,6 @@ def get_sqlalchemy_url():
             database=aurweb.config.get('database', 'name'),
             query={
                 'unix_socket': aurweb.config.get('database', 'socket'),
-                'buffered': True,
             },
         )
     elif aur_db_backend == 'sqlite':

From b41422450a1f761fc9c550461c4b6445716482b9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 16 May 2021 01:40:19 -0700
Subject: [PATCH 062/844] aurweb.db: only pass check_same_thread with sqlite

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 1a708562..8ca32165 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -49,10 +49,15 @@ def get_engine():
     from sqlalchemy import create_engine
     global engine
     if engine is None:
-        engine = create_engine(get_sqlalchemy_url(),
-                               # check_same_thread is for a SQLite technicality
-                               # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
-                               connect_args={"check_same_thread": False})
+        connect_args = dict()
+        if aurweb.config.get("database", "backend") == "sqlite":
+            # check_same_thread is for a SQLite technicality
+            # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
+            connect_args["check_same_thread"] = False
+        engine = create_engine(get_sqlalchemy_url(), connect_args=connect_args)
+        Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+        session = Session()
+
     return engine
 
 

From 82f6d2ce7505b2796fc32b33a443d2ea729e7f1d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 May 2021 02:44:59 -0700
Subject: [PATCH 063/844] alembic: fix ef39fcd6e1cd downgrade

op.drop_constraint requires a valid field to drop the constraint on.
Without this, downgrade cannot occur.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .../versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py b/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
index 9e125165..d3b3693d 100644
--- a/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
+++ b/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
@@ -25,6 +25,6 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(None, 'Users', type_='unique')
+    op.drop_constraint('SSOAccountID', 'Users', type_='unique')
     op.drop_column('Users', 'SSOAccountID')
     # ### end Alembic commands ###

From 0d68b914bfcd348e15ea7c0a67cd754d3ac1300b Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Tue, 18 May 2021 13:04:20 +0100
Subject: [PATCH 064/844] Conditionally apply SSOAccountId migration to support
 misaligned databases

Closes: #34

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
 ...6e1cd_add_sso_account_id_in_table_users.py | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py b/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
index d3b3693d..2b257e9d 100644
--- a/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
+++ b/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
@@ -5,9 +5,9 @@ Revises: f47cad5d6d03
 Create Date: 2020-06-08 10:04:13.898617
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
+from sqlalchemy.engine.reflection import Inspector
 
 # revision identifiers, used by Alembic.
 revision = 'ef39fcd6e1cd'
@@ -16,15 +16,20 @@ branch_labels = None
 depends_on = None
 
 
+def table_has_column(table, column_name):
+    for element in Inspector.from_engine(op.get_bind()).get_columns(table):
+        if element.get('name') == column_name:
+            return True
+    return False
+
+
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('Users', sa.Column('SSOAccountID', sa.String(length=255), nullable=True))
-    op.create_unique_constraint(None, 'Users', ['SSOAccountID'])
-    # ### end Alembic commands ###
+    if not table_has_column('Users', 'SSOAccountID'):
+        op.add_column('Users', sa.Column('SSOAccountID', sa.String(length=255), nullable=True))
+        op.create_unique_constraint(None, 'Users', ['SSOAccountID'])
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint('SSOAccountID', 'Users', type_='unique')
-    op.drop_column('Users', 'SSOAccountID')
-    # ### end Alembic commands ###
+    if table_has_column('Users', 'SSOAccountID'):
+        op.drop_constraint('SSOAccountID', 'Users', type_='unique')
+        op.drop_column('Users', 'SSOAccountID')

From b1121dc6ca50f0ca8fbf19758b4c0ea414c9bd5c Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 17 May 2021 19:12:05 +0100
Subject: [PATCH 065/844] Adds Alembic migration for DB/Tables conversion to
 utf8mb4

MySql defaults to `utf8` and case insensitive collation so migrate these to case sensitive and `utf8mb4`

Closes #21

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
 aurweb/schema.py                              | 46 +++++------
 ...2ce8e2ffa_utf8mb4_charset_and_collation.py | 78 +++++++++++++++++++
 2 files changed, 101 insertions(+), 23 deletions(-)
 create mode 100644 migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py

diff --git a/aurweb/schema.py b/aurweb/schema.py
index a1d56281..f76d4e06 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -35,7 +35,7 @@ AccountTypes = Table(
     'AccountTypes', metadata,
     Column('ID', TINYINT(unsigned=True), primary_key=True),
     Column('AccountType', String(32), nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin'
 )
 
 
@@ -69,7 +69,7 @@ Users = Table(
     Column('OwnershipNotify', TINYINT(1), nullable=False, server_default=text("1")),
     Column('SSOAccountID', String(255), nullable=True, unique=True),
     Index('UsersAccountTypeID', 'AccountTypeID'),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -79,7 +79,7 @@ SSHPubKeys = Table(
     Column('UserID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
     Column('Fingerprint', String(44), primary_key=True),
     Column('PubKey', String(4096), nullable=False),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -89,7 +89,7 @@ Sessions = Table(
     Column('UsersID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
     Column('SessionID', CHAR(32), nullable=False, unique=True),
     Column('LastUpdateTS', BIGINT(unsigned=True), nullable=False),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -113,7 +113,7 @@ PackageBases = Table(
     Index('BasesNumVotes', 'NumVotes'),
     Index('BasesPackagerUID', 'PackagerUID'),
     Index('BasesSubmitterUID', 'SubmitterUID'),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -122,7 +122,7 @@ PackageKeywords = Table(
     'PackageKeywords', metadata,
     Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
     Column('Keyword', String(255), primary_key=True, nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -135,7 +135,7 @@ Packages = Table(
     Column('Version', String(255), nullable=False, server_default=text("''")),
     Column('Description', String(255)),
     Column('URL', String(8000)),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -144,7 +144,7 @@ Licenses = Table(
     'Licenses', metadata,
     Column('ID', INTEGER(unsigned=True), primary_key=True),
     Column('Name', String(255), nullable=False, unique=True),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -162,7 +162,7 @@ Groups = Table(
     'Groups', metadata,
     Column('ID', INTEGER(unsigned=True), primary_key=True),
     Column('Name', String(255), nullable=False, unique=True),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -180,7 +180,7 @@ DependencyTypes = Table(
     'DependencyTypes', metadata,
     Column('ID', TINYINT(unsigned=True), primary_key=True),
     Column('Name', String(32), nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -195,7 +195,7 @@ PackageDepends = Table(
     Column('DepArch', String(255)),
     Index('DependsDepName', 'DepName'),
     Index('DependsPackageID', 'PackageID'),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -204,7 +204,7 @@ RelationTypes = Table(
     'RelationTypes', metadata,
     Column('ID', TINYINT(unsigned=True), primary_key=True),
     Column('Name', String(32), nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -218,7 +218,7 @@ PackageRelations = Table(
     Column('RelArch', String(255)),
     Index('RelationsPackageID', 'PackageID'),
     Index('RelationsRelName', 'RelName'),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -229,7 +229,7 @@ PackageSources = Table(
     Column('Source', String(8000), nullable=False, server_default=text("'/dev/null'")),
     Column('SourceArch', String(255)),
     Index('SourcesPackageID', 'PackageID'),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -262,7 +262,7 @@ PackageComments = Table(
     Column('PinnedTS', BIGINT(unsigned=True), nullable=False, server_default=text("0")),
     Index('CommentsPackageBaseID', 'PackageBaseID'),
     Index('CommentsUsersID', 'UsersID'),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -293,7 +293,7 @@ PackageBlacklist = Table(
     'PackageBlacklist', metadata,
     Column('ID', INTEGER(unsigned=True), primary_key=True),
     Column('Name', String(64), nullable=False, unique=True),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -305,7 +305,7 @@ OfficialProviders = Table(
     Column('Repo', String(64), nullable=False),
     Column('Provides', String(64), nullable=False),
     Index('ProviderNameProvides', 'Name', 'Provides', unique=True),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -314,7 +314,7 @@ RequestTypes = Table(
     'RequestTypes', metadata,
     Column('ID', TINYINT(unsigned=True), primary_key=True),
     Column('Name', String(32), nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -335,7 +335,7 @@ PackageRequests = Table(
     Column('Status', TINYINT(unsigned=True), nullable=False, server_default=text("0")),
     Index('RequestsPackageBaseID', 'PackageBaseID'),
     Index('RequestsUsersID', 'UsersID'),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -353,7 +353,7 @@ TU_VoteInfo = Table(
     Column('No', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
     Column('Abstain', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
     Column('ActiveTUs', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -371,7 +371,7 @@ Bans = Table(
     'Bans', metadata,
     Column('IPAddress', String(45), primary_key=True),
     Column('BanTS', TIMESTAMP, nullable=False),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -382,7 +382,7 @@ Terms = Table(
     Column('Description', String(255), nullable=False),
     Column('URL', String(8000), nullable=False),
     Column('Revision', INTEGER(unsigned=True), nullable=False, server_default=text("1")),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
 
 
@@ -403,5 +403,5 @@ ApiRateLimit = Table(
     Column('Requests', INTEGER(11), nullable=False),
     Column('WindowStart', BIGINT(20), nullable=False),
     Index('ApiRateLimitWindowStart', 'WindowStart'),
-    mysql_engine='InnoDB',
+    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
 )
diff --git a/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py b/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
new file mode 100644
index 00000000..ef7a903c
--- /dev/null
+++ b/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
@@ -0,0 +1,78 @@
+"""utf8mb4 charset and collation
+
+Revision ID: 56e2ce8e2ffa
+Revises: ef39fcd6e1cd
+Create Date: 2021-05-17 14:23:00.008479
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = '56e2ce8e2ffa'
+down_revision = 'ef39fcd6e1cd'
+branch_labels = None
+depends_on = None
+
+# Tables affected by charset/collate change
+tables = ['AccountTypes', 'ApiRateLimit', 'Bans', 'DependencyTypes', 'Groups', 'Licenses', 'OfficialProviders',
+          'PackageBases', 'PackageBlacklist', 'PackageComments', 'PackageDepends', 'PackageKeywords',
+          'PackageRelations', 'PackageRequests', 'PackageSources', 'Packages', 'RelationTypes', 'RequestTypes',
+          'SSHPubKeys', 'Sessions', 'TU_VoteInfo', 'Terms', 'Users']
+
+# Indexes affected by charset/collate change
+# Map of Unique Indexes key = index_name, value = [table_name, column1, column2]
+indexes = {'ProviderNameProvides': ['OfficialProviders', 'Name', 'Provides']}
+
+# Source charset/collation, before this migration is run.
+src_charset = "utf8"
+src_collate = "utf8_general_ci"
+
+# Destination charset/collation, after this migration is run.
+dst_charset = "utf8mb4"
+dst_collate = "utf8mb4_bin"
+
+
+def rebuild_unique_indexes_with_str_cols():
+    for idx_name in indexes:
+        sql = f"""
+DROP INDEX IF EXISTS {idx_name} 
+ON {indexes.get(idx_name)[0]}
+"""
+        op.execute(sql)
+        sql = f"""
+CREATE UNIQUE INDEX {idx_name} 
+ON {indexes.get(idx_name)[0]} 
+({indexes.get(idx_name)[1]}, {indexes.get(idx_name)[2]}) 
+"""
+        op.execute(sql)
+
+
+def do_all(iterable, fn):
+    for element in iterable:
+        fn(element)
+
+
+def upgrade():
+    def op_execute(table):
+        sql = f"""
+ALTER TABLE {table} 
+CONVERT TO CHARACTER SET {dst_charset} 
+COLLATE {dst_collate}
+"""
+        op.execute(sql)
+
+    do_all(tables, op_execute)
+    rebuild_unique_indexes_with_str_cols()
+
+
+def downgrade():
+    def op_execute(table):
+        sql = f"""
+ALTER TABLE {table} 
+CONVERT TO CHARACTER SET {src_charset} 
+COLLATE {src_collate}
+"""
+        op.execute(sql)
+
+    do_all(tables, op_execute)
+    rebuild_unique_indexes_with_str_cols()

From bac38edd484851dd776dba99caa97c9bb03f45d4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 5 Jun 2021 02:26:03 -0700
Subject: [PATCH 066/844] [db] fix schema and migration for case insensitivity

Some of the columns that were changed still want to be
case insensitive. Good thing our tables have nice
separation.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/schema.py                              | 80 ++++++++++++++-----
 ...2ce8e2ffa_utf8mb4_charset_and_collation.py | 48 ++++++++---
 2 files changed, 98 insertions(+), 30 deletions(-)

diff --git a/aurweb/schema.py b/aurweb/schema.py
index f76d4e06..f0162045 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -10,6 +10,10 @@ from sqlalchemy import CHAR, TIMESTAMP, Column, ForeignKey, Index, MetaData, Str
 from sqlalchemy.dialects.mysql import BIGINT, DECIMAL, INTEGER, TINYINT
 from sqlalchemy.ext.compiler import compiles
 
+import aurweb.config
+
+db_backend = aurweb.config.get("database", "backend")
+
 
 @compiles(TINYINT, 'sqlite')
 def compile_tinyint_sqlite(type_, compiler, **kw):
@@ -35,7 +39,9 @@ AccountTypes = Table(
     'AccountTypes', metadata,
     Column('ID', TINYINT(unsigned=True), primary_key=True),
     Column('AccountType', String(32), nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin'
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci'
 )
 
 
@@ -69,7 +75,9 @@ Users = Table(
     Column('OwnershipNotify', TINYINT(1), nullable=False, server_default=text("1")),
     Column('SSOAccountID', String(255), nullable=True, unique=True),
     Index('UsersAccountTypeID', 'AccountTypeID'),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -113,7 +121,9 @@ PackageBases = Table(
     Index('BasesNumVotes', 'NumVotes'),
     Index('BasesPackagerUID', 'PackagerUID'),
     Index('BasesSubmitterUID', 'SubmitterUID'),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -122,7 +132,9 @@ PackageKeywords = Table(
     'PackageKeywords', metadata,
     Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
     Column('Keyword', String(255), primary_key=True, nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -135,7 +147,9 @@ Packages = Table(
     Column('Version', String(255), nullable=False, server_default=text("''")),
     Column('Description', String(255)),
     Column('URL', String(8000)),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -144,7 +158,9 @@ Licenses = Table(
     'Licenses', metadata,
     Column('ID', INTEGER(unsigned=True), primary_key=True),
     Column('Name', String(255), nullable=False, unique=True),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -162,7 +178,9 @@ Groups = Table(
     'Groups', metadata,
     Column('ID', INTEGER(unsigned=True), primary_key=True),
     Column('Name', String(255), nullable=False, unique=True),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -180,7 +198,9 @@ DependencyTypes = Table(
     'DependencyTypes', metadata,
     Column('ID', TINYINT(unsigned=True), primary_key=True),
     Column('Name', String(32), nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -195,7 +215,9 @@ PackageDepends = Table(
     Column('DepArch', String(255)),
     Index('DependsDepName', 'DepName'),
     Index('DependsPackageID', 'PackageID'),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -204,7 +226,9 @@ RelationTypes = Table(
     'RelationTypes', metadata,
     Column('ID', TINYINT(unsigned=True), primary_key=True),
     Column('Name', String(32), nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -218,7 +242,9 @@ PackageRelations = Table(
     Column('RelArch', String(255)),
     Index('RelationsPackageID', 'PackageID'),
     Index('RelationsRelName', 'RelName'),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -229,7 +255,9 @@ PackageSources = Table(
     Column('Source', String(8000), nullable=False, server_default=text("'/dev/null'")),
     Column('SourceArch', String(255)),
     Index('SourcesPackageID', 'PackageID'),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -262,7 +290,9 @@ PackageComments = Table(
     Column('PinnedTS', BIGINT(unsigned=True), nullable=False, server_default=text("0")),
     Index('CommentsPackageBaseID', 'PackageBaseID'),
     Index('CommentsUsersID', 'UsersID'),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -293,7 +323,9 @@ PackageBlacklist = Table(
     'PackageBlacklist', metadata,
     Column('ID', INTEGER(unsigned=True), primary_key=True),
     Column('Name', String(64), nullable=False, unique=True),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -314,7 +346,9 @@ RequestTypes = Table(
     'RequestTypes', metadata,
     Column('ID', TINYINT(unsigned=True), primary_key=True),
     Column('Name', String(32), nullable=False, server_default=text("''")),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -335,7 +369,9 @@ PackageRequests = Table(
     Column('Status', TINYINT(unsigned=True), nullable=False, server_default=text("0")),
     Index('RequestsPackageBaseID', 'PackageBaseID'),
     Index('RequestsUsersID', 'UsersID'),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -371,7 +407,9 @@ Bans = Table(
     'Bans', metadata,
     Column('IPAddress', String(45), primary_key=True),
     Column('BanTS', TIMESTAMP, nullable=False),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -382,7 +420,9 @@ Terms = Table(
     Column('Description', String(255), nullable=False),
     Column('URL', String(8000), nullable=False),
     Column('Revision', INTEGER(unsigned=True), nullable=False, server_default=text("1")),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
@@ -403,5 +443,7 @@ ApiRateLimit = Table(
     Column('Requests', INTEGER(11), nullable=False),
     Column('WindowStart', BIGINT(20), nullable=False),
     Index('ApiRateLimitWindowStart', 'WindowStart'),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
diff --git a/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py b/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
index ef7a903c..e198c34c 100644
--- a/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
+++ b/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
@@ -7,6 +7,8 @@ Create Date: 2021-05-17 14:23:00.008479
 """
 from alembic import op
 
+import aurweb.config
+
 # revision identifiers, used by Alembic.
 revision = '56e2ce8e2ffa'
 down_revision = 'ef39fcd6e1cd'
@@ -14,10 +16,31 @@ branch_labels = None
 depends_on = None
 
 # Tables affected by charset/collate change
-tables = ['AccountTypes', 'ApiRateLimit', 'Bans', 'DependencyTypes', 'Groups', 'Licenses', 'OfficialProviders',
-          'PackageBases', 'PackageBlacklist', 'PackageComments', 'PackageDepends', 'PackageKeywords',
-          'PackageRelations', 'PackageRequests', 'PackageSources', 'Packages', 'RelationTypes', 'RequestTypes',
-          'SSHPubKeys', 'Sessions', 'TU_VoteInfo', 'Terms', 'Users']
+tables = [
+    ('AccountTypes', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('ApiRateLimit', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('Bans', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('DependencyTypes', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('Groups', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('Licenses', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('OfficialProviders', 'utf8mb4', 'utf8mb4_bin'),
+    ('PackageBases', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('PackageBlacklist', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('PackageComments', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('PackageDepends', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('PackageKeywords', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('PackageRelations', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('PackageRequests', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('PackageSources', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('Packages', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('RelationTypes', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('RequestTypes', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('SSHPubKeys', 'utf8mb4', 'utf8mb4_bin'),
+    ('Sessions', 'utf8mb4', 'utf8mb4_bin'),
+    ('TU_VoteInfo', 'utf8mb4', 'utf8mb4_bin'),
+    ('Terms', 'utf8mb4', 'utf8mb4_general_ci'),
+    ('Users', 'utf8mb4', 'utf8mb4_general_ci')
+]
 
 # Indexes affected by charset/collate change
 # Map of Unique Indexes key = index_name, value = [table_name, column1, column2]
@@ -27,9 +50,7 @@ indexes = {'ProviderNameProvides': ['OfficialProviders', 'Name', 'Provides']}
 src_charset = "utf8"
 src_collate = "utf8_general_ci"
 
-# Destination charset/collation, after this migration is run.
-dst_charset = "utf8mb4"
-dst_collate = "utf8mb4_bin"
+db_backend = aurweb.config.get("database", "backend")
 
 
 def rebuild_unique_indexes_with_str_cols():
@@ -53,11 +74,12 @@ def do_all(iterable, fn):
 
 
 def upgrade():
-    def op_execute(table):
+    def op_execute(table_meta):
+        table, charset, collate = table_meta
         sql = f"""
 ALTER TABLE {table} 
-CONVERT TO CHARACTER SET {dst_charset} 
-COLLATE {dst_collate}
+CONVERT TO CHARACTER SET {charset} 
+COLLATE {collate}
 """
         op.execute(sql)
 
@@ -66,7 +88,11 @@ COLLATE {dst_collate}
 
 
 def downgrade():
-    def op_execute(table):
+    if db_backend == "sqlite":
+        return None
+
+    def op_execute(table_meta):
+        table, charset, collate = table_meta
         sql = f"""
 ALTER TABLE {table} 
 CONVERT TO CHARACTER SET {src_charset} 

From 4230772e3be7ba9e99a03237006b1de5b2be0a8c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Dec 2020 21:10:02 -0800
Subject: [PATCH 067/844] add .coveragerc, update .gitignore

Now, .coveragerc enforces a minimum overall 82% coverage, as is
the current standing. Providing less than 100% coverage for added
code should reduce the overall coverage and eventually reach 81%
or below, causing coverage report to fail on execution.

Developers should increase the failure minimum as they increase
coverage across the uncovered code.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .coveragerc | 7 +++++++
 .gitignore  | 8 ++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000..144a9f5c
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+disable_warnings = already-imported
+
+[report]
+include = aurweb/*
+exclude_lines =
+    if __name__ == .__main__.:
diff --git a/.gitignore b/.gitignore
index 4d961d13..372fa105 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,11 @@ __pycache__/
 test/test-results/
 test/trash directory*
 schema/aur-schema-sqlite.sql
+data.sql
+aurweb.sqlite3
+conf/config
+htmlcov/
+fastapi_aw/
+.vim/
+.pylintrc
+.coverage

From e800cefe958462b79067921cde57cae95c55363e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 21 Dec 2020 00:49:15 -0800
Subject: [PATCH 068/844] Makefile: run pytest units

Important note: Python tests will repeatedly clear out tables
that they test against; for this reason, one should always run
the shell tests first. The __init__.py file is necessary for
coverage to collect data from the tests being run.

At this point in FastAPI development, I'd like to encourage a
few things going forward:

1. Any time you contribute to the FastAPI codebase, you **must**
   maintain equal or increased coverage on the overall source.
   Developers are highly appreciated for adding tests in your
   specific domain of addition or modification that may be missing
   coverage. Our goal is 100% coverage, and all newly added files
   **must** have 100% coverage through tests.
2. All source should be formatted with the autopep8 tool and
   kept within an 80 column width, with the exception of HTML
   templates.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml              |   5 +-
 test/Makefile               |  12 ++-
 test/scripts/cover          |  13 ++++
 test/setup.sh               |   5 ++
 test/t1100-git-auth.t       |   9 ++-
 test/t1200-git-serve.t      | 144 ++++++++++++++++++------------------
 test/t1300-git-update.t     |  64 ++++++++--------
 test/t2100-mkpkglists.t     |   6 +-
 test/t2200-tuvotereminder.t |   4 +-
 test/t2300-pkgmaint.t       |   2 +-
 test/t2400-aurblup.t        |   2 +-
 test/t2500-notify.t         |  36 ++++-----
 test/t2600-rendercomment.t  |  14 ++--
 test/t2700-usermaint.t      |   4 +-
 14 files changed, 175 insertions(+), 145 deletions(-)
 create mode 100755 test/scripts/cover

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aff18a83..71c14457 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,8 +12,11 @@ before_script:
            python-pygit2 python-srcinfo python-bleach python-markdown
            python-sqlalchemy python-alembic python-pytest python-werkzeug
            python-pytest-tap python-fastapi hypercorn nginx python-authlib
-           python-itsdangerous python-httpx
+           python-itsdangerous python-httpx python-jinja python-pytest-cov
+           python-requests python-aiofiles python-python-multipart
+           python-pytest-asyncio python-coverage
 
 test:
   script:
     - make -C test
+    - coverage report --include='aurweb/*'
diff --git a/test/Makefile b/test/Makefile
index 758befa3..060e57c2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,11 +2,19 @@ T = $(sort $(wildcard *.t))
 
 PROVE := $(shell command -v prove 2> /dev/null)
 
+MAKEFLAGS = -j1
+
+# IMPORTANT: `sh` should come somewhere AFTER `pytest`.
+check: sh pytest
+
+pytest:
+	cd .. && AUR_CONFIG=conf/config coverage run --append /usr/bin/pytest test
+
 ifdef PROVE
-check:
+sh:
 	prove .
 else
-check: $(T)
+sh: $(T)
 endif
 
 clean:
diff --git a/test/scripts/cover b/test/scripts/cover
new file mode 100755
index 00000000..1ebe596d
--- /dev/null
+++ b/test/scripts/cover
@@ -0,0 +1,13 @@
+#!/bin/sh
+# This script is used by sharness tests hosted in our `test`
+# directory. We require a concrete script to make using this easily,
+# because we often call `env` in those tests.
+#
+# The purpose of this script is to allow sharness tests to gather
+# Python coverage when calling scripts within `aurweb`.
+#
+TOPLEVEL=$(dirname "$0")/../..
+
+# Define a COVERAGE_FILE in our root directory.
+COVERAGE_FILE="$TOPLEVEL/.coverage" \
+coverage run -L --source="$TOPLEVEL/aurweb" --append "$@"
diff --git a/test/setup.sh b/test/setup.sh
index 4a6eb3b1..64ada289 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -18,6 +18,11 @@ AURBLUP="$TOPLEVEL/aurweb/scripts/aurblup.py"
 NOTIFY="$TOPLEVEL/aurweb/scripts/notify.py"
 RENDERCOMMENT="$TOPLEVEL/aurweb/scripts/rendercomment.py"
 
+# We reuse some of these scripts when running `env`, so add
+# it to PATH; that way, env can pick up the script when loaded.
+PATH="${PATH}:${TOPLEVEL}/test/scripts"
+export PATH
+
 # Create the configuration file and a dummy notification script.
 cat >config <<-EOF
 [database]
diff --git a/test/t1100-git-auth.t b/test/t1100-git-auth.t
index cbf16aed..e29bccdd 100755
--- a/test/t1100-git-auth.t
+++ b/test/t1100-git-auth.t
@@ -4,24 +4,25 @@ test_description='git-auth tests'
 
 . "$(dirname "$0")/setup.sh"
 
+
 test_expect_success 'Test basic authentication.' '
-	"$GIT_AUTH" "$AUTH_KEYTYPE_USER" "$AUTH_KEYTEXT_USER" >out &&
+	cover "$GIT_AUTH" "$AUTH_KEYTYPE_USER" "$AUTH_KEYTEXT_USER" >out &&
 	grep -q AUR_USER=user out &&
 	grep -q AUR_PRIVILEGED=0 out
 '
 
 test_expect_success 'Test Trusted User authentication.' '
-	"$GIT_AUTH" "$AUTH_KEYTYPE_TU" "$AUTH_KEYTEXT_TU" >out &&
+	cover "$GIT_AUTH" "$AUTH_KEYTYPE_TU" "$AUTH_KEYTEXT_TU" >out &&
 	grep -q AUR_USER=tu out &&
 	grep -q AUR_PRIVILEGED=1 out
 '
 
 test_expect_success 'Test authentication with an unsupported key type.' '
-	test_must_fail "$GIT_AUTH" ssh-xxx "$AUTH_KEYTEXT_USER"
+	test_must_fail cover "$GIT_AUTH" ssh-xxx "$AUTH_KEYTEXT_USER"
 '
 
 test_expect_success 'Test authentication with a wrong key.' '
-	"$GIT_AUTH" "$AUTH_KEYTYPE_MISSING" "$AUTH_KEYTEXT_MISSING" >out
+	cover "$GIT_AUTH" "$AUTH_KEYTYPE_MISSING" "$AUTH_KEYTEXT_MISSING" >out
 	test_must_be_empty out
 '
 
diff --git a/test/t1200-git-serve.t b/test/t1200-git-serve.t
index 1893cdcd..f1657412 100755
--- a/test/t1200-git-serve.t
+++ b/test/t1200-git-serve.t
@@ -2,14 +2,14 @@
 
 test_description='git-serve tests'
 
-. "$(dirname "$0")/setup.sh"
+. "$(dirname $0)/setup.sh"
 
 test_expect_success 'Test interactive shell.' '
-	"$GIT_SERVE" 2>&1 | grep -q "Interactive shell is disabled."
+	cover "$GIT_SERVE" 2>&1 | grep -q "Interactive shell is disabled."
 '
 
 test_expect_success 'Test help.' '
-	SSH_ORIGINAL_COMMAND=help "$GIT_SERVE" 2>actual &&
+	SSH_ORIGINAL_COMMAND=help cover "$GIT_SERVE" 2>actual &&
 	save_IFS=$IFS
 	IFS=
 	while read -r line; do
@@ -25,7 +25,7 @@ test_expect_success 'Test maintenance mode.' '
 	sed "s/^\(enable-maintenance = \)0$/\\11/" config.old >config &&
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND=help \
-	"$GIT_SERVE" 2>actual &&
+	cover "$GIT_SERVE" 2>actual &&
 	cat >expected <<-EOF &&
 	The AUR is down due to maintenance. We will be back soon.
 	EOF
@@ -34,7 +34,7 @@ test_expect_success 'Test maintenance mode.' '
 '
 
 test_expect_success 'Test IP address logging.' '
-	SSH_ORIGINAL_COMMAND=help AUR_USER=user "$GIT_SERVE" 2>actual &&
+	SSH_ORIGINAL_COMMAND=help AUR_USER=user cover "$GIT_SERVE" 2>actual &&
 	cat >expected <<-EOF &&
 	1.2.3.4
 	EOF
@@ -48,7 +48,7 @@ test_expect_success 'Test IP address bans.' '
 	SSH_CLIENT="1.3.3.7 1337 22" &&
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND=help \
-	"$GIT_SERVE" 2>actual &&
+	cover "$GIT_SERVE" 2>actual &&
 	cat >expected <<-EOF &&
 	The SSH interface is disabled for your IP address.
 	EOF
@@ -58,14 +58,14 @@ test_expect_success 'Test IP address bans.' '
 
 test_expect_success 'Test setup-repo and list-repos.' '
 	SSH_ORIGINAL_COMMAND="setup-repo foobar" AUR_USER=user \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="setup-repo foobar2" AUR_USER=tu \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	*foobar
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
@@ -77,7 +77,7 @@ test_expect_success 'Test git-receive-pack.' '
 	EOF
 	SSH_ORIGINAL_COMMAND="git-receive-pack /foobar.git/" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
@@ -85,7 +85,7 @@ test_expect_success 'Test git-receive-pack with an invalid repository name.' '
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="git-receive-pack /!.git/" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual
+	cover "$GIT_SERVE" 2>&1 >actual
 '
 
 test_expect_success "Test git-upload-pack." '
@@ -96,7 +96,7 @@ test_expect_success "Test git-upload-pack." '
 	EOF
 	SSH_ORIGINAL_COMMAND="git-upload-pack /foobar.git/" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
@@ -108,7 +108,7 @@ test_expect_success "Try to pull from someone else's repository." '
 	EOF
 	SSH_ORIGINAL_COMMAND="git-upload-pack /foobar2.git/" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
@@ -116,7 +116,7 @@ test_expect_success "Try to push to someone else's repository." '
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="git-receive-pack /foobar2.git/" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1
+	cover "$GIT_SERVE" 2>&1
 '
 
 test_expect_success "Try to push to someone else's repository as Trusted User." '
@@ -127,7 +127,7 @@ test_expect_success "Try to push to someone else's repository as Trusted User."
 	EOF
 	SSH_ORIGINAL_COMMAND="git-receive-pack /foobar.git/" \
 	AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
@@ -139,40 +139,40 @@ test_expect_success "Test restore." '
 	foobar
 	EOF
 	SSH_ORIGINAL_COMMAND="restore foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual
+	cover "$GIT_SERVE" 2>&1 >actual
 	test_cmp expected actual
 '
 
 test_expect_success "Try to restore an existing package base." '
 	test_must_fail \
-	env SSH_ORIGINAL_COMMAND="restore foobar2" \
+	env SSH_ORIGINAL_COMMAND="restore foobar2"\
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1
+	cover "$GIT_SERVE" 2>&1
 '
 
 test_expect_success "Disown all package bases." '
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="disown foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success "Adopt a package base as a regular user." '
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	*foobar
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
@@ -180,119 +180,119 @@ test_expect_success "Adopt an already adopted package base." '
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="adopt foobar" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1
+	cover "$GIT_SERVE" 2>&1
 '
 
 test_expect_success "Adopt a package base as a Trusted User." '
 	SSH_ORIGINAL_COMMAND="adopt foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	*foobar2
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success "Disown one's own package base as a regular user." '
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success "Disown one's own package base as a Trusted User." '
 	SSH_ORIGINAL_COMMAND="disown foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success "Try to steal another user's package as a regular user." '
 	SSH_ORIGINAL_COMMAND="adopt foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="adopt foobar2" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	cat >expected <<-EOF &&
 	*foobar2
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	SSH_ORIGINAL_COMMAND="disown foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1
+	cover "$GIT_SERVE" 2>&1
 '
 
 test_expect_success "Try to steal another user's package as a Trusted User." '
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	cat >expected <<-EOF &&
 	*foobar
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1
+	cover "$GIT_SERVE" 2>&1
 '
 
 test_expect_success "Try to disown another user's package as a regular user." '
 	SSH_ORIGINAL_COMMAND="adopt foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="disown foobar2" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	*foobar2
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	SSH_ORIGINAL_COMMAND="disown foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1
+	cover "$GIT_SERVE" 2>&1
 '
 
 test_expect_success "Try to disown another user's package as a Trusted User." '
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1
+	cover "$GIT_SERVE" 2>&1
 '
 
 test_expect_success "Adopt a package base and add co-maintainers." '
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="set-comaintainers foobar user3 user4" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	5|3|1
 	6|3|2
@@ -305,7 +305,7 @@ test_expect_success "Adopt a package base and add co-maintainers." '
 test_expect_success "Update package base co-maintainers." '
 	SSH_ORIGINAL_COMMAND="set-comaintainers foobar user2 user3 user4" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	4|3|1
 	5|3|2
@@ -320,7 +320,7 @@ test_expect_success "Try to add co-maintainers to an orphan package base." '
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="set-comaintainers foobar2 user2 user3 user4" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	4|3|1
 	5|3|2
@@ -333,12 +333,12 @@ test_expect_success "Try to add co-maintainers to an orphan package base." '
 
 test_expect_success "Disown a package base and check (co-)maintainer list." '
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	*foobar
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user2 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	cat >expected <<-EOF &&
 	5|3|1
@@ -351,11 +351,11 @@ test_expect_success "Disown a package base and check (co-)maintainer list." '
 
 test_expect_success "Force-disown a package base and check (co-)maintainer list." '
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=tu AUR_PRIVILEGED=1 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	SSH_ORIGINAL_COMMAND="list-repos" AUR_USER=user3 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 >actual &&
+	cover "$GIT_SERVE" 2>&1 >actual &&
 	test_cmp expected actual &&
 	cat >expected <<-EOF &&
 	EOF
@@ -366,7 +366,7 @@ test_expect_success "Force-disown a package base and check (co-)maintainer list.
 
 test_expect_success "Check whether package requests are closed when disowning." '
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat <<-EOD | sqlite3 aur.db &&
 	INSERT INTO PackageRequests (ID, ReqTypeID, PackageBaseID, PackageBaseName, UsersID, Comments, ClosureComment) VALUES (1, 2, 3, "foobar", 4, "", "");
 	INSERT INTO PackageRequests (ID, ReqTypeID, PackageBaseID, PackageBaseName, UsersID, Comments, ClosureComment) VALUES (2, 3, 3, "foobar", 5, "", "");
@@ -374,7 +374,7 @@ test_expect_success "Check whether package requests are closed when disowning."
 	EOD
 	>sendmail.out &&
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat <<-EOD >expected &&
 	Subject: [PRQ#1] Orphan Request for foobar Accepted
 	EOD
@@ -389,7 +389,7 @@ test_expect_success "Check whether package requests are closed when disowning."
 
 test_expect_success "Flag a package base out-of-date." '
 	SSH_ORIGINAL_COMMAND="flag foobar Because." AUR_USER=user2 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	1|Because.
 	EOF
@@ -400,7 +400,7 @@ test_expect_success "Flag a package base out-of-date." '
 
 test_expect_success "Unflag a package base as flagger." '
 	SSH_ORIGINAL_COMMAND="unflag foobar" AUR_USER=user2 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	0|Because.
 	EOF
@@ -411,11 +411,11 @@ test_expect_success "Unflag a package base as flagger." '
 
 test_expect_success "Unflag a package base as maintainer." '
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="flag foobar Because." AUR_USER=user2 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="unflag foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	0|Because.
 	EOF
@@ -426,9 +426,9 @@ test_expect_success "Unflag a package base as maintainer." '
 
 test_expect_success "Unflag a package base as random user." '
 	SSH_ORIGINAL_COMMAND="flag foobar Because." AUR_USER=user2 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="unflag foobar" AUR_USER=user3 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	1|Because.
 	EOF
@@ -439,11 +439,11 @@ test_expect_success "Unflag a package base as random user." '
 
 test_expect_success "Flag using a comment which is too short." '
 	SSH_ORIGINAL_COMMAND="unflag foobar" AUR_USER=user2 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="flag foobar xx" \
 	AUR_USER=user2 AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	0|Because.
 	EOF
@@ -454,7 +454,7 @@ test_expect_success "Flag using a comment which is too short." '
 
 test_expect_success "Vote for a package base." '
 	SSH_ORIGINAL_COMMAND="vote foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	3|1
 	EOF
@@ -472,7 +472,7 @@ test_expect_success "Vote for a package base." '
 test_expect_success "Vote for a package base twice." '
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="vote foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	3|1
 	EOF
@@ -489,7 +489,7 @@ test_expect_success "Vote for a package base twice." '
 
 test_expect_success "Remove vote from a package base." '
 	SSH_ORIGINAL_COMMAND="unvote foobar" AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	echo "SELECT PackageBaseID, UsersID FROM PackageVotes;" | \
@@ -507,7 +507,7 @@ test_expect_success "Try to remove the vote again." '
 	test_must_fail \
 	env SSH_ORIGINAL_COMMAND="unvote foobar" \
 	AUR_USER=user AUR_PRIVILEGED=0 \
-	"$GIT_SERVE" 2>&1 &&
+	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
 	EOF
 	echo "SELECT PackageBaseID, UsersID FROM PackageVotes;" | \
diff --git a/test/t1300-git-update.t b/test/t1300-git-update.t
index 82c0fb99..e9d943c0 100755
--- a/test/t1300-git-update.t
+++ b/test/t1300-git-update.t
@@ -16,7 +16,7 @@ test_expect_success 'Test update hook on a fresh repository.' '
 	old=0000000000000000000000000000000000000000 &&
 	new=$(git -C aur.git rev-parse HEAD^) &&
 	AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
 	cat >expected <<-EOF &&
 	1|1|foobar|1-1|aurweb test package.|https://aur.archlinux.org/
 	1|GPL
@@ -34,7 +34,7 @@ test_expect_success 'Test update hook on another fresh repository.' '
 	git -C aur.git checkout -q refs/namespaces/foobar2/refs/heads/master &&
 	new=$(git -C aur.git rev-parse HEAD) &&
 	AUR_USER=user AUR_PKGBASE=foobar2 AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
 	cat >expected <<-EOF &&
 	1|1|foobar|1-1|aurweb test package.|https://aur.archlinux.org/
 	2|2|foobar2|1-1|aurweb test package.|https://aur.archlinux.org/
@@ -55,7 +55,7 @@ test_expect_success 'Test update hook on an updated repository.' '
 	old=$(git -C aur.git rev-parse HEAD^) &&
 	new=$(git -C aur.git rev-parse HEAD) &&
 	AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
 	cat >expected <<-EOF &&
 	2|2|foobar2|1-1|aurweb test package.|https://aur.archlinux.org/
 	3|1|foobar|1-2|aurweb test package.|https://aur.archlinux.org/
@@ -74,7 +74,7 @@ test_expect_success 'Test update hook on an updated repository.' '
 
 test_expect_success 'Test restore mode.' '
 	AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" restore 2>&1 &&
+	cover "$GIT_UPDATE" restore 2>&1 &&
 	cat >expected <<-EOF &&
 	2|2|foobar2|1-1|aurweb test package.|https://aur.archlinux.org/
 	3|1|foobar|1-2|aurweb test package.|https://aur.archlinux.org/
@@ -97,7 +97,7 @@ test_expect_success 'Test restore mode on a non-existent repository.' '
 	EOD
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar3 AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" restore >actual 2>&1 &&
+	cover "$GIT_UPDATE" restore >actual 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -109,7 +109,7 @@ test_expect_success 'Pushing to a branch other than master.' '
 	EOD
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/pu "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/pu "$old" "$new" >actual 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -121,7 +121,7 @@ test_expect_success 'Performing a non-fast-forward ref update.' '
 	EOD
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -133,7 +133,7 @@ test_expect_success 'Performing a non-fast-forward ref update as Trusted User.'
 	EOD
 	test_must_fail \
 	env AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -145,7 +145,7 @@ test_expect_success 'Performing a non-fast-forward ref update as normal user wit
 	EOD
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 AUR_OVERWRITE=1 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -153,7 +153,7 @@ test_expect_success 'Performing a non-fast-forward ref update as Trusted User wi
 	old=$(git -C aur.git rev-parse HEAD) &&
 	new=$(git -C aur.git rev-parse HEAD^) &&
 	AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 AUR_OVERWRITE=1 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1
 '
 
 test_expect_success 'Removing .SRCINFO.' '
@@ -164,7 +164,7 @@ test_expect_success 'Removing .SRCINFO.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: missing .SRCINFO$" actual
 '
 
@@ -177,7 +177,7 @@ test_expect_success 'Removing .SRCINFO with a follow-up fix.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: missing .SRCINFO$" actual
 '
 
@@ -189,7 +189,7 @@ test_expect_success 'Removing PKGBUILD.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: missing PKGBUILD$" actual
 '
 
@@ -203,7 +203,7 @@ test_expect_success 'Pushing a tree with a subdirectory.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: the repository must not contain subdirectories$" actual
 '
 
@@ -216,7 +216,7 @@ test_expect_success 'Pushing a tree with a large blob.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: maximum blob size (250.00KiB) exceeded$" actual
 '
 
@@ -232,7 +232,7 @@ test_expect_success 'Pushing .SRCINFO with a non-matching package base.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: invalid pkgbase: foobar2, expected foobar$" actual
 '
 
@@ -248,7 +248,7 @@ test_expect_success 'Pushing .SRCINFO with invalid syntax.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1
 '
 
 test_expect_success 'Pushing .SRCINFO without pkgver.' '
@@ -263,7 +263,7 @@ test_expect_success 'Pushing .SRCINFO without pkgver.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: missing mandatory field: pkgver$" actual
 '
 
@@ -279,7 +279,7 @@ test_expect_success 'Pushing .SRCINFO without pkgrel.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: missing mandatory field: pkgrel$" actual
 '
 
@@ -294,7 +294,7 @@ test_expect_success 'Pushing .SRCINFO with epoch.' '
 	) &&
 	new=$(git -C aur.git rev-parse HEAD) &&
 	AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
 	cat >expected <<-EOF &&
 	2|2|foobar2|1-1|aurweb test package.|https://aur.archlinux.org/
 	3|1|foobar|1:1-2|aurweb test package.|https://aur.archlinux.org/
@@ -315,7 +315,7 @@ test_expect_success 'Pushing .SRCINFO with invalid pkgname.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: invalid package name: !$" actual
 '
 
@@ -331,7 +331,7 @@ test_expect_success 'Pushing .SRCINFO with invalid epoch.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: invalid epoch: !$" actual
 '
 
@@ -348,7 +348,7 @@ test_expect_success 'Pushing .SRCINFO with too long URL.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: url field too long: $url\$" actual
 '
 
@@ -364,7 +364,7 @@ test_expect_success 'Missing install file.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: missing install file: install$" actual
 '
 
@@ -380,7 +380,7 @@ test_expect_success 'Missing changelog file.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: missing changelog file: changelog$" actual
 '
 
@@ -396,7 +396,7 @@ test_expect_success 'Missing source file.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: missing source file: file$" actual
 '
 
@@ -413,7 +413,7 @@ test_expect_success 'Pushing .SRCINFO with too long source URL.' '
 	new=$(git -C aur.git rev-parse HEAD) &&
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	grep -q "^error: source entry too long: $url\$" actual
 '
 
@@ -428,7 +428,7 @@ test_expect_success 'Pushing a blacklisted package.' '
 	EOD
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -442,7 +442,7 @@ test_expect_success 'Pushing a blacklisted package as Trusted User.' '
 	warning: package is blacklisted: forbidden
 	EOD
 	AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -457,7 +457,7 @@ test_expect_success 'Pushing a package already in the official repositories.' '
 	EOD
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -471,7 +471,7 @@ test_expect_success 'Pushing a package already in the official repositories as T
 	warning: package already provided by [core]: official
 	EOD
 	AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	test_cmp expected actual
 '
 
@@ -491,7 +491,7 @@ test_expect_success 'Trying to hijack a package.' '
 	EOD
 	test_must_fail \
 	env AUR_USER=user AUR_PKGBASE=foobar2 AUR_PRIVILEGED=0 \
-	"$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
+	cover "$GIT_UPDATE" refs/heads/master "$old" "$new" >actual 2>&1 &&
 	test_cmp expected actual
 '
 
diff --git a/test/t2100-mkpkglists.t b/test/t2100-mkpkglists.t
index 5bf13de8..6bb6838d 100755
--- a/test/t2100-mkpkglists.t
+++ b/test/t2100-mkpkglists.t
@@ -7,7 +7,7 @@ test_description='mkpkglists tests'
 test_expect_success 'Test package list generation with no packages.' '
 	echo "DELETE FROM Packages;" | sqlite3 aur.db &&
 	echo "DELETE FROM PackageBases;" | sqlite3 aur.db &&
-	"$MKPKGLISTS" &&
+	cover "$MKPKGLISTS" &&
 	test $(zcat packages.gz | wc -l) -eq 1 &&
 	test $(zcat pkgbase.gz | wc -l) -eq 1
 '
@@ -24,7 +24,7 @@ test_expect_success 'Test package list generation.' '
 	INSERT INTO Packages (ID, PackageBaseID, Name) VALUES (4, 2, "pkg4");
 	INSERT INTO Packages (ID, PackageBaseID, Name) VALUES (5, 3, "pkg5");
 	EOD
-	"$MKPKGLISTS" &&
+	cover "$MKPKGLISTS" &&
 	cat <<-EOD >expected &&
 	foobar
 	foobar2
@@ -45,7 +45,7 @@ test_expect_success 'Test package list generation.' '
 '
 
 test_expect_success 'Test user list generation.' '
-	"$MKPKGLISTS" &&
+	cover "$MKPKGLISTS" &&
 	cat <<-EOD >expected &&
 	dev
 	tu
diff --git a/test/t2200-tuvotereminder.t b/test/t2200-tuvotereminder.t
index 5a8f3a25..2f3836de 100755
--- a/test/t2200-tuvotereminder.t
+++ b/test/t2200-tuvotereminder.t
@@ -15,7 +15,7 @@ test_expect_success 'Test Trusted User vote reminders.' '
 	INSERT INTO TU_VoteInfo (ID, Agenda, User, Submitted, End, Quorum, SubmitterID) VALUES (4, "Lorem ipsum.", "user", 0, $threedays, 0.00, 2);
 	EOD
 	>sendmail.out &&
-	"$TUVOTEREMINDER" &&
+	cover "$TUVOTEREMINDER" &&
 	grep -q "Proposal 2" sendmail.out &&
 	grep -q "Proposal 3" sendmail.out &&
 	test_must_fail grep -q "Proposal 1" sendmail.out &&
@@ -35,7 +35,7 @@ test_expect_success 'Check that only TUs who did not vote receive reminders.' '
 	INSERT INTO TU_Votes (VoteID, UserID) VALUES (1, 9);
 	EOD
 	>sendmail.out &&
-	"$TUVOTEREMINDER" &&
+	cover "$TUVOTEREMINDER" &&
 	cat <<-EOD >expected &&
 	Subject: TU Vote Reminder: Proposal 2
 	To: tu2@localhost
diff --git a/test/t2300-pkgmaint.t b/test/t2300-pkgmaint.t
index c390f5db..997f95b0 100755
--- a/test/t2300-pkgmaint.t
+++ b/test/t2300-pkgmaint.t
@@ -13,7 +13,7 @@ test_expect_success 'Test package base cleanup script.' '
 	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (3, "foobar3", NULL, $now, 0, "");
 	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (4, "foobar4", NULL, $threedaysago, 0, "");
 	EOD
-	"$PKGMAINT" &&
+	cover "$PKGMAINT" &&
 	cat <<-EOD >expected &&
 	foobar
 	foobar2
diff --git a/test/t2400-aurblup.t b/test/t2400-aurblup.t
index cc287a0f..42da6791 100755
--- a/test/t2400-aurblup.t
+++ b/test/t2400-aurblup.t
@@ -39,7 +39,7 @@ test_expect_success 'Test official provider update script.' '
 	EOD
 	( cd remote/test && bsdtar -czf ../test.db * ) &&
 	mkdir sync &&
-	"$AURBLUP" &&
+	cover "$AURBLUP" &&
 	cat <<-EOD >expected &&
 	foobar|test|foobar
 	foobar2|test|foobar2
diff --git a/test/t2500-notify.t b/test/t2500-notify.t
index 713b31e3..3514357a 100755
--- a/test/t2500-notify.t
+++ b/test/t2500-notify.t
@@ -18,7 +18,7 @@ test_expect_success 'Test out-of-date notifications.' '
 	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1003, 4, 1);
 	EOD
 	>sendmail.out &&
-	"$NOTIFY" flag 1 1001 &&
+	cover "$NOTIFY" flag 1 1001 &&
 	cat <<-EOD >expected &&
 	Subject: AUR Out-of-date Notification for foobar
 	To: tu@localhost
@@ -39,7 +39,7 @@ test_expect_success 'Test subject and body of reset key notifications.' '
 	UPDATE Users SET ResetKey = "12345678901234567890123456789012" WHERE ID = 1;
 	EOD
 	>sendmail.out &&
-	"$NOTIFY" send-resetkey 1 &&
+	cover "$NOTIFY" send-resetkey 1 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Password Reset
@@ -62,7 +62,7 @@ test_expect_success 'Test subject and body of welcome notifications.' '
 	UPDATE Users SET ResetKey = "12345678901234567890123456789012" WHERE ID = 1;
 	EOD
 	>sendmail.out &&
-	"$NOTIFY" welcome 1 &&
+	cover "$NOTIFY" welcome 1 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: Welcome to the Arch User Repository
@@ -88,7 +88,7 @@ test_expect_success 'Test subject and body of comment notifications.' '
 	UPDATE Users SET CommentNotify = 1 WHERE ID = 2;
 	EOD
 	>sendmail.out &&
-	"$NOTIFY" comment 1 1001 2001 &&
+	cover "$NOTIFY" comment 1 1001 2001 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Comment for foobar
@@ -116,7 +116,7 @@ test_expect_success 'Test subject and body of update notifications.' '
 	UPDATE Users SET UpdateNotify = 1 WHERE ID = 2;
 	EOD
 	>sendmail.out &&
-	"$NOTIFY" update 1 1001 &&
+	cover "$NOTIFY" update 1 1001 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Package Update: foobar
@@ -139,7 +139,7 @@ test_expect_success 'Test subject and body of update notifications.' '
 
 test_expect_success 'Test subject and body of out-of-date notifications.' '
 	>sendmail.out &&
-	"$NOTIFY" flag 1 1001 &&
+	cover "$NOTIFY" flag 1 1001 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Out-of-date Notification for foobar
@@ -160,7 +160,7 @@ test_expect_success 'Test subject and body of out-of-date notifications.' '
 
 test_expect_success 'Test subject and body of adopt notifications.' '
 	>sendmail.out &&
-	"$NOTIFY" adopt 1 1001 &&
+	cover "$NOTIFY" adopt 1 1001 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Ownership Notification for foobar
@@ -179,7 +179,7 @@ test_expect_success 'Test subject and body of adopt notifications.' '
 
 test_expect_success 'Test subject and body of disown notifications.' '
 	>sendmail.out &&
-	"$NOTIFY" disown 1 1001 &&
+	cover "$NOTIFY" disown 1 1001 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Ownership Notification for foobar
@@ -198,7 +198,7 @@ test_expect_success 'Test subject and body of disown notifications.' '
 
 test_expect_success 'Test subject and body of co-maintainer addition notifications.' '
 	>sendmail.out &&
-	"$NOTIFY" comaintainer-add 1 1001 &&
+	cover "$NOTIFY" comaintainer-add 1 1001 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Co-Maintainer Notification for foobar
@@ -216,7 +216,7 @@ test_expect_success 'Test subject and body of co-maintainer addition notificatio
 
 test_expect_success 'Test subject and body of co-maintainer removal notifications.' '
 	>sendmail.out &&
-	"$NOTIFY" comaintainer-remove 1 1001 &&
+	cover "$NOTIFY" comaintainer-remove 1 1001 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Co-Maintainer Notification for foobar
@@ -234,7 +234,7 @@ test_expect_success 'Test subject and body of co-maintainer removal notification
 
 test_expect_success 'Test subject and body of delete notifications.' '
 	>sendmail.out &&
-	"$NOTIFY" delete 1 1001 &&
+	cover "$NOTIFY" delete 1 1001 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Package deleted: foobar
@@ -255,7 +255,7 @@ test_expect_success 'Test subject and body of delete notifications.' '
 
 test_expect_success 'Test subject and body of merge notifications.' '
 	>sendmail.out &&
-	"$NOTIFY" delete 1 1001 1002 &&
+	cover "$NOTIFY" delete 1 1001 1002 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: AUR Package deleted: foobar
@@ -283,7 +283,7 @@ test_expect_success 'Test Cc, subject and body of request open notifications.' '
 	INSERT INTO PackageRequests (ID, PackageBaseID, PackageBaseName, UsersID, ReqTypeID, Comments, ClosureComment) VALUES (3001, 1001, "foobar", 2, 1, "This is a request test comment.", "");
 	EOD
 	>sendmail.out &&
-	"$NOTIFY" request-open 1 3001 orphan 1001 &&
+	cover "$NOTIFY" request-open 1 3001 orphan 1001 &&
 	grep ^Cc: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Cc: user@localhost, tu@localhost
@@ -309,7 +309,7 @@ test_expect_success 'Test Cc, subject and body of request open notifications.' '
 
 test_expect_success 'Test subject and body of request open notifications for merge requests.' '
 	>sendmail.out &&
-	"$NOTIFY" request-open 1 3001 merge 1001 foobar2 &&
+	cover "$NOTIFY" request-open 1 3001 merge 1001 foobar2 &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: [PRQ#3001] Merge Request for foobar
@@ -331,7 +331,7 @@ test_expect_success 'Test subject and body of request open notifications for mer
 
 test_expect_success 'Test Cc, subject and body of request close notifications.' '
 	>sendmail.out &&
-	"$NOTIFY" request-close 1 3001 accepted &&
+	cover "$NOTIFY" request-close 1 3001 accepted &&
 	grep ^Cc: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Cc: user@localhost, tu@localhost
@@ -354,7 +354,7 @@ test_expect_success 'Test Cc, subject and body of request close notifications.'
 
 test_expect_success 'Test subject and body of request close notifications (auto-accept).' '
 	>sendmail.out &&
-	"$NOTIFY" request-close 0 3001 accepted &&
+	cover "$NOTIFY" request-close 0 3001 accepted &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: [PRQ#3001] Deletion Request for foobar Accepted
@@ -374,7 +374,7 @@ test_expect_success 'Test subject and body of request close notifications with c
 	UPDATE PackageRequests SET ClosureComment = "This is a test closure comment." WHERE ID = 3001;
 	EOD
 	>sendmail.out &&
-	"$NOTIFY" request-close 1 3001 accepted &&
+	cover "$NOTIFY" request-close 1 3001 accepted &&
 	grep ^Subject: sendmail.out >actual &&
 	cat <<-EOD >expected &&
 	Subject: [PRQ#3001] Deletion Request for foobar Accepted
@@ -394,7 +394,7 @@ test_expect_success 'Test subject and body of request close notifications with c
 
 test_expect_success 'Test subject and body of TU vote reminders.' '
 	>sendmail.out &&
-	"$NOTIFY" tu-vote-reminder 1 &&
+	cover "$NOTIFY" tu-vote-reminder 1 &&
 	grep ^Subject: sendmail.out | head -1 >actual &&
 	cat <<-EOD >expected &&
 	Subject: TU Vote Reminder: Proposal 1
diff --git a/test/t2600-rendercomment.t b/test/t2600-rendercomment.t
index e01904c6..bb84fcfe 100755
--- a/test/t2600-rendercomment.t
+++ b/test/t2600-rendercomment.t
@@ -10,7 +10,7 @@ test_expect_success 'Test comment rendering.' '
 	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (1, 1, "Hello world!
 	This is a comment.", "");
 	EOD
-	"$RENDERCOMMENT" 1 &&
+	cover "$RENDERCOMMENT" 1 &&
 	cat <<-EOD >expected &&
 	<p>Hello world!
 	This is a comment.</p>
@@ -25,7 +25,7 @@ test_expect_success 'Test Markdown conversion.' '
 	cat <<-EOD | sqlite3 aur.db &&
 	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (2, 1, "*Hello* [world](https://www.archlinux.org/)!", "");
 	EOD
-	"$RENDERCOMMENT" 2 &&
+	cover "$RENDERCOMMENT" 2 &&
 	cat <<-EOD >expected &&
 	<p><em>Hello</em> <a href="https://www.archlinux.org/">world</a>!</p>
 	EOD
@@ -39,7 +39,7 @@ test_expect_success 'Test HTML sanitizing.' '
 	cat <<-EOD | sqlite3 aur.db &&
 	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (3, 1, "<script>alert(""XSS!"");</script>", "");
 	EOD
-	"$RENDERCOMMENT" 3 &&
+	cover "$RENDERCOMMENT" 3 &&
 	cat <<-EOD >expected &&
 	&lt;script&gt;alert("XSS!");&lt;/script&gt;
 	EOD
@@ -61,7 +61,7 @@ test_expect_success 'Test link conversion.' '
 		[arch]: https://www.archlinux.org/
 	", "");
 	EOD
-	"$RENDERCOMMENT" 4 &&
+	cover "$RENDERCOMMENT" 4 &&
 	cat <<-EOD >expected &&
 		<p>Visit <a href="https://www.archlinux.org/#_test_">https://www.archlinux.org/#_test_</a>.
 		Visit <em><a href="https://www.archlinux.org/">https://www.archlinux.org/</a></em>.
@@ -89,7 +89,7 @@ test_expect_success 'Test Git commit linkification.' '
 		http://example.com/$oid
 	", "");
 	EOD
-	"$RENDERCOMMENT" 5 &&
+	cover "$RENDERCOMMENT" 5 &&
 	cat <<-EOD >expected &&
 		<p><a href="https://aur.archlinux.org/cgit/aur.git/log/?h=foobar&amp;id=${oid:0:12}">${oid:0:12}</a>
 		<a href="https://aur.archlinux.org/cgit/aur.git/log/?h=foobar&amp;id=${oid:0:7}">${oid:0:7}</a>
@@ -116,7 +116,7 @@ test_expect_success 'Test Flyspray issue linkification.' '
 		https://archlinux.org/?test=FS#1234
 	", "");
 	EOD
-	"$RENDERCOMMENT" 6 &&
+	cover "$RENDERCOMMENT" 6 &&
 	cat <<-EOD >expected &&
 		<p><a href="https://bugs.archlinux.org/task/1234567">FS#1234567</a>.
 		<em><a href="https://bugs.archlinux.org/task/1234">FS#1234</a></em>
@@ -142,7 +142,7 @@ test_expect_success 'Test headings lowering.' '
 		###### Six
 	", "");
 	EOD
-	"$RENDERCOMMENT" 7 &&
+	cover "$RENDERCOMMENT" 7 &&
 	cat <<-EOD >expected &&
 		<h5>One</h5>
 		<h6>Two</h6>
diff --git a/test/t2700-usermaint.t b/test/t2700-usermaint.t
index f0bb449b..c119e3f4 100755
--- a/test/t2700-usermaint.t
+++ b/test/t2700-usermaint.t
@@ -16,7 +16,7 @@ test_expect_success 'Test removal of login IP addresses.' '
 	UPDATE Users SET LastLogin = 0, LastLoginIPAddress = "5.6.7.8" WHERE ID = 5;
 	UPDATE Users SET LastLogin = $tendaysago, LastLoginIPAddress = "6.7.8.9" WHERE ID = 6;
 	EOD
-	"$USERMAINT" &&
+	cover "$USERMAINT" &&
 	cat <<-EOD >expected &&
 	1.2.3.4
 	3.4.5.6
@@ -37,7 +37,7 @@ test_expect_success 'Test removal of SSH login IP addresses.' '
 	UPDATE Users SET LastSSHLogin = 0, LastSSHLoginIPAddress = "5.6.7.8" WHERE ID = 5;
 	UPDATE Users SET LastSSHLogin = $tendaysago, LastSSHLoginIPAddress = "6.7.8.9" WHERE ID = 6;
 	EOD
-	"$USERMAINT" &&
+	cover "$USERMAINT" &&
 	cat <<-EOD >expected &&
 	1.2.3.4
 	2.3.4.5

From 4b7609681deb8ce6627919b4c43f879601c49d30 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Dec 2020 18:26:32 -0800
Subject: [PATCH 069/844] add test_exceptions.py

This helps gain coverage over aurweb.exceptions regardless
of their actual use in the testing base.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_exceptions.py | 102 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 test/test_exceptions.py

diff --git a/test/test_exceptions.py b/test/test_exceptions.py
new file mode 100644
index 00000000..feac2656
--- /dev/null
+++ b/test/test_exceptions.py
@@ -0,0 +1,102 @@
+from aurweb.exceptions import (AlreadyVotedException, AurwebException, BannedException, BrokenUpdateHookException,
+                               InvalidArgumentsException, InvalidCommentException, InvalidPackageBaseException,
+                               InvalidReasonException, InvalidRepositoryNameException, InvalidUserException,
+                               MaintenanceException, NotVotedException, PackageBaseExistsException, PermissionDeniedException)
+
+
+def test_aurweb_exception():
+    try:
+        raise AurwebException("test")
+    except AurwebException as exc:
+        assert str(exc) == "test"
+
+
+def test_maintenance_exception():
+    try:
+        raise MaintenanceException("test")
+    except MaintenanceException as exc:
+        assert str(exc) == "test"
+
+
+def test_banned_exception():
+    try:
+        raise BannedException("test")
+    except BannedException as exc:
+        assert str(exc) == "test"
+
+
+def test_already_voted_exception():
+    try:
+        raise AlreadyVotedException("test")
+    except AlreadyVotedException as exc:
+        assert str(exc) == "already voted for package base: test"
+
+
+def test_broken_update_hook_exception():
+    try:
+        raise BrokenUpdateHookException("test")
+    except BrokenUpdateHookException as exc:
+        assert str(exc) == "broken update hook: test"
+
+
+def test_invalid_arguments_exception():
+    try:
+        raise InvalidArgumentsException("test")
+    except InvalidArgumentsException as exc:
+        assert str(exc) == "test"
+
+
+def test_invalid_packagebase_exception():
+    try:
+        raise InvalidPackageBaseException("test")
+    except InvalidPackageBaseException as exc:
+        assert str(exc) == "package base not found: test"
+
+
+def test_invalid_comment_exception():
+    try:
+        raise InvalidCommentException("test")
+    except InvalidCommentException as exc:
+        assert str(exc) == "comment is too short: test"
+
+
+def test_invalid_reason_exception():
+    try:
+        raise InvalidReasonException("test")
+    except InvalidReasonException as exc:
+        assert str(exc) == "invalid reason: test"
+
+
+def test_invalid_user_exception():
+    try:
+        raise InvalidUserException("test")
+    except InvalidUserException as exc:
+        assert str(exc) == "unknown user: test"
+
+
+def test_not_voted_exception():
+    try:
+        raise NotVotedException("test")
+    except NotVotedException as exc:
+        assert str(exc) == "missing vote for package base: test"
+
+
+def test_packagebase_exists_exception():
+    try:
+        raise PackageBaseExistsException("test")
+    except PackageBaseExistsException as exc:
+        assert str(exc) == "package base already exists: test"
+
+
+def test_permission_denied_exception():
+    try:
+        raise PermissionDeniedException("test")
+    except PermissionDeniedException as exc:
+        assert str(exc) == "permission denied: test"
+
+
+def test_repository_name_exception():
+    try:
+        raise InvalidRepositoryNameException("test")
+    except InvalidRepositoryNameException as exc:
+        assert str(exc) == "invalid repository name: test"

From 6d08789ac1f759b66006ab2ec225513863308f91 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 31 Dec 2020 22:00:15 -0800
Subject: [PATCH 070/844] add test_popupdate.py

We had no coverage over aurweb.scripts.popupdate. This test covers
all of its functionality.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py                | 3 +++
 aurweb/scripts/popupdate.py | 1 -
 test/test_popupdate.py      | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 test/test_popupdate.py

diff --git a/aurweb/db.py b/aurweb/db.py
index 8ca32165..04b40f43 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -1,3 +1,5 @@
+import math
+
 try:
     import mysql.connector
 except ImportError:
@@ -95,6 +97,7 @@ class Connection:
         elif aur_db_backend == 'sqlite':
             aur_db_name = aurweb.config.get('database', 'name')
             self._conn = sqlite3.connect(aur_db_name)
+            self._conn.create_function("POWER", 2, math.pow)
             self._paramstyle = sqlite3.paramstyle
         else:
             raise ValueError('unsupported database backend')
diff --git a/aurweb/scripts/popupdate.py b/aurweb/scripts/popupdate.py
index b64deedb..b1e70403 100755
--- a/aurweb/scripts/popupdate.py
+++ b/aurweb/scripts/popupdate.py
@@ -7,7 +7,6 @@ import aurweb.db
 
 def main():
     conn = aurweb.db.Connection()
-
     conn.execute("UPDATE PackageBases SET NumVotes = (" +
                  "SELECT COUNT(*) FROM PackageVotes " +
                  "WHERE PackageVotes.PackageBaseID = PackageBases.ID)")
diff --git a/test/test_popupdate.py b/test/test_popupdate.py
new file mode 100644
index 00000000..93f86f10
--- /dev/null
+++ b/test/test_popupdate.py
@@ -0,0 +1,5 @@
+from aurweb.scripts import popupdate
+
+
+def test_popupdate():
+    popupdate.main()

From 57c11ae13fea0276359cf552ab59455fe2c579a3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 20 Jan 2021 14:08:39 -0800
Subject: [PATCH 071/844] install aurweb package & init db on GitLab CI

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71c14457..6db573d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,5 +18,8 @@ before_script:
 
 test:
   script:
+    - python setup.py install
+    - sed -r "s;YOUR_AUR_ROOT;$(pwd);g" conf/config.dev > conf/config
+    - AUR_CONFIG=conf/config python -m aurweb.initdb
     - make -C test
     - coverage report --include='aurweb/*'

From 52ab056e1876fa68c70d3ff1b1d63ea9f74d6e31 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 21 Dec 2020 22:33:46 -0800
Subject: [PATCH 072/844] update documentation for FastAPI tests and deps.

Additionally, we now ask for two more favors from contributors:

1. All source modified or added within a patchset **must** maintain
   equivalent or increased coverage by providing tests that use the
   functionality.
2. Please keep your source within an 80 column width.

PS: Sneak a few test Makefile and gitlab fixes.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 CONTRIBUTING.md |  9 +++++++++
 INSTALL         |  4 ++--
 README.md       |  9 ++++++++-
 test/README.md  | 53 +++++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7b9ff466..1d57d742 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,3 +8,12 @@ You can add a git hook to do this by installing `python-pre-commit` and running
 `pre-commit install`.
 
 [1] https://lists.archlinux.org/listinfo/aur-dev
+
+### Coding Guidelines
+
+1. All source modified or added within a patchset **must** maintain equivalent
+   or increased coverage by providing tests that use the functionality.
+
+2. Please keep your source within an 80 column width.
+
+Test patches that increase coverage in the codebase are always welcome.
diff --git a/INSTALL b/INSTALL
index a32d6f5a..8607b07f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -48,8 +48,8 @@ read the instructions below.
 4) Install Python modules and dependencies:
 
     # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy \
-                python-bleach python-markdown python-alembic python-jinja \
-                python-itsdangerous python-authlib python-httpx hypercorn
+                python-bleach python-markdown python-alembic hypercorn \
+                python-itsdangerous python-authlib python-httpx
     # python3 setup.py install
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
diff --git a/README.md b/README.md
index 77f3b13d..7521b4d9 100644
--- a/README.md
+++ b/README.md
@@ -19,12 +19,14 @@ Directory Layout
 
 * `aurweb`: aurweb Python modules, Git interface and maintenance scripts
 * `conf`: configuration and configuration templates
+* `static`: static resource files
+* `templates`: jinja2 template collection
 * `doc`: project documentation
 * `po`: translation files for strings in the aurweb interface
 * `schema`: schema for the SQL database
 * `test`: test suite and test cases
 * `upgrading`: instructions for upgrading setups from one release to another
-* `web`: web interface for the AUR
+* `web`: PHP-based web interface for the AUR
 
 Links
 -----
@@ -46,3 +48,8 @@ Translations are welcome via our Transifex project at
 https://www.transifex.com/lfleischer/aurweb; see `doc/i18n.txt` for details.
 
 ![Transifex](https://www.transifex.com/projects/p/aurweb/chart/image_png)
+
+Testing
+-------
+
+See [test/README.md](test/README.md) for details on dependencies and testing.
diff --git a/test/README.md b/test/README.md
index de7eff18..3261899b 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,10 +1,11 @@
 Running tests
 -------------
 
-To run all the tests, you may run `make check` under `test/`.
+To run all tests, you may run `make check` under `test/` (alternative targets:
+`make pytest`, `make sh`).
 
-For more control, you may use the `prove` command, which receives a directory
-or a list of files to run, and produces a report.
+For more control, you may use the `prove` or `pytest` command, which receives a
+directory or a list of files to run, and produces a report.
 
 Each test script is standalone, so you may run them individually. Some tests
 may receive command-line options to help debugging. See for example sharness's
@@ -22,16 +23,60 @@ For all the test to run, the following Arch packages should be installed:
 - python-pygit2
 - python-sqlalchemy
 - python-srcinfo
+- python-coverage
+- python-pytest
+- python-pytest-cov
+- python-pytest-asyncio
+
+Running tests
+-------------
+
+Recommended method of running tests: `make check`.
+
+First, setup the test configuration:
+
+    $ sed -r 's;YOUR_AUR_ROOT;$(pwd);g' conf/config.dev > conf/config
+
+With those installed, one can run Python tests manually with any AUR config
+specified by `AUR_CONFIG`:
+
+    $ AUR_CONFIG=conf/config coverage run --append /usr/bin/pytest test/
+
+After tests are run (particularly, with `coverage run` included), one can
+produce coverage reports.
+
+    # Print out a CLI coverage report.
+    $ coverage report
+    # Produce an HTML-based coverage report.
+    $ coverage html
+
+When running `make -C test`, all tests ran will produce coverage data via
+`coverage run --append`. After running `make -C test`, one can continue with
+coverage reporting steps above. Running tests through `make` will test and
+cover code ran by both aurweb scripts and our pytest collection.
 
 Writing tests
 -------------
 
-Test scripts must follow the Test Anything Protocol specification:
+Shell test scripts must follow the Test Anything Protocol specification:
 http://testanything.org/tap-specification.html
 
+Python tests must be compatible with `pytest` and included in `pytest test/`
+execution after setting up a configuration.
+
 Tests must support being run from any directory. They may use $0 to determine
 their location. Python scripts should expect aurweb to be installed and
 importable without toying with os.path or PYTHONPATH.
 
 Tests written in shell should use sharness. In general, new tests should be
 consistent with existing tests unless they have a good reason not to.
+
+Debugging tests
+---------------
+
+By default, `make -C test` is quiet and does not print out verbose information
+about tests being run. If a test is failing, one can look into verbose details
+of sharness tests by executing them with the `--verbose` flag. Example:
+`./t1100_git_auth.t --verbose`. This is particularly useful when tests happen
+to fail in a remote continuous integration environment, where the reader does
+not have complete access to the runner.

From cd3e880264339ffd73e507775b4fb7e9d740a24d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 23 Dec 2020 16:11:40 -0800
Subject: [PATCH 073/844] add Dockerfile

This docker file downloads deps, sets up some things beforehand and
finishes with running our entire collection of tests.

Signed-off-by: Kevin Morris <kevr@0cost.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 Dockerfile | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..7e981340
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,30 @@
+FROM archlinux
+COPY . /aurweb
+WORKDIR /aurweb
+
+# Install dependencies.
+RUN pacman -Syu --noconfirm base-devel git gpgme protobuf pyalpm \
+    python-mysql-connector python-pygit2 python-srcinfo python-bleach \
+    python-markdown python-sqlalchemy python-alembic python-pytest \
+    python-werkzeug python-pytest-tap python-fastapi nginx python-authlib \
+    python-itsdangerous python-httpx python-jinja python-pytest-cov \
+    python-requests python-aiofiles python-python-multipart \
+    python-pytest-asyncio python-coverage hypercorn
+
+# Remove aurweb.sqlite3 if it was copied over via COPY.
+RUN rm -fv aurweb.sqlite3
+
+# Setup our test config.
+RUN sed -r "s;YOUR_AUR_ROOT;/aurweb;g" conf/config.dev > conf/config
+
+# Install translations.
+RUN AUR_CONFIG=conf/config make -C po all install
+
+# Initialize the database.
+RUN AUR_CONFIG=conf/config python -m aurweb.initdb
+
+# Test everything!
+RUN make -C test
+
+# Produce a coverage report.
+RUN coverage report --include='aurweb/*'

From 21140e28a8d5aa6ccf7a3366ca0d5fe7de8d2364 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Wed, 7 Apr 2021 09:56:16 +0100
Subject: [PATCH 074/844] Filter out current username from co-maintainers list.

Closes: #8

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 web/lib/pkgbasefuncs.inc.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 4a49898c..a053962e 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -1189,7 +1189,8 @@ function pkgbase_get_comaintainer_uids($base_ids) {
  * @return array Tuple of success/failure indicator and error message
  */
 function pkgbase_set_comaintainers($base_id, $users, $override=false) {
-	if (!$override && !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(pkgbase_maintainer_uid($base_id)))) {
+	$maintainer_uid = pkgbase_maintainer_uid($base_id);
+	if (!$override && !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array($maintainer_uid))) {
 		return array(false, __("You are not allowed to manage co-maintainers of this package base."));
 	}
 
@@ -1207,9 +1208,12 @@ function pkgbase_set_comaintainers($base_id, $users, $override=false) {
 
 		if (!$uid) {
 			return array(false, __("Invalid user name: %s", $user));
+		} elseif ($uid == $maintainer_uid) {
+			// silently ignore when maintainer == co-maintainer
+			continue;
+		} else {
+			$uids_new[] = $uid;
 		}
-
-		$uids_new[] = $uid;
 	}
 
 	$q = sprintf("SELECT UsersID FROM PackageComaintainers WHERE PackageBaseID = %d", $base_id);

From c1e29e90ca2a7e58faef573c975ddf47f108e048 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Mar 2021 15:17:17 -0700
Subject: [PATCH 075/844] aurweb: Globalize a Translator instance, add more
 utility

+ Added SUPPORTED_LANGUAGES, a global constant dictionary of
  language => display pairs for languages we support.
+ Add Translator.get_translator, a function used to retrieve a
  translator after initializing it (if needed). Use `fallback=True`
  while creating languages, in case we setup a language that we
  don't have a translation for, it will noop the translation.
  This is particularly useful for "en," since we do not translate
  it, but doing this will allow us to go through our normal translation
  flow in any case.
+ Added typing.
+ Added get_request_language, a function that grabs the language for
  a request session, defaulting to aurweb.config [options] default_lang.
+ Added get_raw_translator_for_request, a function that retrieves
  the concrete translation object for a given language.
+ Added tr, a jinja2 contextfilter that can be used to inline translate
  strings in jinja2 templates.
+ Added `python-jinja` dep to .gitlab-ci.yml. This needs to be
  included in documentation before this set is merged in.
+ Introduce pytest units (test_l10n.py) in `test` along with
  __init__.py, which marks `test` as a test package.
+ Additionally, fix up notify.py to use the global translator. Also
  reduce its source width to <= 80 by newlining some code.
+ Additionally, prepare locale in .gitlab-ci.yml and add
  aurweb.config [options] localedir to config.dev with YOUR_AUR_ROOT
  like others.

Signed-off-by: Kevin Morris <kevr@0cost.org>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 .gitlab-ci.yml           |   1 +
 aurweb/l10n.py           |  79 +++++++++++--
 aurweb/scripts/notify.py | 238 ++++++++++++++++++++-------------------
 conf/config.dev          |   1 +
 test/__init__.py         |   0
 test/test_l10n.py        |  44 ++++++++
 6 files changed, 240 insertions(+), 123 deletions(-)
 create mode 100644 test/__init__.py
 create mode 100644 test/test_l10n.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6db573d2..1e287748 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ test:
   script:
     - python setup.py install
     - sed -r "s;YOUR_AUR_ROOT;$(pwd);g" conf/config.dev > conf/config
+    - AUR_CONFIG=conf/config make -C po all install
     - AUR_CONFIG=conf/config python -m aurweb.initdb
     - make -C test
     - coverage report --include='aurweb/*'
diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index a476ecd8..030ab274 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -1,24 +1,79 @@
 import gettext
+import typing
+
+from collections import OrderedDict
+
+from fastapi import Request
+from jinja2 import contextfilter
 
 import aurweb.config
 
+SUPPORTED_LANGUAGES = OrderedDict({
+    "ar": "العربية",
+    "ast": "Asturianu",
+    "ca": "Català",
+    "cs": "Český",
+    "da": "Dansk",
+    "de": "Deutsch",
+    "el": "Ελληνικά",
+    "en": "English",
+    "es": "Español",
+    "es_419": "Español (Latinoamérica)",
+    "fi": "Suomi",
+    "fr": "Français",
+    "he": "עברית",
+    "hr": "Hrvatski",
+    "hu": "Magyar",
+    "it": "Italiano",
+    "ja": "日本語",
+    "nb": "Norsk",
+    "nl": "Nederlands",
+    "pl": "Polski",
+    "pt_BR": "Português (Brasil)",
+    "pt_PT": "Português (Portugal)",
+    "ro": "Română",
+    "ru": "Русский",
+    "sk": "Slovenčina",
+    "sr": "Srpski",
+    "tr": "Türkçe",
+    "uk": "Українська",
+    "zh_CN": "简体中文",
+    "zh_TW": "正體中文"
+})
+
 
 class Translator:
     def __init__(self):
         self._localedir = aurweb.config.get('options', 'localedir')
         self._translator = {}
 
-    def translate(self, s, lang):
-        if lang == 'en':
-            return s
+    def get_translator(self, lang: str):
         if lang not in self._translator:
             self._translator[lang] = gettext.translation("aurweb",
                                                          self._localedir,
-                                                         languages=[lang])
-        return self._translator[lang].gettext(s)
+                                                         languages=[lang],
+                                                         fallback=True)
+        return self._translator.get(lang)
+
+    def translate(self, s: str, lang: str):
+        return self.get_translator(lang).gettext(s)
 
 
-def get_translator_for_request(request):
+# Global translator object.
+translator = Translator()
+
+
+def get_request_language(request: Request):
+    return request.cookies.get("AURLANG",
+                               aurweb.config.get("options", "default_lang"))
+
+
+def get_raw_translator_for_request(request: Request):
+    lang = get_request_language(request)
+    return translator.get_translator(lang)
+
+
+def get_translator_for_request(request: Request):
     """
     Determine the preferred language from a FastAPI request object and build a
     translator function for it.
@@ -29,12 +84,16 @@ def get_translator_for_request(request):
     print(_("Hello"))
     ```
     """
-    lang = request.cookies.get("AURLANG")
-    if lang is None:
-        lang = aurweb.config.get("options", "default_lang")
-    translator = Translator()
+    lang = get_request_language(request)
 
     def translate(message):
         return translator.translate(message, lang)
 
     return translate
+
+
+@contextfilter
+def tr(context: typing.Any, value: str):
+    """ A translation filter; example: {{ "Hello" | tr("de") }}. """
+    _ = get_translator_for_request(context.get("request"))
+    return _(value)
diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index 7f8e7168..1df0175a 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -40,9 +40,6 @@ def pkgbase_from_pkgreq(conn, reqid):
 
 
 class Notification:
-    def __init__(self):
-        self._l10n = aurweb.l10n.Translator()
-
     def get_refs(self):
         return ()
 
@@ -97,9 +94,12 @@ class Notification:
             else:
                 # send email using smtplib; no local MTA required
                 server_addr = aurweb.config.get('notifications', 'smtp-server')
-                server_port = aurweb.config.getint('notifications', 'smtp-port')
-                use_ssl = aurweb.config.getboolean('notifications', 'smtp-use-ssl')
-                use_starttls = aurweb.config.getboolean('notifications', 'smtp-use-starttls')
+                server_port = aurweb.config.getint('notifications',
+                                                   'smtp-port')
+                use_ssl = aurweb.config.getboolean('notifications',
+                                                   'smtp-use-ssl')
+                use_starttls = aurweb.config.getboolean('notifications',
+                                                        'smtp-use-starttls')
                 user = aurweb.config.get('notifications', 'smtp-user')
                 passwd = aurweb.config.get('notifications', 'smtp-password')
 
@@ -127,7 +127,8 @@ class ResetKeyNotification(Notification):
         cur = conn.execute('SELECT UserName, Email, BackupEmail, ' +
                            'LangPreference, ResetKey ' +
                            'FROM Users WHERE ID = ? AND Suspended = 0', [uid])
-        self._username, self._to, self._backup, self._lang, self._resetkey = cur.fetchone()
+        self._username, self._to, self._backup, self._lang, self._resetkey = \
+            cur.fetchone()
         super().__init__()
 
     def get_recipients(self):
@@ -137,15 +138,15 @@ class ResetKeyNotification(Notification):
             return [(self._to, self._lang)]
 
     def get_subject(self, lang):
-        return self._l10n.translate('AUR Password Reset', lang)
+        return aurweb.l10n.translator.translate('AUR Password Reset', lang)
 
     def get_body(self, lang):
-        return self._l10n.translate(
-                'A password reset request was submitted for the account '
-                '{user} associated with your email address. If you wish to '
-                'reset your password follow the link [1] below, otherwise '
-                'ignore this message and nothing will happen.',
-                lang).format(user=self._username)
+        return aurweb.l10n.translator.translate(
+            'A password reset request was submitted for the account '
+            '{user} associated with your email address. If you wish to '
+            'reset your password follow the link [1] below, otherwise '
+            'ignore this message and nothing will happen.',
+            lang).format(user=self._username)
 
     def get_refs(self):
         return (aur_location + '/passreset/?resetkey=' + self._resetkey,)
@@ -153,15 +154,16 @@ class ResetKeyNotification(Notification):
 
 class WelcomeNotification(ResetKeyNotification):
     def get_subject(self, lang):
-        return self._l10n.translate('Welcome to the Arch User Repository',
-                                    lang)
+        return aurweb.l10n.translator.translate(
+            'Welcome to the Arch User Repository',
+            lang)
 
     def get_body(self, lang):
-        return self._l10n.translate(
-                'Welcome to the Arch User Repository! In order to set an '
-                'initial password for your new account, please click the '
-                'link [1] below. If the link does not work, try copying and '
-                'pasting it into your browser.', lang)
+        return aurweb.l10n.translator.translate(
+            'Welcome to the Arch User Repository! In order to set an '
+            'initial password for your new account, please click the '
+            'link [1] below. If the link does not work, try copying and '
+            'pasting it into your browser.', lang)
 
 
 class CommentNotification(Notification):
@@ -186,19 +188,21 @@ class CommentNotification(Notification):
         return self._recipients
 
     def get_subject(self, lang):
-        return self._l10n.translate('AUR Comment for {pkgbase}',
-                                    lang).format(pkgbase=self._pkgbase)
+        return aurweb.l10n.translator.translate(
+            'AUR Comment for {pkgbase}',
+            lang).format(pkgbase=self._pkgbase)
 
     def get_body(self, lang):
-        body = self._l10n.translate(
-                '{user} [1] added the following comment to {pkgbase} [2]:',
-                lang).format(user=self._user, pkgbase=self._pkgbase)
+        body = aurweb.l10n.translator.translate(
+            '{user} [1] added the following comment to {pkgbase} [2]:',
+            lang).format(user=self._user, pkgbase=self._pkgbase)
         body += '\n\n' + self._text + '\n\n-- \n'
-        dnlabel = self._l10n.translate('Disable notifications', lang)
-        body += self._l10n.translate(
-                'If you no longer wish to receive notifications about this '
-                'package, please go to the package page [2] and select '
-                '"{label}".', lang).format(label=dnlabel)
+        dnlabel = aurweb.l10n.translator.translate(
+            'Disable notifications', lang)
+        body += aurweb.l10n.translator.translate(
+            'If you no longer wish to receive notifications about this '
+            'package, please go to the package page [2] and select '
+            '"{label}".', lang).format(label=dnlabel)
         return body
 
     def get_refs(self):
@@ -231,20 +235,21 @@ class UpdateNotification(Notification):
         return self._recipients
 
     def get_subject(self, lang):
-        return self._l10n.translate('AUR Package Update: {pkgbase}',
-                                    lang).format(pkgbase=self._pkgbase)
+        return aurweb.l10n.translator.translate(
+            'AUR Package Update: {pkgbase}',
+            lang).format(pkgbase=self._pkgbase)
 
     def get_body(self, lang):
-        body = self._l10n.translate('{user} [1] pushed a new commit to '
-                                    '{pkgbase} [2].', lang).format(
-                                            user=self._user,
-                                            pkgbase=self._pkgbase)
+        body = aurweb.l10n.translator.translate(
+            '{user} [1] pushed a new commit to {pkgbase} [2].',
+            lang).format(user=self._user, pkgbase=self._pkgbase)
         body += '\n\n-- \n'
-        dnlabel = self._l10n.translate('Disable notifications', lang)
-        body += self._l10n.translate(
-                'If you no longer wish to receive notifications about this '
-                'package, please go to the package page [2] and select '
-                '"{label}".', lang).format(label=dnlabel)
+        dnlabel = aurweb.l10n.translator.translate(
+            'Disable notifications', lang)
+        body += aurweb.l10n.translator.translate(
+            'If you no longer wish to receive notifications about this '
+            'package, please go to the package page [2] and select '
+            '"{label}".', lang).format(label=dnlabel)
         return body
 
     def get_refs(self):
@@ -261,15 +266,16 @@ class FlagNotification(Notification):
     def __init__(self, conn, uid, pkgbase_id):
         self._user = username_from_id(conn, uid)
         self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
-        cur = conn.execute('SELECT DISTINCT Users.Email, ' +
-                           'Users.LangPreference FROM Users ' +
-                           'LEFT JOIN PackageComaintainers ' +
-                           'ON PackageComaintainers.UsersID = Users.ID ' +
-                           'INNER JOIN PackageBases ' +
-                           'ON PackageBases.MaintainerUID = Users.ID OR ' +
-                           'PackageBases.ID = PackageComaintainers.PackageBaseID ' +
-                           'WHERE PackageBases.ID = ? AND ' +
-                           'Users.Suspended = 0', [pkgbase_id])
+        cur = conn.execute(
+            'SELECT DISTINCT Users.Email, ' +
+            'Users.LangPreference FROM Users ' +
+            'LEFT JOIN PackageComaintainers ' +
+            'ON PackageComaintainers.UsersID = Users.ID ' +
+            'INNER JOIN PackageBases ' +
+            'ON PackageBases.MaintainerUID = Users.ID OR ' +
+            'PackageBases.ID = PackageComaintainers.PackageBaseID ' +
+            'WHERE PackageBases.ID = ? AND ' +
+            'Users.Suspended = 0', [pkgbase_id])
         self._recipients = cur.fetchall()
         cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' +
                            'ID = ?', [pkgbase_id])
@@ -280,15 +286,15 @@ class FlagNotification(Notification):
         return self._recipients
 
     def get_subject(self, lang):
-        return self._l10n.translate('AUR Out-of-date Notification for '
-                                    '{pkgbase}',
-                                    lang).format(pkgbase=self._pkgbase)
+        return aurweb.l10n.translator.translate(
+            'AUR Out-of-date Notification for {pkgbase}',
+            lang).format(pkgbase=self._pkgbase)
 
     def get_body(self, lang):
-        body = self._l10n.translate(
-                'Your package {pkgbase} [1] has been flagged out-of-date by '
-                '{user} [2]:', lang).format(pkgbase=self._pkgbase,
-                                            user=self._user)
+        body = aurweb.l10n.translator.translate(
+            'Your package {pkgbase} [1] has been flagged out-of-date by '
+            '{user} [2]:', lang).format(pkgbase=self._pkgbase,
+                                        user=self._user)
         body += '\n\n' + self._text
         return body
 
@@ -320,8 +326,9 @@ class OwnershipEventNotification(Notification):
         return self._recipients
 
     def get_subject(self, lang):
-        return self._l10n.translate('AUR Ownership Notification for {pkgbase}',
-                                    lang).format(pkgbase=self._pkgbase)
+        return aurweb.l10n.translator.translate(
+            'AUR Ownership Notification for {pkgbase}',
+            lang).format(pkgbase=self._pkgbase)
 
     def get_refs(self):
         return (aur_location + '/pkgbase/' + self._pkgbase + '/',
@@ -330,17 +337,17 @@ class OwnershipEventNotification(Notification):
 
 class AdoptNotification(OwnershipEventNotification):
     def get_body(self, lang):
-        return self._l10n.translate(
-                'The package {pkgbase} [1] was adopted by {user} [2].',
-                lang).format(pkgbase=self._pkgbase, user=self._user)
+        return aurweb.l10n.translator.translate(
+            'The package {pkgbase} [1] was adopted by {user} [2].',
+            lang).format(pkgbase=self._pkgbase, user=self._user)
 
 
 class DisownNotification(OwnershipEventNotification):
     def get_body(self, lang):
-        return self._l10n.translate(
-                'The package {pkgbase} [1] was disowned by {user} '
-                '[2].', lang).format(pkgbase=self._pkgbase,
-                                     user=self._user)
+        return aurweb.l10n.translator.translate(
+            'The package {pkgbase} [1] was disowned by {user} '
+            '[2].', lang).format(pkgbase=self._pkgbase,
+                                 user=self._user)
 
 
 class ComaintainershipEventNotification(Notification):
@@ -355,9 +362,9 @@ class ComaintainershipEventNotification(Notification):
         return [(self._to, self._lang)]
 
     def get_subject(self, lang):
-        return self._l10n.translate('AUR Co-Maintainer Notification for '
-                                    '{pkgbase}',
-                                    lang).format(pkgbase=self._pkgbase)
+        return aurweb.l10n.translator.translate(
+            'AUR Co-Maintainer Notification for {pkgbase}',
+            lang).format(pkgbase=self._pkgbase)
 
     def get_refs(self):
         return (aur_location + '/pkgbase/' + self._pkgbase + '/',)
@@ -365,16 +372,16 @@ class ComaintainershipEventNotification(Notification):
 
 class ComaintainerAddNotification(ComaintainershipEventNotification):
     def get_body(self, lang):
-        return self._l10n.translate(
-                'You were added to the co-maintainer list of {pkgbase} [1].',
-                lang).format(pkgbase=self._pkgbase)
+        return aurweb.l10n.translator.translate(
+            'You were added to the co-maintainer list of {pkgbase} [1].',
+            lang).format(pkgbase=self._pkgbase)
 
 
 class ComaintainerRemoveNotification(ComaintainershipEventNotification):
     def get_body(self, lang):
-        return self._l10n.translate(
-                'You were removed from the co-maintainer list of {pkgbase} '
-                '[1].', lang).format(pkgbase=self._pkgbase)
+        return aurweb.l10n.translator.translate(
+            'You were removed from the co-maintainer list of {pkgbase} '
+            '[1].', lang).format(pkgbase=self._pkgbase)
 
 
 class DeleteNotification(Notification):
@@ -400,25 +407,27 @@ class DeleteNotification(Notification):
         return self._recipients
 
     def get_subject(self, lang):
-        return self._l10n.translate('AUR Package deleted: {pkgbase}',
-                                    lang).format(pkgbase=self._old_pkgbase)
+        return aurweb.l10n.translator.translate(
+            'AUR Package deleted: {pkgbase}',
+            lang).format(pkgbase=self._old_pkgbase)
 
     def get_body(self, lang):
         if self._new_pkgbase:
-            dnlabel = self._l10n.translate('Disable notifications', lang)
-            return self._l10n.translate(
-                    '{user} [1] merged {old} [2] into {new} [3].\n\n'
-                    '-- \n'
-                    'If you no longer wish receive notifications about the '
-                    'new package, please go to [3] and click "{label}".',
-                    lang).format(user=self._user, old=self._old_pkgbase,
-                                 new=self._new_pkgbase, label=dnlabel)
+            dnlabel = aurweb.l10n.translator.translate(
+                'Disable notifications', lang)
+            return aurweb.l10n.translator.translate(
+                '{user} [1] merged {old} [2] into {new} [3].\n\n'
+                '-- \n'
+                'If you no longer wish receive notifications about the '
+                'new package, please go to [3] and click "{label}".',
+                lang).format(user=self._user, old=self._old_pkgbase,
+                             new=self._new_pkgbase, label=dnlabel)
         else:
-            return self._l10n.translate(
-                    '{user} [1] deleted {pkgbase} [2].\n\n'
-                    'You will no longer receive notifications about this '
-                    'package.', lang).format(user=self._user,
-                                             pkgbase=self._old_pkgbase)
+            return aurweb.l10n.translator.translate(
+                '{user} [1] deleted {pkgbase} [2].\n\n'
+                'You will no longer receive notifications about this '
+                'package.', lang).format(user=self._user,
+                                         pkgbase=self._old_pkgbase)
 
     def get_refs(self):
         refs = (aur_location + '/account/' + self._user + '/',
@@ -432,14 +441,15 @@ class RequestOpenNotification(Notification):
     def __init__(self, conn, uid, reqid, reqtype, pkgbase_id, merge_into=None):
         self._user = username_from_id(conn, uid)
         self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
-        cur = conn.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' +
-                           'INNER JOIN PackageBases ' +
-                           'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
-                           'INNER JOIN Users ' +
-                           'ON Users.ID = PackageRequests.UsersID ' +
-                           'OR Users.ID = PackageBases.MaintainerUID ' +
-                           'WHERE PackageRequests.ID = ? AND ' +
-                           'Users.Suspended = 0', [reqid])
+        cur = conn.execute(
+            'SELECT DISTINCT Users.Email FROM PackageRequests ' +
+            'INNER JOIN PackageBases ' +
+            'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
+            'INNER JOIN Users ' +
+            'ON Users.ID = PackageRequests.UsersID ' +
+            'OR Users.ID = PackageBases.MaintainerUID ' +
+            'WHERE PackageRequests.ID = ? AND ' +
+            'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
         self._cc = [row[0] for row in cur.fetchall()]
         cur = conn.execute('SELECT Comments FROM PackageRequests WHERE ID = ?',
@@ -489,14 +499,15 @@ class RequestOpenNotification(Notification):
 class RequestCloseNotification(Notification):
     def __init__(self, conn, uid, reqid, reason):
         self._user = username_from_id(conn, uid) if int(uid) else None
-        cur = conn.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' +
-                           'INNER JOIN PackageBases ' +
-                           'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
-                           'INNER JOIN Users ' +
-                           'ON Users.ID = PackageRequests.UsersID ' +
-                           'OR Users.ID = PackageBases.MaintainerUID ' +
-                           'WHERE PackageRequests.ID = ? AND ' +
-                           'Users.Suspended = 0', [reqid])
+        cur = conn.execute(
+            'SELECT DISTINCT Users.Email FROM PackageRequests ' +
+            'INNER JOIN PackageBases ' +
+            'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
+            'INNER JOIN Users ' +
+            'ON Users.ID = PackageRequests.UsersID ' +
+            'OR Users.ID = PackageBases.MaintainerUID ' +
+            'WHERE PackageRequests.ID = ? AND ' +
+            'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
         self._cc = [row[0] for row in cur.fetchall()]
         cur = conn.execute('SELECT PackageRequests.ClosureComment, ' +
@@ -563,14 +574,15 @@ class TUVoteReminderNotification(Notification):
         return self._recipients
 
     def get_subject(self, lang):
-        return self._l10n.translate('TU Vote Reminder: Proposal {id}',
-                                    lang).format(id=self._vote_id)
+        return aurweb.l10n.translator.translate(
+            'TU Vote Reminder: Proposal {id}',
+            lang).format(id=self._vote_id)
 
     def get_body(self, lang):
-        return self._l10n.translate(
-                'Please remember to cast your vote on proposal {id} [1]. '
-                'The voting period ends in less than 48 hours.',
-                lang).format(id=self._vote_id)
+        return aurweb.l10n.translator.translate(
+            'Please remember to cast your vote on proposal {id} [1]. '
+            'The voting period ends in less than 48 hours.',
+            lang).format(id=self._vote_id)
 
     def get_refs(self):
         return (aur_location + '/tu/?id=' + str(self._vote_id),)
diff --git a/conf/config.dev b/conf/config.dev
index 37f38c45..ef7b5ed7 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -19,6 +19,7 @@ name = YOUR_AUR_ROOT/aurweb.sqlite3
 aur_location = http://127.0.0.1:8080
 disable_http_login = 0
 enable-maintenance = 0
+localedir = YOUR_AUR_ROOT/web/locale
 
 ; Single sign-on; see doc/sso.txt.
 [sso]
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/test/test_l10n.py b/test/test_l10n.py
new file mode 100644
index 00000000..1a1ef3e6
--- /dev/null
+++ b/test/test_l10n.py
@@ -0,0 +1,44 @@
+""" Test our l10n module. """
+from aurweb import l10n
+
+
+class FakeRequest:
+    """ A fake Request doppleganger; use this to change request.cookies
+    easily and with no side-effects. """
+
+    def __init__(self, *args, **kwargs):
+        self.cookies = kwargs.pop("cookies", dict())
+
+
+def test_translator():
+    """ Test creating l10n translation tools. """
+    de_home = l10n.translator.translate("Home", "de")
+    assert de_home == "Startseite"
+
+
+def test_get_request_language():
+    """ First, tests default_lang, then tests a modified AURLANG cookie. """
+    request = FakeRequest()
+    assert l10n.get_request_language(request) == "en"
+
+    request.cookies["AURLANG"] = "de"
+    assert l10n.get_request_language(request) == "de"
+
+
+def test_get_raw_translator_for_request():
+    """ Make sure that get_raw_translator_for_request is giving us
+    the translator we expect. """
+    request = FakeRequest(cookies={"AURLANG": "de"})
+
+    translator = l10n.get_raw_translator_for_request(request)
+    assert translator.gettext("Home") == \
+        l10n.translator.translate("Home", "de")
+
+
+def test_get_translator_for_request():
+    """ Make sure that get_translator_for_request is giving us back
+    our expected translation function. """
+    request = FakeRequest(cookies={"AURLANG": "de"})
+
+    translate = l10n.get_translator_for_request(request)
+    assert translate("Home") == "Startseite"

From bda9256ab11101397977282236af6cbc6d664181 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus@tojoma.se>
Date: Fri, 7 May 2021 18:50:41 +0200
Subject: [PATCH 076/844] Add error color when package is orphaned

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>

From 1ff822bb1492497adb284f278e0e537ea9be00f3 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Tue, 11 May 2021 00:01:13 +0200
Subject: [PATCH 077/844] Use the clipboard API for copy paste

The Document.execCommand API is deprecated and no longer recommended to
be used. It's replacement is the much simpler navigator.clipboard API
which is supported in all browsers except internet explorer.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 web/template/pkg_details.php     | 10 +++-------
 web/template/pkgbase_details.php | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index c6bb32d8..047de9a7 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -308,14 +308,10 @@ endif;
 </div>
 
 <script>
-$(document).ready(function() {
-	$('.copy').click(function(e) {
-		var tmp = $("<input>");
-		$("body").append(tmp);
-		tmp.val($(this).text()).select();
-		document.execCommand("copy");
-		tmp.remove();
+document.addEventListener('DOMContentLoaded', function() {
+	document.querySelector('.copy').addEventListener('click', function(e) {
 		e.preventDefault();
+		navigator.clipboard.writeText(event.target.text);
 	});
 });
 </script>
diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php
index a6857c4e..35ad217a 100644
--- a/web/template/pkgbase_details.php
+++ b/web/template/pkgbase_details.php
@@ -137,14 +137,10 @@ endif;
 </div>
 
 <script>
-$(document).ready(function() {
-	$('.copy').click(function(e) {
-		var tmp = $("<input>");
-		$("body").append(tmp);
-		tmp.val($(this).text()).select();
-		document.execCommand("copy");
-		tmp.remove();
+document.addEventListener('DOMContentLoaded', function() {
+	document.querySelector('.copy').addEventListener('click', function(e) {
 		e.preventDefault();
+		navigator.clipboard.writeText(event.target.text);
 	});
 });
 </script>

From 2df90ce28087d02e7b1dbd0e8efd5d5f99407793 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Mar 2021 15:20:04 -0700
Subject: [PATCH 078/844] port over base HTML layout from PHP to FastAPI+Jinja2

+ Mounted static files (at web/html) to /static.
+ Added AURWEB_VERSION to aurweb.config (this is used around HTML
  to refer back to aurweb's release on git.archlinux.org), so we
  need it easily accessible in the Python codebase.
+ Implemented basic Jinja2 partials to put together whole aurweb
  pages. This may be missing some things currently and is a WIP
  until this set is ready to be merged.
+ Added config [options] aurwebdir = YOUR_AUR_ROOT; this configuration
  option should specify the root directory of the aurweb project.
  It is used by various parts of the FastAPI codebase to target
  project directories.

Added routes via aurweb.routers.html:
    * POST /language: Set your session language.
    * GET /favicon.ico: Redirect to /static/images/favicon.ico.
        * Some browsers always look for $ROOT/favicon.ico to get an icon
          for the page being loaded, regardless of a specified "shortcut
          icon" given in a <link> directive.
    * GET /: Home page; WIP.

* Updated aurweb.routers.html.language passes query parameters to
  its next redirection.

When calling aurweb.templates.render_template, the context passed should
be formed via the aurweb.templates.make_context. See
aurweb.routers.html.index for an example of this.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .coveragerc                            |  1 +
 INSTALL                                |  4 +-
 aurweb/asgi.py                         | 23 ++++++++-
 aurweb/config.py                       |  5 ++
 aurweb/routers/html.py                 | 50 +++++++++++++++++++
 aurweb/templates.py                    | 57 +++++++++++++++++++++
 conf/config.dev                        |  1 +
 templates/index.html                   |  4 ++
 templates/partials/archdev-navbar.html |  8 +++
 templates/partials/body.html           | 10 ++++
 templates/partials/footer.html         |  5 ++
 templates/partials/head.html           | 16 ++++++
 templates/partials/layout.html         | 10 ++++
 templates/partials/meta.html           |  1 +
 templates/partials/navbar.html         | 19 +++++++
 templates/partials/set_lang.html       | 28 +++++++++++
 templates/partials/typeahead.html      | 30 +++++++++++
 test/test_routes.py                    | 69 ++++++++++++++++++++++++++
 18 files changed, 339 insertions(+), 2 deletions(-)
 create mode 100644 aurweb/routers/html.py
 create mode 100644 aurweb/templates.py
 create mode 100644 templates/index.html
 create mode 100644 templates/partials/archdev-navbar.html
 create mode 100644 templates/partials/body.html
 create mode 100644 templates/partials/footer.html
 create mode 100644 templates/partials/head.html
 create mode 100644 templates/partials/layout.html
 create mode 100644 templates/partials/meta.html
 create mode 100644 templates/partials/navbar.html
 create mode 100644 templates/partials/set_lang.html
 create mode 100644 templates/partials/typeahead.html
 create mode 100644 test/test_routes.py

diff --git a/.coveragerc b/.coveragerc
index 144a9f5c..9dcfca18 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -3,5 +3,6 @@ disable_warnings = already-imported
 
 [report]
 include = aurweb/*
+fail_under = 85
 exclude_lines =
     if __name__ == .__main__.:
diff --git a/INSTALL b/INSTALL
index 8607b07f..e4c52480 100644
--- a/INSTALL
+++ b/INSTALL
@@ -49,7 +49,9 @@ read the instructions below.
 
     # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy \
                 python-bleach python-markdown python-alembic hypercorn \
-                python-itsdangerous python-authlib python-httpx
+                python-itsdangerous python-authlib python-httpx \
+                python-jinja python-aiofiles python-python-multipart \
+                python-requests
     # python3 setup.py install
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 9293ed77..00d7c595 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -2,13 +2,26 @@ import http
 
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import HTMLResponse
+from fastapi.staticfiles import StaticFiles
 from starlette.middleware.sessions import SessionMiddleware
 
 import aurweb.config
 
-from aurweb.routers import sso
+from aurweb.routers import html, sso
 
+routes = set()
+
+# Setup the FastAPI app.
 app = FastAPI()
+app.mount("/static/css",
+          StaticFiles(directory="web/html/css"),
+          name="static_css")
+app.mount("/static/js",
+          StaticFiles(directory="web/html/js"),
+          name="static_js")
+app.mount("/static/images",
+          StaticFiles(directory="web/html/images"),
+          name="static_images")
 
 session_secret = aurweb.config.get("fastapi", "session_secret")
 if not session_secret:
@@ -17,6 +30,14 @@ if not session_secret:
 app.add_middleware(SessionMiddleware, secret_key=session_secret)
 
 app.include_router(sso.router)
+app.include_router(html.router)
+
+# NOTE: Always keep this dictionary updated with all routes
+# that the application contains. We use this to check for
+# parameter value verification.
+routes = {route.path for route in app.routes}
+routes.update({route.path for route in sso.router.routes})
+routes.update({route.path for route in html.router.routes})
 
 
 @app.exception_handler(HTTPException)
diff --git a/aurweb/config.py b/aurweb/config.py
index 52ec461e..020c3b80 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -1,6 +1,11 @@
 import configparser
 import os
 
+# Publicly visible version of aurweb. This is used to display
+# aurweb versioning in the footer and must be maintained.
+# Todo: Make this dynamic/automated.
+AURWEB_VERSION = "v5.0.0"
+
 _parser = None
 
 
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
new file mode 100644
index 00000000..ae08c764
--- /dev/null
+++ b/aurweb/routers/html.py
@@ -0,0 +1,50 @@
+""" AURWeb's primary routing module. Define all routes via @app.app.{get,post}
+decorators in some way; more complex routes should be defined in their
+own modules and imported here. """
+from http import HTTPStatus
+from urllib.parse import unquote
+
+from fastapi import APIRouter, Form, Request
+from fastapi.responses import HTMLResponse, RedirectResponse
+
+from aurweb.templates import make_context, render_template
+
+router = APIRouter()
+
+
+@router.get("/favicon.ico")
+async def favicon(request: Request):
+    """ Some browsers attempt to find a website's favicon via root uri at
+    /favicon.ico, so provide a redirection here to our static icon. """
+    return RedirectResponse("/static/images/favicon.ico")
+
+
+@router.post("/language", response_class=RedirectResponse)
+async def language(request: Request,
+                   set_lang: str = Form(...),
+                   next: str = Form(...),
+                   q: str = Form(default=None)):
+    """ A POST route used to set a session's language.
+
+    Return a 303 See Other redirect to {next}?next={next}. If we are
+    setting the language on any page, we want to preserve query
+    parameters across the redirect.
+    """
+    from aurweb.asgi import routes
+    if unquote(next) not in routes:
+        return HTMLResponse(
+            b"Invalid 'next' parameter.",
+            status_code=400)
+
+    query_string = "?" + q if q else str()
+    response = RedirectResponse(url=f"{next}{query_string}",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+    response.set_cookie("AURLANG", set_lang)
+    return response
+
+
+@router.get("/", response_class=HTMLResponse)
+async def index(request: Request):
+    """ Homepage route. """
+    context = make_context(request, "Home")
+    return render_template("index.html", context)
diff --git a/aurweb/templates.py b/aurweb/templates.py
new file mode 100644
index 00000000..c05dce79
--- /dev/null
+++ b/aurweb/templates.py
@@ -0,0 +1,57 @@
+import copy
+import os
+
+from datetime import datetime
+from http import HTTPStatus
+
+import jinja2
+
+from fastapi import Request
+from fastapi.responses import HTMLResponse
+
+import aurweb.config
+
+from aurweb import l10n
+
+# Prepare jinja2 objects.
+loader = jinja2.FileSystemLoader(os.path.join(
+    aurweb.config.get("options", "aurwebdir"), "templates"))
+env = jinja2.Environment(loader=loader, autoescape=True,
+                         extensions=["jinja2.ext.i18n"])
+
+# Add tr translation filter.
+env.filters["tr"] = l10n.tr
+
+
+def make_context(request: Request, title: str, next: str = None):
+    """ Create a context for a jinja2 TemplateResponse. """
+
+    return {
+        "request": request,
+        "language": l10n.get_request_language(request),
+        "languages": l10n.SUPPORTED_LANGUAGES,
+        "title": title,
+        # The 'now' context variable will not show proper datetimes
+        # until we've implemented timezone support here.
+        "now": datetime.now(),
+        "config": aurweb.config,
+        "next": next if next else request.url.path
+    }
+
+
+def render_template(path: str, context: dict, status_code=int(HTTPStatus.OK)):
+    """ Render a Jinja2 multi-lingual template with some context. """
+
+    # Create a deep copy of our jinja2 environment. The environment in
+    # total by itself is 48 bytes large (according to sys.getsizeof).
+    # This is done so we can install gettext translations on the template
+    # environment being rendered without installing them into a global
+    # which is reused in this function.
+    templates = copy.copy(env)
+
+    translator = l10n.get_raw_translator_for_request(context.get("request"))
+    templates.install_gettext_translations(translator)
+
+    template = templates.get_template(path)
+    rendered = template.render(context)
+    return HTMLResponse(rendered, status_code=status_code)
diff --git a/conf/config.dev b/conf/config.dev
index ef7b5ed7..ccb01f4f 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -16,6 +16,7 @@ name = YOUR_AUR_ROOT/aurweb.sqlite3
 ;password = aur
 
 [options]
+aurwebdir = YOUR_AUR_ROOT
 aur_location = http://127.0.0.1:8080
 disable_http_login = 0
 enable-maintenance = 0
diff --git a/templates/index.html b/templates/index.html
new file mode 100644
index 00000000..27d3375d
--- /dev/null
+++ b/templates/index.html
@@ -0,0 +1,4 @@
+{% extends 'partials/layout.html' %}
+
+{% block pageContent %}
+{% endblock %}
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
new file mode 100644
index 00000000..55338bc4
--- /dev/null
+++ b/templates/partials/archdev-navbar.html
@@ -0,0 +1,8 @@
+<div id="archdev-navbar">
+    <ul>
+        <li><a href="/">AUR {% trans %}Home{% endtrans %}</a></li>
+        <li><a href="/packages/">{% trans %}Packages{% endtrans %}</a></li>
+        <li><a href="/register/">{% trans %}Register{% endtrans %}</a></li>
+        <li><a href="/login/">{% trans %}Login{% endtrans %}</a></li>
+    </ul>
+</div>
diff --git a/templates/partials/body.html b/templates/partials/body.html
new file mode 100644
index 00000000..ccae0fe3
--- /dev/null
+++ b/templates/partials/body.html
@@ -0,0 +1,10 @@
+<div id="content">
+    {% include 'partials/set_lang.html' %}
+    {% include 'partials/archdev-navbar.html' %}
+
+    {% block pageContent %}
+    <!-- Content block to be defined by extender. -->
+    {% endblock %}
+
+    {% include 'partials/footer.html' %}
+</div>
diff --git a/templates/partials/footer.html b/templates/partials/footer.html
new file mode 100644
index 00000000..0ac4d089
--- /dev/null
+++ b/templates/partials/footer.html
@@ -0,0 +1,5 @@
+<div id="footer">
+    <p>aurweb <a href="https://git.archlinux.org/aurweb.git/log/?h={{ config.AURWEB_VERSION }}">{{ config.AURWEB_VERSION }}</a></p>
+    <p>Copyright &copy; 2004-{{ now.strftime("%Y") }} aurweb Development Team.</p>
+    <p>{% trans %}AUR packages are user produced content. Any use of the provided files is at your own risk.{% endtrans %}</p>
+</div>
diff --git a/templates/partials/head.html b/templates/partials/head.html
new file mode 100644
index 00000000..0351fd6e
--- /dev/null
+++ b/templates/partials/head.html
@@ -0,0 +1,16 @@
+<head>
+    {% include 'partials/meta.html' %}
+
+    <!-- CSS -->
+    <link rel="stylesheet" href="/static/css/archweb.css">
+    <link rel="stylesheet" href="/static/css/aurweb.css">
+
+    <!-- Resources -->
+    <link rel="shortcut icon" href="/static/images/favicon.ico">
+
+    <!-- Alternate resources -->
+    <link rel="alternate" type="application/rss+xml"
+          title="Newest Packages RSS" href="/rss/">
+
+    <title>AUR ({{ language }}) - {{ title | tr }}</title>
+</head>
diff --git a/templates/partials/layout.html b/templates/partials/layout.html
new file mode 100644
index 00000000..d30208a9
--- /dev/null
+++ b/templates/partials/layout.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="{{ language }}">
+    {% include 'partials/head.html' %}
+
+    <body>
+        {% include 'partials/navbar.html' %}
+        {% extends 'partials/body.html' %}
+        {% include 'partials/typeahead.html' %}
+    </body>
+</html>
diff --git a/templates/partials/meta.html b/templates/partials/meta.html
new file mode 100644
index 00000000..727100b9
--- /dev/null
+++ b/templates/partials/meta.html
@@ -0,0 +1 @@
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
diff --git a/templates/partials/navbar.html b/templates/partials/navbar.html
new file mode 100644
index 00000000..199b2067
--- /dev/null
+++ b/templates/partials/navbar.html
@@ -0,0 +1,19 @@
+<div id="archnavbar" class="anb-aur">
+    <div id="archnavbarlogo">
+        <h1>
+            <a href="/" title="Return to the main page">{% trans %}Arch Linux User Repository{% endtrans %}</a>
+        </h1>
+    </div>
+    <div id="archnavbarmenu">
+        <ul id="archnavbarlist">
+            <li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">{% trans %}Home{% endtrans %}</a></li>
+            <li id="anb-packages"><a href="https://www.archlinux.org/packages/" title="Arch Package Database">{% trans %}Packages{% endtrans %}</a></li>
+            <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">{% trans %}Forums{% endtrans %}</a></li>
+            <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">{% trans %}Wiki{% endtrans %}</a></li>
+            <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">{% trans %}Bugs{% endtrans %}</a></li>
+            <li id="anb-security"><a href="https://security.archlinux.org/" title="Arch Linux Security Tracker">{% trans %}Security{% endtrans %}</a></li>
+            <li id="anb-aur"><a href="/" title="Arch Linux User Repository">AUR</a></li>
+            <li id="anb-download"><a href="https://www.archlinux.org/download/" title="Get Arch Linux">{% trans %}Download{% endtrans %}</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/templates/partials/set_lang.html b/templates/partials/set_lang.html
new file mode 100644
index 00000000..e9590050
--- /dev/null
+++ b/templates/partials/set_lang.html
@@ -0,0 +1,28 @@
+<div id="lang_sub">
+    <form method="post" action="/language">
+        <fieldset>
+            <div>
+                <select id="id_setlang" name="set_lang">
+                    {% for domain, display in languages.items() %}
+                    <option
+                        value="{{ domain }}"
+                        {% if language == domain %}
+                        selected="selected"
+                        {% endif %}
+                    >
+                        {{ display }}
+                    </option>
+                    {% endfor %}
+                </select>
+
+                <!-- Pass our current url path as next. -->
+                <input type="hidden" name="next" value="{{ request.url.path }}">
+
+                <!-- Pass query_params over to /language via POST. -->
+                <input type="hidden" name="q" value="{{ request.query_params }}">
+
+                <input type="submit" value="Go">
+            </div>
+        </fieldset>
+    </form>
+</div>
diff --git a/templates/partials/typeahead.html b/templates/partials/typeahead.html
new file mode 100644
index 00000000..d943dbc4
--- /dev/null
+++ b/templates/partials/typeahead.html
@@ -0,0 +1,30 @@
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
+<script type="text/javascript" src="/static/js/bootstrap-typeahead.min.js"></script>
+<script type="text/javascript">
+    $(document).ready(function() {
+        $('#pkgsearch-field').typeahead({
+            source: function(query, callback) {
+                $.getJSON('/rpc', {type: "suggest", arg: query}, function(data) {
+                        callback(data);
+                    });
+                },
+                matcher: function(item) { return true; },
+                sorter: function(items) { return items; },
+                menu: '<ul class="pkgsearch-typeahead"></ul>',
+                items: 20,
+                updater: function(item) {
+                document.location = '/packages/' + item;
+                return item;
+            }
+        }).attr('autocomplete', 'off');
+
+        $('#pkgsearch-field').keydown(function(e) {
+            if (e.keyCode == 13) {
+                var selectedItem = $('ul.pkgsearch-typeahead li.active');
+                if (selectedItem.length == 0) {
+                        $('#pkgsearch-form').submit();
+                }
+            }
+        });
+    });
+</script>
diff --git a/test/test_routes.py b/test/test_routes.py
new file mode 100644
index 00000000..46ba39f5
--- /dev/null
+++ b/test/test_routes.py
@@ -0,0 +1,69 @@
+import urllib.parse
+
+from http import HTTPStatus
+
+import pytest
+
+from fastapi.testclient import TestClient
+
+from aurweb.asgi import app
+from aurweb.testing import setup_test_db
+
+client = TestClient(app)
+
+
+@pytest.fixture
+def setup():
+    setup_test_db("Users", "Session")
+
+
+def test_index():
+    """ Test the index route at '/'. """
+    # Use `with` to trigger FastAPI app events.
+    with client as req:
+        response = req.get("/")
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_favicon():
+    """ Test the favicon route at '/favicon.ico'. """
+    response1 = client.get("/static/images/favicon.ico")
+    response2 = client.get("/favicon.ico")
+    assert response1.status_code == int(HTTPStatus.OK)
+    assert response1.content == response2.content
+
+
+def test_language():
+    """ Test the language post route at '/language'. """
+    post_data = {
+        "set_lang": "de",
+        "next": "/"
+    }
+    with client as req:
+        response = req.post("/language", data=post_data)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_language_invalid_next():
+    """ Test an invalid next route at '/language'. """
+    post_data = {
+        "set_lang": "de",
+        "next": "/BLAHBLAHFAKE"
+    }
+    with client as req:
+        response = req.post("/language", data=post_data)
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+def test_language_query_params():
+    """ Test the language post route with query params. """
+    next = urllib.parse.quote_plus("/")
+    post_data = {
+        "set_lang": "de",
+        "next": "/",
+        "q": f"next={next}"
+    }
+    q = post_data.get("q")
+    with client as req:
+        response = req.post("/language", data=post_data)
+        assert response.headers.get("location") == f"/?{q}"
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)

From 7c65604dad8d9c68bee59129b03af05d26db1582 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Mar 2021 15:20:19 -0700
Subject: [PATCH 079/844] move off env.py's active code to __name__ ==
 "__main__"

* Moved migrations/env.py's logging initialization and migration execution
  into a `__name__ == "__main__"` stanza so it doesn't immediately happen
  when imported by another module.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 migrations/env.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/migrations/env.py b/migrations/env.py
index c2ff58c1..23759123 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -11,10 +11,6 @@ import aurweb.schema
 # access to the values within the .ini file in use.
 config = context.config
 
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
-logging.config.fileConfig(config.config_file_name)
-
 # model MetaData for autogenerating migrations
 target_metadata = aurweb.schema.metadata
 
@@ -68,7 +64,12 @@ def run_migrations_online():
             context.run_migrations()
 
 
-if context.is_offline_mode():
-    run_migrations_offline()
-else:
-    run_migrations_online()
+if __name__ == "__main__":
+    # Interpret the config file for Python logging.
+    # This line sets up loggers basically.
+    logging.config.fileConfig(config.config_file_name)
+
+    if context.is_offline_mode():
+        run_migrations_offline()
+    else:
+        run_migrations_online()

From 4238a9fc6855242121402b392581ba5b695e2f90 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Mar 2021 15:20:23 -0700
Subject: [PATCH 080/844] add aurweb.db.session

+ Added Session class and global session object to aurweb.db,
  these are sessions created by sqlalchemy ORM's sessionmaker
  and will allow us to use declarative/imperative models.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py      |  36 +++++----
 aurweb/config.py    |   7 ++
 aurweb/db.py        |  33 ++++-----
 test/test_asgi.py   |  29 ++++++++
 test/test_config.py |  13 ++++
 test/test_db.py     | 174 ++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 260 insertions(+), 32 deletions(-)
 create mode 100644 test/test_asgi.py
 create mode 100644 test/test_config.py
 create mode 100644 test/test_db.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 00d7c595..b6e15582 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -7,30 +7,36 @@ from starlette.middleware.sessions import SessionMiddleware
 
 import aurweb.config
 
+from aurweb.db import get_engine
 from aurweb.routers import html, sso
 
 routes = set()
 
 # Setup the FastAPI app.
 app = FastAPI()
-app.mount("/static/css",
-          StaticFiles(directory="web/html/css"),
-          name="static_css")
-app.mount("/static/js",
-          StaticFiles(directory="web/html/js"),
-          name="static_js")
-app.mount("/static/images",
-          StaticFiles(directory="web/html/images"),
-          name="static_images")
 
-session_secret = aurweb.config.get("fastapi", "session_secret")
-if not session_secret:
-    raise Exception("[fastapi] session_secret must not be empty")
 
-app.add_middleware(SessionMiddleware, secret_key=session_secret)
+@app.on_event("startup")
+async def app_startup():
+    session_secret = aurweb.config.get("fastapi", "session_secret")
+    if not session_secret:
+        raise Exception("[fastapi] session_secret must not be empty")
 
-app.include_router(sso.router)
-app.include_router(html.router)
+    app.mount("/static/css",
+              StaticFiles(directory="web/html/css"),
+              name="static_css")
+    app.mount("/static/js",
+              StaticFiles(directory="web/html/js"),
+              name="static_js")
+    app.mount("/static/images",
+              StaticFiles(directory="web/html/images"),
+              name="static_images")
+
+    app.add_middleware(SessionMiddleware, secret_key=session_secret)
+    app.include_router(sso.router)
+    app.include_router(html.router)
+
+    get_engine()
 
 # NOTE: Always keep this dictionary updated with all routes
 # that the application contains. We use this to check for
diff --git a/aurweb/config.py b/aurweb/config.py
index 020c3b80..49a2765a 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -25,6 +25,13 @@ def _get_parser():
     return _parser
 
 
+def rehash():
+    """ Globally rehash the configuration parser. """
+    global _parser
+    _parser = None
+    _get_parser()
+
+
 def get(section, option):
     return _get_parser().get(section, option)
 
diff --git a/aurweb/db.py b/aurweb/db.py
index 04b40f43..7993dfdb 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -1,19 +1,15 @@
 import math
 
-try:
-    import mysql.connector
-except ImportError:
-    pass
-
-try:
-    import sqlite3
-except ImportError:
-    pass
-
 import aurweb.config
 
 engine = None  # See get_engine
 
+# ORM Session class.
+Session = None
+
+# Global ORM Session object.
+session = None
+
 
 def get_sqlalchemy_url():
     """
@@ -49,14 +45,15 @@ def get_engine():
     `engine` global variable for the next calls.
     """
     from sqlalchemy import create_engine
-    global engine
+    from sqlalchemy.orm import sessionmaker
+
+    global engine, session, Session
+
     if engine is None:
-        connect_args = dict()
-        if aurweb.config.get("database", "backend") == "sqlite":
-            # check_same_thread is for a SQLite technicality
-            # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
-            connect_args["check_same_thread"] = False
-        engine = create_engine(get_sqlalchemy_url(), connect_args=connect_args)
+        engine = create_engine(get_sqlalchemy_url(),
+                               # check_same_thread is for a SQLite technicality
+                               # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
+                               connect_args={"check_same_thread": False})
         Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
         session = Session()
 
@@ -82,6 +79,7 @@ class Connection:
         aur_db_backend = aurweb.config.get('database', 'backend')
 
         if aur_db_backend == 'mysql':
+            import mysql.connector
             aur_db_host = aurweb.config.get('database', 'host')
             aur_db_name = aurweb.config.get('database', 'name')
             aur_db_user = aurweb.config.get('database', 'user')
@@ -95,6 +93,7 @@ class Connection:
                                                  buffered=True)
             self._paramstyle = mysql.connector.paramstyle
         elif aur_db_backend == 'sqlite':
+            import sqlite3
             aur_db_name = aurweb.config.get('database', 'name')
             self._conn = sqlite3.connect(aur_db_name)
             self._conn.create_function("POWER", 2, math.pow)
diff --git a/test/test_asgi.py b/test/test_asgi.py
new file mode 100644
index 00000000..79b34daf
--- /dev/null
+++ b/test/test_asgi.py
@@ -0,0 +1,29 @@
+import http
+import os
+
+from unittest import mock
+
+import pytest
+
+from fastapi import HTTPException
+
+import aurweb.asgi
+import aurweb.config
+
+
+@pytest.mark.asyncio
+async def test_asgi_startup_exception(monkeypatch):
+    with mock.patch.dict(os.environ, {"AUR_CONFIG": "conf/config.defaults"}):
+        aurweb.config.rehash()
+        with pytest.raises(Exception):
+            await aurweb.asgi.app_startup()
+    aurweb.config.rehash()
+
+
+@pytest.mark.asyncio
+async def test_asgi_http_exception_handler():
+    exc = HTTPException(status_code=422, detail="EXCEPTION!")
+    phrase = http.HTTPStatus(exc.status_code).phrase
+    response = await aurweb.asgi.http_exception_handler(None, exc)
+    assert response.body.decode() == \
+        f"<h1>{exc.status_code} {phrase}</h1><p>{exc.detail}</p>"
diff --git a/test/test_config.py b/test/test_config.py
new file mode 100644
index 00000000..4f10b60d
--- /dev/null
+++ b/test/test_config.py
@@ -0,0 +1,13 @@
+from aurweb import config
+
+
+def test_get():
+    assert config.get("options", "disable_http_login") == "0"
+
+
+def test_getboolean():
+    assert not config.getboolean("options", "disable_http_login")
+
+
+def test_getint():
+    assert config.getint("options", "disable_http_login") == 0
diff --git a/test/test_db.py b/test/test_db.py
new file mode 100644
index 00000000..0a134541
--- /dev/null
+++ b/test/test_db.py
@@ -0,0 +1,174 @@
+import os
+import re
+import sqlite3
+import tempfile
+
+from unittest import mock
+
+import mysql.connector
+import pytest
+
+import aurweb.config
+
+from aurweb import db
+from aurweb.testing import setup_test_db
+
+
+class DBCursor:
+    """ A fake database cursor object used in tests. """
+    items = []
+
+    def execute(self, *args, **kwargs):
+        self.items = list(args)
+        return self
+
+    def fetchall(self):
+        return self.items
+
+
+class DBConnection:
+    """ A fake database connection object used in tests. """
+    @staticmethod
+    def cursor():
+        return DBCursor()
+
+    @staticmethod
+    def create_function(name, num_args, func):
+        pass
+
+
+@pytest.fixture(autouse=True)
+def setup_db():
+    setup_test_db()
+
+
+def test_sqlalchemy_sqlite_url():
+    with mock.patch.dict(os.environ, {"AUR_CONFIG": "conf/config.dev"}):
+        aurweb.config.rehash()
+        assert db.get_sqlalchemy_url()
+    aurweb.config.rehash()
+
+
+def test_sqlalchemy_mysql_url():
+    with mock.patch.dict(os.environ, {"AUR_CONFIG": "conf/config.defaults"}):
+        aurweb.config.rehash()
+        assert db.get_sqlalchemy_url()
+    aurweb.config.rehash()
+
+
+def make_temp_config(backend):
+    if not os.path.isdir("/tmp"):
+        os.mkdir("/tmp")
+    tmpdir = tempfile.mkdtemp()
+    tmp = os.path.join(tmpdir, "config.tmp")
+    with open("conf/config") as f:
+        config = re.sub(r'backend = sqlite', f'backend = {backend}', f.read())
+        with open(tmp, "w") as o:
+            o.write(config)
+    return (tmpdir, tmp)
+
+
+def test_sqlalchemy_unknown_backend():
+    tmpdir, tmp = make_temp_config("blah")
+
+    with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+        aurweb.config.rehash()
+        with pytest.raises(ValueError):
+            db.get_sqlalchemy_url()
+    aurweb.config.rehash()
+
+    os.remove(tmp)
+    os.removedirs(tmpdir)
+
+
+def test_db_connects_without_fail():
+    db.connect()
+    assert db.engine is not None
+
+
+def test_connection_class_without_fail():
+    conn = db.Connection()
+
+    cur = conn.execute(
+        "SELECT AccountType FROM AccountTypes WHERE ID = ?", (1,))
+    account_type = cur.fetchone()[0]
+
+    assert account_type == "User"
+
+
+def test_connection_class_unsupported_backend():
+    tmpdir, tmp = make_temp_config("blah")
+
+    with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+        aurweb.config.rehash()
+        with pytest.raises(ValueError):
+            db.Connection()
+    aurweb.config.rehash()
+
+    os.remove(tmp)
+    os.removedirs(tmpdir)
+
+
+@mock.patch("mysql.connector.connect", mock.MagicMock(return_value=True))
+@mock.patch.object(mysql.connector, "paramstyle", "qmark")
+def test_connection_mysql():
+    tmpdir, tmp = make_temp_config("mysql")
+    with mock.patch.dict(os.environ, {
+        "AUR_CONFIG": tmp,
+        "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
+    }):
+        aurweb.config.rehash()
+        db.Connection()
+    aurweb.config.rehash()
+
+    os.remove(tmp)
+    os.removedirs(tmpdir)
+
+
+@mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
+@mock.patch.object(sqlite3, "paramstyle", "qmark")
+def test_connection_sqlite():
+    db.Connection()
+
+
+@mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
+@mock.patch.object(sqlite3, "paramstyle", "format")
+def test_connection_execute_paramstyle_format():
+    conn = db.Connection()
+
+    # First, test ? to %s format replacement.
+    account_types = conn\
+        .execute("SELECT * FROM AccountTypes WHERE AccountType = ?", ["User"])\
+        .fetchall()
+    assert account_types == \
+        ["SELECT * FROM AccountTypes WHERE AccountType = %s", ["User"]]
+
+    # Test other format replacement.
+    account_types = conn\
+        .execute("SELECT * FROM AccountTypes WHERE AccountType = %", ["User"])\
+        .fetchall()
+    assert account_types == \
+        ["SELECT * FROM AccountTypes WHERE AccountType = %%", ["User"]]
+
+
+@mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
+@mock.patch.object(sqlite3, "paramstyle", "qmark")
+def test_connection_execute_paramstyle_qmark():
+    conn = db.Connection()
+    # We don't modify anything when using qmark, so test equality.
+    account_types = conn\
+        .execute("SELECT * FROM AccountTypes WHERE AccountType = ?", ["User"])\
+        .fetchall()
+    assert account_types == \
+        ["SELECT * FROM AccountTypes WHERE AccountType = ?", ["User"]]
+
+
+@mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
+@mock.patch.object(sqlite3, "paramstyle", "unsupported")
+def test_connection_execute_paramstyle_unsupported():
+    conn = db.Connection()
+    with pytest.raises(ValueError, match="unsupported paramstyle"):
+        conn.execute(
+            "SELECT * FROM AccountTypes WHERE AccountType = ?",
+            ["User"]
+        ).fetchall()

From 32f289309579554d85a9971be59ccc24c973840c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Mar 2021 15:20:26 -0700
Subject: [PATCH 081/844] add aurweb.models.account_type.AccountType

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/__init__.py     |  0
 aurweb/models/account_type.py | 20 ++++++++++++++++++++
 test/test_account_type.py     | 28 ++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 aurweb/models/__init__.py
 create mode 100644 aurweb/models/account_type.py
 create mode 100644 test/test_account_type.py

diff --git a/aurweb/models/__init__.py b/aurweb/models/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/aurweb/models/account_type.py b/aurweb/models/account_type.py
new file mode 100644
index 00000000..44225e35
--- /dev/null
+++ b/aurweb/models/account_type.py
@@ -0,0 +1,20 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import AccountTypes
+
+
+class AccountType:
+    """ An ORM model of a single AccountTypes record. """
+
+    def __init__(self, **kwargs):
+        self.AccountType = kwargs.pop("AccountType")
+
+    def __str__(self):
+        return str(self.AccountType)
+
+    def __repr__(self):
+        return "<AccountType(ID='%s', AccountType='%s')>" % (
+            self.ID, str(self))
+
+
+mapper(AccountType, AccountTypes, confirm_deleted_rows=False)
diff --git a/test/test_account_type.py b/test/test_account_type.py
new file mode 100644
index 00000000..b6a12363
--- /dev/null
+++ b/test/test_account_type.py
@@ -0,0 +1,28 @@
+import pytest
+
+from aurweb.models.account_type import AccountType
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db()
+
+
+def test_account_type():
+    """ Test creating an AccountType, and reading its columns. """
+    from aurweb.db import session
+    account_type = AccountType(AccountType="TestUser")
+    session.add(account_type)
+    session.commit()
+
+    # Make sure it got created and was given an ID.
+    assert bool(account_type.ID)
+
+    # Next, test our string functions.
+    assert str(account_type) == "TestUser"
+    assert repr(account_type) == \
+        "<AccountType(ID='%s', AccountType='TestUser')>" % (
+        account_type.ID)
+
+    session.delete(account_type)

From e860d828b6f9babaa5829db92951087de3774b78 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Mar 2021 15:20:28 -0700
Subject: [PATCH 082/844] add aurweb.testing, a module with testing utilities

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 aurweb/testing.py

diff --git a/aurweb/testing.py b/aurweb/testing.py
new file mode 100644
index 00000000..7516d918
--- /dev/null
+++ b/aurweb/testing.py
@@ -0,0 +1,30 @@
+from aurweb.db import get_engine
+
+
+def setup_test_db(*args):
+    """ This function is to be used to setup a test database before
+    using it. It takes a variable number of table strings, and for
+    each table in that set of table strings, it deletes all records.
+
+    The primary goal of this method is to configure empty tables
+    that tests can use from scratch. This means that tests using
+    this function should make sure they do not depend on external
+    records and keep their logic self-contained.
+
+    Generally used inside of pytest fixtures, this function
+    can be used anywhere, but keep in mind its functionality when
+    doing so.
+
+    Examples:
+        setup_test_db("Users", "Sessions")
+
+        test_tables = ["Users", "Sessions"];
+        setup_test_db(*test_tables)
+    """
+    engine = get_engine()
+    conn = engine.connect()
+
+    tables = list(args)
+    for table in tables:
+        conn.execute(f"DELETE FROM {table}")
+    conn.close()

From 8a47afd2ea8ce56b17aba95503d7c97f22023dff Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Mar 2021 15:20:32 -0700
Subject: [PATCH 083/844] add aurweb.models.user.User

+ Added aurweb.models.user.User class. This is the first example
  of an sqlalchemy ORM model. We can search for users via for example:
  `session.query(User).filter(User.ID==1).first()`, where `session` is
  a configured `aurweb.db.session` object.
+ Along with the User class, defined the AccountType class.
  Each User maintains a relationship to its AccountType via User.AccountType.
+ Added AccountType.users backref.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py | 43 +++++++++++++++++++++++++++++++++++
 test/test_user.py     | 52 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 aurweb/models/user.py
 create mode 100644 test/test_user.py

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
new file mode 100644
index 00000000..ba91c439
--- /dev/null
+++ b/aurweb/models/user.py
@@ -0,0 +1,43 @@
+from sqlalchemy.orm import backref, mapper, relationship
+
+from aurweb.models.account_type import AccountType
+from aurweb.schema import Users
+
+
+class User:
+    """ An ORM model of a single Users record. """
+
+    def __init__(self, **kwargs):
+        self.AccountTypeID = kwargs.get("AccountTypeID")
+
+        account_type = kwargs.get("AccountType")
+        if account_type:
+            self.AccountType = account_type
+
+        self.Username = kwargs.get("Username")
+        self.Email = kwargs.get("Email")
+        self.BackupEmail = kwargs.get("BackupEmail")
+        self.Passwd = kwargs.get("Passwd")
+        self.Salt = kwargs.get("Salt")
+        self.RealName = kwargs.get("RealName")
+        self.LangPreference = kwargs.get("LangPreference")
+        self.Timezone = kwargs.get("Timezone")
+        self.Homepage = kwargs.get("Homepage")
+        self.IRCNick = kwargs.get("IRCNick")
+        self.PGPKey = kwargs.get("PGPKey")
+        self.RegistrationTS = kwargs.get("RegistrationTS")
+        self.CommentNotify = kwargs.get("CommentNotify")
+        self.UpdateNotify = kwargs.get("UpdateNotify")
+        self.OwnershipNotify = kwargs.get("OwnershipNotify")
+        self.SSOAccountID = kwargs.get("SSOAccountID")
+
+    def __repr__(self):
+        return "<User(ID='%s', AccountType='%s', Username='%s')>" % (
+            self.ID, str(self.AccountType), self.Username)
+
+
+# Map schema.Users to User and give it some relationships.
+mapper(User, Users, properties={
+    "AccountType": relationship(AccountType,
+                                backref=backref("users", lazy="dynamic"))
+})
diff --git a/test/test_user.py b/test/test_user.py
new file mode 100644
index 00000000..8ac9b00b
--- /dev/null
+++ b/test/test_user.py
@@ -0,0 +1,52 @@
+import pytest
+
+from aurweb.models.account_type import AccountType
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db("Users")
+
+
+def test_user():
+    """ Test creating a user and reading its columns. """
+    from aurweb.db import session
+
+    # First, grab our target AccountType.
+    account_type = session.query(AccountType).filter(
+        AccountType.AccountType == "User").first()
+
+    user = User(
+        AccountType=account_type,
+        RealName="Test User", Username="test",
+        Email="test@example.org", Passwd="abcd",
+        IRCNick="tester",
+        Salt="efgh", ResetKey="blahblah")
+    session.add(user)
+    session.commit()
+
+    assert user in account_type.users
+
+    # Make sure the user was created and given an ID.
+    assert bool(user.ID)
+
+    # Search for the user via query API.
+    result = session.query(User).filter(User.ID == user.ID).first()
+
+    # Compare the result and our original user.
+    assert result.ID == user.ID
+    assert result.AccountType.ID == user.AccountType.ID
+    assert result.Username == user.Username
+    assert result.Email == user.Email
+
+    # Ensure we've got the correct account type.
+    assert user.AccountType.ID == account_type.ID
+    assert user.AccountType.AccountType == account_type.AccountType
+
+    # Test out user string functions.
+    assert repr(user) == f"<User(ID='{user.ID}', " + \
+        "AccountType='User', Username='test')>"
+
+    session.delete(user)

From 02311eab7604d29de7b70721cb1e10329178cfc7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Mar 2021 15:20:34 -0700
Subject: [PATCH 084/844] add test_initdb.py

IMPORTANT: This test completely wipes out the database it's using.
Make sure you've got AUR_CONFIG set to a test database configuration!

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_initdb.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 test/test_initdb.py

diff --git a/test/test_initdb.py b/test/test_initdb.py
new file mode 100644
index 00000000..ff089b63
--- /dev/null
+++ b/test/test_initdb.py
@@ -0,0 +1,27 @@
+import pytest
+
+import aurweb.config
+import aurweb.db
+import aurweb.initdb
+
+from aurweb.models.account_type import AccountType
+from aurweb.schema import metadata
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db()
+
+    tables = metadata.tables.keys()
+    for table in tables:
+        aurweb.db.session.execute(f"DROP TABLE IF EXISTS {table}")
+
+
+def test_run():
+    class Args:
+        use_alembic = True
+        verbose = False
+    aurweb.initdb.run(Args())
+    assert aurweb.db.session.query(AccountType).filter(
+        AccountType.AccountType == "User").first() is not None

From 81856f3b646ad2bf27008a97b1604a5325eea03c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 13 May 2021 21:05:34 -0700
Subject: [PATCH 085/844] Fix incorrect construction of MySQL SQLAlchemy URL

Signed-off-by: Kevin Morris <kevr@0cost.org>

From 82f3871a83bf234983f8d63d2f1861d876a52fb1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 13 May 2021 21:11:57 -0700
Subject: [PATCH 086/844] Support SQLAlchemy 1.4 URL.create recommendation

This fixes a deprecating warning when using SQLAlchemy 1.4.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .coveragerc  |  1 +
 aurweb/db.py | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 9dcfca18..69c153ce 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -6,3 +6,4 @@ include = aurweb/*
 fail_under = 85
 exclude_lines =
     if __name__ == .__main__.:
+    pragma: no cover
diff --git a/aurweb/db.py b/aurweb/db.py
index 7993dfdb..49e0abd2 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -16,9 +16,18 @@ def get_sqlalchemy_url():
     Build an SQLAlchemy for use with create_engine based on the aurweb configuration.
     """
     import sqlalchemy
+
+    constructor = sqlalchemy.engine.url.URL
+
+    parts = sqlalchemy.__version__.split('.')
+    major = int(parts[0])
+    minor = int(parts[1])
+    if major == 1 and minor >= 4:  # pragma: no cover
+        constructor = sqlalchemy.engine.url.URL.create
+
     aur_db_backend = aurweb.config.get('database', 'backend')
     if aur_db_backend == 'mysql':
-        return sqlalchemy.engine.url.URL(
+        return constructor(
             'mysql+mysqlconnector',
             username=aurweb.config.get('database', 'user'),
             password=aurweb.config.get('database', 'password'),
@@ -29,7 +38,7 @@ def get_sqlalchemy_url():
             },
         )
     elif aur_db_backend == 'sqlite':
-        return sqlalchemy.engine.url.URL(
+        return constructor(
             'sqlite',
             database=aurweb.config.get('database', 'name'),
         )

From cdf75ced9abe855753e33b48cc869c4ac64506ba Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus@tojoma.se>
Date: Thu, 13 May 2021 00:08:15 +0200
Subject: [PATCH 087/844] Adding error 404  catcher

---
 aurweb/routers/errors.py  | 14 ++++++++++++++
 templates/errors/404.html |  8 ++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 aurweb/routers/errors.py
 create mode 100644 templates/errors/404.html

diff --git a/aurweb/routers/errors.py b/aurweb/routers/errors.py
new file mode 100644
index 00000000..5d4ca4ce
--- /dev/null
+++ b/aurweb/routers/errors.py
@@ -0,0 +1,14 @@
+from aurweb.templates import make_context, render_template
+from aurweb import l10n
+
+
+async def not_found(request, exc):
+    _ = l10n.get_translator_for_request(request)
+    context = make_context(request, f"404 - {_('Page Not Found')}")
+    return render_template("errors/404.html", context)
+
+
+# Maps HTTP errors to functions
+exceptions = {
+    404: not_found,
+}
diff --git a/templates/errors/404.html b/templates/errors/404.html
new file mode 100644
index 00000000..0afdd2fa
--- /dev/null
+++ b/templates/errors/404.html
@@ -0,0 +1,8 @@
+{% extends 'partials/layout.html' %}
+
+{% block pageContent %}
+  <div class="box 404">
+    <h2>404 - {% trans %}Page Not Found{% endtrans %}</h2>
+    <p>{% trans %}Sorry, the page you've requested does not exist.{% endtrans %}</p>
+  </div>
+  {% endblock %}

From f6744d3e39fd044f797f9a702d8c9883fe40c527 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus@tojoma.se>
Date: Thu, 13 May 2021 00:08:15 +0200
Subject: [PATCH 088/844] Adding error 503 catcher

---
 aurweb/asgi.py            | 4 ++--
 aurweb/routers/errors.py  | 6 ++++++
 templates/errors/503.html | 8 ++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 templates/errors/503.html

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index b6e15582..c03a00f7 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -8,12 +8,12 @@ from starlette.middleware.sessions import SessionMiddleware
 import aurweb.config
 
 from aurweb.db import get_engine
-from aurweb.routers import html, sso
+from aurweb.routers import html, sso, errors
 
 routes = set()
 
 # Setup the FastAPI app.
-app = FastAPI()
+app = FastAPI(exception_handlers=errors.exceptions)
 
 
 @app.on_event("startup")
diff --git a/aurweb/routers/errors.py b/aurweb/routers/errors.py
index 5d4ca4ce..3bdaeb9d 100644
--- a/aurweb/routers/errors.py
+++ b/aurweb/routers/errors.py
@@ -8,7 +8,13 @@ async def not_found(request, exc):
     return render_template("errors/404.html", context)
 
 
+async def service_unavailable(request, exc):
+    _ = l10n.get_translator_for_request(request)
+    context = make_context(request, "503 - {_('Service Unavailable')}")
+    return render_template("errors/503.html", context)
+
 # Maps HTTP errors to functions
 exceptions = {
     404: not_found,
+    503: service_unavailable
 }
diff --git a/templates/errors/503.html b/templates/errors/503.html
new file mode 100644
index 00000000..d31666a1
--- /dev/null
+++ b/templates/errors/503.html
@@ -0,0 +1,8 @@
+{% extends 'partials/layout.html' %}
+
+{% block pageContent %}
+  <div class="box 404">
+    <h2>503 - {% trans %}Service Unavailable{% endtrans %}</h2>
+    <p>{% trans %}Don't panic! This site is down due to maintenance. We will be back soon.{% endtrans %}</p>
+  </div>
+{% endblock %}

From 1d5827007f205c8972d07eee138372e8f9303684 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus@tojoma.se>
Date: Thu, 13 May 2021 22:02:50 +0200
Subject: [PATCH 089/844] Adding route tests

Removing status code from 404 title

Removing status code from 503 title

Adding id to 503 error box

Indatation fix
---
 aurweb/routers/errors.py  | 11 ++++-------
 aurweb/routers/html.py    |  8 +++++++-
 templates/errors/404.html |  4 ++--
 templates/errors/503.html |  2 +-
 test/test_routes.py       |  7 +++++++
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/aurweb/routers/errors.py b/aurweb/routers/errors.py
index 3bdaeb9d..111d802a 100644
--- a/aurweb/routers/errors.py
+++ b/aurweb/routers/errors.py
@@ -1,17 +1,14 @@
 from aurweb.templates import make_context, render_template
-from aurweb import l10n
 
 
 async def not_found(request, exc):
-    _ = l10n.get_translator_for_request(request)
-    context = make_context(request, f"404 - {_('Page Not Found')}")
-    return render_template("errors/404.html", context)
+    context = make_context(request, "Page Not Found")
+    return render_template("errors/404.html", context, 404)
 
 
 async def service_unavailable(request, exc):
-    _ = l10n.get_translator_for_request(request)
-    context = make_context(request, "503 - {_('Service Unavailable')}")
-    return render_template("errors/503.html", context)
+    context = make_context(request, "Service Unavailable")
+    return render_template("errors/503.html", context, 503)
 
 # Maps HTTP errors to functions
 exceptions = {
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index ae08c764..50b62450 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -4,7 +4,7 @@ own modules and imported here. """
 from http import HTTPStatus
 from urllib.parse import unquote
 
-from fastapi import APIRouter, Form, Request
+from fastapi import APIRouter, Form, Request, HTTPException
 from fastapi.responses import HTMLResponse, RedirectResponse
 
 from aurweb.templates import make_context, render_template
@@ -48,3 +48,9 @@ async def index(request: Request):
     """ Homepage route. """
     context = make_context(request, "Home")
     return render_template("index.html", context)
+
+
+# A route that returns a error 503. For testing purposes.
+@router.get("/raisefivethree", response_class=HTMLResponse)
+async def raise_service_unavailable(request: Request):
+    raise HTTPException(status_code=503)
diff --git a/templates/errors/404.html b/templates/errors/404.html
index 0afdd2fa..4926aff6 100644
--- a/templates/errors/404.html
+++ b/templates/errors/404.html
@@ -1,8 +1,8 @@
 {% extends 'partials/layout.html' %}
 
 {% block pageContent %}
-  <div class="box 404">
+  <div id="error-page" class="box 404">
     <h2>404 - {% trans %}Page Not Found{% endtrans %}</h2>
     <p>{% trans %}Sorry, the page you've requested does not exist.{% endtrans %}</p>
   </div>
-  {% endblock %}
+{% endblock %}
diff --git a/templates/errors/503.html b/templates/errors/503.html
index d31666a1..9a0ed56a 100644
--- a/templates/errors/503.html
+++ b/templates/errors/503.html
@@ -1,7 +1,7 @@
 {% extends 'partials/layout.html' %}
 
 {% block pageContent %}
-  <div class="box 404">
+  <div id="error-page" class="box 503">
     <h2>503 - {% trans %}Service Unavailable{% endtrans %}</h2>
     <p>{% trans %}Don't panic! This site is down due to maintenance. We will be back soon.{% endtrans %}</p>
   </div>
diff --git a/test/test_routes.py b/test/test_routes.py
index 46ba39f5..86221108 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -67,3 +67,10 @@ def test_language_query_params():
         response = req.post("/language", data=post_data)
         assert response.headers.get("location") == f"/?{q}"
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_error_messages():
+    response1 = client.get("/thisroutedoesnotexist")
+    response2 = client.get("/raisefivethree")
+    assert response1.status_code == int(HTTPStatus.NOT_FOUND)
+    assert response2.status_code == int(HTTPStatus.SERVICE_UNAVAILABLE)
\ No newline at end of file

From e0eb6b0e76311bc4e2df02e083edea28c42c178c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 16 May 2021 06:26:38 -0700
Subject: [PATCH 090/844] test_db: remove use of mkdtemp and os.removedirs

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_db.py | 52 +++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/test/test_db.py b/test/test_db.py
index 0a134541..f5902e4c 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -57,10 +57,8 @@ def test_sqlalchemy_mysql_url():
 
 
 def make_temp_config(backend):
-    if not os.path.isdir("/tmp"):
-        os.mkdir("/tmp")
-    tmpdir = tempfile.mkdtemp()
-    tmp = os.path.join(tmpdir, "config.tmp")
+    tmpdir = tempfile.TemporaryDirectory()
+    tmp = os.path.join(tmpdir.name, "config.tmp")
     with open("conf/config") as f:
         config = re.sub(r'backend = sqlite', f'backend = {backend}', f.read())
         with open(tmp, "w") as o:
@@ -69,16 +67,14 @@ def make_temp_config(backend):
 
 
 def test_sqlalchemy_unknown_backend():
-    tmpdir, tmp = make_temp_config("blah")
+    tmpctx, tmp = make_temp_config("blah")
 
-    with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+    with tmpctx:
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+            aurweb.config.rehash()
+            with pytest.raises(ValueError):
+                db.get_sqlalchemy_url()
         aurweb.config.rehash()
-        with pytest.raises(ValueError):
-            db.get_sqlalchemy_url()
-    aurweb.config.rehash()
-
-    os.remove(tmp)
-    os.removedirs(tmpdir)
 
 
 def test_db_connects_without_fail():
@@ -97,32 +93,28 @@ def test_connection_class_without_fail():
 
 
 def test_connection_class_unsupported_backend():
-    tmpdir, tmp = make_temp_config("blah")
+    tmpctx, tmp = make_temp_config("blah")
 
-    with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+    with tmpctx:
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+            aurweb.config.rehash()
+            with pytest.raises(ValueError):
+                db.Connection()
         aurweb.config.rehash()
-        with pytest.raises(ValueError):
-            db.Connection()
-    aurweb.config.rehash()
-
-    os.remove(tmp)
-    os.removedirs(tmpdir)
 
 
 @mock.patch("mysql.connector.connect", mock.MagicMock(return_value=True))
 @mock.patch.object(mysql.connector, "paramstyle", "qmark")
 def test_connection_mysql():
-    tmpdir, tmp = make_temp_config("mysql")
-    with mock.patch.dict(os.environ, {
-        "AUR_CONFIG": tmp,
-        "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
-    }):
+    tmpctx, tmp = make_temp_config("mysql")
+    with tmpctx:
+        with mock.patch.dict(os.environ, {
+            "AUR_CONFIG": tmp,
+            "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
+        }):
+            aurweb.config.rehash()
+            db.Connection()
         aurweb.config.rehash()
-        db.Connection()
-    aurweb.config.rehash()
-
-    os.remove(tmp)
-    os.removedirs(tmpdir)
 
 
 @mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))

From 3f1f03e03c904f1c8202a692bc18ca153c529f50 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 16 May 2021 01:40:19 -0700
Subject: [PATCH 091/844] aurweb.db: only pass check_same_thread with sqlite

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 49e0abd2..f5530bcf 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -59,10 +59,12 @@ def get_engine():
     global engine, session, Session
 
     if engine is None:
-        engine = create_engine(get_sqlalchemy_url(),
-                               # check_same_thread is for a SQLite technicality
-                               # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
-                               connect_args={"check_same_thread": False})
+        connect_args = dict()
+        if aurweb.config.get("database", "backend") == "sqlite":
+            # check_same_thread is for a SQLite technicality
+            # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
+            connect_args["check_same_thread"] = False
+        engine = create_engine(get_sqlalchemy_url(), connect_args=connect_args)
         Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
         session = Session()
 

From 66189c4460d1516344b13ad6a381aca6a7a0786e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 May 2021 02:46:56 -0700
Subject: [PATCH 092/844] alembic: restore logging, fix pytest conflicts

In this case, when running pytests, we do not allow alembic to
configure loggers.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/initdb.py  |  1 +
 migrations/env.py | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/aurweb/initdb.py b/aurweb/initdb.py
index c8d0b2ae..5f55bfc9 100644
--- a/aurweb/initdb.py
+++ b/aurweb/initdb.py
@@ -40,6 +40,7 @@ def run(args):
     if args.use_alembic:
         alembic_config = alembic.config.Config('alembic.ini')
         alembic_config.get_main_option('script_location')
+        alembic_config.attributes["configure_logger"] = False
 
     engine = sqlalchemy.create_engine(aurweb.db.get_sqlalchemy_url(),
                                       echo=(args.verbose >= 1))
diff --git a/migrations/env.py b/migrations/env.py
index 23759123..dfe14804 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -20,6 +20,12 @@ target_metadata = aurweb.schema.metadata
 # ... etc.
 
 
+# If configure_logger is either True or not specified,
+# configure the logger via fileConfig.
+if config.attributes.get("configure_logger", True):
+    logging.config.fileConfig(config.config_file_name)
+
+
 def run_migrations_offline():
     """Run migrations in 'offline' mode.
 
@@ -64,12 +70,7 @@ def run_migrations_online():
             context.run_migrations()
 
 
-if __name__ == "__main__":
-    # Interpret the config file for Python logging.
-    # This line sets up loggers basically.
-    logging.config.fileConfig(config.config_file_name)
-
-    if context.is_offline_mode():
-        run_migrations_offline()
-    else:
-        run_migrations_online()
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

From 72f755817c012a5c38255175522f32a059f976c0 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 17 May 2021 19:12:05 +0100
Subject: [PATCH 093/844] Adds Alembic migration for DB/Tables conversion to
 utf8mb4

MySql defaults to `utf8` and case insensitive collation so migrate these to case sensitive and `utf8mb4`

Closes #21

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>

From 7b7c3abbe2dab35bf4a7bb67c7ab4121a0ee7566 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Tue, 18 May 2021 13:04:20 +0100
Subject: [PATCH 094/844] Conditionally apply SSOAccountId migration to support
 misaligned databases

Closes: #34

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>

From ac31f520ea25d31f675dd4e2ac236078418c2f69 Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Mon, 10 May 2021 22:34:19 +0200
Subject: [PATCH 095/844] Add coverage report for "Test Coverage
 Visualization"[1]

[1] https://docs.gitlab.com/ee/user/project/merge_requests/test_coverage_visualization.html
---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e287748..ca3055ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,3 +24,7 @@ test:
     - AUR_CONFIG=conf/config python -m aurweb.initdb
     - make -C test
     - coverage report --include='aurweb/*'
+    - coverage xml --include='aurweb/*'
+  artifacts:
+    reports:
+      cobertura: coverage.xml

From 64bc93926f87aa9a0a29b4f014af2374e527fc8a Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Tue, 18 May 2021 13:15:47 +0100
Subject: [PATCH 096/844] Add support for configuring database with port
 instead of socket

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
 .gitignore           |  1 +
 aurweb/config.py     |  4 ++++
 aurweb/db.py         | 11 ++++++++---
 conf/config.defaults |  1 +
 conf/config.dev      |  5 ++++-
 test/test_db.py      | 24 +++++++++++++++++-------
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 372fa105..35b571d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ fastapi_aw/
 .vim/
 .pylintrc
 .coverage
+.idea
diff --git a/aurweb/config.py b/aurweb/config.py
index 49a2765a..2a6cfc3e 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -32,6 +32,10 @@ def rehash():
     _get_parser()
 
 
+def get_with_fallback(section, option, fallback):
+    return _get_parser().get(section, option, fallback=fallback)
+
+
 def get(section, option):
     return _get_parser().get(section, option)
 
diff --git a/aurweb/db.py b/aurweb/db.py
index f5530bcf..491ce9e2 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -27,15 +27,20 @@ def get_sqlalchemy_url():
 
     aur_db_backend = aurweb.config.get('database', 'backend')
     if aur_db_backend == 'mysql':
+        if aurweb.config.get_with_fallback('database', 'port', fallback=None):
+            port = aurweb.config.get('database', 'port')
+            param_query = None
+        else:
+            port = None
+            param_query = {'unix_socket': aurweb.config.get('database', 'socket')}
         return constructor(
             'mysql+mysqlconnector',
             username=aurweb.config.get('database', 'user'),
             password=aurweb.config.get('database', 'password'),
             host=aurweb.config.get('database', 'host'),
             database=aurweb.config.get('database', 'name'),
-            query={
-                'unix_socket': aurweb.config.get('database', 'socket'),
-            },
+            port=port,
+            query=param_query
         )
     elif aur_db_backend == 'sqlite':
         return constructor(
diff --git a/conf/config.defaults b/conf/config.defaults
index 98e033b7..c05648d5 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -2,6 +2,7 @@
 backend = mysql
 host = localhost
 socket = /var/run/mysqld/mysqld.sock
+;port = 3306
 name = AUR
 user = aur
 password = aur
diff --git a/conf/config.dev b/conf/config.dev
index ccb01f4f..194a3bf8 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -9,11 +9,14 @@
 backend = sqlite
 name = YOUR_AUR_ROOT/aurweb.sqlite3
 
-; Alternative MySQL configuration
+; Alternative MySQL configuration (Use either port of socket, if both defined port takes priority)
 ;backend = mysql
 ;name = aurweb
 ;user = aur
 ;password = aur
+;host = localhost
+;port = 3306
+;socket = /var/run/mysqld/mysqld.sock
 
 [options]
 aurwebdir = YOUR_AUR_ROOT
diff --git a/test/test_db.py b/test/test_db.py
index f5902e4c..41936321 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -56,18 +56,28 @@ def test_sqlalchemy_mysql_url():
     aurweb.config.rehash()
 
 
-def make_temp_config(backend):
+def test_sqlalchemy_mysql_port_url():
+    tmpctx, tmp = make_temp_config("conf/config.defaults", ";port = 3306", "port = 3306")
+
+    with tmpctx:
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+            aurweb.config.rehash()
+            assert db.get_sqlalchemy_url()
+        aurweb.config.rehash()
+
+
+def make_temp_config(config_file, src_str, replace_with):
     tmpdir = tempfile.TemporaryDirectory()
     tmp = os.path.join(tmpdir.name, "config.tmp")
-    with open("conf/config") as f:
-        config = re.sub(r'backend = sqlite', f'backend = {backend}', f.read())
+    with open(config_file) as f:
+        config = re.sub(src_str, f'{replace_with}', f.read())
         with open(tmp, "w") as o:
             o.write(config)
-    return (tmpdir, tmp)
+    return tmpdir, tmp
 
 
 def test_sqlalchemy_unknown_backend():
-    tmpctx, tmp = make_temp_config("blah")
+    tmpctx, tmp = make_temp_config("conf/config", "backend = sqlite", "backend = blah")
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -93,7 +103,7 @@ def test_connection_class_without_fail():
 
 
 def test_connection_class_unsupported_backend():
-    tmpctx, tmp = make_temp_config("blah")
+    tmpctx, tmp = make_temp_config("conf/config", "backend = sqlite", "backend = blah")
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -106,7 +116,7 @@ def test_connection_class_unsupported_backend():
 @mock.patch("mysql.connector.connect", mock.MagicMock(return_value=True))
 @mock.patch.object(mysql.connector, "paramstyle", "qmark")
 def test_connection_mysql():
-    tmpctx, tmp = make_temp_config("mysql")
+    tmpctx, tmp = make_temp_config("conf/config", "backend = sqlite", "backend = mysql")
     with tmpctx:
         with mock.patch.dict(os.environ, {
             "AUR_CONFIG": tmp,

From 5185df629ee7d2190fac7f0268935e3f4477d114 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Dec 2020 20:48:35 -0800
Subject: [PATCH 097/844] move aurweb.testing to its own package

+ Added aurweb.testing.setup_test_db(*tables)
+ Added aurweb.testing.models.make_user(**kwargs)
+ Added aurweb.testing.models.make_session(**kwargs)
+ Added aurweb.testing.requests.Client
+ Added aurweb.testing.requests.Request
* Updated test_l10n.py to use our new Request

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/{testing.py => testing/__init__.py} |  4 ++--
 aurweb/testing/models.py                   | 25 ++++++++++++++++++++++
 aurweb/testing/requests.py                 |  8 +++++++
 test/test_l10n.py                          | 18 ++++++----------
 4 files changed, 41 insertions(+), 14 deletions(-)
 rename aurweb/{testing.py => testing/__init__.py} (93%)
 create mode 100644 aurweb/testing/models.py
 create mode 100644 aurweb/testing/requests.py

diff --git a/aurweb/testing.py b/aurweb/testing/__init__.py
similarity index 93%
rename from aurweb/testing.py
rename to aurweb/testing/__init__.py
index 7516d918..0a807b40 100644
--- a/aurweb/testing.py
+++ b/aurweb/testing/__init__.py
@@ -1,4 +1,4 @@
-from aurweb.db import get_engine
+import aurweb.db
 
 
 def setup_test_db(*args):
@@ -21,7 +21,7 @@ def setup_test_db(*args):
         test_tables = ["Users", "Sessions"];
         setup_test_db(*test_tables)
     """
-    engine = get_engine()
+    engine = aurweb.db.get_engine()
     conn = engine.connect()
 
     tables = list(args)
diff --git a/aurweb/testing/models.py b/aurweb/testing/models.py
new file mode 100644
index 00000000..8a27c409
--- /dev/null
+++ b/aurweb/testing/models.py
@@ -0,0 +1,25 @@
+import warnings
+
+from sqlalchemy import exc
+
+import aurweb.db
+
+
+def make_user(**kwargs):
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", exc.SAWarning)
+        from aurweb.models.user import User
+        user = User(**kwargs)
+        aurweb.db.session.add(user)
+        aurweb.db.session.commit()
+        return user
+
+
+def make_session(**kwargs):
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", exc.SAWarning)
+        from aurweb.models.session import Session
+        session = Session(**kwargs)
+        aurweb.db.session.add(session)
+        aurweb.db.session.commit()
+        return session
diff --git a/aurweb/testing/requests.py b/aurweb/testing/requests.py
new file mode 100644
index 00000000..2839c93f
--- /dev/null
+++ b/aurweb/testing/requests.py
@@ -0,0 +1,8 @@
+class Client:
+    host = "127.0.0.1"
+
+
+class Request:
+    client = Client()
+    cookies = dict()
+    headers = dict()
diff --git a/test/test_l10n.py b/test/test_l10n.py
index 1a1ef3e6..e833cd44 100644
--- a/test/test_l10n.py
+++ b/test/test_l10n.py
@@ -1,13 +1,6 @@
 """ Test our l10n module. """
 from aurweb import l10n
-
-
-class FakeRequest:
-    """ A fake Request doppleganger; use this to change request.cookies
-    easily and with no side-effects. """
-
-    def __init__(self, *args, **kwargs):
-        self.cookies = kwargs.pop("cookies", dict())
+from aurweb.testing.requests import Request
 
 
 def test_translator():
@@ -18,7 +11,7 @@ def test_translator():
 
 def test_get_request_language():
     """ First, tests default_lang, then tests a modified AURLANG cookie. """
-    request = FakeRequest()
+    request = Request()
     assert l10n.get_request_language(request) == "en"
 
     request.cookies["AURLANG"] = "de"
@@ -28,8 +21,8 @@ def test_get_request_language():
 def test_get_raw_translator_for_request():
     """ Make sure that get_raw_translator_for_request is giving us
     the translator we expect. """
-    request = FakeRequest(cookies={"AURLANG": "de"})
-
+    request = Request()
+    request.cookies["AURLANG"] = "de"
     translator = l10n.get_raw_translator_for_request(request)
     assert translator.gettext("Home") == \
         l10n.translator.translate("Home", "de")
@@ -38,7 +31,8 @@ def test_get_raw_translator_for_request():
 def test_get_translator_for_request():
     """ Make sure that get_translator_for_request is giving us back
     our expected translation function. """
-    request = FakeRequest(cookies={"AURLANG": "de"})
+    request = Request()
+    request.cookies["AURLANG"] = "de"
 
     translate = l10n.get_translator_for_request(request)
     assert translate("Home") == "Startseite"

From a836892cde9a8f89fb7cb9e159bc8d4711f88439 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 14 Jan 2021 21:06:41 -0800
Subject: [PATCH 098/844] aurweb.db: add query, create, delete helpers

Takes sqlalchemy kwargs or stanzas:

query(Model, Model.Column == value)
query(Model, and_(Model.Column == value, Model.Column != "BAD!"))

Updated tests to reflect the new utility and a comment about upcoming
function deprecation is added to get_account_type().

From here on, phase out the use of get_account_type().

+ aurweb.db: Added create utility function
+ aurweb.db: Added delete utility function

The `delete` function can be used to delete a record by search
kwargs directly.

Example:
    delete(User, User.ID == 6)

All three functions added in this commit are typically useful to
perform these operations without having to import aurweb.db.session.
Removes a bit of redundancy overall.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py              | 18 ++++++++++++++++++
 test/test_account_type.py | 40 ++++++++++++++++++++++++++++++++++-----
 test/test_db.py           | 13 ++++++++++++-
 test/test_routes.py       | 18 ++++++++++++++++--
 test/test_user.py         |  4 +++-
 5 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 491ce9e2..9ca51de2 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -11,6 +11,24 @@ Session = None
 session = None
 
 
+def query(model, *args, **kwargs):
+    return session.query(model).filter(*args, **kwargs)
+
+
+def create(model, *args, **kwargs):
+    instance = model(*args, **kwargs)
+    session.add(instance)
+    session.commit()
+    return instance
+
+
+def delete(model, *args, **kwargs):
+    instance = session.query(model).filter(*args, **kwargs)
+    for record in instance:
+        session.delete(record)
+    session.commit()
+
+
 def get_sqlalchemy_url():
     """
     Build an SQLAlchemy for use with create_engine based on the aurweb configuration.
diff --git a/test/test_account_type.py b/test/test_account_type.py
index b6a12363..9419970c 100644
--- a/test/test_account_type.py
+++ b/test/test_account_type.py
@@ -1,20 +1,34 @@
 import pytest
 
 from aurweb.models.account_type import AccountType
+from aurweb.models.user import User
 from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_user
+
+account_type = None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    setup_test_db()
+    setup_test_db("Users")
+
+    from aurweb.db import session
+
+    global account_type
+
+    account_type = AccountType(AccountType="TestUser")
+    session.add(account_type)
+    session.commit()
+
+    yield account_type
+
+    session.delete(account_type)
+    session.commit()
 
 
 def test_account_type():
     """ Test creating an AccountType, and reading its columns. """
     from aurweb.db import session
-    account_type = AccountType(AccountType="TestUser")
-    session.add(account_type)
-    session.commit()
 
     # Make sure it got created and was given an ID.
     assert bool(account_type.ID)
@@ -25,4 +39,20 @@ def test_account_type():
         "<AccountType(ID='%s', AccountType='TestUser')>" % (
         account_type.ID)
 
-    session.delete(account_type)
+    record = session.query(AccountType).filter(
+        AccountType.AccountType == "TestUser").first()
+    assert account_type == record
+
+
+def test_user_account_type_relationship():
+    from aurweb.db import session
+
+    user = make_user(Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
+
+    assert user.AccountType == account_type
+    assert account_type.users.filter(User.ID == user.ID).first()
+
+    session.delete(user)
+    session.commit()
diff --git a/test/test_db.py b/test/test_db.py
index 41936321..1eb0dc28 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -3,6 +3,7 @@ import re
 import sqlite3
 import tempfile
 
+from datetime import datetime
 from unittest import mock
 
 import mysql.connector
@@ -11,6 +12,7 @@ import pytest
 import aurweb.config
 
 from aurweb import db
+from aurweb.models.account_type import AccountType
 from aurweb.testing import setup_test_db
 
 
@@ -39,7 +41,7 @@ class DBConnection:
 
 @pytest.fixture(autouse=True)
 def setup_db():
-    setup_test_db()
+    setup_test_db("Bans")
 
 
 def test_sqlalchemy_sqlite_url():
@@ -174,3 +176,12 @@ def test_connection_execute_paramstyle_unsupported():
             "SELECT * FROM AccountTypes WHERE AccountType = ?",
             ["User"]
         ).fetchall()
+
+
+def test_create_delete():
+    db.create(AccountType, AccountType="test")
+    record = db.query(AccountType, AccountType.AccountType == "test").first()
+    assert record is not None
+    db.delete(AccountType, AccountType.AccountType == "test")
+    record = db.query(AccountType, AccountType.AccountType == "test").first()
+    assert record is None
diff --git a/test/test_routes.py b/test/test_routes.py
index 86221108..950d9b71 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -7,14 +7,26 @@ import pytest
 from fastapi.testclient import TestClient
 
 from aurweb.asgi import app
+from aurweb.db import query
+from aurweb.models.account_type import AccountType
 from aurweb.testing import setup_test_db
 
 client = TestClient(app)
 
+user = None
+
 
 @pytest.fixture
 def setup():
-    setup_test_db("Users", "Session")
+    global user
+
+    setup_test_db("Users", "Sessions")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = make_user(Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
 
 
 def test_index():
@@ -54,6 +66,7 @@ def test_language_invalid_next():
         response = req.post("/language", data=post_data)
     assert response.status_code == int(HTTPStatus.BAD_REQUEST)
 
+
 def test_language_query_params():
     """ Test the language post route with query params. """
     next = urllib.parse.quote_plus("/")
@@ -73,4 +86,5 @@ def test_error_messages():
     response1 = client.get("/thisroutedoesnotexist")
     response2 = client.get("/raisefivethree")
     assert response1.status_code == int(HTTPStatus.NOT_FOUND)
-    assert response2.status_code == int(HTTPStatus.SERVICE_UNAVAILABLE)
\ No newline at end of file
+    assert response2.status_code == int(HTTPStatus.SERVICE_UNAVAILABLE)
+
diff --git a/test/test_user.py b/test/test_user.py
index 8ac9b00b..5a56a035 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -1,5 +1,8 @@
 import pytest
 
+import aurweb.config
+
+from aurweb.db import query
 from aurweb.models.account_type import AccountType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
@@ -26,7 +29,6 @@ def test_user():
         Salt="efgh", ResetKey="blahblah")
     session.add(user)
     session.commit()
-
     assert user in account_type.users
 
     # Make sure the user was created and given an ID.

From adc9fccb7d0e984cd780cd1a785911e36a6316b1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Dec 2020 19:29:19 -0800
Subject: [PATCH 099/844] add aurweb.models.ban.Ban ORM mapping

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/ban.py | 19 +++++++++++++
 test/test_ban.py     | 63 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 aurweb/models/ban.py
 create mode 100644 test/test_ban.py

diff --git a/aurweb/models/ban.py b/aurweb/models/ban.py
new file mode 100644
index 00000000..be030380
--- /dev/null
+++ b/aurweb/models/ban.py
@@ -0,0 +1,19 @@
+from fastapi import Request
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import Bans
+
+
+class Ban:
+    def __init__(self, **kwargs):
+        self.IPAddress = kwargs.get("IPAddress")
+        self.BanTS = kwargs.get("BanTS")
+
+
+def is_banned(request: Request):
+    from aurweb.db import session
+    ip = request.client.host
+    return session.query(Ban).filter(Ban.IPAddress == ip).first() is not None
+
+
+mapper(Ban, Bans)
diff --git a/test/test_ban.py b/test/test_ban.py
new file mode 100644
index 00000000..de4f5b1b
--- /dev/null
+++ b/test/test_ban.py
@@ -0,0 +1,63 @@
+import warnings
+
+from datetime import datetime, timedelta
+
+import pytest
+
+from sqlalchemy import exc as sa_exc
+
+from aurweb.models.ban import Ban, is_banned
+from aurweb.testing import setup_test_db
+from aurweb.testing.requests import Request
+
+ban = None
+
+request = Request()
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    from aurweb.db import session
+
+    global ban
+
+    setup_test_db("Bans")
+
+    ban = Ban(IPAddress="127.0.0.1",
+              BanTS=datetime.utcnow() + timedelta(seconds=30))
+    session.add(ban)
+    session.commit()
+
+
+def test_ban():
+    assert ban.IPAddress == "127.0.0.1"
+    assert bool(ban.BanTS)
+
+
+def test_invalid_ban():
+    from aurweb.db import session
+
+    with pytest.raises(sa_exc.IntegrityError,
+                       match="NOT NULL constraint failed: Bans.IPAddress"):
+        bad_ban = Ban(BanTS=datetime.utcnow())
+        session.add(bad_ban)
+
+        # We're adding a ban with no primary key; this causes an
+        # SQLAlchemy warnings when committing to the DB.
+        # Ignore them.
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", sa_exc.SAWarning)
+            session.commit()
+
+    # Since we got a transaction failure, we need to rollback.
+    session.rollback()
+
+
+def test_banned():
+    request.client.host = "127.0.0.1"
+    assert is_banned(request)
+
+
+def test_not_banned():
+    request.client.host = "192.168.0.1"
+    assert not is_banned(request)

From 1922e5380d819501b1ee3f9b50ff69bc583dbf6c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Dec 2020 20:55:43 -0800
Subject: [PATCH 100/844] add aurweb.models.session.Session ORM database object

+ Added aurweb.util module.
    - Added make_random_string function.
+ Added aurweb.db.make_random_value function.
    - Takes a model and a column and introspects them to figure out the
      proper column length to create a random string for; then creates
      a unique string for that column.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py             | 42 +++++++++++++++++++++++++++++-
 aurweb/models/session.py | 25 ++++++++++++++++++
 aurweb/util.py           |  7 +++++
 test/test_session.py     | 56 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 aurweb/models/session.py
 create mode 100644 aurweb/util.py
 create mode 100644 test/test_session.py

diff --git a/aurweb/db.py b/aurweb/db.py
index 9ca51de2..3f5731a9 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -1,8 +1,10 @@
 import math
 
 import aurweb.config
+import aurweb.util
 
-engine = None  # See get_engine
+# See get_engine.
+engine = None
 
 # ORM Session class.
 Session = None
@@ -10,6 +12,44 @@ Session = None
 # Global ORM Session object.
 session = None
 
+# Global introspected object memo.
+introspected = dict()
+
+
+def make_random_value(table: str, column: str):
+    """ Generate a unique, random value for a string column in a table.
+
+    This can be used to generate for example, session IDs that
+    align with the properties of the database column with regards
+    to size.
+
+    Internally, we use SQLAlchemy introspection to look at column
+    to decide which length to use for random string generation.
+
+    :return: A unique string that is not in the database
+    """
+    global introspected
+
+    # Make sure column is converted to a string for memo interaction.
+    scolumn = str(column)
+
+    # If the target column is not yet introspected, store its introspection
+    # object into our global `introspected` memo.
+    if scolumn not in introspected:
+        from sqlalchemy import inspect
+        target_column = scolumn.split('.')[-1]
+        col = list(filter(lambda c: c.name == target_column,
+                          inspect(table).columns))[0]
+        introspected[scolumn] = col
+
+    col = introspected.get(scolumn)
+    length = col.type.length
+
+    string = aurweb.util.make_random_string(length)
+    while session.query(table).filter(column == string).first():
+        string = aurweb.util.make_random_string(length)
+    return string
+
 
 def query(model, *args, **kwargs):
     return session.query(model).filter(*args, **kwargs)
diff --git a/aurweb/models/session.py b/aurweb/models/session.py
new file mode 100644
index 00000000..60749303
--- /dev/null
+++ b/aurweb/models/session.py
@@ -0,0 +1,25 @@
+from sqlalchemy import Column, Integer
+from sqlalchemy.orm import backref, mapper, relationship
+
+from aurweb.db import make_random_value
+from aurweb.models.user import User
+from aurweb.schema import Sessions
+
+
+class Session:
+    UsersID = Column(Integer, nullable=True)
+
+    def __init__(self, **kwargs):
+        self.UsersID = kwargs.get("UsersID")
+        self.SessionID = kwargs.get("SessionID")
+        self.LastUpdateTS = kwargs.get("LastUpdateTS")
+
+
+mapper(Session, Sessions, primary_key=[Sessions.c.SessionID], properties={
+    "User": relationship(User, backref=backref("session",
+                                               uselist=False))
+})
+
+
+def generate_unique_sid():
+    return make_random_value(Session, Session.SessionID)
diff --git a/aurweb/util.py b/aurweb/util.py
new file mode 100644
index 00000000..65f18a4c
--- /dev/null
+++ b/aurweb/util.py
@@ -0,0 +1,7 @@
+import random
+import string
+
+
+def make_random_string(length):
+    return ''.join(random.choices(string.ascii_lowercase +
+                                  string.digits, k=length))
diff --git a/test/test_session.py b/test/test_session.py
new file mode 100644
index 00000000..560f628c
--- /dev/null
+++ b/test/test_session.py
@@ -0,0 +1,56 @@
+""" Test our Session model. """
+from datetime import datetime
+from unittest import mock
+
+import pytest
+
+from aurweb.models.account_type import AccountType
+from aurweb.models.session import generate_unique_sid
+from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_session, make_user
+
+user, _session = None, None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    from aurweb.db import session
+
+    global user, _session
+
+    setup_test_db("Users", "Sessions")
+
+    account_type = session.query(AccountType).filter(
+        AccountType.AccountType == "User").first()
+    user = make_user(Username="test", Email="test@example.org",
+                     ResetKey="testReset", Passwd="testPassword",
+                     AccountType=account_type)
+    _session = make_session(UsersID=user.ID, SessionID="testSession",
+                            LastUpdateTS=datetime.utcnow())
+
+
+def test_session():
+    assert _session.SessionID == "testSession"
+    assert _session.UsersID == user.ID
+
+
+def test_session_user_association():
+    # Make sure that the Session user attribute is correct.
+    assert _session.User == user
+
+
+def test_generate_unique_sid():
+    # Mock up aurweb.models.session.generate_sid by returning
+    # sids[i % 2] from 0 .. n. This will swap between each sid
+    # between each call.
+    sids = ["testSession", "realSession"]
+    i = 0
+
+    def mock_generate_sid(length):
+        nonlocal i
+        sid = sids[i % 2]
+        i += 1
+        return sid
+
+    with mock.patch("aurweb.util.make_random_string", mock_generate_sid):
+        assert generate_unique_sid() == "realSession"

From 137c050f99e29f3d039c42f3b693dd9ef7ed4bd1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 30 Jan 2021 16:43:35 -0800
Subject: [PATCH 101/844] add python-bcrypt dependency

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 2 +-
 Dockerfile     | 2 +-
 INSTALL        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca3055ad..4ad97393 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ before_script:
            python-pytest-tap python-fastapi hypercorn nginx python-authlib
            python-itsdangerous python-httpx python-jinja python-pytest-cov
            python-requests python-aiofiles python-python-multipart
-           python-pytest-asyncio python-coverage
+           python-pytest-asyncio python-coverage python-bcrypt
 
 test:
   script:
diff --git a/Dockerfile b/Dockerfile
index 7e981340..6638f9a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN pacman -Syu --noconfirm base-devel git gpgme protobuf pyalpm \
     python-werkzeug python-pytest-tap python-fastapi nginx python-authlib \
     python-itsdangerous python-httpx python-jinja python-pytest-cov \
     python-requests python-aiofiles python-python-multipart \
-    python-pytest-asyncio python-coverage hypercorn
+    python-pytest-asyncio python-coverage hypercorn python-bcrypt
 
 # Remove aurweb.sqlite3 if it was copied over via COPY.
 RUN rm -fv aurweb.sqlite3
diff --git a/INSTALL b/INSTALL
index e4c52480..6c43fec8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -51,7 +51,7 @@ read the instructions below.
                 python-bleach python-markdown python-alembic hypercorn \
                 python-itsdangerous python-authlib python-httpx \
                 python-jinja python-aiofiles python-python-multipart \
-                python-requests
+                python-requests hypercorn python-bcrypt
     # python3 setup.py install
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:

From 56f2798279f3cbde46389aa65a27fb58bfb0bcfc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Dec 2020 20:54:53 -0800
Subject: [PATCH 102/844] add aurweb.auth and authentication to User

+ Added aurweb.auth.AnonymousUser
    * An instance of this model is returned as the request user
      when the request is not authenticated
+ Added aurweb.auth.BasicAuthBackend
+ Add starlette's AuthenticationMiddleware to app middleware,
  which uses our BasicAuthBackend facility
+ Added User.is_authenticated()
+ Added User.authenticate(password)
+ Added User.login(request, password)
+ Added User.logout(request)
+ Added repr(User(...)) representation
+ Added aurweb.auth.auth_required decorator.

This change uses the same AURSID logic in the PHP implementation.

Additionally, introduce a few helpers for authentication,
one of which being `User.update_password(password, rounds = 12)`
where `rounds` is a configurable number of salt rounds.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py        |   8 +++
 aurweb/auth.py        |  77 +++++++++++++++++++++++
 aurweb/models/user.py | 125 ++++++++++++++++++++++++++++++++++++-
 test/test_auth.py     |  80 ++++++++++++++++++++++++
 test/test_user.py     | 142 +++++++++++++++++++++++++++++++++++++-----
 5 files changed, 412 insertions(+), 20 deletions(-)
 create mode 100644 aurweb/auth.py
 create mode 100644 test/test_auth.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index c03a00f7..4d21ad03 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,12 +1,15 @@
 import http
+import os
 
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
+from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.middleware.sessions import SessionMiddleware
 
 import aurweb.config
 
+from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine
 from aurweb.routers import html, sso, errors
 
@@ -32,10 +35,15 @@ async def app_startup():
               StaticFiles(directory="web/html/images"),
               name="static_images")
 
+    # Add application middlewares.
+    app.add_middleware(AuthenticationMiddleware, backend=BasicAuthBackend())
     app.add_middleware(SessionMiddleware, secret_key=session_secret)
+
+    # Add application routes.
     app.include_router(sso.router)
     app.include_router(html.router)
 
+    # Initialize the database engine and ORM.
     get_engine()
 
 # NOTE: Always keep this dictionary updated with all routes
diff --git a/aurweb/auth.py b/aurweb/auth.py
new file mode 100644
index 00000000..8608a82a
--- /dev/null
+++ b/aurweb/auth.py
@@ -0,0 +1,77 @@
+import functools
+
+from datetime import datetime
+from http import HTTPStatus
+
+from fastapi.responses import RedirectResponse
+from starlette.authentication import AuthCredentials, AuthenticationBackend, AuthenticationError
+from starlette.requests import HTTPConnection
+
+from aurweb.models.session import Session
+from aurweb.models.user import User
+from aurweb.templates import make_context, render_template
+
+
+class AnonymousUser:
+    @staticmethod
+    def is_authenticated():
+        return False
+
+
+class BasicAuthBackend(AuthenticationBackend):
+    async def authenticate(self, conn: HTTPConnection):
+        from aurweb.db import session
+
+        sid = conn.cookies.get("AURSID")
+        if not sid:
+            return None, AnonymousUser()
+
+        now_ts = datetime.utcnow().timestamp()
+        record = session.query(Session).filter(
+            Session.SessionID == sid, Session.LastUpdateTS >= now_ts).first()
+        if not record:
+            return None, AnonymousUser()
+
+        user = session.query(User).filter(User.ID == record.UsersID).first()
+        if not user:
+            raise AuthenticationError(f"Invalid User ID: {record.UsersID}")
+
+        user.authenticated = True
+        return AuthCredentials(["authenticated"]), user
+
+
+def auth_required(is_required: bool = True,
+                  redirect: str = "/",
+                  template: tuple = None):
+    """ Authentication route decorator.
+
+    If redirect is given, the user will be redirected if the auth state
+    does not match is_required.
+
+    If template is given, it will be rendered with Unauthorized if
+    is_required does not match and take priority over redirect.
+
+    :param is_required: A boolean indicating whether the function requires auth
+    :param redirect: Path to redirect to if is_required isn't True
+    :param template: A template tuple: ("template.html", "Template Page")
+    """
+
+    def decorator(func):
+        @functools.wraps(func)
+        async def wrapper(request, *args, **kwargs):
+            if request.user.is_authenticated() != is_required:
+                status_code = int(HTTPStatus.UNAUTHORIZED)
+                url = "/"
+                if redirect:
+                    status_code = int(HTTPStatus.SEE_OTHER)
+                    url = redirect
+                if template:
+                    path, title = template
+                    context = make_context(request, title)
+                    return render_template(request, path, context,
+                                           status_code=int(HTTPStatus.UNAUTHORIZED))
+                return RedirectResponse(url=url, status_code=status_code)
+            return await func(request, *args, **kwargs)
+        return wrapper
+
+    return decorator
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index ba91c439..aff4ce6b 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -1,13 +1,25 @@
+import hashlib
+
+from datetime import datetime
+
+import bcrypt
+
+from fastapi import Request
 from sqlalchemy.orm import backref, mapper, relationship
 
+import aurweb.config
+
 from aurweb.models.account_type import AccountType
+from aurweb.models.ban import is_banned
 from aurweb.schema import Users
 
 
 class User:
     """ An ORM model of a single Users record. """
+    authenticated = False
 
     def __init__(self, **kwargs):
+        # Set AccountTypeID if it was passed.
         self.AccountTypeID = kwargs.get("AccountTypeID")
 
         account_type = kwargs.get("AccountType")
@@ -15,22 +27,129 @@ class User:
             self.AccountType = account_type
 
         self.Username = kwargs.get("Username")
+
+        self.ResetKey = kwargs.get("ResetKey")
         self.Email = kwargs.get("Email")
         self.BackupEmail = kwargs.get("BackupEmail")
-        self.Passwd = kwargs.get("Passwd")
-        self.Salt = kwargs.get("Salt")
         self.RealName = kwargs.get("RealName")
         self.LangPreference = kwargs.get("LangPreference")
         self.Timezone = kwargs.get("Timezone")
         self.Homepage = kwargs.get("Homepage")
         self.IRCNick = kwargs.get("IRCNick")
         self.PGPKey = kwargs.get("PGPKey")
-        self.RegistrationTS = kwargs.get("RegistrationTS")
+        self.RegistrationTS = datetime.utcnow()
         self.CommentNotify = kwargs.get("CommentNotify")
         self.UpdateNotify = kwargs.get("UpdateNotify")
         self.OwnershipNotify = kwargs.get("OwnershipNotify")
         self.SSOAccountID = kwargs.get("SSOAccountID")
 
+        self.Salt = None
+        self.Passwd = str()
+
+        passwd = kwargs.get("Passwd")
+        if passwd:
+            self.update_password(passwd)
+
+    def update_password(self, password, salt_rounds=12):
+        from aurweb.db import session
+        self.Passwd = bcrypt.hashpw(
+            password.encode(),
+            bcrypt.gensalt(rounds=salt_rounds)).decode()
+        session.commit()
+
+    @staticmethod
+    def minimum_passwd_length():
+        return aurweb.config.getint("options", "passwd_min_len")
+
+    def is_authenticated(self):
+        """ Return internal authenticated state. """
+        return self.authenticated
+
+    def valid_password(self, password: str):
+        """ Check authentication against a given password. """
+        from aurweb.db import session
+
+        if password is None:
+            return False
+
+        password_is_valid = False
+
+        try:
+            password_is_valid = bcrypt.checkpw(password.encode(),
+                                               self.Passwd.encode())
+        except ValueError:
+            pass
+
+        # If our Salt column is not empty, we're using a legacy password.
+        if not password_is_valid and self.Salt != str():
+            # Try to login with legacy method.
+            password_is_valid = hashlib.md5(
+                f"{self.Salt}{password}".encode()
+            ).hexdigest() == self.Passwd
+
+            # We got here, we passed the legacy authentication.
+            # Update the password to our modern hash style.
+            if password_is_valid:
+                self.update_password(password)
+
+        return password_is_valid
+
+    def _login_approved(self, request: Request):
+        return not is_banned(request) and not self.Suspended
+
+    def login(self, request: Request, password: str, session_time=0):
+        """ Login and authenticate a request. """
+
+        from aurweb.db import session
+        from aurweb.models.session import Session, generate_unique_sid
+
+        if not self._login_approved(request):
+            return None
+
+        self.authenticated = self.valid_password(password)
+        if not self.authenticated:
+            return None
+
+        self.LastLogin = now_ts = datetime.utcnow().timestamp()
+        self.LastLoginIPAddress = request.client.host
+        session.commit()
+
+        session_ts = now_ts + (
+            session_time if session_time
+            else aurweb.config.getint("options", "login_timeout")
+        )
+
+        sid = None
+
+        if not self.session:
+            sid = generate_unique_sid()
+            self.session = Session(UsersID=self.ID, SessionID=sid,
+                                   LastUpdateTS=session_ts)
+            session.add(self.session)
+        else:
+            last_updated = self.session.LastUpdateTS
+            if last_updated and last_updated < now_ts:
+                self.session.SessionID = sid = generate_unique_sid()
+            else:
+                # Session is still valid; retrieve the current SID.
+                sid = self.session.SessionID
+
+            self.session.LastUpdateTS = session_ts
+
+        session.commit()
+
+        request.cookies["AURSID"] = self.session.SessionID
+        return self.session.SessionID
+
+    def logout(self, request):
+        from aurweb.db import session
+
+        del request.cookies["AURSID"]
+        self.authenticated = False
+        if self.session:
+            session.delete(self.session)
+            session.commit()
+
     def __repr__(self):
         return "<User(ID='%s', AccountType='%s', Username='%s')>" % (
             self.ID, str(self.AccountType), self.Username)
diff --git a/test/test_auth.py b/test/test_auth.py
new file mode 100644
index 00000000..d2251de4
--- /dev/null
+++ b/test/test_auth.py
@@ -0,0 +1,80 @@
+from datetime import datetime
+
+import pytest
+
+from starlette.authentication import AuthenticationError
+
+from aurweb.db import query
+from aurweb.auth import BasicAuthBackend
+from aurweb.models.account_type import AccountType
+from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_session, make_user
+from aurweb.testing.requests import Request
+
+# Persistent user object, initialized in our setup fixture.
+user = None
+backend = None
+request = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, backend, request
+
+    setup_test_db("Users", "Sessions")
+
+    from aurweb.db import session
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = make_user(Username="test", Email="test@example.com",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
+
+    session.add(user)
+    session.commit()
+
+    backend = BasicAuthBackend()
+    request = Request()
+
+
+@pytest.mark.asyncio
+async def test_auth_backend_missing_sid():
+    # The request has no AURSID cookie, so authentication fails, and
+    # AnonymousUser is returned.
+    _, result = await backend.authenticate(request)
+    assert not result.is_authenticated()
+
+
+@pytest.mark.asyncio
+async def test_auth_backend_invalid_sid():
+    # Provide a fake AURSID that won't be found in the database.
+    # This results in our path going down the invalid sid route,
+    # which gives us an AnonymousUser.
+    request.cookies["AURSID"] = "fake"
+    _, result = await backend.authenticate(request)
+    assert not result.is_authenticated()
+
+
+@pytest.mark.asyncio
+async def test_auth_backend_invalid_user_id():
+    # Create a new session with a fake user id.
+    now_ts = datetime.utcnow().timestamp()
+    make_session(UsersID=666, SessionID="realSession",
+                 LastUpdateTS=now_ts + 5)
+
+    # Here, we specify a real SID; but it's user is not there.
+    request.cookies["AURSID"] = "realSession"
+    with pytest.raises(AuthenticationError, match="Invalid User ID: 666"):
+        await backend.authenticate(request)
+
+
+@pytest.mark.asyncio
+async def test_basic_auth_backend():
+    # This time, everything matches up. We expect the user to
+    # equal the real_user.
+    now_ts = datetime.utcnow().timestamp()
+    make_session(UsersID=user.ID, SessionID="realSession",
+                 LastUpdateTS=now_ts + 5)
+    _, result = await backend.authenticate(request)
+    assert result == user
diff --git a/test/test_user.py b/test/test_user.py
index 5a56a035..b8d4248a 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -1,48 +1,86 @@
+import hashlib
+
+from datetime import datetime, timedelta
+
+import bcrypt
 import pytest
 
+import aurweb.auth
 import aurweb.config
 
 from aurweb.db import query
 from aurweb.models.account_type import AccountType
+from aurweb.models.ban import Ban
+from aurweb.models.session import Session
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_session, make_user
+from aurweb.testing.requests import Request
+
+account_type, user = None, None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    setup_test_db("Users")
-
-
-def test_user():
-    """ Test creating a user and reading its columns. """
     from aurweb.db import session
 
-    # First, grab our target AccountType.
+    global account_type, user
+
+    setup_test_db("Users", "Sessions", "Bans")
+
     account_type = session.query(AccountType).filter(
         AccountType.AccountType == "User").first()
 
-    user = User(
-        AccountType=account_type,
-        RealName="Test User", Username="test",
-        Email="test@example.org", Passwd="abcd",
-        IRCNick="tester",
-        Salt="efgh", ResetKey="blahblah")
-    session.add(user)
-    session.commit()
+    user = make_user(Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
+
+
+def test_user_login_logout():
+    """ Test creating a user and reading its columns. """
+    from aurweb.db import session
+
+    # Assert that make_user created a valid user.
+    assert bool(user.ID)
+
+    # Test authentication.
+    assert user.valid_password("testPassword")
+    assert not user.valid_password("badPassword")
+
     assert user in account_type.users
 
-    # Make sure the user was created and given an ID.
-    assert bool(user.ID)
+    # Make a raw request.
+    request = Request()
+    assert not user.login(request, "badPassword")
+    assert not user.is_authenticated()
+
+    sid = user.login(request, "testPassword")
+    assert sid is not None
+    assert user.is_authenticated()
+    assert "AURSID" in request.cookies
+
+    # Expect that User session relationships work right.
+    user_session = session.query(Session).filter(
+        Session.UsersID == user.ID).first()
+    assert user_session == user.session
+    assert user.session.SessionID == sid
+    assert user.session.User == user
 
     # Search for the user via query API.
     result = session.query(User).filter(User.ID == user.ID).first()
 
     # Compare the result and our original user.
+    assert result == user
     assert result.ID == user.ID
     assert result.AccountType.ID == user.AccountType.ID
     assert result.Username == user.Username
     assert result.Email == user.Email
 
+    # Test result authenticate methods to ensure they work the same.
+    assert not result.valid_password("badPassword")
+    assert result.valid_password("testPassword")
+    assert result.is_authenticated()
+
     # Ensure we've got the correct account type.
     assert user.AccountType.ID == account_type.ID
     assert user.AccountType.AccountType == account_type.AccountType
@@ -51,4 +89,74 @@ def test_user():
     assert repr(user) == f"<User(ID='{user.ID}', " + \
         "AccountType='User', Username='test')>"
 
-    session.delete(user)
+    # Test logout.
+    user.logout(request)
+    assert "AURSID" not in request.cookies
+    assert not user.is_authenticated()
+
+
+def test_user_login_twice():
+    request = Request()
+    assert user.login(request, "testPassword")
+    assert user.login(request, "testPassword")
+
+
+def test_user_login_banned():
+    from aurweb.db import session
+
+    # Add ban for the next 30 seconds.
+    banned_timestamp = datetime.utcnow() + timedelta(seconds=30)
+    ban = Ban(IPAddress="127.0.0.1", BanTS=banned_timestamp)
+    session.add(ban)
+    session.commit()
+
+    request = Request()
+    request.client.host = "127.0.0.1"
+    assert not user.login(request, "testPassword")
+
+
+def test_user_login_suspended():
+    from aurweb.db import session
+    user.Suspended = True
+    session.commit()
+    assert not user.login(Request(), "testPassword")
+
+
+def test_legacy_user_authentication():
+    from aurweb.db import session
+
+    user.Salt = bcrypt.gensalt().decode()
+    user.Passwd = hashlib.md5(f"{user.Salt}testPassword".encode()).hexdigest()
+    session.commit()
+
+    assert not user.valid_password("badPassword")
+    assert user.valid_password("testPassword")
+
+    # Test by passing a password of None value in.
+    assert not user.valid_password(None)
+
+
+def test_user_login_with_outdated_sid():
+    from aurweb.db import session
+
+    # Make a session with a LastUpdateTS 5 seconds ago, causing
+    # user.login to update it with a new sid.
+    _session = make_session(UsersID=user.ID, SessionID="stub",
+                            LastUpdateTS=datetime.utcnow().timestamp() - 5)
+    sid = user.login(Request(), "testPassword")
+    assert sid and user.is_authenticated()
+    assert sid != "stub"
+
+    session.delete(_session)
+    session.commit()
+
+
+def test_user_update_password():
+    user.update_password("secondPassword")
+    assert not user.valid_password("testPassword")
+    assert user.valid_password("secondPassword")
+
+
+def test_user_minimum_passwd_length():
+    passwd_min_len = aurweb.config.getint("options", "passwd_min_len")
+    assert User.minimum_passwd_length() == passwd_min_len

From 5d4a5deddf59806a691cda8d6933c7049b84db53 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 31 Dec 2020 20:44:59 -0800
Subject: [PATCH 103/844] implement login + logout routes and templates

+ Added route: GET `/login` via `aurweb.routers.auth.login_get`
+ Added route: POST `/login` via `aurweb.routers.auth.login_post`
+ Added route: GET `/logout` via `aurweb.routers.auth.logout`
+ Added route: POST `/logout` via `aurweb.routers.auth.logout_post`
* Modify archdev-navbar.html template to toggle displays on auth state
+ Added login.html template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py                         |   3 +-
 aurweb/routers/auth.py                 |  85 +++++++++++++++++
 templates/login.html                   |  84 +++++++++++++++++
 templates/partials/archdev-navbar.html |  18 +++-
 test/test_auth_routes.py               | 126 +++++++++++++++++++++++++
 5 files changed, 313 insertions(+), 3 deletions(-)
 create mode 100644 aurweb/routers/auth.py
 create mode 100644 templates/login.html
 create mode 100644 test/test_auth_routes.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 4d21ad03..b15e5874 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -11,7 +11,7 @@ import aurweb.config
 
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine
-from aurweb.routers import html, sso, errors
+from aurweb.routers import auth, html, sso, errors
 
 routes = set()
 
@@ -42,6 +42,7 @@ async def app_startup():
     # Add application routes.
     app.include_router(sso.router)
     app.include_router(html.router)
+    app.include_router(auth.router)
 
     # Initialize the database engine and ORM.
     get_engine()
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
new file mode 100644
index 00000000..24f5d4e3
--- /dev/null
+++ b/aurweb/routers/auth.py
@@ -0,0 +1,85 @@
+from datetime import datetime
+from http import HTTPStatus
+
+from fastapi import APIRouter, Form, Request
+from fastapi.responses import HTMLResponse, RedirectResponse
+
+import aurweb.config
+
+from aurweb.models.user import User
+from aurweb.templates import make_context, render_template
+
+router = APIRouter()
+
+
+def login_template(request: Request, next: str, errors: list = None):
+    """ Provide login-specific template context to render_template. """
+    context = make_context(request, "Login", next)
+    context["errors"] = errors
+    context["url_base"] = f"{request.url.scheme}://{request.url.netloc}"
+    return render_template("login.html", context)
+
+
+@router.get("/login", response_class=HTMLResponse)
+async def login_get(request: Request, next: str = "/"):
+    """ Homepage route. """
+    return login_template(request, next)
+
+
+@router.post("/login", response_class=HTMLResponse)
+async def login_post(request: Request,
+                     next: str = Form(...),
+                     user: str = Form(default=str()),
+                     passwd: str = Form(default=str()),
+                     remember_me: bool = Form(default=False)):
+    from aurweb.db import session
+
+    user = session.query(User).filter(User.Username == user).first()
+    if not user:
+        return login_template(request, next,
+                              errors=["Bad username or password."])
+
+    cookie_timeout = 0
+
+    if remember_me:
+        cookie_timeout = aurweb.config.getint(
+            "options", "persistent_cookie_timeout")
+
+    _, sid = user.login(request, passwd, cookie_timeout)
+    if not _:
+        return login_template(request, next,
+                              errors=["Bad username or password."])
+
+    login_timeout = aurweb.config.getint("options", "login_timeout")
+
+    expires_at = int(datetime.utcnow().timestamp()
+                     + max(cookie_timeout, login_timeout))
+
+    response = RedirectResponse(url=next,
+                                status_code=int(HTTPStatus.SEE_OTHER))
+    response.set_cookie("AURSID", sid, expires=expires_at)
+    return response
+
+
+@router.get("/logout")
+async def logout(request: Request, next: str = "/"):
+    """ A GET and POST route for logging out.
+
+    @param request FastAPI request
+    @param next Route to redirect to
+    """
+    if request.user.is_authenticated():
+        request.user.logout(request)
+
+    # Use 303 since we may be handling a post request, that'll get it
+    # to redirect to a get request.
+    response = RedirectResponse(url=next,
+                                status_code=int(HTTPStatus.SEE_OTHER))
+    response.delete_cookie("AURSID")
+    response.delete_cookie("AURTZ")
+    return response
+
+
+@router.post("/logout")
+async def logout_post(request: Request, next: str = "/"):
+    return await logout(request=request, next=next)
diff --git a/templates/login.html b/templates/login.html
new file mode 100644
index 00000000..da7bd722
--- /dev/null
+++ b/templates/login.html
@@ -0,0 +1,84 @@
+{% extends 'partials/layout.html' %}
+
+{% block pageContent %}
+
+<div id="dev-login" class="box">
+    <h2>AUR {% trans %}Login{% endtrans %}</h2>
+
+    {% if request.url.scheme == "http" and config.getboolean("options", "disable_http_login") %}
+        {% set https_login = url_base.replace("http://", "https://") + "/login/" %}
+        <p>
+        {{ "HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+        | tr
+        | format(
+            '<a href="%s">' | format(https_login),
+            "</a>")
+        | safe
+        }}
+        </p>
+    {% else %}
+        {% if request.user.is_authenticated() %}
+            <p>
+            {{ "Logged-in as: %s"
+            | tr
+            | format("<b>%s</b>" | format(request.user.Username))
+            | safe
+            }}
+            <a href="/logout/?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
+            </p>
+        {% else %}
+        <form method="post" action="/login?next={{ next }}">
+            <fieldset>
+                <legend>{% trans %}Enter login credentials{% endtrans %}</legend>
+
+                {% if errors %}
+                    <ul class="errorlist">
+                        {% for error in errors %}
+                            <li>{{ error }}</li>
+                        {% endfor %}
+                    </ul>
+                {% endif %}
+
+                <p>
+                    <label for="id_username">
+                        {% trans %}User name or primary email address{% endtrans %}:
+                    </label>
+
+                    <input id="id_username" type="text" name="user" size="30"
+                           maxlength="254" autofocus="autofocus">
+                </p>
+
+                <p>
+                    <label for="id_password">
+                        {% trans %}Password{% endtrans %}:
+                    </label>
+                    <input id="id_password" type="password" name="passwd"
+                           size="30">
+                </p>
+
+                <p>
+                    <input id="id_remember_me" type="checkbox" name="remember_me">
+                    <label for="id_remember_me">
+                        {% trans %}Remember me{% endtrans %}
+                    </label>
+                </p>
+
+                <p>
+                    <input class="button" type="submit"
+                           value="{% trans %}Login{% endtrans %}">
+                    <a href="/passreset/">
+                        [{% trans %}Forgot Password{% endtrans %}]
+                    </a>
+                    <input id="id_referer" type="hidden" name="referer"
+                           value="{{ url_base }}">
+                    <input type="hidden" name="next" value="{{ next }}">
+                </p>
+
+            </fieldset>
+        </form>
+        {% endif %}
+    {% endif %}
+
+</div>
+
+{% endblock %}
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 55338bc4..7662e3a4 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -1,8 +1,22 @@
 <div id="archdev-navbar">
     <ul>
-        <li><a href="/">AUR {% trans %}Home{% endtrans %}</a></li>
+        {% if request.user.is_authenticated() %}
+            <li><a href="/">{% trans %}Dashboard{% endtrans %}</a></li>
+        {% else %}
+            <li><a href="/">AUR {% trans %}Home{% endtrans %}</a></li>
+        {% endif %}
         <li><a href="/packages/">{% trans %}Packages{% endtrans %}</a></li>
         <li><a href="/register/">{% trans %}Register{% endtrans %}</a></li>
-        <li><a href="/login/">{% trans %}Login{% endtrans %}</a></li>
+        <li>
+            {% if request.user.is_authenticated() %}
+                <a href="/logout/?next={{ next }}">
+                    {% trans %}Logout{% endtrans %}
+                </a>
+            {% else %}
+                <a href="/login/?next={{ next }}">
+                    {% trans %}Login{% endtrans %}
+                </a>
+            {% endif %}
+        </li>
     </ul>
 </div>
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
new file mode 100644
index 00000000..adf75329
--- /dev/null
+++ b/test/test_auth_routes.py
@@ -0,0 +1,126 @@
+from datetime import datetime
+from http import HTTPStatus
+
+import pytest
+
+from fastapi.testclient import TestClient
+
+import aurweb.config
+
+from aurweb.asgi import app
+from aurweb.db import query
+from aurweb.models.account_type import AccountType
+from aurweb.models.session import Session
+from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_user
+
+client = TestClient(app)
+
+user = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user
+
+    setup_test_db("Users", "Sessions", "Bans")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = make_user(Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
+
+
+def test_login_logout():
+    post_data = {
+        "user": "test",
+        "passwd": "testPassword",
+        "next": "/"
+    }
+
+    with client as request:
+        response = client.get("/login")
+        assert response.status_code == int(HTTPStatus.OK)
+
+        response = request.post("/login", data=post_data,
+                                allow_redirects=False)
+        assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+        response = request.get(response.headers.get("location"), cookies={
+            "AURSID": response.cookies.get("AURSID")
+        })
+        assert response.status_code == int(HTTPStatus.OK)
+
+        response = request.post("/logout", data=post_data,
+                                allow_redirects=False)
+        assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+        response = request.post("/logout", data=post_data, cookies={
+            "AURSID": response.cookies.get("AURSID")
+        }, allow_redirects=False)
+        assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert "AURSID" not in response.cookies
+
+
+def test_login_missing_username():
+    post_data = {
+        "passwd": "testPassword",
+        "next": "/"
+    }
+
+    with client as request:
+        response = request.post("/login", data=post_data)
+    assert "AURSID" not in response.cookies
+
+
+def test_login_remember_me():
+    from aurweb.db import session
+
+    post_data = {
+        "user": "test",
+        "passwd": "testPassword",
+        "next": "/",
+        "remember_me": True
+    }
+
+    with client as request:
+        response = request.post("/login", data=post_data,
+                                allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert "AURSID" in response.cookies
+
+    cookie_timeout = aurweb.config.getint(
+        "options", "persistent_cookie_timeout")
+    expected_ts = datetime.utcnow().timestamp() + cookie_timeout
+
+    _session = session.query(Session).filter(
+        Session.UsersID == user.ID).first()
+
+    # Expect that LastUpdateTS was within 5 seconds of the expected_ts,
+    # which is equal to the current timestamp + persistent_cookie_timeout.
+    assert _session.LastUpdateTS > expected_ts - 5
+    assert _session.LastUpdateTS < expected_ts + 5
+
+
+def test_login_missing_password():
+    post_data = {
+        "user": "test",
+        "next": "/"
+    }
+
+    with client as request:
+        response = request.post("/login", data=post_data)
+    assert "AURSID" not in response.cookies
+
+
+def test_login_incorrect_password():
+    post_data = {
+        "user": "test",
+        "passwd": "badPassword",
+        "next": "/"
+    }
+
+    with client as request:
+        response = request.post("/login", data=post_data)
+    assert "AURSID" not in response.cookies

From 4423326cec91dbfc9cd90294fc09ca40e917bc63 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 8 Jan 2021 20:24:22 -0800
Subject: [PATCH 104/844] add the request parameter to render_template

This allows us to inspect things about the request we're rendering from.

* Use render_template(request, ...) in aurweb.routers.auth

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/auth.py   |  2 +-
 aurweb/routers/errors.py |  4 ++--
 aurweb/routers/html.py   |  2 +-
 aurweb/templates.py      | 10 ++++++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 24f5d4e3..3a1c7192 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -17,7 +17,7 @@ def login_template(request: Request, next: str, errors: list = None):
     context = make_context(request, "Login", next)
     context["errors"] = errors
     context["url_base"] = f"{request.url.scheme}://{request.url.netloc}"
-    return render_template("login.html", context)
+    return render_template(request, "login.html", context)
 
 
 @router.get("/login", response_class=HTMLResponse)
diff --git a/aurweb/routers/errors.py b/aurweb/routers/errors.py
index 111d802a..eb935b57 100644
--- a/aurweb/routers/errors.py
+++ b/aurweb/routers/errors.py
@@ -3,12 +3,12 @@ from aurweb.templates import make_context, render_template
 
 async def not_found(request, exc):
     context = make_context(request, "Page Not Found")
-    return render_template("errors/404.html", context, 404)
+    return render_template(request, "errors/404.html", context, 404)
 
 
 async def service_unavailable(request, exc):
     context = make_context(request, "Service Unavailable")
-    return render_template("errors/503.html", context, 503)
+    return render_template(request, "errors/503.html", context, 503)
 
 # Maps HTTP errors to functions
 exceptions = {
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 50b62450..32a7e630 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -47,7 +47,7 @@ async def language(request: Request,
 async def index(request: Request):
     """ Homepage route. """
     context = make_context(request, "Home")
-    return render_template("index.html", context)
+    return render_template(request, "index.html", context)
 
 
 # A route that returns a error 503. For testing purposes.
diff --git a/aurweb/templates.py b/aurweb/templates.py
index c05dce79..c5f378b8 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -39,7 +39,10 @@ def make_context(request: Request, title: str, next: str = None):
     }
 
 
-def render_template(path: str, context: dict, status_code=int(HTTPStatus.OK)):
+def render_template(request: Request,
+                    path: str,
+                    context: dict,
+                    status_code=int(HTTPStatus.OK)):
     """ Render a Jinja2 multi-lingual template with some context. """
 
     # Create a deep copy of our jinja2 environment. The environment in
@@ -54,4 +57,7 @@ def render_template(path: str, context: dict, status_code=int(HTTPStatus.OK)):
 
     template = templates.get_template(path)
     rendered = template.render(context)
-    return HTMLResponse(rendered, status_code=status_code)
+
+    response = HTMLResponse(rendered, status_code=status_code)
+    response.set_cookie("AURLANG", context.get("language"))
+    return response

From a33d076d8bae9ab2e988aaa5bc3ab5d8eabd44d3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 6 Jan 2021 21:00:12 -0800
Subject: [PATCH 105/844] add passreset routes

Introduced `get|post` `/passreset` routes. These routes mimic the
behavior of the existing PHP implementation, with the exception of
HTTP status code returns.

Routes added:
    GET /passreset
    POST /passreset

Routers added:
    aurweb.routers.accounts

* On an unknown user or mismatched resetkey (where resetkey must ==
  user.resetkey), return HTTP status NOT_FOUND (404).
* On another error in the request, return HTTP status BAD_REQUEST (400).

Both `get|post` routes requires that the current user is **not**
authenticated, hence `@auth_required(False, redirect="/")`.

+ Added auth_required decorator to aurweb.auth.
+ Added some more utility to aurweb.models.user.User.
+ Added `partials/error.html` template.
+ Added `passreset.html` template.
+ Added aurweb.db.ConnectionExecutor functor for paramstyle logic.
  Decoupling the executor logic from the database connection logic
  is needed for us to easily use the same logic with a fastapi
  database session, when we need to use aurweb.scripts modules.

At this point, notification configuration is now required to complete
tests involved with notifications properly, like passreset.
`conf/config.dev` has been modified to include [notifications] sendmail,
sender and reply-to overrides. Dockerfile and .gitlab-ci.yml have been
updated to setup /etc/hosts and start postfix before running tests.

* setup.cfg: ignore E741, C901 in aurweb.routers.accounts

These two warnings (shown in the commit) are not dangerous and a bi-product
of maintaining compatibility with our current code flow.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml                |   2 +
 aurweb/asgi.py                |   4 +-
 aurweb/db.py                  |  70 +++++++----
 aurweb/routers/accounts.py    | 102 ++++++++++++++++
 aurweb/routers/auth.py        |  10 +-
 conf/config.dev               |   6 +
 setup.cfg                     |  13 ++
 templates/partials/error.html |  15 +++
 templates/passreset.html      |  76 ++++++++++++
 test/README.md                |   5 +
 test/test_accounts_routes.py  | 218 ++++++++++++++++++++++++++++++++++
 test/test_auth_routes.py      |  51 ++++++--
 test/test_db.py               |  13 +-
 test/test_user.py             |   6 +-
 util/sendmail                 |   2 +
 15 files changed, 552 insertions(+), 41 deletions(-)
 create mode 100644 aurweb/routers/accounts.py
 create mode 100644 templates/partials/error.html
 create mode 100644 templates/passreset.html
 create mode 100644 test/test_accounts_routes.py
 create mode 100755 util/sendmail

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ad97393..db7dec9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,8 @@ before_script:
            python-itsdangerous python-httpx python-jinja python-pytest-cov
            python-requests python-aiofiles python-python-multipart
            python-pytest-asyncio python-coverage python-bcrypt
+  - bash -c "echo '127.0.0.1' > /etc/hosts"
+  - bash -c "echo '::1' >> /etc/hosts"
 
 test:
   script:
diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index b15e5874..1a61b1f4 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,5 +1,4 @@
 import http
-import os
 
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import HTMLResponse
@@ -11,7 +10,7 @@ import aurweb.config
 
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine
-from aurweb.routers import auth, html, sso, errors
+from aurweb.routers import accounts, auth, errors, html, sso
 
 routes = set()
 
@@ -43,6 +42,7 @@ async def app_startup():
     app.include_router(sso.router)
     app.include_router(html.router)
     app.include_router(auth.router)
+    app.include_router(accounts.router)
 
     # Initialize the database engine and ORM.
     get_engine()
diff --git a/aurweb/db.py b/aurweb/db.py
index 3f5731a9..7dab6c4a 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -145,35 +145,21 @@ def connect():
     return get_engine().connect()
 
 
-class Connection:
+class ConnectionExecutor:
     _conn = None
     _paramstyle = None
 
-    def __init__(self):
-        aur_db_backend = aurweb.config.get('database', 'backend')
-
-        if aur_db_backend == 'mysql':
+    def __init__(self, conn, backend=aurweb.config.get("database", "backend")):
+        self._conn = conn
+        if backend == "mysql":
             import mysql.connector
-            aur_db_host = aurweb.config.get('database', 'host')
-            aur_db_name = aurweb.config.get('database', 'name')
-            aur_db_user = aurweb.config.get('database', 'user')
-            aur_db_pass = aurweb.config.get('database', 'password')
-            aur_db_socket = aurweb.config.get('database', 'socket')
-            self._conn = mysql.connector.connect(host=aur_db_host,
-                                                 user=aur_db_user,
-                                                 passwd=aur_db_pass,
-                                                 db=aur_db_name,
-                                                 unix_socket=aur_db_socket,
-                                                 buffered=True)
             self._paramstyle = mysql.connector.paramstyle
-        elif aur_db_backend == 'sqlite':
+        elif backend == "sqlite":
             import sqlite3
-            aur_db_name = aurweb.config.get('database', 'name')
-            self._conn = sqlite3.connect(aur_db_name)
-            self._conn.create_function("POWER", 2, math.pow)
             self._paramstyle = sqlite3.paramstyle
-        else:
-            raise ValueError('unsupported database backend')
+
+    def paramstyle(self):
+        return self._paramstyle
 
     def execute(self, query, params=()):
         if self._paramstyle in ('format', 'pyformat'):
@@ -193,3 +179,43 @@ class Connection:
 
     def close(self):
         self._conn.close()
+
+
+class Connection:
+    _executor = None
+    _conn = None
+
+    def __init__(self):
+        aur_db_backend = aurweb.config.get('database', 'backend')
+
+        if aur_db_backend == 'mysql':
+            import mysql.connector
+            aur_db_host = aurweb.config.get('database', 'host')
+            aur_db_name = aurweb.config.get('database', 'name')
+            aur_db_user = aurweb.config.get('database', 'user')
+            aur_db_pass = aurweb.config.get('database', 'password')
+            aur_db_socket = aurweb.config.get('database', 'socket')
+            self._conn = mysql.connector.connect(host=aur_db_host,
+                                                 user=aur_db_user,
+                                                 passwd=aur_db_pass,
+                                                 db=aur_db_name,
+                                                 unix_socket=aur_db_socket,
+                                                 buffered=True)
+        elif aur_db_backend == 'sqlite':
+            import sqlite3
+            aur_db_name = aurweb.config.get('database', 'name')
+            self._conn = sqlite3.connect(aur_db_name)
+            self._conn.create_function("POWER", 2, math.pow)
+        else:
+            raise ValueError('unsupported database backend')
+
+        self._conn = ConnectionExecutor(self._conn)
+
+    def execute(self, query, params=()):
+        return self._conn.execute(query, params)
+
+    def commit(self):
+        self._conn.commit()
+
+    def close(self):
+        self._conn.close()
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
new file mode 100644
index 00000000..0839f64e
--- /dev/null
+++ b/aurweb/routers/accounts.py
@@ -0,0 +1,102 @@
+from http import HTTPStatus
+
+from fastapi import APIRouter, Form, Request
+from fastapi.responses import HTMLResponse, RedirectResponse
+from sqlalchemy import or_
+
+from aurweb import db
+from aurweb.auth import auth_required
+from aurweb.l10n import get_translator_for_request
+from aurweb.models.user import User
+from aurweb.scripts.notify import ResetKeyNotification
+from aurweb.templates import make_context, render_template
+
+router = APIRouter()
+
+
+@router.get("/passreset", response_class=HTMLResponse)
+@auth_required(False)
+async def passreset(request: Request):
+    context = make_context(request, "Password Reset")
+
+    for k, v in request.query_params.items():
+        context[k] = v
+
+    return render_template(request, "passreset.html", context)
+
+
+@router.post("/passreset", response_class=HTMLResponse)
+@auth_required(False)
+async def passreset_post(request: Request,
+                         user: str = Form(...),
+                         resetkey: str = Form(default=None),
+                         password: str = Form(default=None),
+                         confirm: str = Form(default=None)):
+    from aurweb.db import session
+
+    context = make_context(request, "Password Reset")
+
+    for k, v in dict(await request.form()).items():
+        context[k] = v
+
+    # The user parameter being required, we can match against
+    user = db.query(User, or_(User.Username == user,
+                              User.Email == user)).first()
+    if not user:
+        context["errors"] = ["Invalid e-mail."]
+        return render_template(request, "passreset.html", context,
+                               status_code=int(HTTPStatus.NOT_FOUND))
+
+    if resetkey:
+        context["resetkey"] = resetkey
+
+        if not user.ResetKey or resetkey != user.ResetKey:
+            context["errors"] = ["Invalid e-mail."]
+            return render_template(request, "passreset.html", context,
+                                   status_code=int(HTTPStatus.NOT_FOUND))
+
+        if not user or not password:
+            context["errors"] = ["Missing a required field."]
+            return render_template(request, "passreset.html", context,
+                                   status_code=int(HTTPStatus.BAD_REQUEST))
+
+        if password != confirm:
+            # If the provided password does not match the provided confirm.
+            context["errors"] = ["Password fields do not match."]
+            return render_template(request, "passreset.html", context,
+                                   status_code=int(HTTPStatus.BAD_REQUEST))
+
+        if len(password) < User.minimum_passwd_length():
+            # Translate the error here, which simplifies error output
+            # in the jinja2 template.
+            _ = get_translator_for_request(request)
+            context["errors"] = [_(
+                "Your password must be at least %s characters.") % (
+                str(User.minimum_passwd_length()))]
+            return render_template(request, "passreset.html", context,
+                                   status_code=int(HTTPStatus.BAD_REQUEST))
+
+        # We got to this point; everything matched up. Update the password
+        # and remove the ResetKey.
+        user.ResetKey = str()
+        user.update_password(password)
+
+        if user.session:
+            session.delete(user.session)
+            session.commit()
+
+        # Render ?step=complete.
+        return RedirectResponse(url="/passreset?step=complete",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+
+    # If we got here, we continue with issuing a resetkey for the user.
+    resetkey = db.make_random_value(User, User.ResetKey)
+    user.ResetKey = resetkey
+    session.commit()
+
+    executor = db.ConnectionExecutor(db.get_engine().raw_connection())
+    ResetKeyNotification(executor, user.ID).send()
+
+    # Render ?step=confirm.
+    return RedirectResponse(url="/passreset?step=confirm",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 3a1c7192..e4864424 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -6,6 +6,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 
 import aurweb.config
 
+from aurweb.auth import auth_required
 from aurweb.models.user import User
 from aurweb.templates import make_context, render_template
 
@@ -21,12 +22,13 @@ def login_template(request: Request, next: str, errors: list = None):
 
 
 @router.get("/login", response_class=HTMLResponse)
+@auth_required(False)
 async def login_get(request: Request, next: str = "/"):
-    """ Homepage route. """
     return login_template(request, next)
 
 
 @router.post("/login", response_class=HTMLResponse)
+@auth_required(False)
 async def login_post(request: Request,
                      next: str = Form(...),
                      user: str = Form(default=str()),
@@ -45,8 +47,8 @@ async def login_post(request: Request,
         cookie_timeout = aurweb.config.getint(
             "options", "persistent_cookie_timeout")
 
-    _, sid = user.login(request, passwd, cookie_timeout)
-    if not _:
+    sid = user.login(request, passwd, cookie_timeout)
+    if not sid:
         return login_template(request, next,
                               errors=["Bad username or password."])
 
@@ -62,6 +64,7 @@ async def login_post(request: Request,
 
 
 @router.get("/logout")
+@auth_required()
 async def logout(request: Request, next: str = "/"):
     """ A GET and POST route for logging out.
 
@@ -81,5 +84,6 @@ async def logout(request: Request, next: str = "/"):
 
 
 @router.post("/logout")
+@auth_required()
 async def logout_post(request: Request, next: str = "/"):
     return await logout(request=request, next=next)
diff --git a/conf/config.dev b/conf/config.dev
index 194a3bf8..94775a92 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -25,6 +25,12 @@ disable_http_login = 0
 enable-maintenance = 0
 localedir = YOUR_AUR_ROOT/web/locale
 
+[notifications]
+; For development/testing, use /usr/bin/sendmail
+sendmail = YOUR_AUR_ROOT/util/sendmail
+sender = notify@localhost
+reply-to = noreply@localhost
+
 ; Single sign-on; see doc/sso.txt.
 [sso]
 openid_configuration = http://127.0.0.1:8083/auth/realms/aurweb/.well-known/openid-configuration
diff --git a/setup.cfg b/setup.cfg
index b868c096..98261651 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,6 +2,19 @@
 max-line-length = 127
 max-complexity = 10
 
+# Ignore some unavoidable flake8 warnings; we know this is against
+# pycodestyle, but some of the existing codebase uses `I` variables,
+# so specifically silence warnings about it in pre-defined files.
+# In E741, the 'I', 'O', 'l' are ambiguous variable names.
+# Our current implementation uses these variables through HTTP
+# and the FastAPI form specification wants them named as such.
+# In C901's case, our process_account_form function is way too
+# complex for PEP (too many if statements). However, we need to
+# process these anyways, and making it any more complex would
+# just add confusion to the implementation.
+per-file-ignores =
+    aurweb/routers/accounts.py:E741,C901
+
 [isort]
 line_length = 127
 lines_between_types = 1
diff --git a/templates/partials/error.html b/templates/partials/error.html
new file mode 100644
index 00000000..6043dfd1
--- /dev/null
+++ b/templates/partials/error.html
@@ -0,0 +1,15 @@
+{% if errors %}
+    <ul class="errorlist">
+        {% for error in errors %}
+            {% if error is string %}
+                <li>{{ error | tr | safe }}</li>
+            {% elif error is iterable %}
+                <ul>
+                    {% for e in error %}
+                        <li>{{ e | tr | safe }}</li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
+        {% endfor %}
+    </ul>
+{% endif %}
diff --git a/templates/passreset.html b/templates/passreset.html
new file mode 100644
index 00000000..d2c3c2ee
--- /dev/null
+++ b/templates/passreset.html
@@ -0,0 +1,76 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{% trans %}Password Reset{% endtrans %}</h2>
+
+        <p>
+            {% if step == "confirm" %}
+                {% trans %}Check your e-mail for the confirmation link.{% endtrans %}
+            {% elif step == "complete" %}
+                {% trans %}Your password has been reset successfully.{% endtrans %}
+            {% elif resetkey %}
+                <!-- Provided with a resetkey. -->
+                {% include "partials/error.html" %}
+
+                <form method="post">
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td>{% trans %}Confirm your user name or primary e-mail address:{% endtrans %}</td>
+                                <td>
+                                    <input type="text" name="user" size="30" maxlength="64"
+                                           value="{{ user or '' }}">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>{% trans %}Enter your new password:{% endtrans %}</td>
+                                <td>
+                                    <input type="password" name="password" size="30"
+                                           value="{{ password or '' }}">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>{% trans %}Confirm your new password:{% endtrans %}</td>
+                                <td>
+                                    <input type="password" name="confirm" size="30"
+                                           value="{{ confirm or '' }}">
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <br>
+                    <input type="hidden" name="resetkey"
+                           value="{{ resetkey }}">
+                    <input class="button" type="submit"
+                           value="{% trans %}Continue{% endtrans %}">
+                </form>
+            {% else %}
+                <!-- Default page with prompt for user name/e-mail. -->
+                {% set url = "https://mailman.archlinux.org/mailman/listinfo/aur-general" %}
+                {{ "If you have forgotten the user name and the primary e-mail "
+                "address you used to register, please send a message to the "
+                "%saur-general%s mailing list."
+                | tr
+                | format(
+                    '<a href="%s">' | format(url),
+                    "</a>")
+                | safe
+                }}
+                </p>
+
+                {% include "partials/error.html" %}
+
+                <form method="post">
+                    <p>
+                        {% trans %}Enter your user name or your primary e-mail address:{% endtrans %}
+                        <input type="text" name="user" size="30" maxlength="64"
+                               value="{{ user or '' }}">
+                    </p>
+                    <input class="button" type="submit"
+                           value="{% trans %}Continue{% endtrans %}">
+                </form>
+            {% endif %}
+        </p>
+    </div>
+{% endblock %}
diff --git a/test/README.md b/test/README.md
index 3261899b..872d980b 100644
--- a/test/README.md
+++ b/test/README.md
@@ -27,6 +27,7 @@ For all the test to run, the following Arch packages should be installed:
 - python-pytest
 - python-pytest-cov
 - python-pytest-asyncio
+- postfix
 
 Running tests
 -------------
@@ -37,6 +38,10 @@ First, setup the test configuration:
 
     $ sed -r 's;YOUR_AUR_ROOT;$(pwd);g' conf/config.dev > conf/config
 
+You'll need to make sure that emails can be sent out by aurweb.scripts.notify.
+If you don't have anything setup, just install postfix and start it before
+running tests.
+
 With those installed, one can run Python tests manually with any AUR config
 specified by `AUR_CONFIG`:
 
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
new file mode 100644
index 00000000..0f548805
--- /dev/null
+++ b/test/test_accounts_routes.py
@@ -0,0 +1,218 @@
+from http import HTTPStatus
+
+import pytest
+
+from fastapi.testclient import TestClient
+
+from aurweb.asgi import app
+from aurweb.db import query
+from aurweb.models.account_type import AccountType
+from aurweb.models.session import Session
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_user
+from aurweb.testing.requests import Request
+
+# Some test global constants.
+TEST_USERNAME = "test"
+TEST_EMAIL = "test@example.org"
+
+# Global mutables.
+client = TestClient(app)
+user = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user
+
+    setup_test_db("Users", "Sessions", "Bans")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = make_user(Username=TEST_USERNAME, Email=TEST_EMAIL,
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
+
+
+def test_get_passreset_authed_redirects():
+    sid = user.login(Request(), "testPassword")
+    assert sid is not None
+
+    with client as request:
+        response = request.get("/passreset", cookies={"AURSID": sid},
+                               allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/"
+
+
+def test_get_passreset():
+    with client as request:
+        response = request.get("/passreset")
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_get_passreset_translation():
+    # Test that translation works.
+    with client as request:
+        response = request.get("/passreset", cookies={"AURLANG": "de"})
+
+    # The header title should be translated.
+    assert "Passwort zurücksetzen".encode("utf-8") in response.content
+
+    # The form input label should be translated.
+    assert "Benutzername oder primäre E-Mail-Adresse eingeben:".encode(
+        "utf-8") in response.content
+
+    # And the button.
+    assert "Weiter".encode("utf-8") in response.content
+
+
+def test_get_passreset_with_resetkey():
+    with client as request:
+        response = request.get("/passreset", data={"resetkey": "abcd"})
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_post_passreset_authed_redirects():
+    sid = user.login(Request(), "testPassword")
+    assert sid is not None
+
+    with client as request:
+        response = request.post("/passreset",
+                                cookies={"AURSID": sid},
+                                data={"user": "blah"},
+                                allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/"
+
+
+def test_post_passreset_user():
+    # With username.
+    with client as request:
+        response = request.post("/passreset", data={"user": TEST_USERNAME})
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/passreset?step=confirm"
+
+    # With e-mail.
+    with client as request:
+        response = request.post("/passreset", data={"user": TEST_EMAIL})
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/passreset?step=confirm"
+
+
+def test_post_passreset_resetkey():
+    from aurweb.db import session
+
+    user.session = Session(UsersID=user.ID, SessionID="blah",
+                           LastUpdateTS=datetime.utcnow().timestamp())
+    session.commit()
+
+    # Prepare a password reset.
+    with client as request:
+        response = request.post("/passreset", data={"user": TEST_USERNAME})
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/passreset?step=confirm"
+
+    # Now that we've prepared the password reset, prepare a POST
+    # request with the user's ResetKey.
+    resetkey = user.ResetKey
+    post_data = {
+        "user": TEST_USERNAME,
+        "resetkey": resetkey,
+        "password": "abcd1234",
+        "confirm": "abcd1234"
+    }
+
+    with client as request:
+        response = request.post("/passreset", data=post_data)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/passreset?step=complete"
+
+
+def test_post_passreset_error_invalid_email():
+    # First, test with a user that doesn't even exist.
+    with client as request:
+        response = request.post("/passreset", data={"user": "invalid"})
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+
+    error = "Invalid e-mail."
+    assert error in response.content.decode("utf-8")
+
+    # Then, test with an invalid resetkey for a real user.
+    _ = make_resetkey()
+    post_data = make_passreset_data("fake")
+    post_data["password"] = "abcd1234"
+    post_data["confirm"] = "abcd1234"
+
+    with client as request:
+        response = request.post("/passreset", data=post_data)
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+    assert error in response.content.decode("utf-8")
+
+
+def make_resetkey():
+    with client as request:
+        response = request.post("/passreset", data={"user": TEST_USERNAME})
+        assert response.status_code == int(HTTPStatus.SEE_OTHER)
+        assert response.headers.get("location") == "/passreset?step=confirm"
+    return user.ResetKey
+
+
+def make_passreset_data(resetkey):
+    return {
+        "user": user.Username,
+        "resetkey": resetkey
+    }
+
+
+def test_post_passreset_error_missing_field():
+    # Now that we've prepared the password reset, prepare a POST
+    # request with the user's ResetKey.
+    resetkey = make_resetkey()
+    post_data = make_passreset_data(resetkey)
+
+    with client as request:
+        response = request.post("/passreset", data=post_data)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    error = "Missing a required field."
+    assert error in response.content.decode("utf-8")
+
+
+def test_post_passreset_error_password_mismatch():
+    resetkey = make_resetkey()
+    post_data = make_passreset_data(resetkey)
+
+    post_data["password"] = "abcd1234"
+    post_data["confirm"] = "mismatched"
+
+    with client as request:
+        response = request.post("/passreset", data=post_data)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    error = "Password fields do not match."
+    assert error in response.content.decode("utf-8")
+
+
+def test_post_passreset_error_password_requirements():
+    resetkey = make_resetkey()
+    post_data = make_passreset_data(resetkey)
+
+    passwd_min_len = User.minimum_passwd_length()
+    assert passwd_min_len >= 4
+
+    post_data["password"] = "x"
+    post_data["confirm"] = "x"
+
+    with client as request:
+        response = request.post("/passreset", data=post_data)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    error = f"Your password must be at least {passwd_min_len} characters."
+    assert error in response.content.decode("utf-8")
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index adf75329..ff8a08e9 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -14,8 +14,12 @@ from aurweb.models.session import Session
 from aurweb.testing import setup_test_db
 from aurweb.testing.models import make_user
 
-client = TestClient(app)
+# Some test global constants.
+TEST_USERNAME = "test"
+TEST_EMAIL = "test@example.org"
 
+# Global mutables.
+client = TestClient(app)
 user = None
 
 
@@ -27,7 +31,8 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = make_user(Username="test", Email="test@example.org",
+
+    user = make_user(Username=TEST_USERNAME, Email=TEST_EMAIL,
                      RealName="Test User", Passwd="testPassword",
                      AccountType=account_type)
 
@@ -40,16 +45,16 @@ def test_login_logout():
     }
 
     with client as request:
-        response = client.get("/login")
+        # First, let's test get /login.
+        response = request.get("/login")
         assert response.status_code == int(HTTPStatus.OK)
 
         response = request.post("/login", data=post_data,
                                 allow_redirects=False)
         assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
-        response = request.get(response.headers.get("location"), cookies={
-            "AURSID": response.cookies.get("AURSID")
-        })
+        # Simulate following the redirect location from above's response.
+        response = request.get(response.headers.get("location"))
         assert response.status_code == int(HTTPStatus.OK)
 
         response = request.post("/logout", data=post_data,
@@ -60,9 +65,37 @@ def test_login_logout():
             "AURSID": response.cookies.get("AURSID")
         }, allow_redirects=False)
         assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
     assert "AURSID" not in response.cookies
 
 
+def test_authenticated_login_forbidden():
+    post_data = {
+        "user": "test",
+        "passwd": "testPassword",
+        "next": "/"
+    }
+
+    with client as request:
+        # Login.
+        response = request.post("/login", data=post_data,
+                                allow_redirects=False)
+        assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+        # Now, let's verify that we receive 403 Forbidden when we
+        # try to get /login as an authenticated user.
+        response = request.get("/login", allow_redirects=False)
+        assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_unauthenticated_logout_unauthorized():
+    with client as request:
+        # Alright, let's verify that attempting to /logout when not
+        # authenticated returns 401 Unauthorized.
+        response = request.get("/logout", allow_redirects=False)
+        assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+
 def test_login_missing_username():
     post_data = {
         "passwd": "testPassword",
@@ -75,8 +108,6 @@ def test_login_missing_username():
 
 
 def test_login_remember_me():
-    from aurweb.db import session
-
     post_data = {
         "user": "test",
         "passwd": "testPassword",
@@ -94,8 +125,8 @@ def test_login_remember_me():
         "options", "persistent_cookie_timeout")
     expected_ts = datetime.utcnow().timestamp() + cookie_timeout
 
-    _session = session.query(Session).filter(
-        Session.UsersID == user.ID).first()
+    _session = query(Session,
+                     Session.UsersID == user.ID).first()
 
     # Expect that LastUpdateTS was within 5 seconds of the expected_ts,
     # which is equal to the current timestamp + persistent_cookie_timeout.
diff --git a/test/test_db.py b/test/test_db.py
index 1eb0dc28..e0946ed5 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -3,7 +3,6 @@ import re
 import sqlite3
 import tempfile
 
-from datetime import datetime
 from unittest import mock
 
 import mysql.connector
@@ -185,3 +184,15 @@ def test_create_delete():
     db.delete(AccountType, AccountType.AccountType == "test")
     record = db.query(AccountType, AccountType.AccountType == "test").first()
     assert record is None
+
+
+@mock.patch("mysql.connector.paramstyle", "qmark")
+def test_connection_executor_mysql_paramstyle():
+    executor = db.ConnectionExecutor(None, backend="mysql")
+    assert executor.paramstyle() == "qmark"
+
+
+@mock.patch("sqlite3.paramstyle", "pyformat")
+def test_connection_executor_sqlite_paramstyle():
+    executor = db.ConnectionExecutor(None, backend="sqlite")
+    assert executor.paramstyle() == "pyformat"
diff --git a/test/test_user.py b/test/test_user.py
index b8d4248a..4f144819 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -28,8 +28,8 @@ def setup():
 
     setup_test_db("Users", "Sessions", "Bans")
 
-    account_type = session.query(AccountType).filter(
-        AccountType.AccountType == "User").first()
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
 
     user = make_user(Username="test", Email="test@example.org",
                      RealName="Test User", Passwd="testPassword",
@@ -67,7 +67,7 @@ def test_user_login_logout():
     assert user.session.User == user
 
     # Search for the user via query API.
-    result = session.query(User).filter(User.ID == user.ID).first()
+    result = query(User, User.ID == user.ID).first()
 
     # Compare the result and our original user.
     assert result == user
diff --git a/util/sendmail b/util/sendmail
new file mode 100755
index 00000000..06bd9865
--- /dev/null
+++ b/util/sendmail
@@ -0,0 +1,2 @@
+#!/bin/bash
+exit 0

From 9fdbe3f775a3d13e92a02a11e5eb4830e6daf875 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 8 Jan 2021 20:10:45 -0800
Subject: [PATCH 106/844] add authenticated User LangPreference tracking

+ Use User.LangPreference when there is no set AURSID
  if request.user.is_authenticated is true.
+ Updated post /language to update LangPreference when
  request.user.is_authenticated.
+ Restore language during test where we change it.
+ Added the user attribute to aurweb.testing.requests.Request.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/l10n.py               | 12 ++++--------
 aurweb/routers/html.py       | 11 ++++++++++-
 aurweb/testing/requests.py   | 19 +++++++++++++++++++
 test/test_accounts_routes.py |  6 +++++-
 test/test_routes.py          | 25 +++++++++++++++++++++----
 5 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index 030ab274..4a5c1a46 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -64,8 +64,10 @@ translator = Translator()
 
 
 def get_request_language(request: Request):
-    return request.cookies.get("AURLANG",
-                               aurweb.config.get("options", "default_lang"))
+    if request.user.is_authenticated():
+        return request.user.LangPreference
+    default_lang = aurweb.config.get("options", "default_lang")
+    return request.cookies.get("AURLANG", default_lang)
 
 
 def get_raw_translator_for_request(request: Request):
@@ -77,12 +79,6 @@ def get_translator_for_request(request: Request):
     """
     Determine the preferred language from a FastAPI request object and build a
     translator function for it.
-
-    Example:
-    ```python
-    _ = get_translator_for_request(request)
-    print(_("Hello"))
-    ```
     """
     lang = get_request_language(request)
 
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 32a7e630..e947d213 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -24,12 +24,14 @@ async def language(request: Request,
                    set_lang: str = Form(...),
                    next: str = Form(...),
                    q: str = Form(default=None)):
-    """ A POST route used to set a session's language.
+    """
+    A POST route used to set a session's language.
 
     Return a 303 See Other redirect to {next}?next={next}. If we are
     setting the language on any page, we want to preserve query
     parameters across the redirect.
     """
+    from aurweb.db import session
     from aurweb.asgi import routes
     if unquote(next) not in routes:
         return HTMLResponse(
@@ -37,6 +39,13 @@ async def language(request: Request,
             status_code=400)
 
     query_string = "?" + q if q else str()
+
+    # If the user is authenticated, update the user's LangPreference.
+    if request.user.is_authenticated():
+        request.user.LangPreference = set_lang
+        session.commit()
+
+    # In any case, set the response's AURLANG cookie that never expires.
     response = RedirectResponse(url=f"{next}{query_string}",
                                 status_code=int(HTTPStatus.SEE_OTHER))
     response.set_cookie("AURLANG", set_lang)
diff --git a/aurweb/testing/requests.py b/aurweb/testing/requests.py
index 2839c93f..2e64fd3d 100644
--- a/aurweb/testing/requests.py
+++ b/aurweb/testing/requests.py
@@ -1,8 +1,27 @@
+import aurweb.config
+
+
+class User:
+    """ A fake User model. """
+    # Fake columns.
+    LangPreference = aurweb.config.get("options", "default_lang")
+
+    # A fake authenticated flag.
+    authenticated = False
+
+    def is_authenticated(self):
+        return self.authenticated
+
+
 class Client:
+    """ A fake FastAPI Request.client object. """
+    # A fake host.
     host = "127.0.0.1"
 
 
 class Request:
+    """ A fake Request object which mimics a FastAPI Request for tests. """
     client = Client()
     cookies = dict()
     headers = dict()
+    user = User()
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 0f548805..69896a0f 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -54,7 +54,7 @@ def test_get_passreset():
 
 
 def test_get_passreset_translation():
-    # Test that translation works.
+    # Test that translation works; set it to de.
     with client as request:
         response = request.get("/passreset", cookies={"AURLANG": "de"})
 
@@ -68,6 +68,10 @@ def test_get_passreset_translation():
     # And the button.
     assert "Weiter".encode("utf-8") in response.content
 
+    # Restore english.
+    with client as request:
+        response = request.get("/passreset", cookies={"AURLANG": "en"})
+
 
 def test_get_passreset_with_resetkey():
     with client as request:
diff --git a/test/test_routes.py b/test/test_routes.py
index 950d9b71..d512a172 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -10,13 +10,14 @@ from aurweb.asgi import app
 from aurweb.db import query
 from aurweb.models.account_type import AccountType
 from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_user
+from aurweb.testing.requests import Request
 
 client = TestClient(app)
-
 user = None
 
 
-@pytest.fixture
+@pytest.fixture(autouse=True)
 def setup():
     global user
 
@@ -46,7 +47,7 @@ def test_favicon():
 
 
 def test_language():
-    """ Test the language post route at '/language'. """
+    """ Test the language post route as a guest user. """
     post_data = {
         "set_lang": "de",
         "next": "/"
@@ -67,6 +68,23 @@ def test_language_invalid_next():
     assert response.status_code == int(HTTPStatus.BAD_REQUEST)
 
 
+def test_user_language():
+    """ Test the language post route as an authenticated user. """
+    post_data = {
+        "set_lang": "de",
+        "next": "/"
+    }
+
+    sid = user.login(Request(), "testPassword")
+    assert sid is not None
+
+    with client as req:
+        response = req.post("/language", data=post_data,
+                            cookies={"AURSID": sid})
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert user.LangPreference == "de"
+
+
 def test_language_query_params():
     """ Test the language post route with query params. """
     next = urllib.parse.quote_plus("/")
@@ -87,4 +105,3 @@ def test_error_messages():
     response2 = client.get("/raisefivethree")
     assert response1.status_code == int(HTTPStatus.NOT_FOUND)
     assert response2.status_code == int(HTTPStatus.SERVICE_UNAVAILABLE)
-

From 670f711b593ed6c040ed3facb6212d327a3c38af Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 13 Jan 2021 06:46:30 -0800
Subject: [PATCH 107/844] add SSHPubKey ORM model

Includes `aurweb.models.ssh_pub_key.get_fingerprint(pubkey)` helper.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/ssh_pub_key.py | 41 +++++++++++++++++++++++++
 test/test_ssh_pub_key.py     | 58 ++++++++++++++++++++++++++++++++++++
 test/test_user.py            | 20 ++++++++++++-
 3 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 aurweb/models/ssh_pub_key.py
 create mode 100644 test/test_ssh_pub_key.py

diff --git a/aurweb/models/ssh_pub_key.py b/aurweb/models/ssh_pub_key.py
new file mode 100644
index 00000000..01ff558e
--- /dev/null
+++ b/aurweb/models/ssh_pub_key.py
@@ -0,0 +1,41 @@
+import os
+import tempfile
+
+from subprocess import PIPE, Popen
+
+from sqlalchemy.orm import backref, mapper, relationship
+
+from aurweb.models.user import User
+from aurweb.schema import SSHPubKeys
+
+
+class SSHPubKey:
+    def __init__(self, **kwargs):
+        self.UserID = kwargs.get("UserID")
+        self.Fingerprint = kwargs.get("Fingerprint")
+        self.PubKey = kwargs.get("PubKey")
+
+
+def get_fingerprint(pubkey):
+    with tempfile.TemporaryDirectory() as tmpdir:
+        pk = os.path.join(tmpdir, "ssh.pub")
+
+        with open(pk, "w") as f:
+            f.write(pubkey)
+
+        proc = Popen(["ssh-keygen", "-l", "-f", pk], stdout=PIPE, stderr=PIPE)
+        out, err = proc.communicate()
+
+        # Invalid SSH Public Key. Return None to the caller.
+        if proc.returncode != 0:
+            return None
+
+        parts = out.decode().split()
+        fp = parts[1].replace("SHA256:", "")
+
+    return fp
+
+
+mapper(SSHPubKey, SSHPubKeys, properties={
+    "User": relationship(User, backref=backref("ssh_pub_key", uselist=False))
+})
diff --git a/test/test_ssh_pub_key.py b/test/test_ssh_pub_key.py
new file mode 100644
index 00000000..fe9df047
--- /dev/null
+++ b/test/test_ssh_pub_key.py
@@ -0,0 +1,58 @@
+import pytest
+
+from aurweb.db import query
+from aurweb.models.account_type import AccountType
+from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
+from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_user
+
+TEST_SSH_PUBKEY = """
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCycoCi5yGCvSclH2wmNBUuwsYEzRZZBJaQquRc4ysl+Tg+/jiDkR3Zn9fIznC4KnFoyrIHzkKuePZ3bNDYwkZxkJKoWBCh4hXKDXSm87FMN0+VDC+1QxF/z0XaAGr/P6f4XukabyddypBdnHcZiplbw+YOSqcAE2TCqOlSXwNMOcF9U89UsR/Q9i9I52hlvU0q8+fZVGhou1KCowFSnHYtrr5KYJ04CXkJ13DkVf3+pjQWyrByvBcf1hGEaczlgfobrrv/y96jDhgfXucxliNKLdufDPPkii3LhhsNcDmmI1VZ3v0irKvd9WZuauqloobY84zEFcDTyjn0hxGjVeYFejm4fBnvjga0yZXORuWksdNfXWLDxFk6MDDd1jF0ExRbP+OxDuU4IVyIuDL7S3cnbf2YjGhkms/8voYT2OBE7FwNlfv98Kr0NUp51zpf55Arxn9j0Rz9xTA7FiODQgCn6iQ0SDtzUNL0IKTCw26xJY5gzMxbfpvzPQGeulx/ioM= kevr@volcano
+"""
+
+user, ssh_pub_key = None, None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    from aurweb.db import session
+
+    global user, ssh_pub_key
+
+    setup_test_db("Users", "SSHPubKeys")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = make_user(Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
+
+    assert account_type == user.AccountType
+    assert account_type.ID == user.AccountTypeID
+
+    ssh_pub_key = SSHPubKey(UserID=user.ID,
+                            Fingerprint="testFingerprint",
+                            PubKey="testPubKey")
+
+    session.add(ssh_pub_key)
+    session.commit()
+
+    yield ssh_pub_key
+
+    session.delete(ssh_pub_key)
+    session.commit()
+
+
+def test_ssh_pub_key():
+    assert ssh_pub_key.UserID == user.ID
+    assert ssh_pub_key.User == user
+    assert ssh_pub_key.Fingerprint == "testFingerprint"
+    assert ssh_pub_key.PubKey == "testPubKey"
+
+
+def test_ssh_pub_key_fingerprint():
+    assert get_fingerprint(TEST_SSH_PUBKEY) is not None
+
+
+def test_ssh_pub_key_invalid_fingerprint():
+    assert get_fingerprint("ssh-rsa fake and invalid") is None
diff --git a/test/test_user.py b/test/test_user.py
index 4f144819..473b035a 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -12,6 +12,7 @@ from aurweb.db import query
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.session import Session
+from aurweb.models.ssh_pub_key import SSHPubKey
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
 from aurweb.testing.models import make_session, make_user
@@ -26,7 +27,7 @@ def setup():
 
     global account_type, user
 
-    setup_test_db("Users", "Sessions", "Bans")
+    setup_test_db("Users", "Sessions", "Bans", "SSHPubKeys")
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
@@ -160,3 +161,20 @@ def test_user_update_password():
 def test_user_minimum_passwd_length():
     passwd_min_len = aurweb.config.getint("options", "passwd_min_len")
     assert User.minimum_passwd_length() == passwd_min_len
+
+
+def test_user_ssh_pub_key():
+    from aurweb.db import session
+
+    assert user.ssh_pub_key is None
+
+    ssh_pub_key = SSHPubKey(UserID=user.ID,
+                            Fingerprint="testFingerprint",
+                            PubKey="testPubKey")
+    session.add(ssh_pub_key)
+    session.commit()
+
+    assert user.ssh_pub_key == ssh_pub_key
+
+    session.delete(ssh_pub_key)
+    session.commit()

From 07d5907ecda5e93ebe44bd591a7f0ce87fb73cc2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 25 Jan 2021 16:30:47 -0800
Subject: [PATCH 108/844] aurweb.auth: add user credentials and matcher
 functions

This clones the behavior already present in the PHP implementation,
but it uses a global dict with credential constant keys to
validation functions to determine if a given user has a credential.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py        | 101 ++++++++++++++++++++++++++++++++++++++++++
 aurweb/models/user.py |   5 +++
 test/test_auth.py     |   7 ++-
 test/test_user.py     |  42 ++++++++++++++++++
 4 files changed, 154 insertions(+), 1 deletion(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 8608a82a..53c853de 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -17,6 +17,10 @@ class AnonymousUser:
     def is_authenticated():
         return False
 
+    @staticmethod
+    def has_credential(credential):
+        return False
+
 
 class BasicAuthBackend(AuthenticationBackend):
     async def authenticate(self, conn: HTTPConnection):
@@ -75,3 +79,100 @@ def auth_required(is_required: bool = True,
         return wrapper
 
     return decorator
+
+
+CRED_ACCOUNT_CHANGE_TYPE = 1
+CRED_ACCOUNT_EDIT = 2
+CRED_ACCOUNT_EDIT_DEV = 3
+CRED_ACCOUNT_LAST_LOGIN = 4
+CRED_ACCOUNT_SEARCH = 5
+CRED_ACCOUNT_LIST_COMMENTS = 28
+CRED_COMMENT_DELETE = 6
+CRED_COMMENT_UNDELETE = 27
+CRED_COMMENT_VIEW_DELETED = 22
+CRED_COMMENT_EDIT = 25
+CRED_COMMENT_PIN = 26
+CRED_PKGBASE_ADOPT = 7
+CRED_PKGBASE_SET_KEYWORDS = 8
+CRED_PKGBASE_DELETE = 9
+CRED_PKGBASE_DISOWN = 10
+CRED_PKGBASE_EDIT_COMAINTAINERS = 24
+CRED_PKGBASE_FLAG = 11
+CRED_PKGBASE_LIST_VOTERS = 12
+CRED_PKGBASE_NOTIFY = 13
+CRED_PKGBASE_UNFLAG = 15
+CRED_PKGBASE_VOTE = 16
+CRED_PKGREQ_FILE = 23
+CRED_PKGREQ_CLOSE = 17
+CRED_PKGREQ_LIST = 18
+CRED_TU_ADD_VOTE = 19
+CRED_TU_LIST_VOTES = 20
+CRED_TU_VOTE = 21
+
+
+def has_any(user, *account_types):
+    return str(user.AccountType) in set(account_types)
+
+
+def user_developer_or_trusted_user(user):
+    return has_any(user, "User", "Trusted User", "Developer",
+                   "Trusted User & Developer")
+
+
+def trusted_user(user):
+    return has_any(user, "Trusted User", "Trusted User & Developer")
+
+
+def developer(user):
+    return has_any(user, "Developer", "Trusted User & Developer")
+
+
+def trusted_user_or_dev(user):
+    return has_any(user, "Trusted User", "Developer",
+                   "Trusted User & Developer")
+
+
+# A mapping of functions that users must pass to have credentials.
+cred_filters = {
+    CRED_PKGBASE_FLAG: user_developer_or_trusted_user,
+    CRED_PKGBASE_NOTIFY: user_developer_or_trusted_user,
+    CRED_PKGBASE_VOTE: user_developer_or_trusted_user,
+    CRED_PKGREQ_FILE: user_developer_or_trusted_user,
+    CRED_ACCOUNT_CHANGE_TYPE: trusted_user_or_dev,
+    CRED_ACCOUNT_EDIT: trusted_user_or_dev,
+    CRED_ACCOUNT_LAST_LOGIN: trusted_user_or_dev,
+    CRED_ACCOUNT_LIST_COMMENTS: trusted_user_or_dev,
+    CRED_ACCOUNT_SEARCH: trusted_user_or_dev,
+    CRED_COMMENT_DELETE: trusted_user_or_dev,
+    CRED_COMMENT_UNDELETE: trusted_user_or_dev,
+    CRED_COMMENT_VIEW_DELETED: trusted_user_or_dev,
+    CRED_COMMENT_EDIT: trusted_user_or_dev,
+    CRED_COMMENT_PIN: trusted_user_or_dev,
+    CRED_PKGBASE_ADOPT: trusted_user_or_dev,
+    CRED_PKGBASE_SET_KEYWORDS: trusted_user_or_dev,
+    CRED_PKGBASE_DELETE: trusted_user_or_dev,
+    CRED_PKGBASE_EDIT_COMAINTAINERS: trusted_user_or_dev,
+    CRED_PKGBASE_DISOWN: trusted_user_or_dev,
+    CRED_PKGBASE_LIST_VOTERS: trusted_user_or_dev,
+    CRED_PKGBASE_UNFLAG: trusted_user_or_dev,
+    CRED_PKGREQ_CLOSE: trusted_user_or_dev,
+    CRED_PKGREQ_LIST: trusted_user_or_dev,
+    CRED_TU_ADD_VOTE: trusted_user,
+    CRED_TU_LIST_VOTES: trusted_user,
+    CRED_TU_VOTE: trusted_user,
+    CRED_ACCOUNT_EDIT_DEV: developer,
+}
+
+
+def has_credential(user: User,
+                   credential: int,
+                   approved_users: list = tuple()):
+
+    if user in approved_users:
+        return True
+
+    if credential in cred_filters:
+        cred_filter = cred_filters.get(credential)
+        return cred_filter(user)
+
+    return False
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index aff4ce6b..3983e098 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -141,6 +141,11 @@ class User:
         request.cookies["AURSID"] = self.session.SessionID
         return self.session.SessionID
 
+    def has_credential(self, credential: str, approved: list = tuple()):
+        import aurweb.auth
+        cred = getattr(aurweb.auth, credential)
+        return aurweb.auth.has_credential(self, cred, approved)
+
     def logout(self, request):
         from aurweb.db import session
 
diff --git a/test/test_auth.py b/test/test_auth.py
index d2251de4..d43459cd 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -4,8 +4,8 @@ import pytest
 
 from starlette.authentication import AuthenticationError
 
+from aurweb.auth import BasicAuthBackend, has_credential
 from aurweb.db import query
-from aurweb.auth import BasicAuthBackend
 from aurweb.models.account_type import AccountType
 from aurweb.testing import setup_test_db
 from aurweb.testing.models import make_session, make_user
@@ -78,3 +78,8 @@ async def test_basic_auth_backend():
                  LastUpdateTS=now_ts + 5)
     _, result = await backend.authenticate(request)
     assert result == user
+
+
+def test_has_fake_credential_fails():
+    # Fake credential 666 does not exist.
+    assert not has_credential(user, 666)
diff --git a/test/test_user.py b/test/test_user.py
index 473b035a..e8056681 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -163,6 +163,11 @@ def test_user_minimum_passwd_length():
     assert User.minimum_passwd_length() == passwd_min_len
 
 
+def test_user_has_credential():
+    assert user.has_credential("CRED_PKGBASE_FLAG")
+    assert not user.has_credential("CRED_ACCOUNT_CHANGE_TYPE")
+
+
 def test_user_ssh_pub_key():
     from aurweb.db import session
 
@@ -178,3 +183,40 @@ def test_user_ssh_pub_key():
 
     session.delete(ssh_pub_key)
     session.commit()
+
+
+def test_user_credential_types():
+    from aurweb.db import session
+
+    assert aurweb.auth.user_developer_or_trusted_user(user)
+    assert not aurweb.auth.trusted_user(user)
+    assert not aurweb.auth.developer(user)
+    assert not aurweb.auth.trusted_user_or_dev(user)
+
+    trusted_user_type = query(AccountType,
+                              AccountType.AccountType == "Trusted User")\
+        .first()
+    user.AccountType = trusted_user_type
+    session.commit()
+
+    assert aurweb.auth.trusted_user(user)
+    assert aurweb.auth.trusted_user_or_dev(user)
+
+    developer_type = query(AccountType,
+                           AccountType.AccountType == "Developer")\
+        .first()
+    user.AccountType = developer_type
+    session.commit()
+
+    assert aurweb.auth.developer(user)
+    assert aurweb.auth.trusted_user_or_dev(user)
+
+    type_str = "Trusted User & Developer"
+    elevated_type = query(AccountType,
+                          AccountType.AccountType == type_str).first()
+    user.AccountType = elevated_type
+    session.commit()
+
+    assert aurweb.auth.trusted_user(user)
+    assert aurweb.auth.developer(user)
+    assert aurweb.auth.trusted_user_or_dev(user)

From 9052688ed247bccda516ffa84183b7ed442f0a04 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 25 Jan 2021 16:52:14 -0800
Subject: [PATCH 109/844] add aurweb.time module

This module includes timezone-based utilities for a FastAPI request.
This commit introduces use of the AURTZ cookie within get_request_timezone.
This cookie should be set to the user or session's timezone.

* `make_context` has been modified to parse the request's timezone
  and include the "timezone" and "timezones" variables, along with
  a timezone specified "now" date.
+ Added `Timezone` attribute to aurweb.testing.requests.Request.user.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py        | 11 ++++---
 aurweb/testing/requests.py |  1 +
 aurweb/time.py             | 63 ++++++++++++++++++++++++++++++++++++++
 test/test_time.py          | 33 ++++++++++++++++++++
 4 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 aurweb/time.py
 create mode 100644 test/test_time.py

diff --git a/aurweb/templates.py b/aurweb/templates.py
index c5f378b8..564f3149 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -1,5 +1,6 @@
 import copy
 import os
+import zoneinfo
 
 from datetime import datetime
 from http import HTTPStatus
@@ -11,7 +12,7 @@ from fastapi.responses import HTMLResponse
 
 import aurweb.config
 
-from aurweb import l10n
+from aurweb import l10n, time
 
 # Prepare jinja2 objects.
 loader = jinja2.FileSystemLoader(os.path.join(
@@ -26,14 +27,15 @@ env.filters["tr"] = l10n.tr
 def make_context(request: Request, title: str, next: str = None):
     """ Create a context for a jinja2 TemplateResponse. """
 
+    timezone = time.get_request_timezone(request)
     return {
         "request": request,
         "language": l10n.get_request_language(request),
         "languages": l10n.SUPPORTED_LANGUAGES,
+        "timezone": timezone,
+        "timezones": time.SUPPORTED_TIMEZONES,
         "title": title,
-        # The 'now' context variable will not show proper datetimes
-        # until we've implemented timezone support here.
-        "now": datetime.now(),
+        "now": datetime.now(tz=zoneinfo.ZoneInfo(timezone)),
         "config": aurweb.config,
         "next": next if next else request.url.path
     }
@@ -60,4 +62,5 @@ def render_template(request: Request,
 
     response = HTMLResponse(rendered, status_code=status_code)
     response.set_cookie("AURLANG", context.get("language"))
+    response.set_cookie("AURTZ", context.get("timezone"))
     return response
diff --git a/aurweb/testing/requests.py b/aurweb/testing/requests.py
index 2e64fd3d..9976b6fb 100644
--- a/aurweb/testing/requests.py
+++ b/aurweb/testing/requests.py
@@ -5,6 +5,7 @@ class User:
     """ A fake User model. """
     # Fake columns.
     LangPreference = aurweb.config.get("options", "default_lang")
+    Timezone = aurweb.config.get("options", "default_timezone")
 
     # A fake authenticated flag.
     authenticated = False
diff --git a/aurweb/time.py b/aurweb/time.py
new file mode 100644
index 00000000..0b1dff11
--- /dev/null
+++ b/aurweb/time.py
@@ -0,0 +1,63 @@
+import zoneinfo
+
+from collections import OrderedDict
+from datetime import datetime
+
+from fastapi import Request
+
+import aurweb.config
+
+
+def tz_offset(name: str):
+    """ Get a timezone offset in the form "+00:00" by its name.
+
+    Example: tz_offset('America/Los_Angeles')
+
+    :param name: Timezone name
+    :return: UTC offset in the form "+00:00"
+    """
+    dt = datetime.now(tz=zoneinfo.ZoneInfo(name))
+
+    # Our offset in hours.
+    offset = dt.utcoffset().total_seconds() / 60 / 60
+
+    # Prefix the offset string with a - or +.
+    offset_string = '-' if offset < 0 else '+'
+
+    # Remove any negativity from the offset. We want a good offset. :)
+    offset = abs(offset)
+
+    # Truncate the floating point digits, giving the hours.
+    hours = int(offset)
+
+    # Subtract hours from the offset, and multiply the remaining fraction
+    # (0 - 0.99[repeated]) with 60 minutes to get the number of minutes
+    # remaining in the hour.
+    minutes = int((offset - hours) * 60)
+
+    # Pad the hours and minutes by two places.
+    offset_string += "{:0>2}:{:0>2}".format(hours, minutes)
+    return offset_string
+
+
+SUPPORTED_TIMEZONES = OrderedDict({
+    # Flatten out the list of tuples into an OrderedDict.
+    timezone: offset for timezone, offset in sorted([
+        # Comprehend a list of tuples (timezone, offset display string)
+        # and sort them by (offset, timezone).
+        (tz, "(UTC%s) %s" % (tz_offset(tz), tz))
+        for tz in zoneinfo.available_timezones()
+    ], key=lambda element: (tz_offset(element[0]), element[0]))
+})
+
+
+def get_request_timezone(request: Request):
+    """ Get a request's timezone by its AURTZ cookie. We use the
+    configuration's [options] default_timezone otherwise.
+
+    @param request FastAPI request
+    """
+    if request.user.is_authenticated():
+        return request.user.Timezone
+    default_tz = aurweb.config.get("options", "default_timezone")
+    return request.cookies.get("AURTZ", default_tz)
diff --git a/test/test_time.py b/test/test_time.py
new file mode 100644
index 00000000..2134d217
--- /dev/null
+++ b/test/test_time.py
@@ -0,0 +1,33 @@
+import aurweb.config
+
+from aurweb.testing.requests import Request
+from aurweb.time import get_request_timezone, tz_offset
+
+
+def test_tz_offset_utc():
+    offset = tz_offset("UTC")
+    assert offset == "+00:00"
+
+
+def test_tz_offset_mst():
+    offset = tz_offset("MST")
+    assert offset == "-07:00"
+
+
+def test_request_timezone():
+    request = Request()
+    tz = get_request_timezone(request)
+    assert tz == aurweb.config.get("options", "default_timezone")
+
+
+def test_authenticated_request_timezone():
+    # Modify a fake request to be authenticated with the
+    # America/Los_Angeles timezone.
+    request = Request()
+    request.user.authenticated = True
+    request.user.Timezone = "America/Los_Angeles"
+
+    # Get the request's timezone, it should be America/Los_Angeles.
+    tz = get_request_timezone(request)
+    assert tz == request.user.Timezone
+    assert tz == "America/Los_Angeles"

From a5be6fc9beaa8a195b9c8e382d25b5bb51225412 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 27 Jan 2021 18:30:57 -0800
Subject: [PATCH 110/844] aurweb.templates: add make_variable_context

A new make_context wrapper which additionally includes either
query parameters (get) or form data (post) in the context.

Use this to simplify setting context variables for form data
in particular.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py | 13 +++----------
 aurweb/templates.py        | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 0839f64e..db23bc3a 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -9,7 +9,7 @@ from aurweb.auth import auth_required
 from aurweb.l10n import get_translator_for_request
 from aurweb.models.user import User
 from aurweb.scripts.notify import ResetKeyNotification
-from aurweb.templates import make_context, render_template
+from aurweb.templates import make_variable_context, render_template
 
 router = APIRouter()
 
@@ -17,11 +17,7 @@ router = APIRouter()
 @router.get("/passreset", response_class=HTMLResponse)
 @auth_required(False)
 async def passreset(request: Request):
-    context = make_context(request, "Password Reset")
-
-    for k, v in request.query_params.items():
-        context[k] = v
-
+    context = await make_variable_context(request, "Password Reset")
     return render_template(request, "passreset.html", context)
 
 
@@ -34,10 +30,7 @@ async def passreset_post(request: Request,
                          confirm: str = Form(default=None)):
     from aurweb.db import session
 
-    context = make_context(request, "Password Reset")
-
-    for k, v in dict(await request.form()).items():
-        context[k] = v
+    context = await make_variable_context(request, "Password Reset")
 
     # The user parameter being required, we can match against
     user = db.query(User, or_(User.Username == user,
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 564f3149..4ea74a62 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -41,6 +41,20 @@ def make_context(request: Request, title: str, next: str = None):
     }
 
 
+async def make_variable_context(request: Request, title: str, next: str = None):
+    """ Make a context with variables provided by the user
+    (query params via GET or form data via POST). """
+    context = make_context(request, title, next)
+    to_copy = dict(request.query_params) \
+        if request.method.lower() == "get" \
+        else dict(await request.form())
+
+    for k, v in to_copy.items():
+        context[k] = v
+
+    return context
+
+
 def render_template(request: Request,
                     path: str,
                     context: dict,

From 7a6a38592e63db1ca8a5a1748458afe659d5be3f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 27 Jan 2021 18:36:06 -0800
Subject: [PATCH 111/844] add python-email-validator dependency

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 1 +
 Dockerfile     | 3 ++-
 INSTALL        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db7dec9b..f1fe5e6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ before_script:
            python-itsdangerous python-httpx python-jinja python-pytest-cov
            python-requests python-aiofiles python-python-multipart
            python-pytest-asyncio python-coverage python-bcrypt
+           python-email-validator
   - bash -c "echo '127.0.0.1' > /etc/hosts"
   - bash -c "echo '::1' >> /etc/hosts"
 
diff --git a/Dockerfile b/Dockerfile
index 6638f9a2..f65acc7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@ RUN pacman -Syu --noconfirm base-devel git gpgme protobuf pyalpm \
     python-werkzeug python-pytest-tap python-fastapi nginx python-authlib \
     python-itsdangerous python-httpx python-jinja python-pytest-cov \
     python-requests python-aiofiles python-python-multipart \
-    python-pytest-asyncio python-coverage hypercorn python-bcrypt
+    python-pytest-asyncio python-coverage hypercorn python-bcrypt \
+    python-email-validator
 
 # Remove aurweb.sqlite3 if it was copied over via COPY.
 RUN rm -fv aurweb.sqlite3
diff --git a/INSTALL b/INSTALL
index 6c43fec8..04ccd69e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -51,7 +51,7 @@ read the instructions below.
                 python-bleach python-markdown python-alembic hypercorn \
                 python-itsdangerous python-authlib python-httpx \
                 python-jinja python-aiofiles python-python-multipart \
-                python-requests hypercorn python-bcrypt
+                python-requests hypercorn python-bcrypt python-email-validator
     # python3 setup.py install
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:

From df0a637d2b5da4a2fc6dae0c7f07bcd7f50e4828 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Jan 2021 16:52:56 -0800
Subject: [PATCH 112/844] add aurweb.captcha, a CAPTCHA utility module

This CAPTCHA workflow is the same workflow used by our current
PHP implementation of account registration.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/captcha.py    | 54 +++++++++++++++++++++++++++++++++++++++
 aurweb/templates.py  |  6 ++++-
 test/test_captcha.py | 60 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 aurweb/captcha.py
 create mode 100644 test/test_captcha.py

diff --git a/aurweb/captcha.py b/aurweb/captcha.py
new file mode 100644
index 00000000..5475d85f
--- /dev/null
+++ b/aurweb/captcha.py
@@ -0,0 +1,54 @@
+""" This module consists of aurweb's CAPTCHA utility functions and filters. """
+import hashlib
+
+import jinja2
+
+from aurweb.db import query
+from aurweb.models.user import User
+
+
+def get_captcha_salts():
+    """ Produce salts based on the current user count. """
+    count = query(User).count()
+    salts = []
+    for i in range(0, 6):
+        salts.append(f"aurweb-{count - i}")
+    return salts
+
+
+def get_captcha_token(salt):
+    """ Produce a token for the CAPTCHA salt. """
+    return hashlib.md5(salt.encode()).hexdigest()[:3]
+
+
+def get_captcha_challenge(salt):
+    """ Get a CAPTCHA challenge string (shell command) for a salt. """
+    token = get_captcha_token(salt)
+    return f"LC_ALL=C pacman -V|sed -r 's#[0-9]+#{token}#g'|md5sum|cut -c1-6"
+
+
+def get_captcha_answer(token):
+    """ Compute the answer via md5 of the real template text, return the
+    first six digits of the hexadecimal hash. """
+    text = r"""
+ .--.                  Pacman v%s.%s.%s - libalpm v%s.%s.%s
+/ _.-' .-.  .-.  .-.   Copyright (C) %s-%s Pacman Development Team
+\  '-. '-'  '-'  '-'   Copyright (C) %s-%s Judd Vinet
+ '--'
+                       This program may be freely redistributed under
+                       the terms of the GNU General Public License.
+""" % tuple([token] * 10)
+    return hashlib.md5((text + "\n").encode()).hexdigest()[:6]
+
+
+@jinja2.contextfilter
+def captcha_salt_filter(context):
+    """ Returns the most recent CAPTCHA salt in the list of salts. """
+    salts = get_captcha_salts()
+    return salts[0]
+
+
+@jinja2.contextfilter
+def captcha_cmdline_filter(context, salt):
+    """ Returns a CAPTCHA challenge for a given salt. """
+    return get_captcha_challenge(salt)
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 4ea74a62..d548e92b 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -12,7 +12,7 @@ from fastapi.responses import HTMLResponse
 
 import aurweb.config
 
-from aurweb import l10n, time
+from aurweb import captcha, l10n, time
 
 # Prepare jinja2 objects.
 loader = jinja2.FileSystemLoader(os.path.join(
@@ -23,6 +23,10 @@ env = jinja2.Environment(loader=loader, autoescape=True,
 # Add tr translation filter.
 env.filters["tr"] = l10n.tr
 
+# Add captcha filters.
+env.filters["captcha_salt"] = captcha.captcha_salt_filter
+env.filters["captcha_cmdline"] = captcha.captcha_cmdline_filter
+
 
 def make_context(request: Request, title: str, next: str = None):
     """ Create a context for a jinja2 TemplateResponse. """
diff --git a/test/test_captcha.py b/test/test_captcha.py
new file mode 100644
index 00000000..ec19dee9
--- /dev/null
+++ b/test/test_captcha.py
@@ -0,0 +1,60 @@
+import hashlib
+
+from aurweb import captcha
+
+
+def test_captcha_salts():
+    """ Make sure we can get some captcha salts. """
+    salts = captcha.get_captcha_salts()
+    assert len(salts) == 6
+
+
+def test_captcha_token():
+    """ Make sure getting a captcha salt's token matches up against
+    the first three digits of the md5 hash of the salt. """
+    salts = captcha.get_captcha_salts()
+    salt = salts[0]
+
+    token1 = captcha.get_captcha_token(salt)
+    token2 = hashlib.md5(salt.encode()).hexdigest()[:3]
+
+    assert token1 == token2
+
+
+def test_captcha_challenge_answer():
+    """ Make sure that executing the captcha challenge via shell
+    produces the correct result by comparing it against a straight
+    up token conversion. """
+    salts = captcha.get_captcha_salts()
+    salt = salts[0]
+
+    challenge = captcha.get_captcha_challenge(salt)
+
+    token = captcha.get_captcha_token(salt)
+    challenge2 = f"LC_ALL=C pacman -V|sed -r 's#[0-9]+#{token}#g'|md5sum|cut -c1-6"
+
+    assert challenge == challenge2
+
+
+def test_captcha_salt_filter():
+    """ Make sure captcha_salt_filter returns the first salt from
+    get_captcha_salts().
+
+    Example usage:
+        <input type="hidden" name="captcha_salt" value="{{ captcha_salt }}">
+    """
+    salt = captcha.captcha_salt_filter(None)
+    assert salt == captcha.get_captcha_salts()[0]
+
+
+def test_captcha_cmdline_filter():
+    """ Make sure that the captcha_cmdline filter gives us the
+    same challenge that get_captcha_challenge does.
+
+    Example usage:
+        <code>{{ captcha_salt | captcha_cmdline }}</code>
+    """
+    salt = captcha.captcha_salt_filter(None)
+    display1 = captcha.captcha_cmdline_filter(None, salt)
+    display2 = captcha.get_captcha_challenge(salt)
+    assert display1 == display2

From 19b4a896f111c34fcf57a5d6fb0b40cd9ad43e51 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 30 Jan 2021 02:08:59 -0800
Subject: [PATCH 113/844] add openssh to test dependencies

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 2 +-
 Dockerfile     | 2 +-
 test/README.md | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1fe5e6f..58fb9fed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ before_script:
            python-itsdangerous python-httpx python-jinja python-pytest-cov
            python-requests python-aiofiles python-python-multipart
            python-pytest-asyncio python-coverage python-bcrypt
-           python-email-validator
+           python-email-validator openssh
   - bash -c "echo '127.0.0.1' > /etc/hosts"
   - bash -c "echo '::1' >> /etc/hosts"
 
diff --git a/Dockerfile b/Dockerfile
index f65acc7c..cf54a13c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN pacman -Syu --noconfirm base-devel git gpgme protobuf pyalpm \
     python-itsdangerous python-httpx python-jinja python-pytest-cov \
     python-requests python-aiofiles python-python-multipart \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
-    python-email-validator
+    python-email-validator openssh
 
 # Remove aurweb.sqlite3 if it was copied over via COPY.
 RUN rm -fv aurweb.sqlite3
diff --git a/test/README.md b/test/README.md
index 872d980b..0f3f4cbd 100644
--- a/test/README.md
+++ b/test/README.md
@@ -28,6 +28,7 @@ For all the test to run, the following Arch packages should be installed:
 - python-pytest-cov
 - python-pytest-asyncio
 - postfix
+- openssh
 
 Running tests
 -------------

From c94793b0b11b372a299fb6d23e39562066b7531b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Jan 2021 20:26:34 -0800
Subject: [PATCH 114/844] add user registration routes

* Added /register get and post routes.
+ Added default attributes to AnonymousUser, including a new
  AnonymousList which behaves like an sqlalchemy relationship
  list.
+ aurweb.util: Added validation functions for various user fields
  used throughout registration.
+ test_accounts_routes: Added get|post register route tests.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py                       |  10 +
 aurweb/routers/accounts.py           | 320 +++++++++++++++++++++++-
 aurweb/util.py                       |  84 +++++++
 templates/partials/account_form.html | 343 ++++++++++++++++++++++++++
 templates/register.html              |  30 +++
 test/test_accounts_routes.py         | 356 ++++++++++++++++++++++++++-
 6 files changed, 1140 insertions(+), 3 deletions(-)
 create mode 100644 templates/partials/account_form.html
 create mode 100644 templates/register.html

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 53c853de..a4ff2167 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -7,12 +7,22 @@ from fastapi.responses import RedirectResponse
 from starlette.authentication import AuthCredentials, AuthenticationBackend, AuthenticationError
 from starlette.requests import HTTPConnection
 
+import aurweb.config
+
 from aurweb.models.session import Session
 from aurweb.models.user import User
 from aurweb.templates import make_context, render_template
 
 
 class AnonymousUser:
+    # Stub attributes used to mimic a real user.
+    ID = 0
+    LangPreference = aurweb.config.get("options", "default_lang")
+    Timezone = aurweb.config.get("options", "default_timezone")
+
+    # A stub ssh_pub_key relationship.
+    ssh_pub_key = None
+
     @staticmethod
     def is_authenticated():
         return False
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index db23bc3a..a43ba9f7 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -1,12 +1,20 @@
+import copy
+
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
-from sqlalchemy import or_
+from sqlalchemy import and_, func, or_
 
-from aurweb import db
+import aurweb.config
+
+from aurweb import db, l10n, time, util
 from aurweb.auth import auth_required
+from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.l10n import get_translator_for_request
+from aurweb.models.account_type import AccountType
+from aurweb.models.ban import Ban
+from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.user import User
 from aurweb.scripts.notify import ResetKeyNotification
 from aurweb.templates import make_variable_context, render_template
@@ -93,3 +101,311 @@ async def passreset_post(request: Request,
     # Render ?step=confirm.
     return RedirectResponse(url="/passreset?step=confirm",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+def process_account_form(request: Request, user: User, args: dict):
+    """ Process an account form. All fields are optional and only checks
+    requirements in the case they are present.
+
+    ```
+    context = await make_variable_context(request, "Accounts")
+    ok, errors = process_account_form(request, user, **kwargs)
+    if not ok:
+        context["errors"] = errors
+        return render_template(request, "some_account_template.html", context)
+    ```
+
+    :param request: An incoming FastAPI request
+    :param user: The user model of the account being processed
+    :param args: A dictionary of arguments generated via request.form()
+    :return: A (passed processing boolean, list of errors) tuple
+    """
+
+    # Get a local translator.
+    _ = get_translator_for_request(request)
+
+    host = request.client.host
+    ban = db.query(Ban, Ban.IPAddress == host).first()
+    if ban:
+        return False, [
+            "Account registration has been disabled for your " +
+            "IP address, probably due to sustained spam attacks. " +
+            "Sorry for the inconvenience."
+        ]
+
+    if request.user.is_authenticated():
+        if not request.user.valid_password(args.get("passwd", None)):
+            return False, ["Invalid password."]
+
+    email = args.get("E", None)
+    username = args.get("U", None)
+
+    if not email or not username:
+        return False, ["Missing a required field."]
+
+    username_min_len = aurweb.config.getint("options", "username_min_len")
+    username_max_len = aurweb.config.getint("options", "username_max_len")
+    if not util.valid_username(args.get("U")):
+        return False, [
+            "The username is invalid.",
+            [
+                _("It must be between %s and %s characters long") % (
+                    username_min_len, username_max_len),
+                "Start and end with a letter or number",
+                "Can contain only one period, underscore or hyphen.",
+            ]
+        ]
+
+    password = args.get("P", None)
+    if password:
+        confirmation = args.get("C", None)
+        if not util.valid_password(password):
+            return False, [
+                _("Your password must be at least %s characters.") % (
+                    username_min_len)
+            ]
+        elif not confirmation:
+            return False, ["Please confirm your new password."]
+        elif password != confirmation:
+            return False, ["Password fields do not match."]
+
+    backup_email = args.get("BE", None)
+    homepage = args.get("HP", None)
+    pgp_key = args.get("K", None)
+    ssh_pubkey = args.get("PK", None)
+    language = args.get("L", None)
+    timezone = args.get("TZ", None)
+
+    def username_exists(username):
+        return and_(User.ID != user.ID,
+                    func.lower(User.Username) == username.lower())
+
+    def email_exists(email):
+        return and_(User.ID != user.ID,
+                    func.lower(User.Email) == email.lower())
+
+    if not util.valid_email(email):
+        return False, ["The email address is invalid."]
+    elif backup_email and not util.valid_email(backup_email):
+        return False, ["The backup email address is invalid."]
+    elif homepage and not util.valid_homepage(homepage):
+        return False, [
+            "The home page is invalid, please specify the full HTTP(s) URL."]
+    elif pgp_key and not util.valid_pgp_fingerprint(pgp_key):
+        return False, ["The PGP key fingerprint is invalid."]
+    elif ssh_pubkey and not util.valid_ssh_pubkey(ssh_pubkey):
+        return False, ["The SSH public key is invalid."]
+    elif language and language not in l10n.SUPPORTED_LANGUAGES:
+        return False, ["Language is not currently supported."]
+    elif timezone and timezone not in time.SUPPORTED_TIMEZONES:
+        return False, ["Timezone is not currently supported."]
+    elif db.query(User, username_exists(username)).first():
+        # If the username already exists...
+        return False, [
+            _("The username, %s%s%s, is already in use.") % (
+                "<strong>", username, "</strong>")
+        ]
+    elif db.query(User, email_exists(email)).first():
+        # If the email already exists...
+        return False, [
+            _("The address, %s%s%s, is already in use.") % (
+                "<strong>", email, "</strong>")
+        ]
+
+    def ssh_fingerprint_exists(fingerprint):
+        return and_(SSHPubKey.UserID != user.ID,
+                    SSHPubKey.Fingerprint == fingerprint)
+
+    if ssh_pubkey:
+        fingerprint = get_fingerprint(ssh_pubkey.strip().rstrip())
+        if fingerprint is None:
+            return False, ["The SSH public key is invalid."]
+
+        if db.query(SSHPubKey, ssh_fingerprint_exists(fingerprint)).first():
+            return False, [
+                _("The SSH public key, %s%s%s, is already in use.") % (
+                    "<strong>", fingerprint, "</strong>")
+            ]
+
+    captcha_salt = args.get("captcha_salt", None)
+    if captcha_salt and captcha_salt not in get_captcha_salts():
+        return False, ["This CAPTCHA has expired. Please try again."]
+
+    captcha = args.get("captcha", None)
+    if captcha:
+        answer = get_captcha_answer(get_captcha_token(captcha_salt))
+        if captcha != answer:
+            return False, ["The entered CAPTCHA answer is invalid."]
+
+    return True, []
+
+
+def make_account_form_context(context: dict,
+                              request: Request,
+                              user: User,
+                              args: dict):
+    """ Modify a FastAPI context and add attributes for the account form.
+
+    :param context: FastAPI context
+    :param request: FastAPI request
+    :param user: Target user
+    :param args: Persistent arguments: request.form()
+    :return: FastAPI context adjusted for account form
+    """
+    # Do not modify the original context.
+    context = copy.copy(context)
+
+    context["account_types"] = [
+        (1, "Normal User"),
+        (2, "Trusted User")
+    ]
+
+    user_account_type_id = context.get("account_types")[0][0]
+
+    if request.user.has_credential("CRED_ACCOUNT_EDIT_DEV"):
+        context["account_types"].append((3, "Developer"))
+        context["account_types"].append((4, "Trusted User & Developer"))
+
+    if request.user.is_authenticated():
+        context["username"] = args.get("U", user.Username)
+        context["account_type"] = args.get("T", user.AccountType.ID)
+        context["suspended"] = args.get("S", user.Suspended)
+        context["email"] = args.get("E", user.Email)
+        context["hide_email"] = args.get("H", user.HideEmail)
+        context["backup_email"] = args.get("BE", user.BackupEmail)
+        context["realname"] = args.get("R", user.RealName)
+        context["homepage"] = args.get("HP", user.Homepage or str())
+        context["ircnick"] = args.get("I", user.IRCNick)
+        context["pgp"] = args.get("K", user.PGPKey or str())
+        context["lang"] = args.get("L", user.LangPreference)
+        context["tz"] = args.get("TZ", user.Timezone)
+        ssh_pk = user.ssh_pub_key.PubKey if user.ssh_pub_key else str()
+        context["ssh_pk"] = args.get("PK", ssh_pk)
+        context["cn"] = args.get("CN", user.CommentNotify)
+        context["un"] = args.get("UN", user.UpdateNotify)
+        context["on"] = args.get("ON", user.OwnershipNotify)
+    else:
+        context["username"] = args.get("U", str())
+        context["account_type"] = args.get("T", user_account_type_id)
+        context["suspended"] = args.get("S", False)
+        context["email"] = args.get("E", str())
+        context["hide_email"] = args.get("H", False)
+        context["backup_email"] = args.get("BE", str())
+        context["realname"] = args.get("R", str())
+        context["homepage"] = args.get("HP", str())
+        context["ircnick"] = args.get("I", str())
+        context["pgp"] = args.get("K", str())
+        context["lang"] = args.get("L", context.get("language"))
+        context["tz"] = args.get("TZ", context.get("timezone"))
+        context["ssh_pk"] = args.get("PK", str())
+        context["cn"] = args.get("CN", True)
+        context["un"] = args.get("UN", False)
+        context["on"] = args.get("ON", True)
+
+    context["password"] = args.get("P", str())
+    context["confirm"] = args.get("C", str())
+
+    return context
+
+
+@router.get("/register", response_class=HTMLResponse)
+@auth_required(False)
+async def account_register(request: Request,
+                           U: str = Form(default=str()),    # Username
+                           E: str = Form(default=str()),    # Email
+                           H: str = Form(default=False),    # Hide Email
+                           BE: str = Form(default=None),    # Backup Email
+                           R: str = Form(default=None),     # Real Name
+                           HP: str = Form(default=None),    # Homepage
+                           I: str = Form(default=None),     # IRC Nick
+                           K: str = Form(default=None),     # PGP Key FP
+                           L: str = Form(default=aurweb.config.get(
+                               "options", "default_lang")),
+                           TZ: str = Form(default=aurweb.config.get(
+                               "options", "default_timezone")),
+                           PK: str = Form(default=None),
+                           CN: bool = Form(default=False),  # Comment Notify
+                           CU: bool = Form(default=False),  # Update Notify
+                           CO: bool = Form(default=False),  # Owner Notify
+                           captcha: str = Form(default=str())):
+    context = await make_variable_context(request, "Register")
+    context["captcha_salt"] = get_captcha_salts()[0]
+    context = make_account_form_context(context, request, None, dict())
+    return render_template(request, "register.html", context)
+
+
+@router.post("/register", response_class=HTMLResponse)
+@auth_required(False)
+async def account_register_post(request: Request,
+                                U: str = Form(default=str()),  # Username
+                                E: str = Form(default=str()),  # Email
+                                H: str = Form(default=False),   # Hide Email
+                                BE: str = Form(default=None),   # Backup Email
+                                R: str = Form(default=''),    # Real Name
+                                HP: str = Form(default=None),   # Homepage
+                                I: str = Form(default=None),    # IRC Nick
+                                K: str = Form(default=None),    # PGP Key
+                                L: str = Form(default=aurweb.config.get(
+                                    "options", "default_lang")),
+                                TZ: str = Form(default=aurweb.config.get(
+                                    "options", "default_timezone")),
+                                PK: str = Form(default=None),   # SSH PubKey
+                                CN: bool = Form(default=False),
+                                UN: bool = Form(default=False),
+                                ON: bool = Form(default=False),
+                                captcha: str = Form(default=None),
+                                captcha_salt: str = Form(...)):
+    from aurweb.db import session
+
+    context = await make_variable_context(request, "Register")
+
+    args = dict(await request.form())
+    context = make_account_form_context(context, request, None, args)
+
+    ok, errors = process_account_form(request, request.user, args)
+
+    if not ok:
+        # If the field values given do not meet the requirements,
+        # return HTTP 400 with an error.
+        context["errors"] = errors
+        return render_template(request, "register.html", context,
+                               status_code=int(HTTPStatus.BAD_REQUEST))
+
+    if not captcha:
+        context["errors"] = ["The CAPTCHA is missing."]
+        return render_template(request, "register.html", context,
+                               status_code=int(HTTPStatus.BAD_REQUEST))
+
+    # Create a user with no password with a resetkey, then send
+    # an email off about it.
+    resetkey = db.make_random_value(User, User.ResetKey)
+
+    # By default, we grab the User account type to associate with.
+    account_type = db.query(AccountType,
+                            AccountType.AccountType == "User").first()
+
+    # Create a user given all parameters available.
+    user = db.create(User, Username=U, Email=E, HideEmail=H, BackupEmail=BE,
+                     RealName=R, Homepage=HP, IRCNick=I, PGPKey=K,
+                     LangPreference=L, Timezone=TZ, CommentNotify=CN,
+                     UpdateNotify=UN, OwnershipNotify=ON, ResetKey=resetkey,
+                     AccountType=account_type)
+
+    # If a PK was given and either one does not exist or the given
+    # PK mismatches the existing user's SSHPubKey.PubKey.
+    if PK:
+        # Get the second element in the PK, which is the actual key.
+        pubkey = PK.strip().rstrip()
+        fingerprint = get_fingerprint(pubkey)
+        user.ssh_pub_key = SSHPubKey(UserID=user.ID,
+                                     PubKey=pubkey,
+                                     Fingerprint=fingerprint)
+        session.commit()
+
+    # Send a reset key notification to the new user.
+    executor = db.ConnectionExecutor(db.get_engine().raw_connection())
+    ResetKeyNotification(executor, user.ID).send()
+
+    context["complete"] = True
+    context["user"] = user
+    return render_template(request, "register.html", context)
diff --git a/aurweb/util.py b/aurweb/util.py
index 65f18a4c..5e1717bd 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -1,7 +1,91 @@
+import base64
 import random
+import re
 import string
 
+from urllib.parse import urlparse
+
+import jinja2
+
+from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
+
+import aurweb.config
+
 
 def make_random_string(length):
     return ''.join(random.choices(string.ascii_lowercase +
                                   string.digits, k=length))
+
+
+def valid_username(username):
+    min_len = aurweb.config.getint("options", "username_min_len")
+    max_len = aurweb.config.getint("options", "username_max_len")
+    if not (min_len <= len(username) <= max_len):
+        return False
+
+    # Check that username contains: one or more alphanumeric
+    # characters, an optional separator of '.', '-' or '_', followed
+    # by alphanumeric characters.
+    return re.match(r'^[a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$', username)
+
+
+def valid_email(email):
+    try:
+        validate_email(email)
+    except EmailUndeliverableError:
+        return False
+    except EmailNotValidError:
+        return False
+    return True
+
+
+def valid_homepage(homepage):
+    parts = urlparse(homepage)
+    return parts.scheme in ("http", "https") and bool(parts.netloc)
+
+
+def valid_password(password):
+    min_len = aurweb.config.getint("options", "passwd_min_len")
+    return len(password) >= min_len
+
+
+def valid_pgp_fingerprint(fp):
+    fp = fp.replace(" ", "")
+    try:
+        # Attempt to convert the fingerprint to an int via base16.
+        # If it can't, it's not a hex string.
+        int(fp, 16)
+    except ValueError:
+        return False
+
+    # Check the length; must be 40 hexadecimal digits.
+    return len(fp) == 40
+
+
+def valid_ssh_pubkey(pk):
+    valid_prefixes = ("ssh-rsa", "ecdsa-sha2-nistp256",
+                      "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521",
+                      "ssh-ed25519")
+
+    has_valid_prefix = False
+    for prefix in valid_prefixes:
+        if "%s " % prefix in pk:
+            has_valid_prefix = True
+            break
+    if not has_valid_prefix:
+        return False
+
+    tokens = pk.strip().rstrip().split(" ")
+    if len(tokens) < 2:
+        return False
+
+    return base64.b64encode(base64.b64decode(tokens[1])).decode() == tokens[1]
+
+
+@jinja2.contextfilter
+def account_url(context, user):
+    request = context.get("request")
+    base = f"{request.url.scheme}://{request.url.hostname}"
+    if request.url.scheme == "http" and request.url.port != 80:
+        base += f":{request.url.port}"
+    return f"{base}/account/{user.Username}"
diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
new file mode 100644
index 00000000..3af13368
--- /dev/null
+++ b/templates/partials/account_form.html
@@ -0,0 +1,343 @@
+<!--
+    This partial requires a few variables to render properly.
+
+    First off, we can render either a new account form or an
+    update account form.
+
+    (1)
+    To render an update account form, supply `form_type = "UpdateAccount"`.
+    To render a new account form, either omit a `form_type` or set it to
+    anything else (should actually be "NewAccount" based on the PHP impl).
+
+    (2)
+    Furthermore, when rendering an update form, if the request user
+    is authenticated, there **must** be a `user` supplied, pointing
+    to the user being edited.
+-->
+<form id="edit-profile-form" method="post"
+      {% if action %}
+      action="{{ action }}"
+      {% endif %}
+>
+    <fieldset>
+        <input type="hidden" name="Action" value="{{ form_type }}">
+    </fieldset>
+    <fieldset>
+        <!-- Username -->
+        <p>
+            <label for="id_username">
+                {% trans %}Username{% endtrans %}:
+            </label>
+
+            <input id="id_username"
+                   type="text" size="30"
+                   maxlength="16" name="U"
+                   value="{{ username }}"
+            >
+            ({% trans %}required{% endtrans %})
+        </p>
+        <p>
+            <em>{{ "Your user name is the name you will use to login. "
+            "It is visible to the general public, even if your "
+            "account is inactive." | tr }}</em>
+        </p>
+
+        {% if request.user.has_credential("CRED_ACCOUNT_CHANGE_TYPE") %}
+		<p>
+            <label for="id_type">
+                {% trans %}Account Type{% endtrans %}:
+            </label>
+            <select name="T" id="id_type">
+                {% for value, type in account_types %}
+                    <option value="{{ value }}"
+                            {% if account_type == type %}
+                            selected="selected"
+                            {% endif %}
+                    >
+                        {{ type | tr }}
+                    </option>
+                {% endfor %}
+
+			</select>
+		</p>
+
+		<p>
+            <label for="id_suspended">
+                {% trans %}Account Suspended{% endtrans %}:
+            </label>
+
+            <input id="suspended" type="checkbox" name="S"
+                   {% if suspended %}
+                   checked="checked"
+                   {% endif %}
+            >
+		</p>
+        {% endif %}
+
+        <!-- Email -->
+        <p>
+            <label for="id_email">
+                {% trans %}Email Address{% endtrans %}:
+            </label>
+
+            <input id="id_email" type="text"
+                   size="30" maxlength="254" name="E" value="{{ email }}">
+            ({% trans %}required{% endtrans %})
+        </p>
+        <p>
+            <em>{{ "Please ensure you correctly entered your email "
+            "address, otherwise you will be locked out." | tr }}</em>
+        </p>
+
+        <!-- Hide Email -->
+        <p>
+            <label for="id_hide">
+                {% trans %}Hide Email Address{% endtrans %}:
+            </label>
+
+            <input id="id_hide" type="checkbox" name="H" value="{{ H }}">
+        </p>
+        <p>
+            <em>{{ "If you do not hide your email address, it is "
+            "visible to all registered AUR users. If you hide your "
+            "email address, it is visible to members of the Arch "
+            "Linux staff only." | tr }}</em>
+        </p>
+
+        <!-- Backup Email -->
+        <p>
+            <label for="id_backup_email">
+                {% trans %}Backup Email Address{% endtrans %}:
+            </label>
+
+            <input id="id_backup_email" type="text" size="30"
+                   maxlength="254" name="BE" value="{{ backup }}">
+        </p>
+        <p>
+            <em>
+            {{ "Optionally provide a secondary email address that "
+            "can be used to restore your account in case you lose "
+            "access to your primary email address." | tr }}
+            {{ "Password reset links are always sent to both your "
+            "primary and your backup email address." | tr }}
+            {{ "Your backup email address is always only visible to "
+            "members of the Arch Linux staff, independent of the %s "
+            "setting." | tr
+            | format("<em>%s</em>" | format("Hide Email Address" | tr))
+            | safe }}
+            </em>
+        </p>
+
+        <!-- Real Name -->
+        <p>
+            <label for="id_realname">
+                {% trans %}Real Name{% endtrans %}:
+            </label>
+
+            <input id="id_realname" type="text" size="30"
+                   maxlength="32" name="R" value="{{ realname }}">
+        </p>
+
+        <!-- Homepage -->
+        <p>
+            <label for="id_homepage">
+                {% trans %}Homepage{% endtrans %}:
+            </label>
+
+            <input id="id_homepage" type="text" size="30" name="HP"
+                   value="{{ homepage }}">
+        </p>
+
+        <!-- IRC Nick -->
+        <p>
+            <label for="id_irc">
+                {% trans %}IRC Nick{% endtrans %}:
+            </label>
+
+            <input id="id_irc" type="text" size="30"
+                   maxlength="32" name="I" value="{{ ircnick }}">
+        </p>
+
+        <!-- PGP Key Fingerprint -->
+        <p>
+            <label for="id_pgp">
+                {% trans %}PGP Key Fingerprint{% endtrans %}:
+            </label>
+
+            <input id="id_pgp" type="text" size="30"
+                   maxlength="50" name="K" value="{{ pgp }}">
+        </p>
+
+        <!-- Homepage -->
+        <p>
+            <label for="id_language">
+                {% trans %}Language{% endtrans %}:
+            </label>
+
+            <select id="id_language" name="L">
+                {% for domain, display in languages.items() %}
+                    <option
+                        value="{{ domain }}"
+                        {% if lang == domain %}
+                        selected="selected"
+                        {% endif %}
+                    >
+                        {{ display }}
+                    </option>
+                {% endfor %}
+            </select>
+        </p>
+
+        <!-- Homepage -->
+        <p>
+            <label for="id_timezone">
+                {% trans %}Timezone{% endtrans %}
+            </label>
+
+            <select id="id_timezone" name="TZ">
+                {% for current, offset in timezones.items() %}
+                    <option value="{{ current }}"
+                        {% if current == tz  %}
+                            selected="selected"
+                        {% endif %}
+                    >{{ offset }}</option>
+                {% endfor %}
+            </select>
+        </p>
+
+    </fieldset>
+
+    {% if form_type == "UpdateAccount" %}
+        <fieldset>
+            <legend>
+                {{
+                "If you want to change the password, enter a new password "
+                "and confirm the new password by entering it again." | tr
+                }}
+            </legend>
+            <p>
+                <label for="id_passwd1">
+                    {% trans %}Password{% endtrans %}:
+                </label>
+                <input id="id_passwd1" type="password"
+                       size="30" name="P" value="{{ P or '' }}">
+            </p>
+
+            <p>
+                <label for="id_passwd2">
+                    {% trans %}Re-type password{% endtrans %}:
+                </label>
+
+                <input id="id_passwd2" type="password"
+                       size="30" name="C" value="{{ C or '' }}">
+            </p>
+        </fieldset>
+    {% endif %}
+
+    <fieldset>
+        <legend>
+            {{
+            "The following information is only required if you "
+            "want to submit packages to the Arch User Repository." | tr
+            }}
+        </legend>
+        <p>
+            <label for="id_ssh">
+                {% trans %}SSH Public Key{% endtrans %}:
+            </label>
+
+            <!-- Only set PK auto-fill when we've got a NewAccount form. -->
+            <textarea id="id_ssh" name="PK"
+                      rows="5" cols="30">{{ ssh_pk }}</textarea>
+        </p>
+    </fieldset>
+
+    <fieldset>
+        <legend>{% trans%}Notification settings{% endtrans %}:</legend>
+        <p>
+            <label for="id_commentnotify">
+                {% trans %}Notify of new comments{% endtrans %}:
+            </label>
+
+            <input id="id_commentnotify" type="checkbox" name="CN"
+                 {% if cn %}
+                     checked="checked"
+                 {% endif %}
+            >
+        </p>
+        <p>
+            <label for="id_updatenotify">
+                {% trans %}Notify of package updates{% endtrans %}:
+            </label>
+
+            <input id="id_updatenotify" type="checkbox" name="UN"
+                {% if un %}
+                    checked="checked"
+                {% endif %}
+            >
+        </p>
+        <p>
+            <label for="id_ownershipnotify">
+                {% trans %}Notify of ownership updates{% endtrans %}:
+            </label>
+
+            <input id="id_ownershipnotify" type="checkbox" name="ON"
+                {% if on %}
+                    checked="checked"
+                {% endif %}
+            >
+        </p>
+    </fieldset>
+
+    <fieldset>
+        {% if form_type == "UpdateAccount" %}
+            <legend>
+                {{ "To confirm the profile changes, please enter "
+                "your current password:" | tr }}
+            </legend>
+            <p>
+                <label for="id_passwd_current">
+                    {% trans %}Your current password{% endtrans %}:
+                </label>
+                <input id="id_passwd_current" type="password"
+                       size="30" name="passwd" id="id_passwd_current">
+            </p>
+        {% else %}
+            <!-- Otherwise, form_type is assumed that it's NewAccount. -->
+            <legend>
+                {{ "To protect the AUR against automated account creation, "
+                "we kindly ask you to provide the output of the following "
+                "command:" | tr }}
+                <code>
+                    {{ captcha_salt | captcha_cmdline }}
+                </code>
+            </legend>
+            <p>
+                <label for="id_captcha">
+                    {% trans %}Answer{% endtrans %}:
+                </label>
+                <input id="id_captcha"
+                       type="text" size="30" maxlength="6" name="captcha">
+                ({% trans %}required{% endtrans %})
+
+                <input type="hidden" name="captcha_salt"
+                       value="{{ captcha_salt }}">
+            </p>
+        {% endif %}
+    </fieldset>
+
+    <fieldset>
+        <p>
+        <label></label>
+            {% if form_type == "UpdateAccount" %}
+                <input class="button" type="submit"
+                                      value="{{ 'Update' | tr }}"> &nbsp;
+            {% else %}
+                <input class="button" type="submit"
+                                      value="{{ 'Create' | tr }}"> &nbsp;
+            {% endif %}
+            <input class="button" type="reset"
+                                  value="{{ 'Reset' | tr }}">
+        </p>
+    </fieldset>
+</form>
diff --git a/templates/register.html b/templates/register.html
new file mode 100644
index 00000000..a15971a1
--- /dev/null
+++ b/templates/register.html
@@ -0,0 +1,30 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{% trans %}Register{% endtrans %}</h2>
+
+        {% if complete %}
+            {{
+                "The account, %s%s%s, has been successfully created."
+                | tr
+                | format("<strong>", "'" + user.Username + "'", "</strong>")
+                | safe
+            }}
+            <p>
+                {% trans %}A password reset key has been sent to your e-mail address.{% endtrans %}
+            </p>
+        {% else %}
+            {% if errors %}
+                {% include "partials/error.html" %}
+            {% else %}
+                <p>
+                    {% trans %}Use this form to create an account.{% endtrans %}
+                </p>
+            {% endif %}
+
+            {% set form_type = "NewAccount" %}
+            {% include "partials/account_form.html" %}
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 69896a0f..d79137bf 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -1,13 +1,21 @@
+import re
+import tempfile
+
+from datetime import datetime
 from http import HTTPStatus
+from subprocess import Popen
 
 import pytest
 
 from fastapi.testclient import TestClient
 
+from aurweb import captcha
 from aurweb.asgi import app
-from aurweb.db import query
+from aurweb.db import create, delete, query
 from aurweb.models.account_type import AccountType
+from aurweb.models.ban import Ban
 from aurweb.models.session import Session
+from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
 from aurweb.testing.models import make_user
@@ -220,3 +228,349 @@ def test_post_passreset_error_password_requirements():
 
     error = f"Your password must be at least {passwd_min_len} characters."
     assert error in response.content.decode("utf-8")
+
+
+def test_get_register():
+    with client as request:
+        response = request.get("/register")
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def post_register(request, **kwargs):
+    """ A simple helper that allows overrides to test defaults. """
+    salt = captcha.get_captcha_salts()[0]
+    token = captcha.get_captcha_token(salt)
+    answer = captcha.get_captcha_answer(token)
+
+    data = {
+        "U": "newUser",
+        "E": "newUser@email.org",
+        "P": "newUserPassword",
+        "C": "newUserPassword",
+        "L": "en",
+        "TZ": "UTC",
+        "captcha": answer,
+        "captcha_salt": salt
+    }
+
+    # For any kwargs given, override their k:v pairs in data.
+    args = dict(kwargs)
+    for k, v in args.items():
+        data[k] = v
+
+    return request.post("/register", data=data, allow_redirects=False)
+
+
+def test_post_register():
+    with client as request:
+        response = post_register(request)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    expected = "The account, <strong>'newUser'</strong>, "
+    expected += "has been successfully created."
+    assert expected in response.content.decode()
+
+
+def test_post_register_rejects_case_insensitive_spoof():
+    with client as request:
+        response = post_register(request, U="newUser", E="newUser@example.org")
+    assert response.status_code == int(HTTPStatus.OK)
+
+    with client as request:
+        response = post_register(request, U="NEWUSER", E="BLAH@GMAIL.COM")
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    expected = "The username, <strong>NEWUSER</strong>, is already in use."
+    assert expected in response.content.decode()
+
+    with client as request:
+        response = post_register(request, U="BLAH", E="NEWUSER@EXAMPLE.ORG")
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    expected = "The address, <strong>NEWUSER@EXAMPLE.ORG</strong>, "
+    expected += "is already in use."
+    assert expected in response.content.decode()
+
+
+def test_post_register_error_expired_captcha():
+    with client as request:
+        response = post_register(request, captcha_salt="invalid-salt")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "This CAPTCHA has expired. Please try again." in content
+
+
+def test_post_register_error_missing_captcha():
+    with client as request:
+        response = post_register(request, captcha=None)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "The CAPTCHA is missing." in content
+
+
+def test_post_register_error_invalid_captcha():
+    with client as request:
+        response = post_register(request, captcha="invalid blah blah")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "The entered CAPTCHA answer is invalid." in content
+
+
+def test_post_register_error_ip_banned():
+    # 'testclient' is used as request.client.host via FastAPI TestClient.
+    create(Ban, IPAddress="testclient", BanTS=datetime.utcnow())
+
+    with client as request:
+        response = post_register(request)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert ("Account registration has been disabled for your IP address, " +
+            "probably due to sustained spam attacks. Sorry for the " +
+            "inconvenience.") in content
+
+
+def test_post_register_error_missing_username():
+    with client as request:
+        response = post_register(request, U="")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "Missing a required field." in content
+
+
+def test_post_register_error_missing_email():
+    with client as request:
+        response = post_register(request, E="")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "Missing a required field." in content
+
+
+def test_post_register_error_invalid_username():
+    with client as request:
+        # Our test config requires at least three characters for a
+        # valid username, so test against two characters: 'ba'.
+        response = post_register(request, U="ba")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "The username is invalid." in content
+
+
+def test_post_register_invalid_password():
+    with client as request:
+        response = post_register(request, P="abc", C="abc")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = r"Your password must be at least \d+ characters."
+    assert re.search(expected, content)
+
+
+def test_post_register_error_missing_confirm():
+    with client as request:
+        response = post_register(request, C=None)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "Please confirm your new password." in content
+
+
+def test_post_register_error_mismatched_confirm():
+    with client as request:
+        response = post_register(request, C="mismatched")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "Password fields do not match." in content
+
+
+def test_post_register_error_invalid_email():
+    with client as request:
+        response = post_register(request, E="bad@email")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "The email address is invalid." in content
+
+
+def test_post_register_error_undeliverable_email():
+    with client as request:
+        # At the time of writing, webchat.freenode.net does not contain
+        # mx records; if it ever does, it'll break this test.
+        response = post_register(request, E="email@bad.c")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "The email address is invalid." in content
+
+
+def test_post_register_invalid_backup_email():
+    with client as request:
+        response = post_register(request, BE="bad@email")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "The backup email address is invalid." in content
+
+
+def test_post_register_error_invalid_homepage():
+    with client as request:
+        response = post_register(request, HP="bad")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = "The home page is invalid, please specify the full HTTP(s) URL."
+    assert expected in content
+
+
+def test_post_register_error_invalid_pgp_fingerprints():
+    with client as request:
+        response = post_register(request, K="bad")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = "The PGP key fingerprint is invalid."
+    assert expected in content
+
+    pk = 'z' + ('a' * 39)
+    with client as request:
+        response = post_register(request, K=pk)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = "The PGP key fingerprint is invalid."
+    assert expected in content
+
+
+def test_post_register_error_invalid_ssh_pubkeys():
+    with client as request:
+        response = post_register(request, PK="bad")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "The SSH public key is invalid." in content
+
+    with client as request:
+        response = post_register(request, PK="ssh-rsa ")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "The SSH public key is invalid." in content
+
+
+def test_post_register_error_unsupported_language():
+    with client as request:
+        response = post_register(request, L="bad")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = "Language is not currently supported."
+    assert expected in content
+
+
+def test_post_register_error_unsupported_timezone():
+    with client as request:
+        response = post_register(request, TZ="ABCDEFGH")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = "Timezone is not currently supported."
+    assert expected in content
+
+
+def test_post_register_error_username_taken():
+    with client as request:
+        response = post_register(request, U="test")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = r"The username, .*, is already in use."
+    assert re.search(expected, content)
+
+
+def test_post_register_error_email_taken():
+    with client as request:
+        response = post_register(request, E="test@example.org")
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = r"The address, .*, is already in use."
+    assert re.search(expected, content)
+
+
+def test_post_register_error_ssh_pubkey_taken():
+    pk = str()
+
+    # Create a public key with ssh-keygen (this adds ssh-keygen as a
+    # dependency to passing this test).
+    with tempfile.TemporaryDirectory() as tmpdir:
+        with open("/dev/null", "w") as null:
+            proc = Popen(["ssh-keygen", "-f", f"{tmpdir}/test.ssh", "-N", ""],
+                         stdout=null, stderr=null)
+            proc.wait()
+        assert proc.returncode == 0
+
+        # Read in the public key, then delete the temp dir we made.
+        pk = open(f"{tmpdir}/test.ssh.pub").read().rstrip()
+
+    # Take the sha256 fingerprint of the ssh public key, create it.
+    fp = get_fingerprint(pk)
+    create(SSHPubKey, UserID=user.ID, PubKey=pk, Fingerprint=fp)
+
+    with client as request:
+        response = post_register(request, PK=pk)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    expected = r"The SSH public key, .*, is already in use."
+    assert re.search(expected, content)
+
+
+def test_post_register_with_ssh_pubkey():
+    pk = str()
+
+    # Create a public key with ssh-keygen (this adds ssh-keygen as a
+    # dependency to passing this test).
+    with tempfile.TemporaryDirectory() as tmpdir:
+        with open("/dev/null", "w") as null:
+            proc = Popen(["ssh-keygen", "-f", f"{tmpdir}/test.ssh", "-N", ""],
+                         stdout=null, stderr=null)
+            proc.wait()
+        assert proc.returncode == 0
+
+        # Read in the public key, then delete the temp dir we made.
+        pk = open(f"{tmpdir}/test.ssh.pub").read().rstrip()
+
+    with client as request:
+        response = post_register(request, PK=pk)
+
+    assert response.status_code == int(HTTPStatus.OK)

From d323c1f95b666eb5d607919c14c719884b5e1457 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 30 Jan 2021 02:09:34 -0800
Subject: [PATCH 115/844] add python-lxml to dependencies

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 2 +-
 Dockerfile     | 2 +-
 INSTALL        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58fb9fed..5bdf427c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ before_script:
            python-itsdangerous python-httpx python-jinja python-pytest-cov
            python-requests python-aiofiles python-python-multipart
            python-pytest-asyncio python-coverage python-bcrypt
-           python-email-validator openssh
+           python-email-validator openssh python-lxml
   - bash -c "echo '127.0.0.1' > /etc/hosts"
   - bash -c "echo '::1' >> /etc/hosts"
 
diff --git a/Dockerfile b/Dockerfile
index cf54a13c..c432f73f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN pacman -Syu --noconfirm base-devel git gpgme protobuf pyalpm \
     python-itsdangerous python-httpx python-jinja python-pytest-cov \
     python-requests python-aiofiles python-python-multipart \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
-    python-email-validator openssh
+    python-email-validator openssh python-lxml
 
 # Remove aurweb.sqlite3 if it was copied over via COPY.
 RUN rm -fv aurweb.sqlite3
diff --git a/INSTALL b/INSTALL
index 04ccd69e..3381daf5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -51,7 +51,8 @@ read the instructions below.
                 python-bleach python-markdown python-alembic hypercorn \
                 python-itsdangerous python-authlib python-httpx \
                 python-jinja python-aiofiles python-python-multipart \
-                python-requests hypercorn python-bcrypt python-email-validator
+                python-requests hypercorn python-bcrypt python-email-validator \
+                python-lxml
     # python3 setup.py install
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:

From 4e9ef6fb00211378ca7373b0e41ee29479c9aa44 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Jan 2021 20:34:27 -0800
Subject: [PATCH 116/844] add account edit (settings) routes

* Added account_url filter to jinja2 environment. This produces a path
  to the user's account url (/account/{username}).
* Updated archdev-navbar to link to new edit route.
+ Added migrate_cookies(request, response) to aurweb.util, a function
  that simply migrates the request cookies to response and returns it.
+ Added account_edit tests to test_accounts_routes.py.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py             | 145 ++++++++++++
 aurweb/templates.py                    |   5 +-
 aurweb/util.py                         |   6 +
 templates/account/edit.html            |  46 ++++
 templates/partials/account_form.html   |   9 +
 templates/partials/archdev-navbar.html |  20 +-
 test/test_accounts_routes.py           | 296 +++++++++++++++++++++++++
 7 files changed, 522 insertions(+), 5 deletions(-)
 create mode 100644 templates/account/edit.html

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index a43ba9f7..689f7f58 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -1,5 +1,6 @@
 import copy
 
+from datetime import datetime
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, Request
@@ -284,6 +285,7 @@ def make_account_form_context(context: dict,
         context["cn"] = args.get("CN", user.CommentNotify)
         context["un"] = args.get("UN", user.UpdateNotify)
         context["on"] = args.get("ON", user.OwnershipNotify)
+        context["inactive"] = args.get("J", user.InactivityTS != 0)
     else:
         context["username"] = args.get("U", str())
         context["account_type"] = args.get("T", user_account_type_id)
@@ -301,6 +303,7 @@ def make_account_form_context(context: dict,
         context["cn"] = args.get("CN", True)
         context["un"] = args.get("UN", False)
         context["on"] = args.get("ON", True)
+        context["inactive"] = args.get("J", False)
 
     context["password"] = args.get("P", str())
     context["confirm"] = args.get("C", str())
@@ -409,3 +412,145 @@ async def account_register_post(request: Request,
     context["complete"] = True
     context["user"] = user
     return render_template(request, "register.html", context)
+
+
+def cannot_edit(request, user):
+    """ Return a 401 HTMLResponse if the request user doesn't
+    have authorization, otherwise None. """
+    has_dev_cred = request.user.has_credential("CRED_ACCOUNT_EDIT_DEV",
+                                               approved=[user])
+    if not has_dev_cred:
+        return HTMLResponse(status_code=int(HTTPStatus.UNAUTHORIZED))
+    return None
+
+
+@router.get("/account/{username}/edit", response_class=HTMLResponse)
+@auth_required(True)
+async def account_edit(request: Request,
+                       username: str):
+    user = db.query(User, User.Username == username).first()
+    response = cannot_edit(request, user)
+    if response:
+        return response
+
+    context = await make_variable_context(request, "Accounts")
+    context["user"] = user
+
+    context = make_account_form_context(context, request, user, dict())
+    return render_template(request, "account/edit.html", context)
+
+
+@router.post("/account/{username}/edit", response_class=HTMLResponse)
+@auth_required(True)
+async def account_edit_post(request: Request,
+                            username: str,
+                            U: str = Form(default=str()),  # Username
+                            J: bool = Form(default=False),
+                            E: str = Form(default=str()),  # Email
+                            H: str = Form(default=False),    # Hide Email
+                            BE: str = Form(default=None),    # Backup Email
+                            R: str = Form(default=None),     # Real Name
+                            HP: str = Form(default=None),    # Homepage
+                            I: str = Form(default=None),     # IRC Nick
+                            K: str = Form(default=None),     # PGP Key
+                            L: str = Form(aurweb.config.get(
+                                "options", "default_lang")),
+                            TZ: str = Form(aurweb.config.get(
+                                "options", "default_timezone")),
+                            P: str = Form(default=str()),    # New Password
+                            C: str = Form(default=None),     # Password Confirm
+                            PK: str = Form(default=None),    # PubKey
+                            CN: bool = Form(default=False),  # Comment Notify
+                            UN: bool = Form(default=False),  # Update Notify
+                            ON: bool = Form(default=False),  # Owner Notify
+                            passwd: str = Form(default=str())):
+    from aurweb.db import session
+
+    user = session.query(User).filter(User.Username == username).first()
+    response = cannot_edit(request, user)
+    if response:
+        return response
+
+    context = await make_variable_context(request, "Accounts")
+    context["user"] = user
+
+    if not passwd:
+        context["errors"] = ["Invalid password."]
+        return render_template(request, "account/edit.html", context,
+                               status_code=int(HTTPStatus.BAD_REQUEST))
+
+    args = dict(await request.form())
+    context = make_account_form_context(context, request, user, args)
+    ok, errors = process_account_form(request, user, args)
+
+    if not ok:
+        context["errors"] = errors
+        return render_template(request, "account/edit.html", context,
+                               status_code=int(HTTPStatus.BAD_REQUEST))
+
+    # Set all updated fields as needed.
+    user.Username = U or user.Username
+    user.Email = E or user.Email
+    user.HideEmail = bool(H)
+    user.BackupEmail = BE or user.BackupEmail
+    user.RealName = R or user.RealName
+    user.Homepage = HP or user.Homepage
+    user.IRCNick = I or user.IRCNick
+    user.PGPKey = K or user.PGPKey
+    user.InactivityTS = datetime.utcnow().timestamp() if J else 0
+
+    # If we update the language, update the cookie as well.
+    if L and L != user.LangPreference:
+        request.cookies["AURLANG"] = L
+        user.LangPreference = L
+        context["language"] = L
+
+    # If we update the timezone, also update the cookie.
+    if TZ and TZ != user.Timezone:
+        user.Timezone = TZ
+        request.cookies["AURTZ"] = TZ
+        context["timezone"] = TZ
+
+    user.CommentNotify = bool(CN)
+    user.UpdateNotify = bool(UN)
+    user.OwnershipNotify = bool(ON)
+
+    # If a PK is given, compare it against the target user's PK.
+    if PK:
+        # Get the second token in the public key, which is the actual key.
+        pubkey = PK.strip().rstrip()
+        fingerprint = get_fingerprint(pubkey)
+        if not user.ssh_pub_key:
+            # No public key exists, create one.
+            user.ssh_pub_key = SSHPubKey(UserID=user.ID,
+                                         PubKey=PK,
+                                         Fingerprint=fingerprint)
+        elif user.ssh_pub_key.Fingerprint != fingerprint:
+            # A public key already exists, update it.
+            user.ssh_pub_key.PubKey = PK
+            user.ssh_pub_key.Fingerprint = fingerprint
+    elif user.ssh_pub_key:
+        # Else, if the user has a public key already, delete it.
+        session.delete(user.ssh_pub_key)
+
+    # Commit changes, if any.
+    session.commit()
+
+    if P and not user.valid_password(P):
+        # Remove the fields we consumed for passwords.
+        context["P"] = context["C"] = str()
+
+        # If a password was given and it doesn't match the user's, update it.
+        user.update_password(P)
+        if user == request.user:
+            # If the target user is the request user, login with
+            # the updated password and update AURSID.
+            request.cookies["AURSID"] = user.login(request, P)
+
+    if not errors:
+        context["complete"] = True
+
+    # Update cookies with requests, in case they were changed.
+    response = render_template(request, "account/edit.html", context)
+    return util.migrate_cookies(request, response)
+>>>>>> > dddd1137... add account edit(settings) routes
diff --git a/aurweb/templates.py b/aurweb/templates.py
index d548e92b..c0472b2e 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -12,7 +12,7 @@ from fastapi.responses import HTMLResponse
 
 import aurweb.config
 
-from aurweb import captcha, l10n, time
+from aurweb import captcha, l10n, time, util
 
 # Prepare jinja2 objects.
 loader = jinja2.FileSystemLoader(os.path.join(
@@ -27,6 +27,9 @@ env.filters["tr"] = l10n.tr
 env.filters["captcha_salt"] = captcha.captcha_salt_filter
 env.filters["captcha_cmdline"] = captcha.captcha_cmdline_filter
 
+# Add account utility filters.
+env.filters["account_url"] = util.account_url
+
 
 def make_context(request: Request, title: str, next: str = None):
     """ Create a context for a jinja2 TemplateResponse. """
diff --git a/aurweb/util.py b/aurweb/util.py
index 5e1717bd..8b6ddbe7 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -82,6 +82,12 @@ def valid_ssh_pubkey(pk):
     return base64.b64encode(base64.b64decode(tokens[1])).decode() == tokens[1]
 
 
+def migrate_cookies(request, response):
+    for k, v in request.cookies.items():
+        response.set_cookie(k, v)
+    return response
+
+
 @jinja2.contextfilter
 def account_url(context, user):
     request = context.get("request")
diff --git a/templates/account/edit.html b/templates/account/edit.html
new file mode 100644
index 00000000..f8895d92
--- /dev/null
+++ b/templates/account/edit.html
@@ -0,0 +1,46 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{% trans %}Accounts{% endtrans %}</h2>
+
+        {% if complete %}
+
+            {{
+                "The account, %s%s%s, has been successfully modified."
+                | tr
+                | format("<strong>", user.Username, "</strong>")
+                | safe
+            }}
+
+        {% else %}
+            {% if errors %}
+                {% include "partials/error.html" %}
+            {% else %}
+                <p>
+                {{ "Click %shere%s if you want to permanently delete this account."
+                | tr
+                | format('<a href="%s/delete">' | format(user | account_url),
+                         "</a>")
+                | safe
+                }}
+                {{ "Click %shere%s for user details."
+                | tr
+                | format('<a href="%s">' | format(user | account_url),
+                         "</a>")
+                | safe
+                }}
+                {{ "Click %shere%s to list the comments made by this account."
+                | tr
+                | format('<a href="%s/comments">' | format(user | account_url),
+                         "</a>")
+                | safe
+                }}
+                </p>
+            {% endif %}
+
+            {% set form_type = "UpdateAccount" %}
+            {% include "partials/account_form.html" %}
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 3af13368..5ae18131 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -42,6 +42,15 @@
             "account is inactive." | tr }}</em>
         </p>
 
+        <p>
+            <label for="id_inactive">{% trans %}Inactive{% endtrans %}:</label>
+            <input id="id_inactive" type="checkbox" name="J"
+               {% if inactive %}
+                   checked="checked"
+               {% endif %}
+            >
+        </p>
+
         {% if request.user.has_credential("CRED_ACCOUNT_CHANGE_TYPE") %}
 		<p>
             <label for="id_type">
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 7662e3a4..4d54f6af 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -6,16 +6,28 @@
             <li><a href="/">AUR {% trans %}Home{% endtrans %}</a></li>
         {% endif %}
         <li><a href="/packages/">{% trans %}Packages{% endtrans %}</a></li>
-        <li><a href="/register/">{% trans %}Register{% endtrans %}</a></li>
-        <li>
-            {% if request.user.is_authenticated() %}
+        {% if request.user.is_authenticated() %}
+            <li>
+                <a href="/account/{{ request.user.Username }}/edit">
+                    {% trans %} My Account{% endtrans %}
+                </a>
+            </li>
+            <li>
                 <a href="/logout/?next={{ next }}">
                     {% trans %}Logout{% endtrans %}
                 </a>
-            {% else %}
+            </li>
+        {% else %}
+            <li>
+                <a href="/register">
+                    {% trans %}Register{% endtrans %}
+                </a>
+            </li>
+            <li>
                 <a href="/login/?next={{ next }}">
                     {% trans %}Login{% endtrans %}
                 </a>
+            </li>
             {% endif %}
         </li>
     </ul>
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index d79137bf..540adde7 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -5,6 +5,7 @@ from datetime import datetime
 from http import HTTPStatus
 from subprocess import Popen
 
+import lxml.html
 import pytest
 
 from fastapi.testclient import TestClient
@@ -574,3 +575,298 @@ def test_post_register_with_ssh_pubkey():
         response = post_register(request, PK=pk)
 
     assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_get_account_edit():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    with client as request:
+        response = request.get("/account/test/edit", cookies={
+            "AURSID": sid
+        }, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_get_account_edit_unauthorized():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    create(User, Username="test2", Email="test2@example.org",
+           Passwd="testPassword")
+
+    with client as request:
+        # Try to edit `test2` while authenticated as `test`.
+        response = request.get("/account/test2/edit", cookies={
+            "AURSID": sid
+        }, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_post_account_edit():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test666@example.org",
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+    expected = "The account, <strong>test</strong>, "
+    expected += "has been successfully modified."
+    assert expected in response.content.decode()
+
+
+def test_post_account_edit_dev():
+    from aurweb.db import session
+
+    # Modify our user to be a "Trusted User & Developer"
+    name = "Trusted User & Developer"
+    tu_or_dev = query(AccountType, AccountType.AccountType == name).first()
+    user.AccountType = tu_or_dev
+    session.commit()
+
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test666@example.org",
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+    expected = "The account, <strong>test</strong>, "
+    expected += "has been successfully modified."
+    assert expected in response.content.decode()
+
+
+def test_post_account_edit_language():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "L": "de",  # German
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Parse the response content html into an lxml root, then make
+    # sure we see a 'de' option selected on the page.
+    content = response.content.decode()
+    root = lxml.html.fromstring(content)
+    lang_nodes = root.xpath('//option[@value="de"]/@selected')
+    assert lang_nodes and len(lang_nodes) != 0
+    assert lang_nodes[0] == "selected"
+
+
+def test_post_account_edit_timezone():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "TZ": "CET",
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_post_account_edit_error_missing_password():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "TZ": "CET",
+        "passwd": ""
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "Invalid password." in content
+
+
+def test_post_account_edit_error_invalid_password():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "TZ": "CET",
+        "passwd": "invalid"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    content = response.content.decode()
+    assert "Invalid password." in content
+
+
+def test_post_account_edit_error_unauthorized():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    test2 = create(User, Username="test2", Email="test2@example.org",
+                   Passwd="testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "TZ": "CET",
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        # Attempt to edit 'test2' while logged in as 'test'.
+        response = request.post("/account/test2/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_post_account_edit_ssh_pub_key():
+    pk = str()
+
+    # Create a public key with ssh-keygen (this adds ssh-keygen as a
+    # dependency to passing this test).
+    with tempfile.TemporaryDirectory() as tmpdir:
+        with open("/dev/null", "w") as null:
+            proc = Popen(["ssh-keygen", "-f", f"{tmpdir}/test.ssh", "-N", ""],
+                         stdout=null, stderr=null)
+            proc.wait()
+        assert proc.returncode == 0
+
+        # Read in the public key, then delete the temp dir we made.
+        pk = open(f"{tmpdir}/test.ssh.pub").read().rstrip()
+
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "PK": pk,
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Now let's update what's already there to gain coverage over that path.
+    pk = str()
+    with tempfile.TemporaryDirectory() as tmpdir:
+        with open("/dev/null", "w") as null:
+            proc = Popen(["ssh-keygen", "-f", f"{tmpdir}/test.ssh", "-N", ""],
+                         stdout=null, stderr=null)
+            proc.wait()
+        assert proc.returncode == 0
+
+        # Read in the public key, then delete the temp dir we made.
+        pk = open(f"{tmpdir}/test.ssh.pub").read().rstrip()
+
+    post_data["PK"] = pk
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_post_account_edit_invalid_ssh_pubkey():
+    pubkey = "ssh-rsa fake key"
+
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "P": "newPassword",
+        "C": "newPassword",
+        "PK": pubkey,
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_post_account_edit_password():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "P": "newPassword",
+        "C": "newPassword",
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+    assert user.valid_password("newPassword")
+
+
+>>>>>> > dddd1137... add account edit(settings) routes

From 4f928b45770b3b8fd6013473b57feb223679f884 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Jan 2021 23:40:38 -0800
Subject: [PATCH 117/844] add account (view) route

+ Added get /account/{username} route.
+ Added account/show.html template which shows a single use

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py   | 18 ++++++-
 templates/account/show.html  | 96 ++++++++++++++++++++++++++++++++++++
 test/test_accounts_routes.py | 31 +++++++++++-
 3 files changed, 142 insertions(+), 3 deletions(-)
 create mode 100644 templates/account/show.html

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 689f7f58..c7c96003 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -3,7 +3,7 @@ import copy
 from datetime import datetime
 from http import HTTPStatus
 
-from fastapi import APIRouter, Form, Request
+from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from sqlalchemy import and_, func, or_
 
@@ -553,4 +553,18 @@ async def account_edit_post(request: Request,
     # Update cookies with requests, in case they were changed.
     response = render_template(request, "account/edit.html", context)
     return util.migrate_cookies(request, response)
->>>>>> > dddd1137... add account edit(settings) routes
+
+
+@router.get("/account/{username}")
+@auth_required(True, template=("account/show.html", "Accounts"))
+async def account(request: Request, username: str):
+    user = db.query(User, User.Username == username).first()
+
+    context = await make_variable_context(request, "Accounts")
+
+    if not user:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+
+    context["user"] = user
+
+    return render_template(request, "account/show.html", context)
diff --git a/templates/account/show.html b/templates/account/show.html
new file mode 100644
index 00000000..139ff1f5
--- /dev/null
+++ b/templates/account/show.html
@@ -0,0 +1,96 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{% trans %}Accounts{% endtrans %}</h2>
+
+        {% if not request.user.is_authenticated() %}
+            {% trans %}You must log in to view user information.{% endtrans %}
+        {% else %}
+            <table class="arch-bio-entry">
+                <tbody>
+                    <tr>
+                        <td>
+                            <h3>{{ user.Username }}</h3>
+                            <table class="bio">
+                                <tbody>
+                                    <tr>
+                                        <th>{% trans %}Username{% endtrans %}:</th>
+                                        <td>{{ user.Username }}</td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}Account Type{% endtrans %}:</th>
+                                        <td>{{ user.AccountType }}</td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}Email Address{% endtrans %}:</th>
+                                        <td>
+                                            <a href="mailto:{{ user.Email }}">{{ user.Email }}</a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}Real Name{% endtrans %}:</th>
+                                        <td>{{ user.RealName }}</td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}Homepage{% endtrans %}:</th>
+                                        <td>
+                                            {% if user.Homepage %}
+                                                <a href="{{ user.Homepage }}" rel="nofollow">{{ user.Homepage }}</a>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}IRC Nick{% endtrans %}:</th>
+                                        <td>{{ user.IRCNick }}</td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}PGP Key Fingerprint{% endtrans %}:</th>
+                                        <td>{{ user.PGPKey or '' }}</td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}Status{% endtrans %}:</th>
+                                        <td>{{ "Active" if not user.Suspended else "Suspended" | tr }}</td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}Registration date{% endtrans %}:</th>
+                                        <td>
+                                            {{ user.RegistrationTS.strftime("%Y-%m-%d") }}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <th>{% trans %}Links{% endtrans %}:</th>
+                                        <td>
+                                            <ul>
+                                                <li>
+                                                    {{ "%sView this user's packages%s"
+                                                    | tr
+                                                    | format('<a href="/packages/?K=%s&SeB=m">' | format(user.Username), "</a>")
+                                                    | safe
+                                                    }}
+                                                </li>
+                                                <li>
+                                                    {{ "%sEdit this user's account%s"
+                                                    | tr
+                                                    | format('<a href="%s/edit">' | format(user | account_url), "</a>")
+                                                    | safe
+                                                    }}
+                                                </li>
+                                                <li>
+                                                    {{ "%sList this user's comments%s"
+                                                    | tr
+                                                    | format('<a href="%s/comments">' | format(user | account_url), "</a>")
+                                                    | safe
+                                                    }}
+                                                </li>
+                                            </ul>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </td>
+                </tbody>
+            </table>
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 540adde7..c42736fa 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -869,4 +869,33 @@ def test_post_account_edit_password():
     assert user.valid_password("newPassword")
 
 
->>>>>> > dddd1137... add account edit(settings) routes
+def test_get_account():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    with client as request:
+        response = request.get("/account/test", cookies={"AURSID": sid},
+                               allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_get_account_not_found():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    with client as request:
+        response = request.get("/account/not_found", cookies={"AURSID": sid},
+                               allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_get_account_unauthenticated():
+    with client as request:
+        response = request.get("/account/test", allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+    content = response.content.decode()
+    assert "You must log in to view user information." in content

From 32abdbafaed74a0a9dbf3c75401dfa1002f62ba6 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 24 May 2021 12:42:57 +0100
Subject: [PATCH 118/844] fastapi: Jinja contextfilter renamed to pass_context

Closes: #23

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
 aurweb/captcha.py | 6 +++---
 aurweb/l10n.py    | 4 ++--
 aurweb/util.py    | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/aurweb/captcha.py b/aurweb/captcha.py
index 5475d85f..9451f42c 100644
--- a/aurweb/captcha.py
+++ b/aurweb/captcha.py
@@ -1,7 +1,7 @@
 """ This module consists of aurweb's CAPTCHA utility functions and filters. """
 import hashlib
 
-import jinja2
+from jinja2 import pass_context
 
 from aurweb.db import query
 from aurweb.models.user import User
@@ -41,14 +41,14 @@ def get_captcha_answer(token):
     return hashlib.md5((text + "\n").encode()).hexdigest()[:6]
 
 
-@jinja2.contextfilter
+@pass_context
 def captcha_salt_filter(context):
     """ Returns the most recent CAPTCHA salt in the list of salts. """
     salts = get_captcha_salts()
     return salts[0]
 
 
-@jinja2.contextfilter
+@pass_context
 def captcha_cmdline_filter(context, salt):
     """ Returns a CAPTCHA challenge for a given salt. """
     return get_captcha_challenge(salt)
diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index 4a5c1a46..9270f3ce 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -4,7 +4,7 @@ import typing
 from collections import OrderedDict
 
 from fastapi import Request
-from jinja2 import contextfilter
+from jinja2 import pass_context
 
 import aurweb.config
 
@@ -88,7 +88,7 @@ def get_translator_for_request(request: Request):
     return translate
 
 
-@contextfilter
+@pass_context
 def tr(context: typing.Any, value: str):
     """ A translation filter; example: {{ "Hello" | tr("de") }}. """
     _ = get_translator_for_request(context.get("request"))
diff --git a/aurweb/util.py b/aurweb/util.py
index 8b6ddbe7..8e4b291d 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -5,9 +5,8 @@ import string
 
 from urllib.parse import urlparse
 
-import jinja2
-
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
+from jinja2 import pass_context
 
 import aurweb.config
 
@@ -88,7 +87,7 @@ def migrate_cookies(request, response):
     return response
 
 
-@jinja2.contextfilter
+@pass_context
 def account_url(context, user):
     request = context.get("request")
     base = f"{request.url.scheme}://{request.url.hostname}"

From 822905be7d41fbd52790de58ba20f0d82ce69efc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 24 May 2021 05:19:57 -0700
Subject: [PATCH 119/844] bugfix: relax `next` verification

AUR renders its own 404 Not Found page when a bad route
is encountered. Introducing the previous verification
caused an error in this case when setting a language
while viewing the Not Found page. So, instead of checking
through routes, just make sure that the next parameter
starts with a '/' character, which removes the possibility
of any cross attacks.

+ Removed aurweb.asgi.routes; no longer needed.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py         | 9 ---------
 aurweb/routers/html.py | 8 +++-----
 test/test_routes.py    | 2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 1a61b1f4..861f6056 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -12,8 +12,6 @@ from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine
 from aurweb.routers import accounts, auth, errors, html, sso
 
-routes = set()
-
 # Setup the FastAPI app.
 app = FastAPI(exception_handlers=errors.exceptions)
 
@@ -47,13 +45,6 @@ async def app_startup():
     # Initialize the database engine and ORM.
     get_engine()
 
-# NOTE: Always keep this dictionary updated with all routes
-# that the application contains. We use this to check for
-# parameter value verification.
-routes = {route.path for route in app.routes}
-routes.update({route.path for route in sso.router.routes})
-routes.update({route.path for route in html.router.routes})
-
 
 @app.exception_handler(HTTPException)
 async def http_exception_handler(request, exc):
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index e947d213..8f89e05c 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -32,11 +32,9 @@ async def language(request: Request,
     parameters across the redirect.
     """
     from aurweb.db import session
-    from aurweb.asgi import routes
-    if unquote(next) not in routes:
-        return HTMLResponse(
-            b"Invalid 'next' parameter.",
-            status_code=400)
+
+    if next[0] != '/':
+        return HTMLResponse(b"Invalid 'next' parameter.", status_code=400)
 
     query_string = "?" + q if q else str()
 
diff --git a/test/test_routes.py b/test/test_routes.py
index d512a172..e4816231 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -61,7 +61,7 @@ def test_language_invalid_next():
     """ Test an invalid next route at '/language'. """
     post_data = {
         "set_lang": "de",
-        "next": "/BLAHBLAHFAKE"
+        "next": "https://evil.net"
     }
     with client as req:
         response = req.post("/language", data=post_data)

From a7e5498197ebac1986b7b05c4acb6026d9c6f24d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 30 May 2021 16:38:16 -0700
Subject: [PATCH 120/844] add PackageBase SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py                  |  7 +++++
 aurweb/models/package_base.py | 39 ++++++++++++++++++++++++
 test/test_package_base.py     | 57 +++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 aurweb/models/package_base.py
 create mode 100644 test/test_package_base.py

diff --git a/aurweb/db.py b/aurweb/db.py
index 7dab6c4a..bb58c0c8 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -1,5 +1,7 @@
 import math
 
+from sqlalchemy.orm import backref, relationship
+
 import aurweb.config
 import aurweb.util
 
@@ -51,6 +53,11 @@ def make_random_value(table: str, column: str):
     return string
 
 
+def make_relationship(model, foreign_key, backref_):
+    return relationship(model, foreign_keys=[foreign_key],
+                        backref=backref(backref_, lazy="dynamic"))
+
+
 def query(model, *args, **kwargs):
     return session.query(model).filter(*args, **kwargs)
 
diff --git a/aurweb/models/package_base.py b/aurweb/models/package_base.py
new file mode 100644
index 00000000..57e5a46b
--- /dev/null
+++ b/aurweb/models/package_base.py
@@ -0,0 +1,39 @@
+from datetime import datetime
+
+from sqlalchemy.orm import mapper
+
+from aurweb.db import make_relationship
+from aurweb.models.user import User
+from aurweb.schema import PackageBases
+
+
+class PackageBase:
+    def __init__(self, Name: str = None, Flagger: User = None,
+                 Maintainer: User = None, Submitter: User = None,
+                 Packager: User = None, **kwargs):
+        self.Name = Name
+        self.Flagger = Flagger
+        self.Maintainer = Maintainer
+        self.Submitter = Submitter
+        self.Packager = Packager
+
+        self.NumVotes = kwargs.get("NumVotes")
+        self.Popularity = kwargs.get("Popularity")
+        self.OutOfDateTS = kwargs.get("OutOfDateTS")
+        self.FlaggerComment = kwargs.get("FlaggerComment", str())
+        self.SubmittedTS = kwargs.get("SubmittedTS",
+                                      datetime.utcnow().timestamp())
+        self.ModifiedTS = kwargs.get("ModifiedTS",
+                                     datetime.utcnow().timestamp())
+
+
+mapper(PackageBase, PackageBases, properties={
+    "Flagger": make_relationship(User, PackageBases.c.FlaggerUID,
+                                 "flagged_bases"),
+    "Submitter": make_relationship(User, PackageBases.c.SubmitterUID,
+                                   "submitted_bases"),
+    "Maintainer": make_relationship(User, PackageBases.c.MaintainerUID,
+                                    "maintained_bases"),
+    "Packager": make_relationship(User, PackageBases.c.PackagerUID,
+                                  "package_bases")
+})
diff --git a/test/test_package_base.py b/test/test_package_base.py
new file mode 100644
index 00000000..dcb0eb9e
--- /dev/null
+++ b/test/test_package_base.py
@@ -0,0 +1,57 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query
+from aurweb.models.account_type import AccountType
+from aurweb.models.package_base import PackageBase
+from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_user
+
+user = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user
+
+    setup_test_db("Users", "PackageBases")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = make_user(Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
+    yield user
+
+
+def test_package_base():
+    pkgbase = create(PackageBase,
+                     Name="beautiful-package",
+                     Maintainer=user)
+    assert pkgbase in user.maintained_bases
+
+    assert not pkgbase.OutOfDateTS
+    assert pkgbase.SubmittedTS > 0
+    assert pkgbase.ModifiedTS > 0
+
+
+def test_package_base_relationships():
+    pkgbase = create(PackageBase,
+                     Name="beautiful-package",
+                     Flagger=user,
+                     Maintainer=user,
+                     Submitter=user,
+                     Packager=user)
+    assert pkgbase in user.flagged_bases
+    assert pkgbase in user.maintained_bases
+    assert pkgbase in user.submitted_bases
+    assert pkgbase in user.package_bases
+
+
+def test_package_base_null_name_raises_exception():
+    from aurweb.db import session
+
+    with pytest.raises(IntegrityError):
+        create(PackageBase)
+    session.rollback()

From fb210158113307d2fb17cd6377eee8e27a2cec05 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 30 May 2021 18:12:46 -0700
Subject: [PATCH 121/844] add PackageKeyword SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_keyword.py | 20 ++++++++++++
 test/test_package_keyword.py     | 54 ++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 aurweb/models/package_keyword.py
 create mode 100644 test/test_package_keyword.py

diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py
new file mode 100644
index 00000000..87d97558
--- /dev/null
+++ b/aurweb/models/package_keyword.py
@@ -0,0 +1,20 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.db import make_relationship
+from aurweb.models.package_base import PackageBase
+from aurweb.schema import PackageKeywords
+
+
+class PackageKeyword:
+    def __init__(self,
+                 PackageBase: PackageBase = None,
+                 Keyword: str = None):
+        self.PackageBase = PackageBase
+        self.Keyword = Keyword
+
+
+mapper(PackageKeyword, PackageKeywords, properties={
+    "PackageBase": make_relationship(PackageBase,
+                                     PackageKeywords.c.PackageBaseID,
+                                     "keywords")
+})
diff --git a/test/test_package_keyword.py b/test/test_package_keyword.py
new file mode 100644
index 00000000..6e2df344
--- /dev/null
+++ b/test/test_package_keyword.py
@@ -0,0 +1,54 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query
+from aurweb.models.account_type import AccountType
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_keyword import PackageKeyword
+from aurweb.testing import setup_test_db
+from aurweb.testing.models import make_user
+
+user, pkgbase = None, None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase
+
+    setup_test_db("Users", "PackageBases", "PackageKeywords")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = make_user(Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=account_type)
+    pkgbase = create(PackageBase,
+                     Name="beautiful-package",
+                     Maintainer=user)
+
+    yield pkgbase
+
+    from aurweb.db import session
+    session.delete(pkgbase)
+    session.commit()
+
+
+def test_package_keyword():
+    from aurweb.db import session
+    pkg_keyword = create(PackageKeyword,
+                         PackageBase=pkgbase,
+                         Keyword="test")
+    assert pkg_keyword in pkgbase.keywords
+    assert pkgbase == pkg_keyword.PackageBase
+    session.delete(pkg_keyword)
+    session.commit()
+
+
+def test_package_keyword_null_pkgbase_raises_exception():
+    from aurweb.db import session
+
+    with pytest.raises(IntegrityError):
+        create(PackageKeyword,
+               Keyword="test")
+    session.rollback()

From 29db2ee5139baaa7cf4e9989e5916afca6f98bf1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 30 May 2021 22:28:43 -0700
Subject: [PATCH 122/844] add Term SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/term.py | 15 +++++++++++++++
 test/test_term.py     | 30 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 aurweb/models/term.py
 create mode 100644 test/test_term.py

diff --git a/aurweb/models/term.py b/aurweb/models/term.py
new file mode 100644
index 00000000..1b4902f7
--- /dev/null
+++ b/aurweb/models/term.py
@@ -0,0 +1,15 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import Terms
+
+
+class Term:
+    def __init__(self,
+                 Description: str = None, URL: str = None,
+                 Revision: int = None):
+        self.Description = Description
+        self.URL = URL
+        self.Revision = Revision
+
+
+mapper(Term, Terms)
diff --git a/test/test_term.py b/test/test_term.py
new file mode 100644
index 00000000..4ae1e1cd
--- /dev/null
+++ b/test/test_term.py
@@ -0,0 +1,30 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, delete
+from aurweb.models.term import Term
+
+
+def test_term_creation():
+    term = create(Term, Description="Term description",
+                  URL="https://fake_url.io")
+    assert bool(term.ID)
+    assert term.Description == "Term description"
+    assert term.URL == "https://fake_url.io"
+    assert term.Revision == 1
+    delete(Term, Term.ID == term.ID)
+
+
+def test_term_null_description_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(Term, URL="https://fake_url.io")
+    session.rollback()
+
+
+def test_term_null_url_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(Term, Description="Term description")
+    session.rollback()

From 718fa48a5cb0be18cea315bfb1742ef95f30da98 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 30 May 2021 22:29:01 -0700
Subject: [PATCH 123/844] add AcceptedTerm SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/accepted_term.py | 24 ++++++++++++++
 test/test_accepted_term.py     | 57 ++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 aurweb/models/accepted_term.py
 create mode 100644 test/test_accepted_term.py

diff --git a/aurweb/models/accepted_term.py b/aurweb/models/accepted_term.py
new file mode 100644
index 00000000..6e8ffe99
--- /dev/null
+++ b/aurweb/models/accepted_term.py
@@ -0,0 +1,24 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.db import make_relationship
+from aurweb.models.term import Term
+from aurweb.models.user import User
+from aurweb.schema import AcceptedTerms
+
+
+class AcceptedTerm:
+    def __init__(self,
+                 User: User = None, Term: Term = None,
+                 Revision: int = None):
+        self.User = User
+        self.Term = Term
+        self.Revision = Revision
+
+
+properties = {
+    "User": make_relationship(User, AcceptedTerms.c.UsersID, "accepted_terms"),
+    "Term": make_relationship(Term, AcceptedTerms.c.TermsID, "accepted")
+}
+
+mapper(AcceptedTerm, AcceptedTerms, properties=properties,
+       primary_key=[AcceptedTerms.c.UsersID, AcceptedTerms.c.TermsID])
diff --git a/test/test_accepted_term.py b/test/test_accepted_term.py
new file mode 100644
index 00000000..4dd8a5ca
--- /dev/null
+++ b/test/test_accepted_term.py
@@ -0,0 +1,57 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, delete, query
+from aurweb.models.accepted_term import AcceptedTerm
+from aurweb.models.account_type import AccountType
+from aurweb.models.term import Term
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user, term, accepted_term = None, None, None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, term, accepted_term
+
+    setup_test_db("Users", "AcceptedTerms", "Terms")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  account_type=account_type)
+
+    term = create(Term, Description="Test term", URL="https://test.term")
+
+    yield term
+
+    delete(Term, Term.ID == term.ID)
+    delete(User, User.ID == user.ID)
+
+
+def test_accepted_term():
+    accepted_term = create(AcceptedTerm, User=user, Term=term)
+
+    # Make sure our AcceptedTerm relationships got initialized properly.
+    assert accepted_term.User == user
+    assert accepted_term in user.accepted_terms
+    assert accepted_term in term.accepted
+
+    delete(AcceptedTerm, AcceptedTerm.User == user, AcceptedTerm.Term == term)
+
+
+def test_accepted_term_null_user_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(AcceptedTerm, Term=term)
+    session.rollback()
+
+
+def test_accepted_term_null_term_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(AcceptedTerm, User=user)
+    session.rollback()

From e1ab02c2bf88e2a2fcf2048da212f586c6e3a389 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 30 May 2021 23:06:33 -0700
Subject: [PATCH 124/844] Fix database initialization in test_term.py

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_term.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/test_term.py b/test/test_term.py
index 4ae1e1cd..00397b33 100644
--- a/test/test_term.py
+++ b/test/test_term.py
@@ -2,10 +2,15 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, delete
+from aurweb.db import create, delete, get_engine
 from aurweb.models.term import Term
 
 
+@pytest.fixture(autouse=True)
+def setup():
+    get_engine()
+
+
 def test_term_creation():
     term = create(Term, Description="Term description",
                   URL="https://fake_url.io")

From b692b11f62efffd8554fce95c7a0f2a2cdb9014b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 30 May 2021 23:05:16 -0700
Subject: [PATCH 125/844] add Group SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/group.py | 11 +++++++++++
 test/test_group.py     | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 aurweb/models/group.py
 create mode 100644 test/test_group.py

diff --git a/aurweb/models/group.py b/aurweb/models/group.py
new file mode 100644
index 00000000..5d4f3834
--- /dev/null
+++ b/aurweb/models/group.py
@@ -0,0 +1,11 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import Groups
+
+
+class Group:
+    def __init__(self, Name: str = None):
+        self.Name = Name
+
+
+mapper(Group, Groups)
diff --git a/test/test_group.py b/test/test_group.py
new file mode 100644
index 00000000..bbb774b9
--- /dev/null
+++ b/test/test_group.py
@@ -0,0 +1,21 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, delete, get_engine
+from aurweb.models.group import Group
+
+
+def test_group_creation():
+    get_engine()
+    group = create(Group, Name="Test Group")
+    assert bool(group.ID)
+    assert group.Name == "Test Group"
+    delete(Group, Group.ID == group.ID)
+
+
+def test_group_null_name_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(Group)
+    session.rollback()

From 794868b20f700461fd8978be9c162c708db43c57 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 31 May 2021 22:41:06 -0700
Subject: [PATCH 126/844] aurweb.testing.setup_test_db: Expunge objects

This is needed to avoid redundant objects in SQLAlchemy's
IdentityMap, since we pass a direct .execute to delete
the tables passed in. Additionally, remove our engine.connect()
call in favor of relying on the already-established Session.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/__init__.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/aurweb/testing/__init__.py b/aurweb/testing/__init__.py
index 0a807b40..02c21a4c 100644
--- a/aurweb/testing/__init__.py
+++ b/aurweb/testing/__init__.py
@@ -21,10 +21,12 @@ def setup_test_db(*args):
         test_tables = ["Users", "Sessions"];
         setup_test_db(*test_tables)
     """
-    engine = aurweb.db.get_engine()
-    conn = engine.connect()
+    # Make sure that we've grabbed the engine before using the session.
+    aurweb.db.get_engine()
 
     tables = list(args)
     for table in tables:
-        conn.execute(f"DELETE FROM {table}")
-    conn.close()
+        aurweb.db.session.execute(f"DELETE FROM {table}")
+
+    # Expunge all objects from SQLAlchemy's IdentityMap.
+    aurweb.db.session.expunge_all()

From f8a6049de24a1b92b6d1c3456570c47f464aaf21 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 31 May 2021 22:43:28 -0700
Subject: [PATCH 127/844] aurweb.db.session: Use autoflush=True for Sessions

We'd like SQLAlchemy to automatically maintain flushes for us.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index bb58c0c8..ca5ce412 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -135,7 +135,7 @@ def get_engine():
             # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
             connect_args["check_same_thread"] = False
         engine = create_engine(get_sqlalchemy_url(), connect_args=connect_args)
-        Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+        Session = sessionmaker(autocommit=False, autoflush=True, bind=engine)
         session = Session()
 
     return engine

From 621e459dfbd3d6e8e0d7a790dae4e14b092078ad Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 31 May 2021 22:45:30 -0700
Subject: [PATCH 128/844] aurweb.models.user: Remove session.commit() from
 construction

We don't want to do this on construction. We only want to do this
when we want to actually add the user to the database (or modify it).

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 3983e098..6c5c6e21 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -51,11 +51,9 @@ class User:
             self.update_password(passwd)
 
     def update_password(self, password, salt_rounds=12):
-        from aurweb.db import session
         self.Passwd = bcrypt.hashpw(
             password.encode(),
             bcrypt.gensalt(rounds=salt_rounds)).decode()
-        session.commit()
 
     @staticmethod
     def minimum_passwd_length():

From 15b1332656a7f2bb0aa2abe108af4ede0629b749 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 00:25:49 -0700
Subject: [PATCH 129/844] add Package SQLAlchemy ORM model

Additionally, add an optional **kwargs passing via make_relationship.
This allows us to use things like `uselist=False`, which was needed
for test/test_package.py.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py             |  5 ++-
 aurweb/models/package.py | 24 ++++++++++++
 test/test_package.py     | 79 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 aurweb/models/package.py
 create mode 100644 test/test_package.py

diff --git a/aurweb/db.py b/aurweb/db.py
index ca5ce412..500cf95a 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -53,9 +53,10 @@ def make_random_value(table: str, column: str):
     return string
 
 
-def make_relationship(model, foreign_key, backref_):
+def make_relationship(model, foreign_key: str, backref_: str, **kwargs):
     return relationship(model, foreign_keys=[foreign_key],
-                        backref=backref(backref_, lazy="dynamic"))
+                        backref=backref(backref_, lazy="dynamic"),
+                        **kwargs)
 
 
 def query(model, *args, **kwargs):
diff --git a/aurweb/models/package.py b/aurweb/models/package.py
new file mode 100644
index 00000000..fa82bb74
--- /dev/null
+++ b/aurweb/models/package.py
@@ -0,0 +1,24 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.db import make_relationship
+from aurweb.models.package_base import PackageBase
+from aurweb.schema import Packages
+
+
+class Package:
+    def __init__(self,
+                 PackageBase: PackageBase = None,
+                 Name: str = None, Version: str = None,
+                 Description: str = None, URL: str = None):
+        self.PackageBase = PackageBase
+        self.Name = Name
+        self.Version = Version
+        self.Description = Description
+        self.URL = URL
+
+
+mapper(Package, Packages, properties={
+    "PackageBase": make_relationship(PackageBase,
+                                     Packages.c.PackageBaseID,
+                                     "package", uselist=False)
+})
diff --git a/test/test_package.py b/test/test_package.py
new file mode 100644
index 00000000..1d670087
--- /dev/null
+++ b/test/test_package.py
@@ -0,0 +1,79 @@
+import pytest
+
+from sqlalchemy import and_
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query
+from aurweb.models.account_type import AccountType
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = package = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase, package
+
+    setup_test_db("Users", "PackageBases", "Packages")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
+
+    pkgbase = create(PackageBase,
+                     Name="beautiful-package",
+                     Maintainer=user)
+    package = create(Package,
+                     PackageBase=pkgbase,
+                     Name=pkgbase.Name,
+                     Description="Test description.",
+                     URL="https://test.package")
+
+    yield package
+
+
+def test_package():
+    from aurweb.db import session
+
+    assert pkgbase == package.PackageBase
+    assert package.Name == "beautiful-package"
+    assert package.Description == "Test description."
+    assert package.Version == str()  # Default version.
+    assert package.URL == "https://test.package"
+
+    # Update package Version.
+    package.Version = "1.2.3"
+    session.commit()
+
+    # Make sure it got updated in the database.
+    record = query(Package,
+                   and_(Package.ID == package.ID,
+                        Package.Version == "1.2.3")).first()
+    assert record is not None
+
+
+def test_package_null_pkgbase_raises_exception():
+    from aurweb.db import session
+
+    with pytest.raises(IntegrityError):
+        create(Package,
+               Name="some-package",
+               Description="Some description.",
+               URL="https://some.package")
+    session.rollback()
+
+
+def test_package_null_name_raises_exception():
+    from aurweb.db import session
+
+    with pytest.raises(IntegrityError):
+        create(Package,
+               PackageBase=pkgbase,
+               Description="Some description.",
+               URL="https://some.package")
+    session.rollback()

From f2121fb833d2279c5fb6b5863988209e45176fd0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 00:26:32 -0700
Subject: [PATCH 130/844] simplify test_package_keyword.py

We no longer need to delete records like this; in fact, it causes
errors now. Fix this by removing the deletions and allow
setup_test_db to do it's job.

We'll need to do this for other tests as well.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_keyword.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/test/test_package_keyword.py b/test/test_package_keyword.py
index 6e2df344..f110b123 100644
--- a/test/test_package_keyword.py
+++ b/test/test_package_keyword.py
@@ -29,20 +29,13 @@ def setup():
 
     yield pkgbase
 
-    from aurweb.db import session
-    session.delete(pkgbase)
-    session.commit()
-
 
 def test_package_keyword():
-    from aurweb.db import session
     pkg_keyword = create(PackageKeyword,
                          PackageBase=pkgbase,
                          Keyword="test")
     assert pkg_keyword in pkgbase.keywords
     assert pkgbase == pkg_keyword.PackageBase
-    session.delete(pkg_keyword)
-    session.commit()
 
 
 def test_package_keyword_null_pkgbase_raises_exception():

From 38dc2bb99dcbab372c4c7fcd3716f7f532c22ee0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 03:26:14 -0700
Subject: [PATCH 131/844] Sanitize and modernize pytests

Some of these tests were written before some of our convenient
tooling existed. Additionally, some of the tests were not
cooperating with PEP-8 guidelines or isorted.

This commit does the following:
    - Replaces all calls to make_(user|session) with
      aurweb.db.create(Model, ...).
    - Replace calls to session.add(...) + session.commit() with
      aurweb.db.create.
    - Removes the majority of calls to (session|aurweb.db).delete(...).
    - Replaces session.query calls with aurweb.db.query.
    - Initializes all mutable globals in pytest fixture setup().
    - Makes mutable global declarations more concise:
      `var1, var2 = None, None` -> `var1 = var2 = None`
    - Defines a warning exclusion for test/test_ssh_pub_key.py.
    - Removes the aurweb.testing.models module.
    - Removes some useless pytest.fixture yielding.

As of this commit, developers should use the following guidelines
when writing tests:
    - Always use aurweb.db.(create|delete|query) for database
      operations, where possible.
    - Always define mutable globals in the style: `var1 = var2 = None`.
    - `yield` the most dependent model in pytest setup fixture **iff**
      you must delete records after test runs to maintain database
      integrity. Example: test/test_account_type.py.

This all makes the test code look and behave much cleaner.
Previously, aurweb.testing.setup_test_db was buggy and leaving
objects around in SQLAlchemy's IdentityMap.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/models.py     | 25 ---------------
 setup.cfg                    | 28 +++++++++++------
 test/test_accepted_term.py   | 11 ++-----
 test/test_account_type.py    | 28 ++++++-----------
 test/test_accounts_routes.py | 13 ++++----
 test/test_auth.py            | 29 +++++++----------
 test/test_auth_routes.py     | 17 +++++-----
 test/test_ban.py             | 16 ++++------
 test/test_exceptions.py      | 61 +++++++++++++++++-------------------
 test/test_group.py           | 10 ++++--
 test/test_initdb.py          |  5 +--
 test/test_package.py         |  2 --
 test/test_package_base.py    |  9 +++---
 test/test_package_keyword.py | 12 +++----
 test/test_routes.py          | 17 +++++-----
 test/test_session.py         | 31 +++++++++---------
 test/test_ssh_pub_key.py     | 29 ++++++-----------
 test/test_term.py            |  6 ++--
 test/test_user.py            | 50 +++++++++--------------------
 19 files changed, 160 insertions(+), 239 deletions(-)
 delete mode 100644 aurweb/testing/models.py

diff --git a/aurweb/testing/models.py b/aurweb/testing/models.py
deleted file mode 100644
index 8a27c409..00000000
--- a/aurweb/testing/models.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import warnings
-
-from sqlalchemy import exc
-
-import aurweb.db
-
-
-def make_user(**kwargs):
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", exc.SAWarning)
-        from aurweb.models.user import User
-        user = User(**kwargs)
-        aurweb.db.session.add(user)
-        aurweb.db.session.commit()
-        return user
-
-
-def make_session(**kwargs):
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", exc.SAWarning)
-        from aurweb.models.session import Session
-        session = Session(**kwargs)
-        aurweb.db.session.add(session)
-        aurweb.db.session.commit()
-        return session
diff --git a/setup.cfg b/setup.cfg
index 98261651..31a0eb8a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,18 +2,26 @@
 max-line-length = 127
 max-complexity = 10
 
-# Ignore some unavoidable flake8 warnings; we know this is against
-# pycodestyle, but some of the existing codebase uses `I` variables,
-# so specifically silence warnings about it in pre-defined files.
-# In E741, the 'I', 'O', 'l' are ambiguous variable names.
-# Our current implementation uses these variables through HTTP
-# and the FastAPI form specification wants them named as such.
-# In C901's case, our process_account_form function is way too
-# complex for PEP (too many if statements). However, we need to
-# process these anyways, and making it any more complex would
-# just add confusion to the implementation.
+# aurweb/routers/accounts.py
+#   Ignore some unavoidable flake8 warnings; we know this is against
+#   pycodestyle, but some of the existing codebase uses `I` variables,
+#   so specifically silence warnings about it in pre-defined files.
+#   In E741, the 'I', 'O', 'l' are ambiguous variable names.
+#   Our current implementation uses these variables through HTTP
+#   and the FastAPI form specification wants them named as such.
+#   In C901's case, our process_account_form function is way too
+#   complex for PEP (too many if statements). However, we need to
+#   process these anyways, and making it any more complex would
+#   just add confusion to the implementation.
+#
+# test/test_ssh_pub_key.py
+#   E501 is detected due to our >127 width test constant. Ignore it.
+#   Due to this, line width should _always_ be looked at in code reviews.
+#   Anything like this should be questioned.
+#
 per-file-ignores =
     aurweb/routers/accounts.py:E741,C901
+    test/test_ssh_pub_key.py:E501
 
 [isort]
 line_length = 127
diff --git a/test/test_accepted_term.py b/test/test_accepted_term.py
index 4dd8a5ca..4ddf1fc3 100644
--- a/test/test_accepted_term.py
+++ b/test/test_accepted_term.py
@@ -2,14 +2,14 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, delete, query
+from aurweb.db import create, query
 from aurweb.models.accepted_term import AcceptedTerm
 from aurweb.models.account_type import AccountType
 from aurweb.models.term import Term
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
 
-user, term, accepted_term = None, None, None
+user = term = accepted_term = None
 
 
 @pytest.fixture(autouse=True)
@@ -26,11 +26,6 @@ def setup():
 
     term = create(Term, Description="Test term", URL="https://test.term")
 
-    yield term
-
-    delete(Term, Term.ID == term.ID)
-    delete(User, User.ID == user.ID)
-
 
 def test_accepted_term():
     accepted_term = create(AcceptedTerm, User=user, Term=term)
@@ -40,8 +35,6 @@ def test_accepted_term():
     assert accepted_term in user.accepted_terms
     assert accepted_term in term.accepted
 
-    delete(AcceptedTerm, AcceptedTerm.User == user, AcceptedTerm.Term == term)
-
 
 def test_accepted_term_null_user_raises_exception():
     from aurweb.db import session
diff --git a/test/test_account_type.py b/test/test_account_type.py
index 9419970c..3bd76d1e 100644
--- a/test/test_account_type.py
+++ b/test/test_account_type.py
@@ -1,9 +1,9 @@
 import pytest
 
+from aurweb.db import create, delete, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_user
 
 account_type = None
 
@@ -12,24 +12,17 @@ account_type = None
 def setup():
     setup_test_db("Users")
 
-    from aurweb.db import session
-
     global account_type
 
-    account_type = AccountType(AccountType="TestUser")
-    session.add(account_type)
-    session.commit()
+    account_type = create(AccountType, AccountType="TestUser")
 
     yield account_type
 
-    session.delete(account_type)
-    session.commit()
+    delete(AccountType, AccountType.ID == account_type.ID)
 
 
 def test_account_type():
     """ Test creating an AccountType, and reading its columns. """
-    from aurweb.db import session
-
     # Make sure it got created and was given an ID.
     assert bool(account_type.ID)
 
@@ -39,20 +32,17 @@ def test_account_type():
         "<AccountType(ID='%s', AccountType='TestUser')>" % (
         account_type.ID)
 
-    record = session.query(AccountType).filter(
-        AccountType.AccountType == "TestUser").first()
+    record = query(AccountType,
+                   AccountType.AccountType == "TestUser").first()
     assert account_type == record
 
 
 def test_user_account_type_relationship():
-    from aurweb.db import session
-
-    user = make_user(Username="test", Email="test@example.org",
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
 
     assert user.AccountType == account_type
     assert account_type.users.filter(User.ID == user.ID).first()
 
-    session.delete(user)
-    session.commit()
+    delete(User, User.ID == user.ID)
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index c42736fa..0f813823 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -12,14 +12,13 @@ from fastapi.testclient import TestClient
 
 from aurweb import captcha
 from aurweb.asgi import app
-from aurweb.db import create, delete, query
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_user
 from aurweb.testing.requests import Request
 
 # Some test global constants.
@@ -39,9 +38,9 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = make_user(Username=TEST_USERNAME, Email=TEST_EMAIL,
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
+    user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
 
 
 def test_get_passreset_authed_redirects():
@@ -751,8 +750,8 @@ def test_post_account_edit_error_unauthorized():
     request = Request()
     sid = user.login(request, "testPassword")
 
-    test2 = create(User, Username="test2", Email="test2@example.org",
-                   Passwd="testPassword")
+    create(User, Username="test2",
+           Email="test2@example.org", Passwd="testPassword")
 
     post_data = {
         "U": "test",
diff --git a/test/test_auth.py b/test/test_auth.py
index d43459cd..7837e7f7 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -5,16 +5,14 @@ import pytest
 from starlette.authentication import AuthenticationError
 
 from aurweb.auth import BasicAuthBackend, has_credential
-from aurweb.db import query
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
+from aurweb.models.session import Session
+from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_session, make_user
 from aurweb.testing.requests import Request
 
-# Persistent user object, initialized in our setup fixture.
-user = None
-backend = None
-request = None
+user = backend = request = None
 
 
 @pytest.fixture(autouse=True)
@@ -23,16 +21,11 @@ def setup():
 
     setup_test_db("Users", "Sessions")
 
-    from aurweb.db import session
-
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = make_user(Username="test", Email="test@example.com",
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
-
-    session.add(user)
-    session.commit()
+    user = create(User, Username="test", Email="test@example.com",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
 
     backend = BasicAuthBackend()
     request = Request()
@@ -60,8 +53,8 @@ async def test_auth_backend_invalid_sid():
 async def test_auth_backend_invalid_user_id():
     # Create a new session with a fake user id.
     now_ts = datetime.utcnow().timestamp()
-    make_session(UsersID=666, SessionID="realSession",
-                 LastUpdateTS=now_ts + 5)
+    create(Session, UsersID=666, SessionID="realSession",
+           LastUpdateTS=now_ts + 5)
 
     # Here, we specify a real SID; but it's user is not there.
     request.cookies["AURSID"] = "realSession"
@@ -74,8 +67,8 @@ async def test_basic_auth_backend():
     # This time, everything matches up. We expect the user to
     # equal the real_user.
     now_ts = datetime.utcnow().timestamp()
-    make_session(UsersID=user.ID, SessionID="realSession",
-                 LastUpdateTS=now_ts + 5)
+    create(Session, UsersID=user.ID, SessionID="realSession",
+           LastUpdateTS=now_ts + 5)
     _, result = await backend.authenticate(request)
     assert result == user
 
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index ff8a08e9..360b48cc 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -8,33 +8,34 @@ from fastapi.testclient import TestClient
 import aurweb.config
 
 from aurweb.asgi import app
-from aurweb.db import query
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.session import Session
+from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_user
 
 # Some test global constants.
 TEST_USERNAME = "test"
 TEST_EMAIL = "test@example.org"
 
 # Global mutables.
-client = TestClient(app)
-user = None
+user = client = None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    global user
+    global user, client
 
     setup_test_db("Users", "Sessions", "Bans")
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
 
-    user = make_user(Username=TEST_USERNAME, Email=TEST_EMAIL,
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
+    user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
+
+    client = TestClient(app)
 
 
 def test_login_logout():
diff --git a/test/test_ban.py b/test/test_ban.py
index de4f5b1b..a4fa5a28 100644
--- a/test/test_ban.py
+++ b/test/test_ban.py
@@ -6,27 +6,23 @@ import pytest
 
 from sqlalchemy import exc as sa_exc
 
+from aurweb.db import create
 from aurweb.models.ban import Ban, is_banned
 from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
 
-ban = None
-
-request = Request()
+ban = request = None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    from aurweb.db import session
-
-    global ban
+    global ban, request
 
     setup_test_db("Bans")
 
-    ban = Ban(IPAddress="127.0.0.1",
-              BanTS=datetime.utcnow() + timedelta(seconds=30))
-    session.add(ban)
-    session.commit()
+    ts = datetime.utcnow() + timedelta(seconds=30)
+    ban = create(Ban, IPAddress="127.0.0.1", BanTS=ts)
+    request = Request()
 
 
 def test_ban():
diff --git a/test/test_exceptions.py b/test/test_exceptions.py
index feac2656..7247106b 100644
--- a/test/test_exceptions.py
+++ b/test/test_exceptions.py
@@ -1,102 +1,99 @@
-from aurweb.exceptions import (AlreadyVotedException, AurwebException, BannedException, BrokenUpdateHookException,
-                               InvalidArgumentsException, InvalidCommentException, InvalidPackageBaseException,
-                               InvalidReasonException, InvalidRepositoryNameException, InvalidUserException,
-                               MaintenanceException, NotVotedException, PackageBaseExistsException, PermissionDeniedException)
+from aurweb import exceptions
 
 
 def test_aurweb_exception():
     try:
-        raise AurwebException("test")
-    except AurwebException as exc:
+        raise exceptions.AurwebException("test")
+    except exceptions.AurwebException as exc:
         assert str(exc) == "test"
 
 
 def test_maintenance_exception():
     try:
-        raise MaintenanceException("test")
-    except MaintenanceException as exc:
+        raise exceptions.MaintenanceException("test")
+    except exceptions.MaintenanceException as exc:
         assert str(exc) == "test"
 
 
 def test_banned_exception():
     try:
-        raise BannedException("test")
-    except BannedException as exc:
+        raise exceptions.BannedException("test")
+    except exceptions.BannedException as exc:
         assert str(exc) == "test"
 
 
 def test_already_voted_exception():
     try:
-        raise AlreadyVotedException("test")
-    except AlreadyVotedException as exc:
+        raise exceptions.AlreadyVotedException("test")
+    except exceptions.AlreadyVotedException as exc:
         assert str(exc) == "already voted for package base: test"
 
 
 def test_broken_update_hook_exception():
     try:
-        raise BrokenUpdateHookException("test")
-    except BrokenUpdateHookException as exc:
+        raise exceptions.BrokenUpdateHookException("test")
+    except exceptions.BrokenUpdateHookException as exc:
         assert str(exc) == "broken update hook: test"
 
 
 def test_invalid_arguments_exception():
     try:
-        raise InvalidArgumentsException("test")
-    except InvalidArgumentsException as exc:
+        raise exceptions.InvalidArgumentsException("test")
+    except exceptions.InvalidArgumentsException as exc:
         assert str(exc) == "test"
 
 
 def test_invalid_packagebase_exception():
     try:
-        raise InvalidPackageBaseException("test")
-    except InvalidPackageBaseException as exc:
+        raise exceptions.InvalidPackageBaseException("test")
+    except exceptions.InvalidPackageBaseException as exc:
         assert str(exc) == "package base not found: test"
 
 
 def test_invalid_comment_exception():
     try:
-        raise InvalidCommentException("test")
-    except InvalidCommentException as exc:
+        raise exceptions.InvalidCommentException("test")
+    except exceptions.InvalidCommentException as exc:
         assert str(exc) == "comment is too short: test"
 
 
 def test_invalid_reason_exception():
     try:
-        raise InvalidReasonException("test")
-    except InvalidReasonException as exc:
+        raise exceptions.InvalidReasonException("test")
+    except exceptions.InvalidReasonException as exc:
         assert str(exc) == "invalid reason: test"
 
 
 def test_invalid_user_exception():
     try:
-        raise InvalidUserException("test")
-    except InvalidUserException as exc:
+        raise exceptions.InvalidUserException("test")
+    except exceptions.InvalidUserException as exc:
         assert str(exc) == "unknown user: test"
 
 
 def test_not_voted_exception():
     try:
-        raise NotVotedException("test")
-    except NotVotedException as exc:
+        raise exceptions.NotVotedException("test")
+    except exceptions.NotVotedException as exc:
         assert str(exc) == "missing vote for package base: test"
 
 
 def test_packagebase_exists_exception():
     try:
-        raise PackageBaseExistsException("test")
-    except PackageBaseExistsException as exc:
+        raise exceptions.PackageBaseExistsException("test")
+    except exceptions.PackageBaseExistsException as exc:
         assert str(exc) == "package base already exists: test"
 
 
 def test_permission_denied_exception():
     try:
-        raise PermissionDeniedException("test")
-    except PermissionDeniedException as exc:
+        raise exceptions.PermissionDeniedException("test")
+    except exceptions.PermissionDeniedException as exc:
         assert str(exc) == "permission denied: test"
 
 
 def test_repository_name_exception():
     try:
-        raise InvalidRepositoryNameException("test")
-    except InvalidRepositoryNameException as exc:
+        raise exceptions.InvalidRepositoryNameException("test")
+    except exceptions.InvalidRepositoryNameException as exc:
         assert str(exc) == "invalid repository name: test"
diff --git a/test/test_group.py b/test/test_group.py
index bbb774b9..da017a96 100644
--- a/test/test_group.py
+++ b/test/test_group.py
@@ -2,16 +2,20 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, delete, get_engine
+from aurweb.db import create
 from aurweb.models.group import Group
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db("Groups")
 
 
 def test_group_creation():
-    get_engine()
     group = create(Group, Name="Test Group")
     assert bool(group.ID)
     assert group.Name == "Test Group"
-    delete(Group, Group.ID == group.ID)
 
 
 def test_group_null_name_raises_exception():
diff --git a/test/test_initdb.py b/test/test_initdb.py
index ff089b63..eae33007 100644
--- a/test/test_initdb.py
+++ b/test/test_initdb.py
@@ -23,5 +23,6 @@ def test_run():
         use_alembic = True
         verbose = False
     aurweb.initdb.run(Args())
-    assert aurweb.db.session.query(AccountType).filter(
-        AccountType.AccountType == "User").first() is not None
+    record = aurweb.db.query(AccountType,
+                             AccountType.AccountType == "User").first()
+    assert record is not None
diff --git a/test/test_package.py b/test/test_package.py
index 1d670087..66d557f3 100644
--- a/test/test_package.py
+++ b/test/test_package.py
@@ -34,8 +34,6 @@ def setup():
                      Description="Test description.",
                      URL="https://test.package")
 
-    yield package
-
 
 def test_package():
     from aurweb.db import session
diff --git a/test/test_package_base.py b/test/test_package_base.py
index dcb0eb9e..e0359f4f 100644
--- a/test/test_package_base.py
+++ b/test/test_package_base.py
@@ -5,8 +5,8 @@ from sqlalchemy.exc import IntegrityError
 from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.package_base import PackageBase
+from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_user
 
 user = None
 
@@ -19,10 +19,9 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = make_user(Username="test", Email="test@example.org",
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
-    yield user
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
 
 
 def test_package_base():
diff --git a/test/test_package_keyword.py b/test/test_package_keyword.py
index f110b123..316e7ca8 100644
--- a/test/test_package_keyword.py
+++ b/test/test_package_keyword.py
@@ -6,10 +6,10 @@ from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_keyword import PackageKeyword
+from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_user
 
-user, pkgbase = None, None
+user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
@@ -20,15 +20,13 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = make_user(Username="test", Email="test@example.org",
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
     pkgbase = create(PackageBase,
                      Name="beautiful-package",
                      Maintainer=user)
 
-    yield pkgbase
-
 
 def test_package_keyword():
     pkg_keyword = create(PackageKeyword,
diff --git a/test/test_routes.py b/test/test_routes.py
index e4816231..f4bb063f 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -7,27 +7,28 @@ import pytest
 from fastapi.testclient import TestClient
 
 from aurweb.asgi import app
-from aurweb.db import query
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
+from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_user
 from aurweb.testing.requests import Request
 
-client = TestClient(app)
-user = None
+user = client = None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    global user
+    global user, client
 
     setup_test_db("Users", "Sessions")
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = make_user(Username="test", Email="test@example.org",
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
+
+    client = TestClient(app)
 
 
 def test_index():
diff --git a/test/test_session.py b/test/test_session.py
index 560f628c..2877ea7f 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -4,39 +4,38 @@ from unittest import mock
 
 import pytest
 
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
-from aurweb.models.session import generate_unique_sid
+from aurweb.models.session import Session, generate_unique_sid
+from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_session, make_user
 
-user, _session = None, None
+user = session = None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    from aurweb.db import session
-
-    global user, _session
+    global user, session
 
     setup_test_db("Users", "Sessions")
 
-    account_type = session.query(AccountType).filter(
-        AccountType.AccountType == "User").first()
-    user = make_user(Username="test", Email="test@example.org",
-                     ResetKey="testReset", Passwd="testPassword",
-                     AccountType=account_type)
-    _session = make_session(UsersID=user.ID, SessionID="testSession",
-                            LastUpdateTS=datetime.utcnow())
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  ResetKey="testReset", Passwd="testPassword",
+                  AccountType=account_type)
+    session = create(Session, UsersID=user.ID, SessionID="testSession",
+                     LastUpdateTS=datetime.utcnow())
 
 
 def test_session():
-    assert _session.SessionID == "testSession"
-    assert _session.UsersID == user.ID
+    assert session.SessionID == "testSession"
+    assert session.UsersID == user.ID
 
 
 def test_session_user_association():
     # Make sure that the Session user attribute is correct.
-    assert _session.User == user
+    assert session.User == user
 
 
 def test_generate_unique_sid():
diff --git a/test/test_ssh_pub_key.py b/test/test_ssh_pub_key.py
index fe9df047..4072549e 100644
--- a/test/test_ssh_pub_key.py
+++ b/test/test_ssh_pub_key.py
@@ -1,46 +1,37 @@
 import pytest
 
-from aurweb.db import query
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
+from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_user
 
 TEST_SSH_PUBKEY = """
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCycoCi5yGCvSclH2wmNBUuwsYEzRZZBJaQquRc4ysl+Tg+/jiDkR3Zn9fIznC4KnFoyrIHzkKuePZ3bNDYwkZxkJKoWBCh4hXKDXSm87FMN0+VDC+1QxF/z0XaAGr/P6f4XukabyddypBdnHcZiplbw+YOSqcAE2TCqOlSXwNMOcF9U89UsR/Q9i9I52hlvU0q8+fZVGhou1KCowFSnHYtrr5KYJ04CXkJ13DkVf3+pjQWyrByvBcf1hGEaczlgfobrrv/y96jDhgfXucxliNKLdufDPPkii3LhhsNcDmmI1VZ3v0irKvd9WZuauqloobY84zEFcDTyjn0hxGjVeYFejm4fBnvjga0yZXORuWksdNfXWLDxFk6MDDd1jF0ExRbP+OxDuU4IVyIuDL7S3cnbf2YjGhkms/8voYT2OBE7FwNlfv98Kr0NUp51zpf55Arxn9j0Rz9xTA7FiODQgCn6iQ0SDtzUNL0IKTCw26xJY5gzMxbfpvzPQGeulx/ioM= kevr@volcano
 """
 
-user, ssh_pub_key = None, None
+user = ssh_pub_key = None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    from aurweb.db import session
-
     global user, ssh_pub_key
 
     setup_test_db("Users", "SSHPubKeys")
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = make_user(Username="test", Email="test@example.org",
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
 
     assert account_type == user.AccountType
     assert account_type.ID == user.AccountTypeID
 
-    ssh_pub_key = SSHPubKey(UserID=user.ID,
-                            Fingerprint="testFingerprint",
-                            PubKey="testPubKey")
-
-    session.add(ssh_pub_key)
-    session.commit()
-
-    yield ssh_pub_key
-
-    session.delete(ssh_pub_key)
-    session.commit()
+    ssh_pub_key = create(SSHPubKey,
+                         UserID=user.ID,
+                         Fingerprint="testFingerprint",
+                         PubKey="testPubKey")
 
 
 def test_ssh_pub_key():
diff --git a/test/test_term.py b/test/test_term.py
index 00397b33..aa1dfcc6 100644
--- a/test/test_term.py
+++ b/test/test_term.py
@@ -2,13 +2,14 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, delete, get_engine
+from aurweb.db import create
 from aurweb.models.term import Term
+from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    get_engine()
+    setup_test_db("Terms")
 
 
 def test_term_creation():
@@ -18,7 +19,6 @@ def test_term_creation():
     assert term.Description == "Term description"
     assert term.URL == "https://fake_url.io"
     assert term.Revision == 1
-    delete(Term, Term.ID == term.ID)
 
 
 def test_term_null_description_raises_exception():
diff --git a/test/test_user.py b/test/test_user.py
index e8056681..8b4da61e 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -8,23 +8,20 @@ import pytest
 import aurweb.auth
 import aurweb.config
 
-from aurweb.db import query
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.models import make_session, make_user
 from aurweb.testing.requests import Request
 
-account_type, user = None, None
+account_type = user = None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    from aurweb.db import session
-
     global account_type, user
 
     setup_test_db("Users", "Sessions", "Bans", "SSHPubKeys")
@@ -32,15 +29,13 @@ def setup():
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
 
-    user = make_user(Username="test", Email="test@example.org",
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=account_type)
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
 
 
 def test_user_login_logout():
     """ Test creating a user and reading its columns. """
-    from aurweb.db import session
-
     # Assert that make_user created a valid user.
     assert bool(user.ID)
 
@@ -61,8 +56,8 @@ def test_user_login_logout():
     assert "AURSID" in request.cookies
 
     # Expect that User session relationships work right.
-    user_session = session.query(Session).filter(
-        Session.UsersID == user.ID).first()
+    user_session = query(Session,
+                         Session.UsersID == user.ID).first()
     assert user_session == user.session
     assert user.session.SessionID == sid
     assert user.session.User == user
@@ -103,13 +98,9 @@ def test_user_login_twice():
 
 
 def test_user_login_banned():
-    from aurweb.db import session
-
     # Add ban for the next 30 seconds.
     banned_timestamp = datetime.utcnow() + timedelta(seconds=30)
-    ban = Ban(IPAddress="127.0.0.1", BanTS=banned_timestamp)
-    session.add(ban)
-    session.commit()
+    create(Ban, IPAddress="127.0.0.1", BanTS=banned_timestamp)
 
     request = Request()
     request.client.host = "127.0.0.1"
@@ -138,19 +129,14 @@ def test_legacy_user_authentication():
 
 
 def test_user_login_with_outdated_sid():
-    from aurweb.db import session
-
     # Make a session with a LastUpdateTS 5 seconds ago, causing
     # user.login to update it with a new sid.
-    _session = make_session(UsersID=user.ID, SessionID="stub",
-                            LastUpdateTS=datetime.utcnow().timestamp() - 5)
+    create(Session, UsersID=user.ID, SessionID="stub",
+           LastUpdateTS=datetime.utcnow().timestamp() - 5)
     sid = user.login(Request(), "testPassword")
     assert sid and user.is_authenticated()
     assert sid != "stub"
 
-    session.delete(_session)
-    session.commit()
-
 
 def test_user_update_password():
     user.update_password("secondPassword")
@@ -169,21 +155,14 @@ def test_user_has_credential():
 
 
 def test_user_ssh_pub_key():
-    from aurweb.db import session
-
     assert user.ssh_pub_key is None
 
-    ssh_pub_key = SSHPubKey(UserID=user.ID,
-                            Fingerprint="testFingerprint",
-                            PubKey="testPubKey")
-    session.add(ssh_pub_key)
-    session.commit()
+    ssh_pub_key = create(SSHPubKey, UserID=user.ID,
+                         Fingerprint="testFingerprint",
+                         PubKey="testPubKey")
 
     assert user.ssh_pub_key == ssh_pub_key
 
-    session.delete(ssh_pub_key)
-    session.commit()
-
 
 def test_user_credential_types():
     from aurweb.db import session
@@ -203,8 +182,7 @@ def test_user_credential_types():
     assert aurweb.auth.trusted_user_or_dev(user)
 
     developer_type = query(AccountType,
-                           AccountType.AccountType == "Developer")\
-        .first()
+                           AccountType.AccountType == "Developer").first()
     user.AccountType = developer_type
     session.commit()
 

From 943d97efac1f6fca6c823e0edb416b3c300f4b3d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 04:48:49 -0700
Subject: [PATCH 132/844] add License SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/license.py | 11 +++++++++++
 test/test_license.py     | 25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 aurweb/models/license.py
 create mode 100644 test/test_license.py

diff --git a/aurweb/models/license.py b/aurweb/models/license.py
new file mode 100644
index 00000000..1c174925
--- /dev/null
+++ b/aurweb/models/license.py
@@ -0,0 +1,11 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import Licenses
+
+
+class License:
+    def __init__(self, Name: str = None):
+        self.Name = Name
+
+
+mapper(License, Licenses)
diff --git a/test/test_license.py b/test/test_license.py
new file mode 100644
index 00000000..feb7a396
--- /dev/null
+++ b/test/test_license.py
@@ -0,0 +1,25 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create
+from aurweb.models.license import License
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db("Licenses")
+
+
+def test_license_creation():
+    license = create(License, Name="Test License")
+    assert bool(license.ID)
+    assert license.Name == "Test License"
+
+
+def test_license_null_name_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(License)
+    session.rollback()

From 75cc0be189271ed3583486c0b66463f8e43605f4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 05:06:38 -0700
Subject: [PATCH 133/844] add PackageLicense SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_license.py | 27 +++++++++++++++++
 test/test_package_license.py     | 52 ++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 aurweb/models/package_license.py
 create mode 100644 test/test_package_license.py

diff --git a/aurweb/models/package_license.py b/aurweb/models/package_license.py
new file mode 100644
index 00000000..187b113e
--- /dev/null
+++ b/aurweb/models/package_license.py
@@ -0,0 +1,27 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.db import make_relationship
+from aurweb.models.license import License
+from aurweb.models.package import Package
+from aurweb.schema import PackageLicenses
+
+
+class PackageLicense:
+    def __init__(self, Package: Package = None, License: License = None):
+        self.Package = Package
+        self.License = License
+
+
+properties = {
+    "Package": make_relationship(Package,
+                                 PackageLicenses.c.PackageID,
+                                 "package_license",
+                                 uselist=False),
+    "License": make_relationship(License,
+                                 PackageLicenses.c.LicenseID,
+                                 "package_license",
+                                 uselist=False)
+}
+
+mapper(PackageLicense, PackageLicenses, properties=properties,
+       primary_key=[PackageLicenses.c.PackageID, PackageLicenses.c.LicenseID])
diff --git a/test/test_package_license.py b/test/test_package_license.py
new file mode 100644
index 00000000..72eb3681
--- /dev/null
+++ b/test/test_package_license.py
@@ -0,0 +1,52 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query
+from aurweb.models.account_type import AccountType
+from aurweb.models.license import License
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_license import PackageLicense
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = license = pkgbase = package = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, license, pkgbase, package
+
+    setup_test_db("Users", "PackageBases", "Packages",
+                  "Licenses", "PackageLicenses")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  account_type=account_type)
+
+    license = create(License, Name="Test License")
+    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    package = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+
+
+def test_package_license():
+    package_license = create(PackageLicense, Package=package, License=license)
+    assert package_license.License == license
+    assert package_license.Package == package
+
+
+def test_package_license_null_package_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(PackageLicense, License=license)
+    session.rollback()
+
+
+def test_package_license_null_license_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(PackageLicense, Package=package)
+    session.rollback()

From a8a9c28783d606863b57066103e15b64d75fdb69 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 05:21:01 -0700
Subject: [PATCH 134/844] Jinja bugfix: add xmlns + xml:lang to <html>

This was not brought over during the initial commit involving
partisl/layout.html.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/layout.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/partials/layout.html b/templates/partials/layout.html
index d30208a9..019ebff7 100644
--- a/templates/partials/layout.html
+++ b/templates/partials/layout.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
-<html lang="{{ language }}">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xml:lang="{{ language }}" lang="{{ language }}">
     {% include 'partials/head.html' %}
 
     <body>

From 4201348dea2b74bfc172573209561f76b1a36597 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 05:34:27 -0700
Subject: [PATCH 135/844] add PackageGroup SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_group.py | 27 ++++++++++++++++++
 test/test_package_group.py     | 52 ++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 aurweb/models/package_group.py
 create mode 100644 test/test_package_group.py

diff --git a/aurweb/models/package_group.py b/aurweb/models/package_group.py
new file mode 100644
index 00000000..8a32c00b
--- /dev/null
+++ b/aurweb/models/package_group.py
@@ -0,0 +1,27 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.db import make_relationship
+from aurweb.models.group import Group
+from aurweb.models.package import Package
+from aurweb.schema import PackageGroups
+
+
+class PackageGroup:
+    def __init__(self, Package: Package = None, Group: Group = None):
+        self.Package = Package
+        self.Group = Group
+
+
+properties = {
+    "Package": make_relationship(Package,
+                                 PackageGroups.c.PackageID,
+                                 "package_group",
+                                 uselist=False),
+    "Group": make_relationship(Group,
+                               PackageGroups.c.GroupID,
+                               "package_group",
+                               uselist=False)
+}
+
+mapper(PackageGroup, PackageGroups, properties=properties,
+       primary_key=[PackageGroups.c.PackageID, PackageGroups.c.GroupID])
diff --git a/test/test_package_group.py b/test/test_package_group.py
new file mode 100644
index 00000000..28047a7f
--- /dev/null
+++ b/test/test_package_group.py
@@ -0,0 +1,52 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query
+from aurweb.models.account_type import AccountType
+from aurweb.models.group import Group
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_group import PackageGroup
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = group = pkgbase = package = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, group, pkgbase, package
+
+    setup_test_db("Users", "PackageBases", "Packages",
+                  "Groups", "PackageGroups")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  account_type=account_type)
+
+    group = create(Group, Name="Test Group")
+    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    package = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+
+
+def test_package_group():
+    package_group = create(PackageGroup, Package=package, Group=group)
+    assert package_group.Group == group
+    assert package_group.Package == package
+
+
+def test_package_group_null_package_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(PackageGroup, Group=group)
+    session.rollback()
+
+
+def test_package_group_null_group_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(PackageGroup, Package=package)
+    session.rollback()

From 068c8ba638dd032df917d82af8fe6ffe70264ab3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 06:44:24 -0700
Subject: [PATCH 136/844] add DependencyType SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/dependency_type.py | 11 +++++++++++
 test/test_dependency_type.py     | 31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 aurweb/models/dependency_type.py
 create mode 100644 test/test_dependency_type.py

diff --git a/aurweb/models/dependency_type.py b/aurweb/models/dependency_type.py
new file mode 100644
index 00000000..87b38069
--- /dev/null
+++ b/aurweb/models/dependency_type.py
@@ -0,0 +1,11 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import DependencyTypes
+
+
+class DependencyType:
+    def __init__(self, Name: str = None):
+        self.Name = Name
+
+
+mapper(DependencyType, DependencyTypes)
diff --git a/test/test_dependency_type.py b/test/test_dependency_type.py
new file mode 100644
index 00000000..6c37cc58
--- /dev/null
+++ b/test/test_dependency_type.py
@@ -0,0 +1,31 @@
+import pytest
+
+from aurweb.db import create, delete, query
+from aurweb.models.dependency_type import DependencyType
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db()
+
+
+def test_dependency_types():
+    dep_types = ["depends", "makedepends", "checkdepends", "optdepends"]
+    for dep_type in dep_types:
+        dependency_type = query(DependencyType,
+                                DependencyType.Name == dep_type).first()
+        assert dependency_type is not None
+
+
+def test_dependency_type_creation():
+    dependency_type = create(DependencyType, Name="Test Type")
+    assert bool(dependency_type.ID)
+    assert dependency_type.Name == "Test Type"
+    delete(DependencyType, DependencyType.ID == dependency_type.ID)
+
+
+def test_dependency_type_null_name_uses_default():
+    dependency_type = create(DependencyType)
+    assert dependency_type.Name == str()
+    delete(DependencyType, DependencyType.ID == dependency_type.ID)

From e401b92acb82a52f62441f8decb209448ce457a1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 07:21:54 -0700
Subject: [PATCH 137/844] add PackageDependency (PackageDepends) ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_dependency.py |  31 ++++++++
 test/test_package_dependency.py     | 113 ++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 aurweb/models/package_dependency.py
 create mode 100644 test/test_package_dependency.py

diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
new file mode 100644
index 00000000..ae6ae62a
--- /dev/null
+++ b/aurweb/models/package_dependency.py
@@ -0,0 +1,31 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.db import make_relationship
+from aurweb.models.dependency_type import DependencyType
+from aurweb.models.package import Package
+from aurweb.schema import PackageDepends
+
+
+class PackageDependency:
+    def __init__(self, Package: Package = None,
+                 DependencyType: DependencyType = None,
+                 DepName: str = None, DepDesc: str = None,
+                 DepCondition: str = None, DepArch: str = None):
+        self.Package = Package
+        self.DependencyType = DependencyType
+        self.DepName = DepName  # nullable=False
+        self.DepDesc = DepDesc
+        self.DepCondition = DepCondition
+        self.DepArch = DepArch
+
+
+properties = {
+    "Package": make_relationship(Package, PackageDepends.c.PackageID,
+                                 "package_dependencies"),
+    "DependencyType": make_relationship(DependencyType,
+                                        PackageDepends.c.DepTypeID,
+                                        "package_dependencies")
+}
+
+mapper(PackageDependency, PackageDepends, properties=properties,
+       primary_key=[PackageDepends.c.PackageID, PackageDepends.c.DepTypeID])
diff --git a/test/test_package_dependency.py b/test/test_package_dependency.py
new file mode 100644
index 00000000..fc21a08c
--- /dev/null
+++ b/test/test_package_dependency.py
@@ -0,0 +1,113 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query
+from aurweb.models.account_type import AccountType
+from aurweb.models.dependency_type import DependencyType
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_dependency import PackageDependency
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = package = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase, package
+
+    setup_test_db("Users", "PackageBases", "Packages", "PackageDepends")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
+
+    pkgbase = create(PackageBase,
+                     Name="test-package",
+                     Maintainer=user)
+    package = create(Package,
+                     PackageBase=pkgbase,
+                     Name=pkgbase.Name,
+                     Description="Test description.",
+                     URL="https://test.package")
+
+
+def test_package_dependencies():
+    depends = query(DependencyType, DependencyType.Name == "depends").first()
+    pkgdep = create(PackageDependency, Package=package,
+                    DependencyType=depends,
+                    DepName="test-dep")
+    assert pkgdep.DepName == "test-dep"
+    assert pkgdep.Package == package
+    assert pkgdep.DependencyType == depends
+    assert pkgdep in depends.package_dependencies
+    assert pkgdep in package.package_dependencies
+
+    makedepends = query(DependencyType,
+                        DependencyType.Name == "makedepends").first()
+    pkgdep = create(PackageDependency, Package=package,
+                    DependencyType=makedepends,
+                    DepName="test-dep")
+    assert pkgdep.DepName == "test-dep"
+    assert pkgdep.Package == package
+    assert pkgdep.DependencyType == makedepends
+    assert pkgdep in makedepends.package_dependencies
+    assert pkgdep in package.package_dependencies
+
+    checkdepends = query(DependencyType,
+                         DependencyType.Name == "checkdepends").first()
+    pkgdep = create(PackageDependency, Package=package,
+                    DependencyType=checkdepends,
+                    DepName="test-dep")
+    assert pkgdep.DepName == "test-dep"
+    assert pkgdep.Package == package
+    assert pkgdep.DependencyType == checkdepends
+    assert pkgdep in checkdepends.package_dependencies
+    assert pkgdep in package.package_dependencies
+
+    optdepends = query(DependencyType,
+                       DependencyType.Name == "optdepends").first()
+    pkgdep = create(PackageDependency, Package=package,
+                    DependencyType=optdepends,
+                    DepName="test-dep")
+    assert pkgdep.DepName == "test-dep"
+    assert pkgdep.Package == package
+    assert pkgdep.DependencyType == optdepends
+    assert pkgdep in optdepends.package_dependencies
+    assert pkgdep in package.package_dependencies
+
+
+def test_package_dependencies_null_package_raises_exception():
+    from aurweb.db import session
+
+    depends = query(DependencyType, DependencyType.Name == "depends").first()
+    with pytest.raises(IntegrityError):
+        create(PackageDependency,
+               DependencyType=depends,
+               DepName="test-dep")
+    session.rollback()
+
+
+def test_package_dependencies_null_dependency_type_raises_exception():
+    from aurweb.db import session
+
+    with pytest.raises(IntegrityError):
+        create(PackageDependency,
+               Package=package,
+               DepName="test-dep")
+    session.rollback()
+
+
+def test_package_dependencies_null_depname_raises_exception():
+    from aurweb.db import session
+
+    depends = query(DependencyType, DependencyType.Name == "depends").first()
+    with pytest.raises(IntegrityError):
+        create(PackageDependency,
+               Package=package,
+               DependencyType=depends)
+    session.rollback()

From a9cfbce11e3c16c22d168f8fc55238f17ea78273 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 07:37:05 -0700
Subject: [PATCH 138/844] add RelationType SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/relation_type.py | 11 +++++++++++
 test/test_relation_type.py     | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 aurweb/models/relation_type.py
 create mode 100644 test/test_relation_type.py

diff --git a/aurweb/models/relation_type.py b/aurweb/models/relation_type.py
new file mode 100644
index 00000000..b4d1efbc
--- /dev/null
+++ b/aurweb/models/relation_type.py
@@ -0,0 +1,11 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import RelationTypes
+
+
+class RelationType:
+    def __init__(self, Name: str = None):
+        self.Name = Name
+
+
+mapper(RelationType, RelationTypes)
diff --git a/test/test_relation_type.py b/test/test_relation_type.py
new file mode 100644
index 00000000..bf23505c
--- /dev/null
+++ b/test/test_relation_type.py
@@ -0,0 +1,32 @@
+import pytest
+
+from aurweb.db import create, delete, query
+from aurweb.models.relation_type import RelationType
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db()
+
+
+def test_relation_type_creation():
+    relation_type = create(RelationType, Name="test-relation")
+    assert bool(relation_type.ID)
+    assert relation_type.Name == "test-relation"
+
+    delete(RelationType, RelationType.ID == relation_type.ID)
+
+
+def test_relation_types():
+    conflicts = query(RelationType, RelationType.Name == "conflicts").first()
+    assert conflicts is not None
+    assert conflicts.Name == "conflicts"
+
+    provides = query(RelationType, RelationType.Name == "provides").first()
+    assert provides is not None
+    assert provides.Name == "provides"
+
+    replaces = query(RelationType, RelationType.Name == "replaces").first()
+    assert replaces is not None
+    assert replaces.Name == "replaces"

From 2b83d2fb6bb8b5066053220b5929d5d67333f9dd Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 1 Jun 2021 07:52:22 -0700
Subject: [PATCH 139/844] add PackageRelation SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_relation.py |  33 ++++++++++
 test/test_package_relation.py     | 100 ++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+)
 create mode 100644 aurweb/models/package_relation.py
 create mode 100644 test/test_package_relation.py

diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
new file mode 100644
index 00000000..196f1dee
--- /dev/null
+++ b/aurweb/models/package_relation.py
@@ -0,0 +1,33 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.db import make_relationship
+from aurweb.models.package import Package
+from aurweb.models.relation_type import RelationType
+from aurweb.schema import PackageRelations
+
+
+class PackageRelation:
+    def __init__(self, Package: Package = None,
+                 RelationType: RelationType = None,
+                 RelName: str = None, RelCondition: str = None,
+                 RelArch: str = None):
+        self.Package = Package
+        self.RelationType = RelationType
+        self.RelName = RelName  # nullable=False
+        self.RelCondition = RelCondition
+        self.RelArch = RelArch
+
+
+properties = {
+    "Package": make_relationship(Package, PackageRelations.c.PackageID,
+                                 "package_relations"),
+    "RelationType": make_relationship(RelationType,
+                                      PackageRelations.c.RelTypeID,
+                                      "package_relations")
+}
+
+mapper(PackageRelation, PackageRelations, properties=properties,
+       primary_key=[
+           PackageRelations.c.PackageID,
+           PackageRelations.c.RelTypeID
+       ])
diff --git a/test/test_package_relation.py b/test/test_package_relation.py
new file mode 100644
index 00000000..dd0455cd
--- /dev/null
+++ b/test/test_package_relation.py
@@ -0,0 +1,100 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query
+from aurweb.models.account_type import AccountType
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_relation import PackageRelation
+from aurweb.models.relation_type import RelationType
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = package = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase, package
+
+    setup_test_db("Users", "PackageBases", "Packages", "PackageRelations")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
+
+    pkgbase = create(PackageBase,
+                     Name="test-package",
+                     Maintainer=user)
+    package = create(Package,
+                     PackageBase=pkgbase,
+                     Name=pkgbase.Name,
+                     Description="Test description.",
+                     URL="https://test.package")
+
+
+def test_package_dependencies():
+    conflicts = query(RelationType, RelationType.Name == "conflicts").first()
+    pkgrel = create(PackageRelation, Package=package,
+                    RelationType=conflicts,
+                    RelName="test-relation")
+    assert pkgrel.RelName == "test-relation"
+    assert pkgrel.Package == package
+    assert pkgrel.RelationType == conflicts
+    assert pkgrel in conflicts.package_relations
+    assert pkgrel in package.package_relations
+
+    provides = query(RelationType, RelationType.Name == "provides").first()
+    pkgrel = create(PackageRelation, Package=package,
+                    RelationType=provides,
+                    RelName="test-relation")
+    assert pkgrel.RelName == "test-relation"
+    assert pkgrel.Package == package
+    assert pkgrel.RelationType == provides
+    assert pkgrel in provides.package_relations
+    assert pkgrel in package.package_relations
+
+    replaces = query(RelationType, RelationType.Name == "replaces").first()
+    pkgrel = create(PackageRelation, Package=package,
+                    RelationType=replaces,
+                    RelName="test-relation")
+    assert pkgrel.RelName == "test-relation"
+    assert pkgrel.Package == package
+    assert pkgrel.RelationType == replaces
+    assert pkgrel in replaces.package_relations
+    assert pkgrel in package.package_relations
+
+
+def test_package_dependencies_null_package_raises_exception():
+    from aurweb.db import session
+
+    conflicts = query(RelationType, RelationType.Name == "conflicts").first()
+    with pytest.raises(IntegrityError):
+        create(PackageRelation,
+               RelationType=conflicts,
+               RelName="test-relation")
+    session.rollback()
+
+
+def test_package_dependencies_null_dependency_type_raises_exception():
+    from aurweb.db import session
+
+    with pytest.raises(IntegrityError):
+        create(PackageRelation,
+               Package=package,
+               RelName="test-relation")
+    session.rollback()
+
+
+def test_package_dependencies_null_depname_raises_exception():
+    from aurweb.db import session
+
+    depends = query(RelationType, RelationType.Name == "depends").first()
+    with pytest.raises(IntegrityError):
+        create(PackageRelation,
+               Package=package,
+               RelationType=depends)
+    session.rollback()

From a65a60604ab09e83f18cec58afb7a807b1eb2b30 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 3 Jun 2021 10:51:46 -0700
Subject: [PATCH 140/844] add ApiRateLimit SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/api_rate_limit.py | 15 +++++++++++++
 test/test_api_rate_limit.py     | 40 +++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 aurweb/models/api_rate_limit.py
 create mode 100644 test/test_api_rate_limit.py

diff --git a/aurweb/models/api_rate_limit.py b/aurweb/models/api_rate_limit.py
new file mode 100644
index 00000000..44e7a463
--- /dev/null
+++ b/aurweb/models/api_rate_limit.py
@@ -0,0 +1,15 @@
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import ApiRateLimit as _ApiRateLimit
+
+
+class ApiRateLimit:
+    def __init__(self, IP: str = None,
+                 Requests: int = None,
+                 WindowStart: int = None):
+        self.IP = IP
+        self.Requests = Requests
+        self.WindowStart = WindowStart
+
+
+mapper(ApiRateLimit, _ApiRateLimit, primary_key=[_ApiRateLimit.c.IP])
diff --git a/test/test_api_rate_limit.py b/test/test_api_rate_limit.py
new file mode 100644
index 00000000..91ab5854
--- /dev/null
+++ b/test/test_api_rate_limit.py
@@ -0,0 +1,40 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create
+from aurweb.models.api_rate_limit import ApiRateLimit
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db("ApiRateLimit")
+
+
+def test_api_rate_key_creation():
+    rate = create(ApiRateLimit, IP="127.0.0.1", Requests=10, WindowStart=1)
+    assert rate.IP == "127.0.0.1"
+    assert rate.Requests == 10
+    assert rate.WindowStart == 1
+
+
+def test_api_rate_key_null_ip_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(ApiRateLimit, Requests=10, WindowStart=1)
+    session.rollback()
+
+
+def test_api_rate_key_null_requests_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(ApiRateLimit, IP="127.0.0.1", WindowStart=1)
+    session.rollback()
+
+
+def test_api_rate_key_null_window_start_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(ApiRateLimit, IP="127.0.0.1", WindowStart=1)
+    session.rollback()

From e5df083d4553440af309be89c5dcdd11d68dc7d5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 3 Jun 2021 22:56:47 -0700
Subject: [PATCH 141/844] use String(max_len) for DECIMAL types with sqlite

This solves an issue where DECIMAL is not native
to sqlite by using a string to store values and
converting them to float in user code.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/schema.py     | 10 ++++++++--
 web/html/addvote.php |  7 +++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/aurweb/schema.py b/aurweb/schema.py
index f0162045..0d40e272 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -107,7 +107,10 @@ PackageBases = Table(
     Column('ID', INTEGER(unsigned=True), primary_key=True),
     Column('Name', String(255), nullable=False, unique=True),
     Column('NumVotes', INTEGER(unsigned=True), nullable=False, server_default=text("0")),
-    Column('Popularity', DECIMAL(10, 6, unsigned=True), nullable=False, server_default=text("0")),
+    Column('Popularity',
+           DECIMAL(10, 6, unsigned=True)
+           if db_backend == "mysql" else String(16),  # Stubbed out to test.
+           nullable=False, server_default=text("0")),
     Column('OutOfDateTS', BIGINT(unsigned=True)),
     Column('FlaggerComment', Text, nullable=False),
     Column('SubmittedTS', BIGINT(unsigned=True), nullable=False),
@@ -383,7 +386,10 @@ TU_VoteInfo = Table(
     Column('User', String(32), nullable=False),
     Column('Submitted', BIGINT(unsigned=True), nullable=False),
     Column('End', BIGINT(unsigned=True), nullable=False),
-    Column('Quorum', DECIMAL(2, 2, unsigned=True), nullable=False),
+    Column('Quorum',
+           DECIMAL(2, 2, unsigned=True)
+           if db_backend == "mysql" else String(4),
+           nullable=False),
     Column('SubmitterID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
     Column('Yes', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
     Column('No', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
diff --git a/web/html/addvote.php b/web/html/addvote.php
index 3672c031..70280cfd 100644
--- a/web/html/addvote.php
+++ b/web/html/addvote.php
@@ -67,8 +67,11 @@ if (has_credential(CRED_TU_ADD_VOTE)) {
 		}
 	}
 
-	if (!empty($_POST['addVote']) && empty($error)) {
-		add_tu_proposal($_POST['agenda'], $_POST['user'], $len, $quorum, $uid);
+    if (!empty($_POST['addVote']) && empty($error)) {
+        // Convert $quorum to a String of maximum length "12.34" (5).
+        $quorum_str = substr(strval($quorum), min(5, strlen($quorum));
+        add_tu_proposal($_POST['agenda'], $_POST['user'],
+                        $len, $quorum_str, $uid);
 
 		print "<p class=\"pkgoutput\">" . __("New proposal submitted.") . "</p>\n";
 	} else {

From d7481b96499f06be0d9ca983bb9efc578b38eb97 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 4 Jun 2021 00:31:15 -0700
Subject: [PATCH 142/844] modify schema primary keys to be nullable+defaulted

This fixes SQLAlchemy warnings related to primary keys not
having an auto_increment or nullable.

We've done this by making all foreign primary keys nullable.

In ApiRateLimit's case, we can set a default str to act as
a null, which seems a bit more sensible.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_group.py   | 12 ++++++++++++
 aurweb/models/package_keyword.py |  7 +++++++
 aurweb/models/package_license.py | 14 ++++++++++++++
 aurweb/schema.py                 | 12 ++++++------
 test/test_api_rate_limit.py      |  8 +++-----
 5 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/aurweb/models/package_group.py b/aurweb/models/package_group.py
index 8a32c00b..c155fe00 100644
--- a/aurweb/models/package_group.py
+++ b/aurweb/models/package_group.py
@@ -1,4 +1,5 @@
 from sqlalchemy.orm import mapper
+from sqlalchemy.exc import IntegrityError
 
 from aurweb.db import make_relationship
 from aurweb.models.group import Group
@@ -9,7 +10,18 @@ from aurweb.schema import PackageGroups
 class PackageGroup:
     def __init__(self, Package: Package = None, Group: Group = None):
         self.Package = Package
+        if not self.Package:
+            raise IntegrityError(
+                statement="Primary key PackageID cannot be null.",
+                orig="PackageGroups.PackageID",
+                params=("NULL"))
+
         self.Group = Group
+        if not self.Group:
+            raise IntegrityError(
+                statement="Primary key GroupID cannot be null.",
+                orig="PackageGroups.GroupID",
+                params=("NULL"))
 
 
 properties = {
diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py
index 87d97558..4a66f38e 100644
--- a/aurweb/models/package_keyword.py
+++ b/aurweb/models/package_keyword.py
@@ -1,4 +1,5 @@
 from sqlalchemy.orm import mapper
+from sqlalchemy.exc import IntegrityError
 
 from aurweb.db import make_relationship
 from aurweb.models.package_base import PackageBase
@@ -10,6 +11,12 @@ class PackageKeyword:
                  PackageBase: PackageBase = None,
                  Keyword: str = None):
         self.PackageBase = PackageBase
+        if not self.PackageBase:
+            raise IntegrityError(
+                statement="Primary key PackageBaseID cannot be null.",
+                orig="PackageKeywords.PackageBaseID",
+                params=("NULL"))
+
         self.Keyword = Keyword
 
 
diff --git a/aurweb/models/package_license.py b/aurweb/models/package_license.py
index 187b113e..6f23f84a 100644
--- a/aurweb/models/package_license.py
+++ b/aurweb/models/package_license.py
@@ -1,4 +1,5 @@
 from sqlalchemy.orm import mapper
+from sqlalchemy.exc import IntegrityError
 
 from aurweb.db import make_relationship
 from aurweb.models.license import License
@@ -9,7 +10,18 @@ from aurweb.schema import PackageLicenses
 class PackageLicense:
     def __init__(self, Package: Package = None, License: License = None):
         self.Package = Package
+        if not self.Package:
+            raise IntegrityError(
+                statement="Primary key PackageID cannot be null.",
+                orig="PackageLicenses.PackageID",
+                params=("NULL"))
+
         self.License = License
+        if not self.License:
+            raise IntegrityError(
+                statement="Primary key LicenseID cannot be null.",
+                orig="PackageLicenses.LicenseID",
+                params=("NULL"))
 
 
 properties = {
@@ -21,6 +33,8 @@ properties = {
                                  PackageLicenses.c.LicenseID,
                                  "package_license",
                                  uselist=False)
+
+
 }
 
 mapper(PackageLicense, PackageLicenses, properties=properties,
diff --git a/aurweb/schema.py b/aurweb/schema.py
index 0d40e272..fa8923a3 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -133,7 +133,7 @@ PackageBases = Table(
 # Keywords of package bases
 PackageKeywords = Table(
     'PackageKeywords', metadata,
-    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
+    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), primary_key=True, nullable=True),
     Column('Keyword', String(255), primary_key=True, nullable=False, server_default=text("''")),
     mysql_engine='InnoDB',
     mysql_charset='utf8mb4',
@@ -170,8 +170,8 @@ Licenses = Table(
 # Information about package-license-relations
 PackageLicenses = Table(
     'PackageLicenses', metadata,
-    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
-    Column('LicenseID', ForeignKey('Licenses.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
+    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), primary_key=True, nullable=True),
+    Column('LicenseID', ForeignKey('Licenses.ID', ondelete='CASCADE'), primary_key=True, nullable=True),
     mysql_engine='InnoDB',
 )
 
@@ -190,8 +190,8 @@ Groups = Table(
 # Information about package-group-relations
 PackageGroups = Table(
     'PackageGroups', metadata,
-    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
-    Column('GroupID', ForeignKey('Groups.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
+    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), primary_key=True, nullable=True),
+    Column('GroupID', ForeignKey('Groups.ID', ondelete='CASCADE'), primary_key=True, nullable=True),
     mysql_engine='InnoDB',
 )
 
@@ -445,7 +445,7 @@ AcceptedTerms = Table(
 # Rate limits for API
 ApiRateLimit = Table(
     'ApiRateLimit', metadata,
-    Column('IP', String(45), primary_key=True),
+    Column('IP', String(45), primary_key=True, unique=True, default=str()),
     Column('Requests', INTEGER(11), nullable=False),
     Column('WindowStart', BIGINT(20), nullable=False),
     Index('ApiRateLimitWindowStart', 'WindowStart'),
diff --git a/test/test_api_rate_limit.py b/test/test_api_rate_limit.py
index 91ab5854..c599ddcf 100644
--- a/test/test_api_rate_limit.py
+++ b/test/test_api_rate_limit.py
@@ -19,11 +19,9 @@ def test_api_rate_key_creation():
     assert rate.WindowStart == 1
 
 
-def test_api_rate_key_null_ip_raises_exception():
-    from aurweb.db import session
-    with pytest.raises(IntegrityError):
-        create(ApiRateLimit, Requests=10, WindowStart=1)
-    session.rollback()
+def test_api_rate_key_ip_default():
+    api_rate_limit = create(ApiRateLimit, Requests=10, WindowStart=1)
+    assert api_rate_limit.IP == str()
 
 
 def test_api_rate_key_null_requests_raises_exception():

From aecb64947354283a9b2dd357a67e997c78f4adac Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 4 Jun 2021 00:43:57 -0700
Subject: [PATCH 143/844] use mysql backend in config.dev

First off: This commit changes the default development database
backend to mysql. sqlite, however, is still completely supported
with the caveat that a user must now modify config.dev to use
the sqlite backend.

While looking into this, it was discovered that our SQLAlchemy
backend for mysql (mysql-connector) completely broke model
attributes when we switched to utf8mb4_bin (binary) -- it does
not correct the correct conversion to and from binary utf8mb4.

The new, replacement dependency mysqlclient does. mysqlclient
is also recommended in SQLAlchemy documentation as the "best"
one available.

The mysqlclient backend uses a different exception flow then
sqlite, and so tests expecting IntegrityError has to be modified
to expect OperationalError from sqlalchemy.exc.

So, for each model that we define, check keys that can't be
NULL and raise sqlalchemy.exc.IntegrityError if we have to.
This way we keep our exceptions uniform.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py                        |  39 ++++--
 aurweb/initdb.py                    |   6 +-
 aurweb/models/accepted_term.py      |  13 ++
 aurweb/models/api_rate_limit.py     |  13 ++
 aurweb/models/group.py              |   6 +
 aurweb/models/license.py            |   6 +
 aurweb/models/package.py            |  13 ++
 aurweb/models/package_base.py       |   7 +
 aurweb/models/package_dependency.py |  21 ++-
 aurweb/models/package_group.py      |   2 +-
 aurweb/models/package_keyword.py    |   2 +-
 aurweb/models/package_license.py    |   2 +-
 aurweb/models/package_relation.py   |  19 +++
 aurweb/models/session.py            |  12 +-
 aurweb/models/term.py               |  13 ++
 conf/config.dev                     |  20 +--
 test/Makefile                       |   2 +-
 test/test_accounts_routes.py        |  42 ++++--
 test/test_api_rate_limit.py         |   2 +-
 test/test_auth.py                   |  13 +-
 test/test_ban.py                    |   3 +-
 test/test_db.py                     | 202 ++++++++++++++++++++--------
 test/test_initdb.py                 |  20 +--
 test/test_package_relation.py       |  18 ++-
 test/test_session.py                |   2 +-
 25 files changed, 363 insertions(+), 135 deletions(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 500cf95a..590712e0 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -98,9 +98,11 @@ def get_sqlalchemy_url():
             param_query = None
         else:
             port = None
-            param_query = {'unix_socket': aurweb.config.get('database', 'socket')}
+            param_query = {
+                'unix_socket': aurweb.config.get('database', 'socket')
+            }
         return constructor(
-            'mysql+mysqlconnector',
+            'mysql+mysqldb',
             username=aurweb.config.get('database', 'user'),
             password=aurweb.config.get('database', 'password'),
             host=aurweb.config.get('database', 'host'),
@@ -117,7 +119,7 @@ def get_sqlalchemy_url():
         raise ValueError('unsupported database backend')
 
 
-def get_engine():
+def get_engine(echo: bool = False):
     """
     Return the global SQLAlchemy engine.
 
@@ -135,13 +137,24 @@ def get_engine():
             # check_same_thread is for a SQLite technicality
             # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
             connect_args["check_same_thread"] = False
-        engine = create_engine(get_sqlalchemy_url(), connect_args=connect_args)
+
+        engine = create_engine(get_sqlalchemy_url(),
+                               connect_args=connect_args,
+                               echo=echo)
         Session = sessionmaker(autocommit=False, autoflush=True, bind=engine)
         session = Session()
 
     return engine
 
 
+def kill_engine():
+    global engine, Session, session
+    if engine:
+        session.close()
+        engine.dispose()
+    engine = Session = session = None
+
+
 def connect():
     """
     Return an SQLAlchemy connection. Connections are usually pooled. See
@@ -160,8 +173,7 @@ class ConnectionExecutor:
     def __init__(self, conn, backend=aurweb.config.get("database", "backend")):
         self._conn = conn
         if backend == "mysql":
-            import mysql.connector
-            self._paramstyle = mysql.connector.paramstyle
+            self._paramstyle = "format"
         elif backend == "sqlite":
             import sqlite3
             self._paramstyle = sqlite3.paramstyle
@@ -197,18 +209,17 @@ class Connection:
         aur_db_backend = aurweb.config.get('database', 'backend')
 
         if aur_db_backend == 'mysql':
-            import mysql.connector
+            import MySQLdb
             aur_db_host = aurweb.config.get('database', 'host')
             aur_db_name = aurweb.config.get('database', 'name')
             aur_db_user = aurweb.config.get('database', 'user')
             aur_db_pass = aurweb.config.get('database', 'password')
             aur_db_socket = aurweb.config.get('database', 'socket')
-            self._conn = mysql.connector.connect(host=aur_db_host,
-                                                 user=aur_db_user,
-                                                 passwd=aur_db_pass,
-                                                 db=aur_db_name,
-                                                 unix_socket=aur_db_socket,
-                                                 buffered=True)
+            self._conn = MySQLdb.connect(host=aur_db_host,
+                                         user=aur_db_user,
+                                         passwd=aur_db_pass,
+                                         db=aur_db_name,
+                                         unix_socket=aur_db_socket)
         elif aur_db_backend == 'sqlite':
             import sqlite3
             aur_db_name = aurweb.config.get('database', 'name')
@@ -217,7 +228,7 @@ class Connection:
         else:
             raise ValueError('unsupported database backend')
 
-        self._conn = ConnectionExecutor(self._conn)
+        self._conn = ConnectionExecutor(self._conn, aur_db_backend)
 
     def execute(self, query, params=()):
         return self._conn.execute(query, params)
diff --git a/aurweb/initdb.py b/aurweb/initdb.py
index 5f55bfc9..46f079c0 100644
--- a/aurweb/initdb.py
+++ b/aurweb/initdb.py
@@ -2,7 +2,6 @@ import argparse
 
 import alembic.command
 import alembic.config
-import sqlalchemy
 
 import aurweb.db
 import aurweb.schema
@@ -34,6 +33,8 @@ def feed_initial_data(conn):
 
 
 def run(args):
+    aurweb.config.rehash()
+
     # Ensure Alembic is fine before we do the real work, in order not to fail at
     # the last step and leave the database in an inconsistent state. The
     # configuration is loaded lazily, so we query it to force its loading.
@@ -42,8 +43,7 @@ def run(args):
         alembic_config.get_main_option('script_location')
         alembic_config.attributes["configure_logger"] = False
 
-    engine = sqlalchemy.create_engine(aurweb.db.get_sqlalchemy_url(),
-                                      echo=(args.verbose >= 1))
+    engine = aurweb.db.get_engine(echo=(args.verbose >= 1))
     aurweb.schema.metadata.create_all(engine)
     feed_initial_data(engine.connect())
 
diff --git a/aurweb/models/accepted_term.py b/aurweb/models/accepted_term.py
index 6e8ffe99..483109f1 100644
--- a/aurweb/models/accepted_term.py
+++ b/aurweb/models/accepted_term.py
@@ -1,3 +1,4 @@
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.db import make_relationship
@@ -11,7 +12,19 @@ class AcceptedTerm:
                  User: User = None, Term: Term = None,
                  Revision: int = None):
         self.User = User
+        if not self.User:
+            raise IntegrityError(
+                statement="Foreign key UserID cannot be null.",
+                orig="AcceptedTerms.UserID",
+                params=("NULL"))
+
         self.Term = Term
+        if not self.Term:
+            raise IntegrityError(
+                statement="Foreign key TermID cannot be null.",
+                orig="AcceptedTerms.TermID",
+                params=("NULL"))
+
         self.Revision = Revision
 
 
diff --git a/aurweb/models/api_rate_limit.py b/aurweb/models/api_rate_limit.py
index 44e7a463..8b945b6a 100644
--- a/aurweb/models/api_rate_limit.py
+++ b/aurweb/models/api_rate_limit.py
@@ -1,3 +1,4 @@
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.schema import ApiRateLimit as _ApiRateLimit
@@ -8,8 +9,20 @@ class ApiRateLimit:
                  Requests: int = None,
                  WindowStart: int = None):
         self.IP = IP
+
         self.Requests = Requests
+        if self.Requests is None:
+            raise IntegrityError(
+                statement="Column Requests cannot be null.",
+                orig="ApiRateLimit.Requests",
+                params=("NULL"))
+
         self.WindowStart = WindowStart
+        if self.WindowStart is None:
+            raise IntegrityError(
+                statement="Column WindowStart cannot be null.",
+                orig="ApiRateLimit.WindowStart",
+                params=("NULL"))
 
 
 mapper(ApiRateLimit, _ApiRateLimit, primary_key=[_ApiRateLimit.c.IP])
diff --git a/aurweb/models/group.py b/aurweb/models/group.py
index 5d4f3834..c5583eb4 100644
--- a/aurweb/models/group.py
+++ b/aurweb/models/group.py
@@ -1,3 +1,4 @@
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.schema import Groups
@@ -6,6 +7,11 @@ from aurweb.schema import Groups
 class Group:
     def __init__(self, Name: str = None):
         self.Name = Name
+        if not self.Name:
+            raise IntegrityError(
+                statement="Column Name cannot be null.",
+                orig="Groups.Name",
+                params=("NULL"))
 
 
 mapper(Group, Groups)
diff --git a/aurweb/models/license.py b/aurweb/models/license.py
index 1c174925..bcc02713 100644
--- a/aurweb/models/license.py
+++ b/aurweb/models/license.py
@@ -1,3 +1,4 @@
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.schema import Licenses
@@ -6,6 +7,11 @@ from aurweb.schema import Licenses
 class License:
     def __init__(self, Name: str = None):
         self.Name = Name
+        if not self.Name:
+            raise IntegrityError(
+                statement="Column Name cannot be null.",
+                orig="Licenses.Name",
+                params=("NULL"))
 
 
 mapper(License, Licenses)
diff --git a/aurweb/models/package.py b/aurweb/models/package.py
index fa82bb74..28a13791 100644
--- a/aurweb/models/package.py
+++ b/aurweb/models/package.py
@@ -1,3 +1,4 @@
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.db import make_relationship
@@ -11,7 +12,19 @@ class Package:
                  Name: str = None, Version: str = None,
                  Description: str = None, URL: str = None):
         self.PackageBase = PackageBase
+        if not self.PackageBase:
+            raise IntegrityError(
+                statement="Foreign key UserID cannot be null.",
+                orig="Packages.PackageBaseID",
+                params=("NULL"))
+
         self.Name = Name
+        if not self.Name:
+            raise IntegrityError(
+                statement="Column Name cannot be null.",
+                orig="Packages.Name",
+                params=("NULL"))
+
         self.Version = Version
         self.Description = Description
         self.URL = URL
diff --git a/aurweb/models/package_base.py b/aurweb/models/package_base.py
index 57e5a46b..699559d5 100644
--- a/aurweb/models/package_base.py
+++ b/aurweb/models/package_base.py
@@ -1,5 +1,6 @@
 from datetime import datetime
 
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.db import make_relationship
@@ -12,6 +13,12 @@ class PackageBase:
                  Maintainer: User = None, Submitter: User = None,
                  Packager: User = None, **kwargs):
         self.Name = Name
+        if not self.Name:
+            raise IntegrityError(
+                statement="Column Name cannot be null.",
+                orig="PackageBases.Name",
+                params=("NULL"))
+
         self.Flagger = Flagger
         self.Maintainer = Maintainer
         self.Submitter = Submitter
diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index ae6ae62a..21801802 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -1,3 +1,4 @@
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.db import make_relationship
@@ -12,8 +13,26 @@ class PackageDependency:
                  DepName: str = None, DepDesc: str = None,
                  DepCondition: str = None, DepArch: str = None):
         self.Package = Package
+        if not self.Package:
+            raise IntegrityError(
+                statement="Foreign key PackageID cannot be null.",
+                orig="PackageDependencies.PackageID",
+                params=("NULL"))
+
         self.DependencyType = DependencyType
-        self.DepName = DepName  # nullable=False
+        if not self.DependencyType:
+            raise IntegrityError(
+                statement="Foreign key DepTypeID cannot be null.",
+                orig="PackageDependencies.DepTypeID",
+                params=("NULL"))
+
+        self.DepName = DepName
+        if not self.DepName:
+            raise IntegrityError(
+                statement="Column DepName cannot be null.",
+                orig="PackageDependencies.DepName",
+                params=("NULL"))
+
         self.DepDesc = DepDesc
         self.DepCondition = DepCondition
         self.DepArch = DepArch
diff --git a/aurweb/models/package_group.py b/aurweb/models/package_group.py
index c155fe00..19a11c80 100644
--- a/aurweb/models/package_group.py
+++ b/aurweb/models/package_group.py
@@ -1,5 +1,5 @@
-from sqlalchemy.orm import mapper
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import mapper
 
 from aurweb.db import make_relationship
 from aurweb.models.group import Group
diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py
index 4a66f38e..2bae223c 100644
--- a/aurweb/models/package_keyword.py
+++ b/aurweb/models/package_keyword.py
@@ -1,5 +1,5 @@
-from sqlalchemy.orm import mapper
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import mapper
 
 from aurweb.db import make_relationship
 from aurweb.models.package_base import PackageBase
diff --git a/aurweb/models/package_license.py b/aurweb/models/package_license.py
index 6f23f84a..491874a4 100644
--- a/aurweb/models/package_license.py
+++ b/aurweb/models/package_license.py
@@ -1,5 +1,5 @@
-from sqlalchemy.orm import mapper
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import mapper
 
 from aurweb.db import make_relationship
 from aurweb.models.license import License
diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
index 196f1dee..d9ade727 100644
--- a/aurweb/models/package_relation.py
+++ b/aurweb/models/package_relation.py
@@ -1,3 +1,4 @@
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.db import make_relationship
@@ -12,8 +13,26 @@ class PackageRelation:
                  RelName: str = None, RelCondition: str = None,
                  RelArch: str = None):
         self.Package = Package
+        if not self.Package:
+            raise IntegrityError(
+                statement="Foreign key PackageID cannot be null.",
+                orig="PackageRelations.PackageID",
+                params=("NULL"))
+
         self.RelationType = RelationType
+        if not self.RelationType:
+            raise IntegrityError(
+                statement="Foreign key RelTypeID cannot be null.",
+                orig="PackageRelations.RelTypeID",
+                params=("NULL"))
+
         self.RelName = RelName  # nullable=False
+        if not self.RelName:
+            raise IntegrityError(
+                statement="Column RelName cannot be null.",
+                orig="PackageRelations.RelName",
+                params=("NULL"))
+
         self.RelCondition = RelCondition
         self.RelArch = RelArch
 
diff --git a/aurweb/models/session.py b/aurweb/models/session.py
index 60749303..f1e0fff5 100644
--- a/aurweb/models/session.py
+++ b/aurweb/models/session.py
@@ -1,16 +1,20 @@
-from sqlalchemy import Column, Integer
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, mapper, relationship
 
-from aurweb.db import make_random_value
+from aurweb.db import make_random_value, query
 from aurweb.models.user import User
 from aurweb.schema import Sessions
 
 
 class Session:
-    UsersID = Column(Integer, nullable=True)
-
     def __init__(self, **kwargs):
         self.UsersID = kwargs.get("UsersID")
+        if not query(User, User.ID == self.UsersID).first():
+            raise IntegrityError(
+                statement="Foreign key UsersID cannot be null.",
+                orig="Sessions.UsersID",
+                params=("NULL"))
+
         self.SessionID = kwargs.get("SessionID")
         self.LastUpdateTS = kwargs.get("LastUpdateTS")
 
diff --git a/aurweb/models/term.py b/aurweb/models/term.py
index 1b4902f7..1a0780df 100644
--- a/aurweb/models/term.py
+++ b/aurweb/models/term.py
@@ -1,3 +1,4 @@
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import mapper
 
 from aurweb.schema import Terms
@@ -8,7 +9,19 @@ class Term:
                  Description: str = None, URL: str = None,
                  Revision: int = None):
         self.Description = Description
+        if not self.Description:
+            raise IntegrityError(
+                statement="Column Description cannot be null.",
+                orig="Terms.Description",
+                params=("NULL"))
+
         self.URL = URL
+        if not self.URL:
+            raise IntegrityError(
+                statement="Column URL cannot be null.",
+                orig="Terms.URL",
+                params=("NULL"))
+
         self.Revision = Revision
 
 
diff --git a/conf/config.dev b/conf/config.dev
index 94775a92..45d940e6 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -6,17 +6,19 @@
 ; development-specific options too.
 
 [database]
-backend = sqlite
-name = YOUR_AUR_ROOT/aurweb.sqlite3
+; Options: mysql, sqlite.
+backend = mysql
 
-; Alternative MySQL configuration (Use either port of socket, if both defined port takes priority)
-;backend = mysql
-;name = aurweb
-;user = aur
-;password = aur
-;host = localhost
+; If using sqlite, set name to the database file path.
+name = aurweb
+
+; MySQL database information. User defaults to root for containerized
+; testing with mysqldb. This should be set to a non-root user.
+user = root
+;password = non-root-user-password
+host = localhost
 ;port = 3306
-;socket = /var/run/mysqld/mysqld.sock
+socket = /var/run/mysqld/mysqld.sock
 
 [options]
 aurwebdir = YOUR_AUR_ROOT
diff --git a/test/Makefile b/test/Makefile
index 060e57c2..920c7113 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,7 +8,7 @@ MAKEFLAGS = -j1
 check: sh pytest
 
 pytest:
-	cd .. && AUR_CONFIG=conf/config coverage run --append /usr/bin/pytest test
+	cd .. && coverage run --append /usr/bin/pytest test
 
 ifdef PROVE
 sh:
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 0f813823..3080a505 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -802,18 +802,40 @@ def test_post_account_edit_ssh_pub_key():
     assert response.status_code == int(HTTPStatus.OK)
 
     # Now let's update what's already there to gain coverage over that path.
-    pk = str()
-    with tempfile.TemporaryDirectory() as tmpdir:
-        with open("/dev/null", "w") as null:
-            proc = Popen(["ssh-keygen", "-f", f"{tmpdir}/test.ssh", "-N", ""],
-                         stdout=null, stderr=null)
-            proc.wait()
-        assert proc.returncode == 0
+    post_data["PK"] = make_ssh_pubkey()
 
-        # Read in the public key, then delete the temp dir we made.
-        pk = open(f"{tmpdir}/test.ssh.pub").read().rstrip()
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
 
-    post_data["PK"] = pk
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_post_account_edit_missing_ssh_pubkey():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    post_data = {
+        "U": user.Username,
+        "E": user.Email,
+        "PK": make_ssh_pubkey(),
+        "passwd": "testPassword"
+    }
+
+    with client as request:
+        response = request.post("/account/test/edit", cookies={
+            "AURSID": sid
+        }, data=post_data, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+    post_data = {
+        "U": user.Username,
+        "E": user.Email,
+        "PK": str(),  # Pass an empty string now to walk the delete path.
+        "passwd": "testPassword"
+    }
 
     with client as request:
         response = request.post("/account/test/edit", cookies={
diff --git a/test/test_api_rate_limit.py b/test/test_api_rate_limit.py
index c599ddcf..536e3841 100644
--- a/test/test_api_rate_limit.py
+++ b/test/test_api_rate_limit.py
@@ -34,5 +34,5 @@ def test_api_rate_key_null_requests_raises_exception():
 def test_api_rate_key_null_window_start_raises_exception():
     from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(ApiRateLimit, IP="127.0.0.1", WindowStart=1)
+        create(ApiRateLimit, IP="127.0.0.1", Requests=1)
     session.rollback()
diff --git a/test/test_auth.py b/test/test_auth.py
index 7837e7f7..42eac040 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -4,6 +4,8 @@ import pytest
 
 from starlette.authentication import AuthenticationError
 
+import aurweb.config
+
 from aurweb.auth import BasicAuthBackend, has_credential
 from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
@@ -53,13 +55,12 @@ async def test_auth_backend_invalid_sid():
 async def test_auth_backend_invalid_user_id():
     # Create a new session with a fake user id.
     now_ts = datetime.utcnow().timestamp()
-    create(Session, UsersID=666, SessionID="realSession",
-           LastUpdateTS=now_ts + 5)
+    db_backend = aurweb.config.get("database", "backend")
+    with pytest.raises(IntegrityError):
+        create(Session, UsersID=666, SessionID="realSession",
+               LastUpdateTS=now_ts + 5)
 
-    # Here, we specify a real SID; but it's user is not there.
-    request.cookies["AURSID"] = "realSession"
-    with pytest.raises(AuthenticationError, match="Invalid User ID: 666"):
-        await backend.authenticate(request)
+    session.rollback()
 
 
 @pytest.mark.asyncio
diff --git a/test/test_ban.py b/test/test_ban.py
index a4fa5a28..b728644b 100644
--- a/test/test_ban.py
+++ b/test/test_ban.py
@@ -33,8 +33,7 @@ def test_ban():
 def test_invalid_ban():
     from aurweb.db import session
 
-    with pytest.raises(sa_exc.IntegrityError,
-                       match="NOT NULL constraint failed: Bans.IPAddress"):
+    with pytest.raises(sa_exc.IntegrityError):
         bad_ban = Ban(BanTS=datetime.utcnow())
         session.add(bad_ban)
 
diff --git a/test/test_db.py b/test/test_db.py
index e0946ed5..3911134f 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -5,16 +5,22 @@ import tempfile
 
 from unittest import mock
 
-import mysql.connector
 import pytest
 
 import aurweb.config
+import aurweb.initdb
 
 from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.testing import setup_test_db
 
 
+class Args:
+    """ Stub arguments used for running aurweb.initdb. """
+    use_alembic = True
+    verbose = True
+
+
 class DBCursor:
     """ A fake database cursor object used in tests. """
     items = []
@@ -38,27 +44,73 @@ class DBConnection:
         pass
 
 
+def make_temp_config(config_file, *replacements):
+    """ Generate a temporary config file with a set of replacements.
+
+    :param *replacements: A variable number of tuple regex replacement pairs
+    :return: A tuple containing (temp directory, temp config file)
+    """
+    tmpdir = tempfile.TemporaryDirectory()
+    tmp = os.path.join(tmpdir.name, "config.tmp")
+    with open(config_file) as f:
+        config = f.read()
+        for repl in list(replacements):
+            config = re.sub(repl[0], repl[1], config)
+        with open(tmp, "w") as o:
+            o.write(config)
+        aurwebdir = aurweb.config.get("options", "aurwebdir")
+        defaults = os.path.join(aurwebdir, "conf/config.defaults")
+        with open(defaults) as i:
+            with open(f"{tmp}.defaults", "w") as o:
+                o.write(i.read())
+    return tmpdir, tmp
+
+
+def make_temp_sqlite_config(config_file):
+    return make_temp_config(config_file,
+                            (r"backend = .*", "backend = sqlite"),
+                            (r"name = .*", "name = /tmp/aurweb.sqlite3"))
+
+
+def make_temp_mysql_config(config_file):
+    return make_temp_config(config_file,
+                            (r"backend = .*", "backend = mysql"),
+                            (r"name = .*", "name = aurweb"))
+
+
 @pytest.fixture(autouse=True)
 def setup_db():
-    setup_test_db("Bans")
+    if os.path.exists("/tmp/aurweb.sqlite3"):
+        os.remove("/tmp/aurweb.sqlite3")
+
+    # In various places in this test, we reinitialize the engine.
+    # Make sure we kill the previous engine before initializing
+    # it via setup_test_db().
+    aurweb.db.kill_engine()
+    setup_test_db()
 
 
 def test_sqlalchemy_sqlite_url():
-    with mock.patch.dict(os.environ, {"AUR_CONFIG": "conf/config.dev"}):
-        aurweb.config.rehash()
-        assert db.get_sqlalchemy_url()
+    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+    with tmpctx:
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+            aurweb.config.rehash()
+            assert db.get_sqlalchemy_url()
     aurweb.config.rehash()
 
 
 def test_sqlalchemy_mysql_url():
-    with mock.patch.dict(os.environ, {"AUR_CONFIG": "conf/config.defaults"}):
-        aurweb.config.rehash()
-        assert db.get_sqlalchemy_url()
+    tmpctx, tmp = make_temp_mysql_config("conf/config")
+    with tmpctx:
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+            aurweb.config.rehash()
+            assert db.get_sqlalchemy_url()
     aurweb.config.rehash()
 
 
 def test_sqlalchemy_mysql_port_url():
-    tmpctx, tmp = make_temp_config("conf/config.defaults", ";port = 3306", "port = 3306")
+    tmpctx, tmp = make_temp_config("conf/config",
+                                   (r";port = 3306", "port = 3306"))
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -67,18 +119,9 @@ def test_sqlalchemy_mysql_port_url():
         aurweb.config.rehash()
 
 
-def make_temp_config(config_file, src_str, replace_with):
-    tmpdir = tempfile.TemporaryDirectory()
-    tmp = os.path.join(tmpdir.name, "config.tmp")
-    with open(config_file) as f:
-        config = re.sub(src_str, f'{replace_with}', f.read())
-        with open(tmp, "w") as o:
-            o.write(config)
-    return tmpdir, tmp
-
-
 def test_sqlalchemy_unknown_backend():
-    tmpctx, tmp = make_temp_config("conf/config", "backend = sqlite", "backend = blah")
+    tmpctx, tmp = make_temp_config("conf/config",
+                                   (r"backend = mysql", "backend = blah"))
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -89,22 +132,31 @@ def test_sqlalchemy_unknown_backend():
 
 
 def test_db_connects_without_fail():
+    """ This only tests the actual config supplied to pytest. """
     db.connect()
     assert db.engine is not None
 
 
-def test_connection_class_without_fail():
-    conn = db.Connection()
+def test_connection_class_sqlite_without_fail():
+    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+    with tmpctx:
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+            aurweb.config.rehash()
 
-    cur = conn.execute(
-        "SELECT AccountType FROM AccountTypes WHERE ID = ?", (1,))
-    account_type = cur.fetchone()[0]
+            aurweb.db.kill_engine()
+            aurweb.initdb.run(Args())
 
-    assert account_type == "User"
+            conn = db.Connection()
+            cur = conn.execute(
+                "SELECT AccountType FROM AccountTypes WHERE ID = ?", (1,))
+            account_type = cur.fetchone()[0]
+            assert account_type == "User"
+        aurweb.config.rehash()
 
 
 def test_connection_class_unsupported_backend():
-    tmpctx, tmp = make_temp_config("conf/config", "backend = sqlite", "backend = blah")
+    tmpctx, tmp = make_temp_config("conf/config",
+                                   (r"backend = mysql", "backend = blah"))
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -114,10 +166,9 @@ def test_connection_class_unsupported_backend():
         aurweb.config.rehash()
 
 
-@mock.patch("mysql.connector.connect", mock.MagicMock(return_value=True))
-@mock.patch.object(mysql.connector, "paramstyle", "qmark")
+@mock.patch("MySQLdb.connect", mock.MagicMock(return_value=True))
 def test_connection_mysql():
-    tmpctx, tmp = make_temp_config("conf/config", "backend = sqlite", "backend = mysql")
+    tmpctx, tmp = make_temp_mysql_config("conf/config")
     with tmpctx:
         with mock.patch.dict(os.environ, {
             "AUR_CONFIG": tmp,
@@ -137,44 +188,78 @@ def test_connection_sqlite():
 @mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
 @mock.patch.object(sqlite3, "paramstyle", "format")
 def test_connection_execute_paramstyle_format():
-    conn = db.Connection()
+    tmpctx, tmp = make_temp_sqlite_config("conf/config")
 
-    # First, test ? to %s format replacement.
-    account_types = conn\
-        .execute("SELECT * FROM AccountTypes WHERE AccountType = ?", ["User"])\
-        .fetchall()
-    assert account_types == \
-        ["SELECT * FROM AccountTypes WHERE AccountType = %s", ["User"]]
+    with tmpctx:
+        with mock.patch.dict(os.environ, {
+            "AUR_CONFIG": tmp,
+            "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
+        }):
+            aurweb.config.rehash()
 
-    # Test other format replacement.
-    account_types = conn\
-        .execute("SELECT * FROM AccountTypes WHERE AccountType = %", ["User"])\
-        .fetchall()
-    assert account_types == \
-        ["SELECT * FROM AccountTypes WHERE AccountType = %%", ["User"]]
+            aurweb.db.kill_engine()
+            aurweb.initdb.run(Args())
+
+            conn = db.Connection()
+
+            # First, test ? to %s format replacement.
+            account_types = conn\
+                .execute("SELECT * FROM AccountTypes WHERE AccountType = ?",
+                         ["User"]).fetchall()
+            assert account_types == \
+                ["SELECT * FROM AccountTypes WHERE AccountType = %s", ["User"]]
+
+            # Test other format replacement.
+            account_types = conn\
+                .execute("SELECT * FROM AccountTypes WHERE AccountType = %",
+                         ["User"]).fetchall()
+            assert account_types == \
+                ["SELECT * FROM AccountTypes WHERE AccountType = %%", ["User"]]
+        aurweb.config.rehash()
 
 
 @mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
 @mock.patch.object(sqlite3, "paramstyle", "qmark")
 def test_connection_execute_paramstyle_qmark():
-    conn = db.Connection()
-    # We don't modify anything when using qmark, so test equality.
-    account_types = conn\
-        .execute("SELECT * FROM AccountTypes WHERE AccountType = ?", ["User"])\
-        .fetchall()
-    assert account_types == \
-        ["SELECT * FROM AccountTypes WHERE AccountType = ?", ["User"]]
+    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+
+    with tmpctx:
+        with mock.patch.dict(os.environ, {
+            "AUR_CONFIG": tmp,
+            "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
+        }):
+            aurweb.config.rehash()
+
+            aurweb.db.kill_engine()
+            aurweb.initdb.run(Args())
+
+            conn = db.Connection()
+            # We don't modify anything when using qmark, so test equality.
+            account_types = conn\
+                .execute("SELECT * FROM AccountTypes WHERE AccountType = ?",
+                         ["User"]).fetchall()
+            assert account_types == \
+                ["SELECT * FROM AccountTypes WHERE AccountType = ?", ["User"]]
+        aurweb.config.rehash()
 
 
 @mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
 @mock.patch.object(sqlite3, "paramstyle", "unsupported")
 def test_connection_execute_paramstyle_unsupported():
-    conn = db.Connection()
-    with pytest.raises(ValueError, match="unsupported paramstyle"):
-        conn.execute(
-            "SELECT * FROM AccountTypes WHERE AccountType = ?",
-            ["User"]
-        ).fetchall()
+    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+    with tmpctx:
+        with mock.patch.dict(os.environ, {
+            "AUR_CONFIG": tmp,
+            "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
+        }):
+            aurweb.config.rehash()
+            conn = db.Connection()
+            with pytest.raises(ValueError, match="unsupported paramstyle"):
+                conn.execute(
+                    "SELECT * FROM AccountTypes WHERE AccountType = ?",
+                    ["User"]
+                ).fetchall()
+        aurweb.config.rehash()
 
 
 def test_create_delete():
@@ -186,13 +271,12 @@ def test_create_delete():
     assert record is None
 
 
-@mock.patch("mysql.connector.paramstyle", "qmark")
 def test_connection_executor_mysql_paramstyle():
     executor = db.ConnectionExecutor(None, backend="mysql")
-    assert executor.paramstyle() == "qmark"
+    assert executor.paramstyle() == "format"
 
 
 @mock.patch("sqlite3.paramstyle", "pyformat")
 def test_connection_executor_sqlite_paramstyle():
     executor = db.ConnectionExecutor(None, backend="sqlite")
-    assert executor.paramstyle() == "pyformat"
+    assert executor.paramstyle() == sqlite3.paramstyle
diff --git a/test/test_initdb.py b/test/test_initdb.py
index eae33007..c7d29ee2 100644
--- a/test/test_initdb.py
+++ b/test/test_initdb.py
@@ -1,27 +1,19 @@
-import pytest
-
 import aurweb.config
 import aurweb.db
 import aurweb.initdb
 
 from aurweb.models.account_type import AccountType
-from aurweb.schema import metadata
-from aurweb.testing import setup_test_db
 
 
-@pytest.fixture(autouse=True)
-def setup():
-    setup_test_db()
-
-    tables = metadata.tables.keys()
-    for table in tables:
-        aurweb.db.session.execute(f"DROP TABLE IF EXISTS {table}")
+class Args:
+    use_alembic = True
+    verbose = True
 
 
 def test_run():
-    class Args:
-        use_alembic = True
-        verbose = False
+    from aurweb.schema import metadata
+    aurweb.db.kill_engine()
+    metadata.drop_all(aurweb.db.get_engine())
     aurweb.initdb.run(Args())
     record = aurweb.db.query(AccountType,
                              AccountType.AccountType == "User").first()
diff --git a/test/test_package_relation.py b/test/test_package_relation.py
index dd0455cd..96932f40 100644
--- a/test/test_package_relation.py
+++ b/test/test_package_relation.py
@@ -1,6 +1,6 @@
 import pytest
 
-from sqlalchemy.exc import IntegrityError
+from sqlalchemy.exc import IntegrityError, OperationalError
 
 from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
@@ -36,7 +36,7 @@ def setup():
                      URL="https://test.package")
 
 
-def test_package_dependencies():
+def test_package_relation():
     conflicts = query(RelationType, RelationType.Name == "conflicts").first()
     pkgrel = create(PackageRelation, Package=package,
                     RelationType=conflicts,
@@ -68,10 +68,12 @@ def test_package_dependencies():
     assert pkgrel in package.package_relations
 
 
-def test_package_dependencies_null_package_raises_exception():
+def test_package_relation_null_package_raises_exception():
     from aurweb.db import session
 
     conflicts = query(RelationType, RelationType.Name == "conflicts").first()
+    assert conflicts is not None
+
     with pytest.raises(IntegrityError):
         create(PackageRelation,
                RelationType=conflicts,
@@ -79,7 +81,7 @@ def test_package_dependencies_null_package_raises_exception():
     session.rollback()
 
 
-def test_package_dependencies_null_dependency_type_raises_exception():
+def test_package_relation_null_relation_type_raises_exception():
     from aurweb.db import session
 
     with pytest.raises(IntegrityError):
@@ -89,11 +91,13 @@ def test_package_dependencies_null_dependency_type_raises_exception():
     session.rollback()
 
 
-def test_package_dependencies_null_depname_raises_exception():
+def test_package_relation_null_relname_raises_exception():
     from aurweb.db import session
 
-    depends = query(RelationType, RelationType.Name == "depends").first()
-    with pytest.raises(IntegrityError):
+    depends = query(RelationType, RelationType.Name == "conflicts").first()
+    assert depends is not None
+
+    with pytest.raises((OperationalError, IntegrityError)):
         create(PackageRelation,
                Package=package,
                RelationType=depends)
diff --git a/test/test_session.py b/test/test_session.py
index 2877ea7f..c324a739 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -25,7 +25,7 @@ def setup():
                   ResetKey="testReset", Passwd="testPassword",
                   AccountType=account_type)
     session = create(Session, UsersID=user.ID, SessionID="testSession",
-                     LastUpdateTS=datetime.utcnow())
+                     LastUpdateTS=datetime.utcnow().timestamp())
 
 
 def test_session():

From 228bc8fe7c3ea7cef66f00f1608b699d00838c43 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 4 Jun 2021 23:09:38 -0700
Subject: [PATCH 144/844] fix aurweb.auth test coverage

With mysqlclient, we no longer need to account for a user not existing
when an ssh key is found.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py    | 14 +++++++++-----
 test/test_auth.py |  7 ++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index a4ff2167..401ed6ae 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -4,7 +4,8 @@ from datetime import datetime
 from http import HTTPStatus
 
 from fastapi.responses import RedirectResponse
-from starlette.authentication import AuthCredentials, AuthenticationBackend, AuthenticationError
+from sqlalchemy import and_
+from starlette.authentication import AuthCredentials, AuthenticationBackend
 from starlette.requests import HTTPConnection
 
 import aurweb.config
@@ -42,14 +43,17 @@ class BasicAuthBackend(AuthenticationBackend):
 
         now_ts = datetime.utcnow().timestamp()
         record = session.query(Session).filter(
-            Session.SessionID == sid, Session.LastUpdateTS >= now_ts).first()
+            and_(Session.SessionID == sid,
+                 Session.LastUpdateTS >= now_ts)).first()
+
+        # If no session with sid and a LastUpdateTS now or later exists.
         if not record:
             return None, AnonymousUser()
 
+        # At this point, we cannot have an invalid user if the record
+        # exists, due to ForeignKey constraints in the schema upheld
+        # by mysqlclient.
         user = session.query(User).filter(User.ID == record.UsersID).first()
-        if not user:
-            raise AuthenticationError(f"Invalid User ID: {record.UsersID}")
-
         user.authenticated = True
         return AuthCredentials(["authenticated"]), user
 
diff --git a/test/test_auth.py b/test/test_auth.py
index 42eac040..05dd2020 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -2,7 +2,7 @@ from datetime import datetime
 
 import pytest
 
-from starlette.authentication import AuthenticationError
+from sqlalchemy.exc import IntegrityError
 
 import aurweb.config
 
@@ -53,13 +53,13 @@ async def test_auth_backend_invalid_sid():
 
 @pytest.mark.asyncio
 async def test_auth_backend_invalid_user_id():
+    from aurweb.db import session
+
     # Create a new session with a fake user id.
     now_ts = datetime.utcnow().timestamp()
-    db_backend = aurweb.config.get("database", "backend")
     with pytest.raises(IntegrityError):
         create(Session, UsersID=666, SessionID="realSession",
                LastUpdateTS=now_ts + 5)
-
     session.rollback()
 
 
@@ -70,6 +70,7 @@ async def test_basic_auth_backend():
     now_ts = datetime.utcnow().timestamp()
     create(Session, UsersID=user.ID, SessionID="realSession",
            LastUpdateTS=now_ts + 5)
+    request.cookies["AURSID"] = "realSession"
     _, result = await backend.authenticate(request)
     assert result == user
 

From 62e58b122f905b4e5462df6b0bbebd278bb56419 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 4 Jun 2021 23:13:05 -0700
Subject: [PATCH 145/844] fix test_accounts_routes test coverage

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml               |  2 +-
 test/test_accounts_routes.py | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bdf427c..8e14f77f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ cache:
 
 before_script:
   - pacman -Syu --noconfirm --noprogressbar --needed --cachedir .pkg-cache
-           base-devel git gpgme protobuf pyalpm python-mysql-connector
+           base-devel git gpgme protobuf pyalpm python-mysqlclient
            python-pygit2 python-srcinfo python-bleach python-markdown
            python-sqlalchemy python-alembic python-pytest python-werkzeug
            python-pytest-tap python-fastapi hypercorn nginx python-authlib
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 3080a505..d5fd089e 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -30,6 +30,20 @@ client = TestClient(app)
 user = None
 
 
+def make_ssh_pubkey():
+    # Create a public key with ssh-keygen (this adds ssh-keygen as a
+    # dependency to passing this test).
+    with tempfile.TemporaryDirectory() as tmpdir:
+        with open("/dev/null", "w") as null:
+            proc = Popen(["ssh-keygen", "-f", f"{tmpdir}/test.ssh", "-N", ""],
+                         stdout=null, stderr=null)
+            proc.wait()
+        assert proc.returncode == 0
+
+        # Read in the public key, then delete the temp dir we made.
+        return open(f"{tmpdir}/test.ssh.pub").read().rstrip()
+
+
 @pytest.fixture(autouse=True)
 def setup():
     global user
@@ -770,27 +784,13 @@ def test_post_account_edit_error_unauthorized():
 
 
 def test_post_account_edit_ssh_pub_key():
-    pk = str()
-
-    # Create a public key with ssh-keygen (this adds ssh-keygen as a
-    # dependency to passing this test).
-    with tempfile.TemporaryDirectory() as tmpdir:
-        with open("/dev/null", "w") as null:
-            proc = Popen(["ssh-keygen", "-f", f"{tmpdir}/test.ssh", "-N", ""],
-                         stdout=null, stderr=null)
-            proc.wait()
-        assert proc.returncode == 0
-
-        # Read in the public key, then delete the temp dir we made.
-        pk = open(f"{tmpdir}/test.ssh.pub").read().rstrip()
-
     request = Request()
     sid = user.login(request, "testPassword")
 
     post_data = {
         "U": "test",
         "E": "test@example.org",
-        "PK": pk,
+        "PK": make_ssh_pubkey(),
         "passwd": "testPassword"
     }
 

From 4d1faca4477bc510e81513b659f199f0d8c41bb1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 5 Jun 2021 01:07:56 -0700
Subject: [PATCH 146/844] test both mysql and sqlite in .gitlab-ci.yml

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e14f77f..e65b4343 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,9 @@ cache:
     # For some reason Gitlab CI only supports storing cache/artifacts in a path relative to the build directory
     - .pkg-cache
 
+variables:
+  AUR_CONFIG: conf/config
+
 before_script:
   - pacman -Syu --noconfirm --noprogressbar --needed --cachedir .pkg-cache
            base-devel git gpgme protobuf pyalpm python-mysqlclient
@@ -15,17 +18,31 @@ before_script:
            python-itsdangerous python-httpx python-jinja python-pytest-cov
            python-requests python-aiofiles python-python-multipart
            python-pytest-asyncio python-coverage python-bcrypt
-           python-email-validator openssh python-lxml
+           python-email-validator openssh python-lxml mariadb
   - bash -c "echo '127.0.0.1' > /etc/hosts"
   - bash -c "echo '::1' >> /etc/hosts"
+  - mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+  - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
+  - 'until : > /dev/tcp/127.0.0.1/3306; do sleep 1s; done'
+  - mysql -u root -e "CREATE USER 'aur'@'localhost' IDENTIFIED BY 'aur';"
+  - mysql -u root -e "CREATE DATABASE aurweb;"
+  - mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb.* TO 'aur'@'localhost';"
+  - mysql -u root -e "FLUSH PRIVILEGES;"
+  - sed -r "s;YOUR_AUR_ROOT;$(pwd);g" conf/config.dev > conf/config
+  - cp conf/config conf/config.sqlite
+  - cp conf/config.defaults conf/config.sqlite.defaults
+  - sed -i -r 's;backend = .*;backend = sqlite;' conf/config.sqlite
+  - sed -i -r "s;name = .*;name = $(pwd)/aurweb.sqlite3;" conf/config.sqlite
+  - AUR_CONFIG=conf/config.sqlite python -m aurweb.initdb
 
 test:
   script:
     - python setup.py install
-    - sed -r "s;YOUR_AUR_ROOT;$(pwd);g" conf/config.dev > conf/config
-    - AUR_CONFIG=conf/config make -C po all install
-    - AUR_CONFIG=conf/config python -m aurweb.initdb
-    - make -C test
+    - make -C po all install
+    - python -m aurweb.initdb
+    - make -C test sh # sharness tests use sqlite.
+    - make -C test pytest # pytest with mysql.
+    - AUR_CONFIG=conf/config.sqlite make -C test pytest # pytest with sqlite.
     - coverage report --include='aurweb/*'
     - coverage xml --include='aurweb/*'
   artifacts:

From 5ceeb88bee1575427008c119d2c7cd37274f0919 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 5 Jun 2021 21:19:20 -0700
Subject: [PATCH 147/844] remove unused imports, rectify isort violations

Files got into the branch that violate both PEP-8 guidelines
and isorts. This fixes them.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/git/update.py                             |  4 ++--
 aurweb/models/user.py                            |  2 --
 aurweb/routers/html.py                           |  3 +--
 ...56e2ce8e2ffa_utf8mb4_charset_and_collation.py | 16 ++++++++--------
 ...fcd6e1cd_add_sso_account_id_in_table_users.py |  1 +
 .../versions/f47cad5d6d03_initial_revision.py    |  5 -----
 test/test_auth.py                                |  2 --
 7 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/aurweb/git/update.py b/aurweb/git/update.py
index 3c9c3785..2424bf6c 100755
--- a/aurweb/git/update.py
+++ b/aurweb/git/update.py
@@ -305,9 +305,9 @@ def main():  # noqa: C901
 
         try:
             metadata_pkgbase = metadata['pkgbase']
-        except KeyError as e:
+        except KeyError:
             die_commit('invalid .SRCINFO, does not contain a pkgbase (is the file empty?)',
-                    str(commit.id))
+                       str(commit.id))
         if not re.match(repo_regex, metadata_pkgbase):
             die_commit('invalid pkgbase: {:s}'.format(metadata_pkgbase),
                        str(commit.id))
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 6c5c6e21..1961228e 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -65,8 +65,6 @@ class User:
 
     def valid_password(self, password: str):
         """ Check authentication against a given password. """
-        from aurweb.db import session
-
         if password is None:
             return False
 
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 8f89e05c..890aff88 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -2,9 +2,8 @@
 decorators in some way; more complex routes should be defined in their
 own modules and imported here. """
 from http import HTTPStatus
-from urllib.parse import unquote
 
-from fastapi import APIRouter, Form, Request, HTTPException
+from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 
 from aurweb.templates import make_context, render_template
diff --git a/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py b/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
index e198c34c..67f0c065 100644
--- a/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
+++ b/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
@@ -56,14 +56,14 @@ db_backend = aurweb.config.get("database", "backend")
 def rebuild_unique_indexes_with_str_cols():
     for idx_name in indexes:
         sql = f"""
-DROP INDEX IF EXISTS {idx_name} 
+DROP INDEX IF EXISTS {idx_name}
 ON {indexes.get(idx_name)[0]}
 """
         op.execute(sql)
         sql = f"""
-CREATE UNIQUE INDEX {idx_name} 
-ON {indexes.get(idx_name)[0]} 
-({indexes.get(idx_name)[1]}, {indexes.get(idx_name)[2]}) 
+CREATE UNIQUE INDEX {idx_name}
+ON {indexes.get(idx_name)[0]}
+({indexes.get(idx_name)[1]}, {indexes.get(idx_name)[2]})
 """
         op.execute(sql)
 
@@ -77,8 +77,8 @@ def upgrade():
     def op_execute(table_meta):
         table, charset, collate = table_meta
         sql = f"""
-ALTER TABLE {table} 
-CONVERT TO CHARACTER SET {charset} 
+ALTER TABLE {table}
+CONVERT TO CHARACTER SET {charset}
 COLLATE {collate}
 """
         op.execute(sql)
@@ -94,8 +94,8 @@ def downgrade():
     def op_execute(table_meta):
         table, charset, collate = table_meta
         sql = f"""
-ALTER TABLE {table} 
-CONVERT TO CHARACTER SET {src_charset} 
+ALTER TABLE {table}
+CONVERT TO CHARACTER SET {src_charset}
 COLLATE {src_collate}
 """
         op.execute(sql)
diff --git a/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py b/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
index 2b257e9d..49bf055a 100644
--- a/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
+++ b/migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py
@@ -6,6 +6,7 @@ Create Date: 2020-06-08 10:04:13.898617
 
 """
 import sqlalchemy as sa
+
 from alembic import op
 from sqlalchemy.engine.reflection import Inspector
 
diff --git a/migrations/versions/f47cad5d6d03_initial_revision.py b/migrations/versions/f47cad5d6d03_initial_revision.py
index 9e99490f..b214beea 100644
--- a/migrations/versions/f47cad5d6d03_initial_revision.py
+++ b/migrations/versions/f47cad5d6d03_initial_revision.py
@@ -1,14 +1,9 @@
 """initial revision
 
 Revision ID: f47cad5d6d03
-Revises: 
 Create Date: 2020-02-23 13:23:32.331396
 
 """
-from alembic import op
-import sqlalchemy as sa
-
-
 # revision identifiers, used by Alembic.
 revision = 'f47cad5d6d03'
 down_revision = None
diff --git a/test/test_auth.py b/test/test_auth.py
index 05dd2020..e5e1de11 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -4,8 +4,6 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-import aurweb.config
-
 from aurweb.auth import BasicAuthBackend, has_credential
 from aurweb.db import create, query
 from aurweb.models.account_type import AccountType

From e865a6347f16edba73e405a4dabc1f76d3ca6509 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 5 Jun 2021 21:28:26 -0700
Subject: [PATCH 148/844] .gitlab-ci.yml: enforce isort and flake8 compliance

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e65b4343..a9947dfe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ before_script:
            python-requests python-aiofiles python-python-multipart
            python-pytest-asyncio python-coverage python-bcrypt
            python-email-validator openssh python-lxml mariadb
+           python-isort flake8
   - bash -c "echo '127.0.0.1' > /etc/hosts"
   - bash -c "echo '::1' >> /etc/hosts"
   - mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
@@ -45,6 +46,12 @@ test:
     - AUR_CONFIG=conf/config.sqlite make -C test pytest # pytest with sqlite.
     - coverage report --include='aurweb/*'
     - coverage xml --include='aurweb/*'
+    - flake8 --count aurweb # Assert no flake8 violations in aurweb.
+    - flake8 --count test # Assert no flake8 violations in test.
+    - flake8 --count migrations # Assert no flake8 violations in migrations.
+    - isort --check-only aurweb # Assert no isort violations in aurweb.
+    - isort --check-only test # Assert no flake8 violations in test.
+    - isort --check-only migrations # Assert no flake8 violations in migrations.
   artifacts:
     reports:
       cobertura: coverage.xml

From 1874e821f5883c2338b07c4803b67c6802621c38 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 5 Jun 2021 18:13:10 -0700
Subject: [PATCH 149/844] add case [in]sensitivity tests + add OfficialProvider
 model

`ci` in this context means "Case Insensitive".
`cs` in this context means "Case Sensitive".

New models created:
    - OfficialProvider
      This was required to write a test for checking that
      OfficialProviders behaves as we expect, which was the starter
      for the original aurblup bug.

New tests created:
    - test_official_provider

Modified tests:
    - test_package_base: add ci test
    - test_package: add ci test
    - test_session: add cs test
    - test_ssh_pub_key: add cs test

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/official_provider.py | 34 ++++++++++++++
 test/test_official_provider.py     | 75 ++++++++++++++++++++++++++++++
 test/test_package.py               | 16 +++++++
 test/test_package_base.py          | 21 +++++++++
 test/test_session.py               |  9 ++++
 test/test_ssh_pub_key.py           | 12 +++++
 6 files changed, 167 insertions(+)
 create mode 100644 aurweb/models/official_provider.py
 create mode 100644 test/test_official_provider.py

diff --git a/aurweb/models/official_provider.py b/aurweb/models/official_provider.py
new file mode 100644
index 00000000..073eb435
--- /dev/null
+++ b/aurweb/models/official_provider.py
@@ -0,0 +1,34 @@
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import mapper
+
+from aurweb.schema import OfficialProviders
+
+
+class OfficialProvider:
+    def __init__(self,
+                 Name: str = None,
+                 Repo: str = None,
+                 Provides: str = None):
+        self.Name = Name
+        if not self.Name:
+            raise IntegrityError(
+                statement="Column Name cannot be null.",
+                orig="OfficialProviders.Name",
+                params=("NULL"))
+
+        self.Repo = Repo
+        if not self.Repo:
+            raise IntegrityError(
+                statement="Column Repo cannot be null.",
+                orig="OfficialProviders.Repo",
+                params=("NULL"))
+
+        self.Provides = Provides
+        if not self.Provides:
+            raise IntegrityError(
+                statement="Column Provides cannot be null.",
+                orig="OfficialProviders.Provides",
+                params=("NULL"))
+
+
+mapper(OfficialProvider, OfficialProviders)
diff --git a/test/test_official_provider.py b/test/test_official_provider.py
new file mode 100644
index 00000000..a1d3d54a
--- /dev/null
+++ b/test/test_official_provider.py
@@ -0,0 +1,75 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create
+from aurweb.models.official_provider import OfficialProvider
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db("OfficialProviders")
+
+
+def test_official_provider_creation():
+    oprovider = create(OfficialProvider,
+                       Name="some-name",
+                       Repo="some-repo",
+                       Provides="some-provides")
+    assert bool(oprovider.ID)
+    assert oprovider.Name == "some-name"
+    assert oprovider.Repo == "some-repo"
+    assert oprovider.Provides == "some-provides"
+
+
+def test_official_provider_cs():
+    """ Test case sensitivity of the database table. """
+    oprovider = create(OfficialProvider,
+                       Name="some-name",
+                       Repo="some-repo",
+                       Provides="some-provides")
+    assert bool(oprovider.ID)
+
+    oprovider_cs = create(OfficialProvider,
+                          Name="SOME-NAME",
+                          Repo="SOME-REPO",
+                          Provides="SOME-PROVIDES")
+    assert bool(oprovider_cs.ID)
+
+    assert oprovider.ID != oprovider_cs.ID
+
+    assert oprovider.Name == "some-name"
+    assert oprovider.Repo == "some-repo"
+    assert oprovider.Provides == "some-provides"
+
+    assert oprovider_cs.Name == "SOME-NAME"
+    assert oprovider_cs.Repo == "SOME-REPO"
+    assert oprovider_cs.Provides == "SOME-PROVIDES"
+
+
+def test_official_provider_null_name_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(OfficialProvider,
+               Repo="some-repo",
+               Provides="some-provides")
+    session.rollback()
+
+
+def test_official_provider_null_repo_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(OfficialProvider,
+               Name="some-name",
+               Provides="some-provides")
+    session.rollback()
+
+
+def test_official_provider_null_provides_raises_exception():
+    from aurweb.db import session
+    with pytest.raises(IntegrityError):
+        create(OfficialProvider,
+               Name="some-name",
+               Repo="some-repo")
+    session.rollback()
diff --git a/test/test_package.py b/test/test_package.py
index 66d557f3..a994f096 100644
--- a/test/test_package.py
+++ b/test/test_package.py
@@ -3,6 +3,8 @@ import pytest
 from sqlalchemy import and_
 from sqlalchemy.exc import IntegrityError
 
+import aurweb.config
+
 from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
@@ -55,6 +57,20 @@ def test_package():
     assert record is not None
 
 
+def test_package_ci():
+    """ Test case insensitivity of the database table. """
+    if aurweb.config.get("database", "backend") == "sqlite":
+        return None  # SQLite doesn't seem handle this.
+
+    from aurweb.db import session
+
+    with pytest.raises(IntegrityError):
+        create(Package,
+               PackageBase=pkgbase,
+               Name="Beautiful-Package")
+    session.rollback()
+
+
 def test_package_null_pkgbase_raises_exception():
     from aurweb.db import session
 
diff --git a/test/test_package_base.py b/test/test_package_base.py
index e0359f4f..7f608c2c 100644
--- a/test/test_package_base.py
+++ b/test/test_package_base.py
@@ -2,6 +2,8 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
+import aurweb.config
+
 from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.package_base import PackageBase
@@ -35,6 +37,25 @@ def test_package_base():
     assert pkgbase.ModifiedTS > 0
 
 
+def test_package_base_ci():
+    """ Test case insensitivity of the database table. """
+    if aurweb.config.get("database", "backend") == "sqlite":
+        return None  # SQLite doesn't seem handle this.
+
+    from aurweb.db import session
+
+    pkgbase = create(PackageBase,
+                     Name="beautiful-package",
+                     Maintainer=user)
+    assert bool(pkgbase.ID)
+
+    with pytest.raises(IntegrityError):
+        create(PackageBase,
+               Name="Beautiful-Package",
+               Maintainer=user)
+    session.rollback()
+
+
 def test_package_base_relationships():
     pkgbase = create(PackageBase,
                      Name="beautiful-package",
diff --git a/test/test_session.py b/test/test_session.py
index c324a739..1dd82db1 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -33,6 +33,15 @@ def test_session():
     assert session.UsersID == user.ID
 
 
+def test_session_cs():
+    """ Test case sensitivity of the database table. """
+    session_cs = create(Session, UsersID=user.ID,
+                        SessionID="TESTSESSION",
+                        LastUpdateTS=datetime.utcnow().timestamp())
+    assert session_cs.SessionID == "TESTSESSION"
+    assert session.SessionID == "testSession"
+
+
 def test_session_user_association():
     # Make sure that the Session user attribute is correct.
     assert session.User == user
diff --git a/test/test_ssh_pub_key.py b/test/test_ssh_pub_key.py
index 4072549e..0793199a 100644
--- a/test/test_ssh_pub_key.py
+++ b/test/test_ssh_pub_key.py
@@ -41,6 +41,18 @@ def test_ssh_pub_key():
     assert ssh_pub_key.PubKey == "testPubKey"
 
 
+def test_ssh_pub_key_cs():
+    """ Test case sensitivity of the database table. """
+    ssh_pub_key_cs = create(SSHPubKey, UserID=user.ID,
+                            Fingerprint="TESTFINGERPRINT",
+                            PubKey="TESTPUBKEY")
+
+    assert ssh_pub_key_cs.Fingerprint == "TESTFINGERPRINT"
+    assert ssh_pub_key_cs.PubKey == "TESTPUBKEY"
+    assert ssh_pub_key.Fingerprint == "testFingerprint"
+    assert ssh_pub_key.PubKey == "testPubKey"
+
+
 def test_ssh_pub_key_fingerprint():
     assert get_fingerprint(TEST_SSH_PUBKEY) is not None
 

From 889d358a6daff60d5aac3df62b54a7f939b9bc8a Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sun, 6 Jun 2021 21:49:27 +0200
Subject: [PATCH 150/844] Add missing ) for addvote.php

---
 web/html/addvote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/html/addvote.php b/web/html/addvote.php
index 70280cfd..3e4def44 100644
--- a/web/html/addvote.php
+++ b/web/html/addvote.php
@@ -69,7 +69,7 @@ if (has_credential(CRED_TU_ADD_VOTE)) {
 
     if (!empty($_POST['addVote']) && empty($error)) {
         // Convert $quorum to a String of maximum length "12.34" (5).
-        $quorum_str = substr(strval($quorum), min(5, strlen($quorum));
+        $quorum_str = substr(strval($quorum), min(5, strlen($quorum)));
         add_tu_proposal($_POST['agenda'], $_POST['user'],
                         $len, $quorum_str, $uid);
 

From f9f41dc99beb9fd75d3f772bf4023168b53c9180 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 6 Jun 2021 16:30:16 -0700
Subject: [PATCH 151/844] restore TU_VoteInfo -> utf8mb4_general_ci

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/schema.py                                              | 4 +++-
 .../versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aurweb/schema.py b/aurweb/schema.py
index f0162045..a0bb7e09 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -389,7 +389,9 @@ TU_VoteInfo = Table(
     Column('No', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
     Column('Abstain', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
     Column('ActiveTUs', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
-    mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin',
+    mysql_engine='InnoDB',
+    mysql_charset='utf8mb4',
+    mysql_collate='utf8mb4_general_ci',
 )
 
 
diff --git a/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py b/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
index e198c34c..03982676 100644
--- a/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
+++ b/migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py
@@ -37,7 +37,7 @@ tables = [
     ('RequestTypes', 'utf8mb4', 'utf8mb4_general_ci'),
     ('SSHPubKeys', 'utf8mb4', 'utf8mb4_bin'),
     ('Sessions', 'utf8mb4', 'utf8mb4_bin'),
-    ('TU_VoteInfo', 'utf8mb4', 'utf8mb4_bin'),
+    ('TU_VoteInfo', 'utf8mb4', 'utf8mb4_general_ci'),
     ('Terms', 'utf8mb4', 'utf8mb4_general_ci'),
     ('Users', 'utf8mb4', 'utf8mb4_general_ci')
 ]

From 4f09e939ae1d605f6568a180d8ab86033e847a0f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 6 Jun 2021 21:34:42 -0700
Subject: [PATCH 152/844] bugfix: gendummydata.py was producing invalid
 usernames

As per our regex and policies, usernames should consist of
ascii alphanumeric characters and possibly (-, _ or .).

gendummydata.py was creating unicode versions of some
usernames and adding them into the DB. With our newfound
collations, this becomes a problem as it treats them as
the same.

This should have never been the case here, and so,
gendummydata.py has been patched to normalize all of its
usernames and package names.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 schema/gendummydata.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index c7b3a06d..35805d6c 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -98,11 +98,19 @@ if MAX_USERS > len(contents):
     MAX_USERS = len(contents)
 if MAX_PKGS > len(contents):
     MAX_PKGS = len(contents)
-if len(contents) - MAX_USERS > MAX_PKGS:
-    need_dupes = 0
-else:
+
+need_dupes = 0
+if not len(contents) - MAX_USERS > MAX_PKGS:
     need_dupes = 1
 
+
+def normalize(unicode_data):
+    """ We only accept ascii for usernames. Also use this to normalize
+    package names; our database utf8mb4 collations compare with Unicode
+    Equivalence. """
+    return unicode_data.encode('ascii', 'ignore').decode('ascii')
+
+
 # select random usernames
 #
 log.debug("Generating random user names...")
@@ -110,12 +118,13 @@ user_id = USER_ID
 while len(seen_users) < MAX_USERS:
     user = random.randrange(0, len(contents))
     word = contents[user].replace("'", "").replace(".", "").replace(" ", "_")
-    word = word.strip().lower()
+    word = normalize(word.strip().lower())
     if word not in seen_users:
         seen_users[word] = user_id
         user_id += 1
 user_keys = list(seen_users.keys())
 
+
 # select random package names
 #
 log.debug("Generating random package names...")
@@ -123,7 +132,7 @@ num_pkgs = PKG_ID
 while len(seen_pkgs) < MAX_PKGS:
     pkg = random.randrange(0, len(contents))
     word = contents[pkg].replace("'", "").replace(".", "").replace(" ", "_")
-    word = word.strip().lower()
+    word = normalize(word.strip().lower())
     if not need_dupes:
         if word not in seen_pkgs and word not in seen_users:
             seen_pkgs[word] = num_pkgs
@@ -285,10 +294,10 @@ for p in seen_pkgs_keys:
     for i in range(num_sources):
         src_file = user_keys[random.randrange(0, len(user_keys))]
         src = "%s%s.%s/%s/%s-%s.tar.gz" % (
-                RANDOM_URL[random.randrange(0, len(RANDOM_URL))],
-                p, RANDOM_TLDS[random.randrange(0, len(RANDOM_TLDS))],
-                RANDOM_LOCS[random.randrange(0, len(RANDOM_LOCS))],
-                src_file, genVersion())
+            RANDOM_URL[random.randrange(0, len(RANDOM_URL))],
+            p, RANDOM_TLDS[random.randrange(0, len(RANDOM_TLDS))],
+            RANDOM_LOCS[random.randrange(0, len(RANDOM_LOCS))],
+            src_file, genVersion())
         s = "INSERT INTO PackageSources(PackageID, Source) VALUES (%d, '%s');\n"
         s = s % (seen_pkgs[p], src)
         out.write(s)

From 7f7a975614f3c02517b4cbb94537fc4c60b26603 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 10 Jun 2021 01:11:41 -0700
Subject: [PATCH 153/844] remove autoflush from aurweb.db.Session

This causes issues with the declarative API.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 590712e0..1f6f50d8 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -141,7 +141,7 @@ def get_engine(echo: bool = False):
         engine = create_engine(get_sqlalchemy_url(),
                                connect_args=connect_args,
                                echo=echo)
-        Session = sessionmaker(autocommit=False, autoflush=True, bind=engine)
+        Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
         session = Session()
 
     return engine

From a625df07e294866398385548501656eb8645e610 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Thu, 10 Jun 2021 14:46:24 -0400
Subject: [PATCH 154/844] Source valid ssh prefixes from config

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 web/lib/acctfuncs.inc.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index df016c6d..0d021f99 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -875,10 +875,7 @@ function valid_pgp_fingerprint($fingerprint) {
  * @return bool True if the SSH public key is valid, otherwise false
  */
 function valid_ssh_pubkey($pubkey) {
-	$valid_prefixes = array(
-		"ssh-rsa", "ssh-dss", "ecdsa-sha2-nistp256",
-		"ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "ssh-ed25519"
-	);
+	$valid_prefixes = explode(' ', config_get('auth', 'valid-keytypes'));
 
 	$has_valid_prefix = false;
 	foreach ($valid_prefixes as $prefix) {

From b32022a176ede116068a405c928cf25e23ffb691 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Thu, 10 Jun 2021 14:35:13 -0400
Subject: [PATCH 155/844] Add FIDO/U2F ssh keytypes to default config

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 conf/config.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/config.defaults b/conf/config.defaults
index 98e033b7..e6961520 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -62,7 +62,7 @@ ECDSA = SHA256:L71Q91yHwmHPYYkJMDgj0xmUuw16qFOhJbBr1mzsiOI
 RSA = SHA256:Ju+yWiMb/2O+gKQ9RJCDqvRg7l+Q95KFAeqM5sr6l2s
 
 [auth]
-valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519
+valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 sk-ssh-ecdsa@openssh.com sk-ssh-ed25519@openssh.com
 username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$
 git-serve-cmd = /usr/local/bin/aurweb-git-serve
 ssh-options = restrict

From 888cf5118aa1f794f9c87413aa29b5db54adc84a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 6 Jun 2021 22:45:40 -0700
Subject: [PATCH 156/844] use declarative_base for all ORM models

This rewrites the entire model base as declarative models.
This allows us to more easily customize overlay fields
in tables and is more common.

This effort also brought some DB violations to light which
this commit addresses.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py                        | 13 ++----
 aurweb/models/__init__.py           |  1 +
 aurweb/models/accepted_term.py      | 41 ++++++++++-------
 aurweb/models/account_type.py       | 14 +++---
 aurweb/models/api_rate_limit.py     | 18 +++++---
 aurweb/models/ban.py                | 15 ++++---
 aurweb/models/declarative.py        | 10 +++++
 aurweb/models/dependency_type.py    | 15 ++++---
 aurweb/models/group.py              | 15 ++++---
 aurweb/models/license.py            | 15 ++++---
 aurweb/models/official_provider.py  | 15 ++++---
 aurweb/models/package.py            | 42 +++++++++++-------
 aurweb/models/package_base.py       | 58 +++++++++++++++---------
 aurweb/models/package_dependency.py | 55 ++++++++++++++---------
 aurweb/models/package_group.py      | 48 +++++++++++---------
 aurweb/models/package_keyword.py    | 32 +++++++------
 aurweb/models/package_license.py    | 52 ++++++++++++----------
 aurweb/models/package_relation.py   | 52 ++++++++++++----------
 aurweb/models/relation_type.py      | 15 ++++---
 aurweb/models/session.py            | 24 ++++++----
 aurweb/models/ssh_pub_key.py        | 26 +++++++----
 aurweb/models/term.py               | 15 ++++---
 aurweb/models/user.py               | 69 ++++++++++++-----------------
 test/test_accepted_term.py          |  4 +-
 test/test_account_type.py           |  3 +-
 test/test_package.py                | 10 ++---
 test/test_package_group.py          |  2 +-
 test/test_package_license.py        |  2 +-
 test/test_session.py                |  9 ++--
 29 files changed, 398 insertions(+), 292 deletions(-)
 create mode 100644 aurweb/models/declarative.py

diff --git a/aurweb/db.py b/aurweb/db.py
index 1f6f50d8..9837c746 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -1,7 +1,5 @@
 import math
 
-from sqlalchemy.orm import backref, relationship
-
 import aurweb.config
 import aurweb.util
 
@@ -53,12 +51,6 @@ def make_random_value(table: str, column: str):
     return string
 
 
-def make_relationship(model, foreign_key: str, backref_: str, **kwargs):
-    return relationship(model, foreign_keys=[foreign_key],
-                        backref=backref(backref_, lazy="dynamic"),
-                        **kwargs)
-
-
 def query(model, *args, **kwargs):
     return session.query(model).filter(*args, **kwargs)
 
@@ -77,6 +69,10 @@ def delete(model, *args, **kwargs):
     session.commit()
 
 
+def rollback():
+    session.rollback()
+
+
 def get_sqlalchemy_url():
     """
     Build an SQLAlchemy for use with create_engine based on the aurweb configuration.
@@ -137,7 +133,6 @@ def get_engine(echo: bool = False):
             # check_same_thread is for a SQLite technicality
             # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
             connect_args["check_same_thread"] = False
-
         engine = create_engine(get_sqlalchemy_url(),
                                connect_args=connect_args,
                                echo=echo)
diff --git a/aurweb/models/__init__.py b/aurweb/models/__init__.py
index e69de29b..ed0532c6 100644
--- a/aurweb/models/__init__.py
+++ b/aurweb/models/__init__.py
@@ -0,0 +1 @@
+# aurweb SQLAlchemy ORM model collection.
diff --git a/aurweb/models/accepted_term.py b/aurweb/models/accepted_term.py
index 483109f1..b46d086b 100644
--- a/aurweb/models/accepted_term.py
+++ b/aurweb/models/accepted_term.py
@@ -1,15 +1,33 @@
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.db import make_relationship
-from aurweb.models.term import Term
-from aurweb.models.user import User
-from aurweb.schema import AcceptedTerms
+import aurweb.models.term
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
 
 
-class AcceptedTerm:
+class AcceptedTerm(Base):
+    __tablename__ = "AcceptedTerms"
+
+    UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
+                     nullable=False)
+    User = relationship(
+        "User", backref=backref("accepted_terms", lazy="dynamic"),
+        foreign_keys=[UsersID])
+
+    TermsID = Column(Integer, ForeignKey("Terms.ID", ondelete="CASCADE"),
+                     nullable=False)
+    Term = relationship(
+        "Term", backref=backref("accepted_terms", lazy="dynamic"),
+        foreign_keys=[TermsID])
+
+    __mapper_args__ = {"primary_key": [TermsID]}
+
     def __init__(self,
-                 User: User = None, Term: Term = None,
+                 User: aurweb.models.user.User = None,
+                 Term: aurweb.models.term.Term = None,
                  Revision: int = None):
         self.User = User
         if not self.User:
@@ -26,12 +44,3 @@ class AcceptedTerm:
                 params=("NULL"))
 
         self.Revision = Revision
-
-
-properties = {
-    "User": make_relationship(User, AcceptedTerms.c.UsersID, "accepted_terms"),
-    "Term": make_relationship(Term, AcceptedTerms.c.TermsID, "accepted")
-}
-
-mapper(AcceptedTerm, AcceptedTerms, properties=properties,
-       primary_key=[AcceptedTerms.c.UsersID, AcceptedTerms.c.TermsID])
diff --git a/aurweb/models/account_type.py b/aurweb/models/account_type.py
index 44225e35..502a86b1 100644
--- a/aurweb/models/account_type.py
+++ b/aurweb/models/account_type.py
@@ -1,10 +1,15 @@
-from sqlalchemy.orm import mapper
+from sqlalchemy import Column, Integer
 
-from aurweb.schema import AccountTypes
+from aurweb.models.declarative import Base
 
 
-class AccountType:
+class AccountType(Base):
     """ An ORM model of a single AccountTypes record. """
+    __tablename__ = "AccountTypes"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
 
     def __init__(self, **kwargs):
         self.AccountType = kwargs.pop("AccountType")
@@ -15,6 +20,3 @@ class AccountType:
     def __repr__(self):
         return "<AccountType(ID='%s', AccountType='%s')>" % (
             self.ID, str(self))
-
-
-mapper(AccountType, AccountTypes, confirm_deleted_rows=False)
diff --git a/aurweb/models/api_rate_limit.py b/aurweb/models/api_rate_limit.py
index 8b945b6a..f4590553 100644
--- a/aurweb/models/api_rate_limit.py
+++ b/aurweb/models/api_rate_limit.py
@@ -1,11 +1,18 @@
+from sqlalchemy import Column, String
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
 
-from aurweb.schema import ApiRateLimit as _ApiRateLimit
+from aurweb.models.declarative import Base
 
 
-class ApiRateLimit:
-    def __init__(self, IP: str = None,
+class ApiRateLimit(Base):
+    __tablename__ = "ApiRateLimit"
+
+    IP = Column(String(45), primary_key=True, unique=True, default=str())
+
+    __mapper_args__ = {"primary_key": [IP]}
+
+    def __init__(self,
+                 IP: str = None,
                  Requests: int = None,
                  WindowStart: int = None):
         self.IP = IP
@@ -23,6 +30,3 @@ class ApiRateLimit:
                 statement="Column WindowStart cannot be null.",
                 orig="ApiRateLimit.WindowStart",
                 params=("NULL"))
-
-
-mapper(ApiRateLimit, _ApiRateLimit, primary_key=[_ApiRateLimit.c.IP])
diff --git a/aurweb/models/ban.py b/aurweb/models/ban.py
index be030380..e10087b0 100644
--- a/aurweb/models/ban.py
+++ b/aurweb/models/ban.py
@@ -1,10 +1,16 @@
 from fastapi import Request
-from sqlalchemy.orm import mapper
+from sqlalchemy import Column, String
 
-from aurweb.schema import Bans
+from aurweb.models.declarative import Base
 
 
-class Ban:
+class Ban(Base):
+    __tablename__ = "Bans"
+
+    IPAddress = Column(String(45), primary_key=True)
+
+    __mapper_args__ = {"primary_key": [IPAddress]}
+
     def __init__(self, **kwargs):
         self.IPAddress = kwargs.get("IPAddress")
         self.BanTS = kwargs.get("BanTS")
@@ -14,6 +20,3 @@ def is_banned(request: Request):
     from aurweb.db import session
     ip = request.client.host
     return session.query(Ban).filter(Ban.IPAddress == ip).first() is not None
-
-
-mapper(Ban, Bans)
diff --git a/aurweb/models/declarative.py b/aurweb/models/declarative.py
new file mode 100644
index 00000000..45a629ce
--- /dev/null
+++ b/aurweb/models/declarative.py
@@ -0,0 +1,10 @@
+from sqlalchemy.ext.declarative import declarative_base
+
+import aurweb.db
+
+Base = declarative_base()
+Base.__table_args__ = {
+    "autoload": True,
+    "autoload_with": aurweb.db.get_engine(),
+    "extend_existing": True
+}
diff --git a/aurweb/models/dependency_type.py b/aurweb/models/dependency_type.py
index 87b38069..71acf368 100644
--- a/aurweb/models/dependency_type.py
+++ b/aurweb/models/dependency_type.py
@@ -1,11 +1,14 @@
-from sqlalchemy.orm import mapper
+from sqlalchemy import Column, Integer
 
-from aurweb.schema import DependencyTypes
+from aurweb.models.declarative import Base
 
 
-class DependencyType:
+class DependencyType(Base):
+    __tablename__ = "DependencyTypes"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
+
     def __init__(self, Name: str = None):
         self.Name = Name
-
-
-mapper(DependencyType, DependencyTypes)
diff --git a/aurweb/models/group.py b/aurweb/models/group.py
index c5583eb4..1bd3a402 100644
--- a/aurweb/models/group.py
+++ b/aurweb/models/group.py
@@ -1,10 +1,16 @@
+from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
 
-from aurweb.schema import Groups
+from aurweb.models.declarative import Base
 
 
-class Group:
+class Group(Base):
+    __tablename__ = "Groups"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
+
     def __init__(self, Name: str = None):
         self.Name = Name
         if not self.Name:
@@ -12,6 +18,3 @@ class Group:
                 statement="Column Name cannot be null.",
                 orig="Groups.Name",
                 params=("NULL"))
-
-
-mapper(Group, Groups)
diff --git a/aurweb/models/license.py b/aurweb/models/license.py
index bcc02713..aef6a619 100644
--- a/aurweb/models/license.py
+++ b/aurweb/models/license.py
@@ -1,10 +1,16 @@
+from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
 
-from aurweb.schema import Licenses
+from aurweb.models.declarative import Base
 
 
-class License:
+class License(Base):
+    __tablename__ = "Licenses"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
+
     def __init__(self, Name: str = None):
         self.Name = Name
         if not self.Name:
@@ -12,6 +18,3 @@ class License:
                 statement="Column Name cannot be null.",
                 orig="Licenses.Name",
                 params=("NULL"))
-
-
-mapper(License, Licenses)
diff --git a/aurweb/models/official_provider.py b/aurweb/models/official_provider.py
index 073eb435..756be843 100644
--- a/aurweb/models/official_provider.py
+++ b/aurweb/models/official_provider.py
@@ -1,10 +1,16 @@
+from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
 
-from aurweb.schema import OfficialProviders
+from aurweb.models.declarative import Base
 
 
-class OfficialProvider:
+class OfficialProvider(Base):
+    __tablename__ = "OfficialProviders"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
+
     def __init__(self,
                  Name: str = None,
                  Repo: str = None,
@@ -29,6 +35,3 @@ class OfficialProvider:
                 statement="Column Provides cannot be null.",
                 orig="OfficialProviders.Provides",
                 params=("NULL"))
-
-
-mapper(OfficialProvider, OfficialProviders)
diff --git a/aurweb/models/package.py b/aurweb/models/package.py
index 28a13791..ff518f20 100644
--- a/aurweb/models/package.py
+++ b/aurweb/models/package.py
@@ -1,20 +1,37 @@
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.db import make_relationship
-from aurweb.models.package_base import PackageBase
-from aurweb.schema import Packages
+import aurweb.db
+import aurweb.models.package_base
+
+from aurweb.models.declarative import Base
 
 
-class Package:
+class Package(Base):
+    __tablename__ = "Packages"
+
+    ID = Column(Integer, primary_key=True)
+
+    PackageBaseID = Column(
+        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
+        nullable=False)
+    PackageBase = relationship(
+        "PackageBase", backref=backref("package", uselist=False),
+        foreign_keys=[PackageBaseID])
+
+    __mapper_args__ = {"primary_key": [ID]}
+
     def __init__(self,
-                 PackageBase: PackageBase = None,
-                 Name: str = None, Version: str = None,
-                 Description: str = None, URL: str = None):
+                 PackageBase: aurweb.models.package_base.PackageBase = None,
+                 Name: str = None,
+                 Version: str = None,
+                 Description: str = None,
+                 URL: str = None):
         self.PackageBase = PackageBase
         if not self.PackageBase:
             raise IntegrityError(
-                statement="Foreign key UserID cannot be null.",
+                statement="Foreign key PackageBaseID cannot be null.",
                 orig="Packages.PackageBaseID",
                 params=("NULL"))
 
@@ -28,10 +45,3 @@ class Package:
         self.Version = Version
         self.Description = Description
         self.URL = URL
-
-
-mapper(Package, Packages, properties={
-    "PackageBase": make_relationship(PackageBase,
-                                     Packages.c.PackageBaseID,
-                                     "package", uselist=False)
-})
diff --git a/aurweb/models/package_base.py b/aurweb/models/package_base.py
index 699559d5..261c30f3 100644
--- a/aurweb/models/package_base.py
+++ b/aurweb/models/package_base.py
@@ -1,17 +1,47 @@
 from datetime import datetime
 
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.db import make_relationship
-from aurweb.models.user import User
-from aurweb.schema import PackageBases
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
 
 
-class PackageBase:
-    def __init__(self, Name: str = None, Flagger: User = None,
-                 Maintainer: User = None, Submitter: User = None,
-                 Packager: User = None, **kwargs):
+class PackageBase(Base):
+    __tablename__ = "PackageBases"
+
+    FlaggerUID = Column(Integer,
+                        ForeignKey("Users.ID", ondelete="SET NULL"))
+    Flagger = relationship(
+        "User", backref=backref("flagged_bases", lazy="dynamic"),
+        foreign_keys=[FlaggerUID])
+
+    SubmitterUID = Column(Integer,
+                          ForeignKey("Users.ID", ondelete="SET NULL"))
+    Submitter = relationship(
+        "User", backref=backref("submitted_bases", lazy="dynamic"),
+        foreign_keys=[SubmitterUID])
+
+    MaintainerUID = Column(Integer,
+                           ForeignKey("Users.ID", ondelete="SET NULL"))
+    Maintainer = relationship(
+        "User", backref=backref("maintained_bases", lazy="dynamic"),
+        foreign_keys=[MaintainerUID])
+
+    PackagerUID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
+    Packager = relationship(
+        "User", backref=backref("package_bases", lazy="dynamic"),
+        foreign_keys=[PackagerUID])
+
+    def __init__(self, Name: str = None,
+                 Flagger: aurweb.models.user.User = None,
+                 Maintainer: aurweb.models.user.User = None,
+                 Submitter: aurweb.models.user.User = None,
+                 Packager: aurweb.models.user.User = None,
+                 **kwargs):
+        super().__init__(**kwargs)
         self.Name = Name
         if not self.Name:
             raise IntegrityError(
@@ -32,15 +62,3 @@ class PackageBase:
                                       datetime.utcnow().timestamp())
         self.ModifiedTS = kwargs.get("ModifiedTS",
                                      datetime.utcnow().timestamp())
-
-
-mapper(PackageBase, PackageBases, properties={
-    "Flagger": make_relationship(User, PackageBases.c.FlaggerUID,
-                                 "flagged_bases"),
-    "Submitter": make_relationship(User, PackageBases.c.SubmitterUID,
-                                   "submitted_bases"),
-    "Maintainer": make_relationship(User, PackageBases.c.MaintainerUID,
-                                    "maintained_bases"),
-    "Packager": make_relationship(User, PackageBases.c.PackagerUID,
-                                  "package_bases")
-})
diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index 21801802..0bd84073 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -1,17 +1,40 @@
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.db import make_relationship
-from aurweb.models.dependency_type import DependencyType
-from aurweb.models.package import Package
-from aurweb.schema import PackageDepends
+import aurweb.models.package
+
+from aurweb.models import dependency_type
+from aurweb.models.declarative import Base
 
 
-class PackageDependency:
-    def __init__(self, Package: Package = None,
-                 DependencyType: DependencyType = None,
-                 DepName: str = None, DepDesc: str = None,
-                 DepCondition: str = None, DepArch: str = None):
+class PackageDependency(Base):
+    __tablename__ = "PackageDepends"
+
+    PackageID = Column(
+        Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
+        nullable=False)
+    Package = relationship(
+        "Package", backref=backref("package_dependencies", lazy="dynamic"),
+        foreign_keys=[PackageID], lazy="select")
+
+    DepTypeID = Column(
+        Integer, ForeignKey("DependencyTypes.ID", ondelete="NO ACTION"),
+        nullable=False)
+    DependencyType = relationship(
+        "DependencyType",
+        backref=backref("package_dependencies", lazy="dynamic"),
+        foreign_keys=[DepTypeID], lazy="select")
+
+    __mapper_args__ = {"primary_key": [PackageID, DepTypeID]}
+
+    def __init__(self,
+                 Package: aurweb.models.package.Package = None,
+                 DependencyType: dependency_type.DependencyType = None,
+                 DepName: str = None,
+                 DepDesc: str = None,
+                 DepCondition: str = None,
+                 DepArch: str = None):
         self.Package = Package
         if not self.Package:
             raise IntegrityError(
@@ -36,15 +59,3 @@ class PackageDependency:
         self.DepDesc = DepDesc
         self.DepCondition = DepCondition
         self.DepArch = DepArch
-
-
-properties = {
-    "Package": make_relationship(Package, PackageDepends.c.PackageID,
-                                 "package_dependencies"),
-    "DependencyType": make_relationship(DependencyType,
-                                        PackageDepends.c.DepTypeID,
-                                        "package_dependencies")
-}
-
-mapper(PackageDependency, PackageDepends, properties=properties,
-       primary_key=[PackageDepends.c.PackageID, PackageDepends.c.DepTypeID])
diff --git a/aurweb/models/package_group.py b/aurweb/models/package_group.py
index 19a11c80..a8031e0d 100644
--- a/aurweb/models/package_group.py
+++ b/aurweb/models/package_group.py
@@ -1,14 +1,33 @@
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.db import make_relationship
-from aurweb.models.group import Group
-from aurweb.models.package import Package
-from aurweb.schema import PackageGroups
+import aurweb.models.group
+import aurweb.models.package
+
+from aurweb.models.declarative import Base
 
 
-class PackageGroup:
-    def __init__(self, Package: Package = None, Group: Group = None):
+class PackageGroup(Base):
+    __tablename__ = "PackageGroups"
+
+    PackageID = Column(Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
+                       primary_key=True, nullable=True)
+    Package = relationship(
+        "Package", backref=backref("package_groups", lazy="dynamic"),
+        foreign_keys=[PackageID])
+
+    GroupID = Column(Integer, ForeignKey("Groups.ID", ondelete="CASCADE"),
+                     primary_key=True, nullable=True)
+    Group = relationship(
+        "Group", backref=backref("package_groups", lazy="dynamic"),
+        foreign_keys=[GroupID])
+
+    __mapper_args__ = {"primary_key": [PackageID, GroupID]}
+
+    def __init__(self,
+                 Package: aurweb.models.package.Package = None,
+                 Group: aurweb.models.group.Group = None):
         self.Package = Package
         if not self.Package:
             raise IntegrityError(
@@ -22,18 +41,3 @@ class PackageGroup:
                 statement="Primary key GroupID cannot be null.",
                 orig="PackageGroups.GroupID",
                 params=("NULL"))
-
-
-properties = {
-    "Package": make_relationship(Package,
-                                 PackageGroups.c.PackageID,
-                                 "package_group",
-                                 uselist=False),
-    "Group": make_relationship(Group,
-                               PackageGroups.c.GroupID,
-                               "package_group",
-                               uselist=False)
-}
-
-mapper(PackageGroup, PackageGroups, properties=properties,
-       primary_key=[PackageGroups.c.PackageID, PackageGroups.c.GroupID])
diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py
index 2bae223c..2926740d 100644
--- a/aurweb/models/package_keyword.py
+++ b/aurweb/models/package_keyword.py
@@ -1,14 +1,27 @@
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.db import make_relationship
-from aurweb.models.package_base import PackageBase
-from aurweb.schema import PackageKeywords
+import aurweb.db
+import aurweb.models.package_base
+
+from aurweb.models.declarative import Base
 
 
-class PackageKeyword:
+class PackageKeyword(Base):
+    __tablename__ = "PackageKeywords"
+
+    PackageBaseID = Column(
+        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
+        primary_key=True, nullable=True)
+    PackageBase = relationship(
+        "PackageBase", backref=backref("keywords", lazy="dynamic"),
+        foreign_keys=[PackageBaseID])
+
+    __mapper_args__ = {"primary_key": [PackageBaseID]}
+
     def __init__(self,
-                 PackageBase: PackageBase = None,
+                 PackageBase: aurweb.models.package_base.PackageBase = None,
                  Keyword: str = None):
         self.PackageBase = PackageBase
         if not self.PackageBase:
@@ -18,10 +31,3 @@ class PackageKeyword:
                 params=("NULL"))
 
         self.Keyword = Keyword
-
-
-mapper(PackageKeyword, PackageKeywords, properties={
-    "PackageBase": make_relationship(PackageBase,
-                                     PackageKeywords.c.PackageBaseID,
-                                     "keywords")
-})
diff --git a/aurweb/models/package_license.py b/aurweb/models/package_license.py
index 491874a4..0689562f 100644
--- a/aurweb/models/package_license.py
+++ b/aurweb/models/package_license.py
@@ -1,14 +1,35 @@
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.db import make_relationship
-from aurweb.models.license import License
-from aurweb.models.package import Package
-from aurweb.schema import PackageLicenses
+import aurweb.models.license
+import aurweb.models.package
+
+from aurweb.models.declarative import Base
 
 
-class PackageLicense:
-    def __init__(self, Package: Package = None, License: License = None):
+class PackageLicense(Base):
+    __tablename__ = "PackageLicenses"
+
+    PackageID = Column(
+        Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
+        primary_key=True, nullable=True)
+    Package = relationship(
+        "Package", backref=backref("package_license", uselist=False),
+        foreign_keys=[PackageID])
+
+    LicenseID = Column(
+        Integer, ForeignKey("Licenses.ID", ondelete="CASCADE"),
+        primary_key=True, nullable=True)
+    License = relationship(
+        "License", backref=backref("package_license", uselist=False),
+        foreign_keys=[LicenseID])
+
+    __mapper_args__ = {"primary_key": [PackageID, LicenseID]}
+
+    def __init__(self,
+                 Package: aurweb.models.package.Package = None,
+                 License: aurweb.models.license.License = None):
         self.Package = Package
         if not self.Package:
             raise IntegrityError(
@@ -22,20 +43,3 @@ class PackageLicense:
                 statement="Primary key LicenseID cannot be null.",
                 orig="PackageLicenses.LicenseID",
                 params=("NULL"))
-
-
-properties = {
-    "Package": make_relationship(Package,
-                                 PackageLicenses.c.PackageID,
-                                 "package_license",
-                                 uselist=False),
-    "License": make_relationship(License,
-                                 PackageLicenses.c.LicenseID,
-                                 "package_license",
-                                 uselist=False)
-
-
-}
-
-mapper(PackageLicense, PackageLicenses, properties=properties,
-       primary_key=[PackageLicenses.c.PackageID, PackageLicenses.c.LicenseID])
diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
index d9ade727..9204af59 100644
--- a/aurweb/models/package_relation.py
+++ b/aurweb/models/package_relation.py
@@ -1,15 +1,36 @@
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.db import make_relationship
-from aurweb.models.package import Package
-from aurweb.models.relation_type import RelationType
-from aurweb.schema import PackageRelations
+import aurweb.db
+import aurweb.models.package
+import aurweb.models.relation_type
+
+from aurweb.models.declarative import Base
 
 
-class PackageRelation:
-    def __init__(self, Package: Package = None,
-                 RelationType: RelationType = None,
+class PackageRelation(Base):
+    __tablename__ = "PackageRelations"
+
+    PackageID = Column(
+        Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
+        nullable=False)
+    Package = relationship(
+        "Package", backref=backref("package_relations", lazy="dynamic"),
+        foreign_keys=[PackageID])
+
+    RelTypeID = Column(
+        Integer, ForeignKey("RelationTypes.ID", ondelete="CASCADE"),
+        nullable=False)
+    RelationType = relationship(
+        "RelationType", backref=backref("package_relations", lazy="dynamic"),
+        foreign_keys=[RelTypeID])
+
+    __mapper_args__ = {"primary_key": [PackageID, RelTypeID]}
+
+    def __init__(self,
+                 Package: aurweb.models.package.Package = None,
+                 RelationType: aurweb.models.relation_type.RelationType = None,
                  RelName: str = None, RelCondition: str = None,
                  RelArch: str = None):
         self.Package = Package
@@ -35,18 +56,3 @@ class PackageRelation:
 
         self.RelCondition = RelCondition
         self.RelArch = RelArch
-
-
-properties = {
-    "Package": make_relationship(Package, PackageRelations.c.PackageID,
-                                 "package_relations"),
-    "RelationType": make_relationship(RelationType,
-                                      PackageRelations.c.RelTypeID,
-                                      "package_relations")
-}
-
-mapper(PackageRelation, PackageRelations, properties=properties,
-       primary_key=[
-           PackageRelations.c.PackageID,
-           PackageRelations.c.RelTypeID
-       ])
diff --git a/aurweb/models/relation_type.py b/aurweb/models/relation_type.py
index b4d1efbc..319fb7f4 100644
--- a/aurweb/models/relation_type.py
+++ b/aurweb/models/relation_type.py
@@ -1,11 +1,14 @@
-from sqlalchemy.orm import mapper
+from sqlalchemy import Column, Integer
 
-from aurweb.schema import RelationTypes
+from aurweb.models.declarative import Base
 
 
-class RelationType:
+class RelationType(Base):
+    __tablename__ = "RelationTypes"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
+
     def __init__(self, Name: str = None):
         self.Name = Name
-
-
-mapper(RelationType, RelationTypes)
diff --git a/aurweb/models/session.py b/aurweb/models/session.py
index f1e0fff5..9154178e 100644
--- a/aurweb/models/session.py
+++ b/aurweb/models/session.py
@@ -1,12 +1,24 @@
+from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import backref, mapper, relationship
+from sqlalchemy.orm import backref, relationship
 
 from aurweb.db import make_random_value, query
+from aurweb.models.declarative import Base
 from aurweb.models.user import User
-from aurweb.schema import Sessions
 
 
-class Session:
+class Session(Base):
+    __tablename__ = "Sessions"
+
+    UsersID = Column(
+        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
+        nullable=False)
+    User = relationship(
+        "User", backref=backref("session", uselist=False),
+        foreign_keys=[UsersID])
+
+    __mapper_args__ = {"primary_key": [UsersID]}
+
     def __init__(self, **kwargs):
         self.UsersID = kwargs.get("UsersID")
         if not query(User, User.ID == self.UsersID).first():
@@ -19,11 +31,5 @@ class Session:
         self.LastUpdateTS = kwargs.get("LastUpdateTS")
 
 
-mapper(Session, Sessions, primary_key=[Sessions.c.SessionID], properties={
-    "User": relationship(User, backref=backref("session",
-                                               uselist=False))
-})
-
-
 def generate_unique_sid():
     return make_random_value(Session, Session.SessionID)
diff --git a/aurweb/models/ssh_pub_key.py b/aurweb/models/ssh_pub_key.py
index 01ff558e..268a585b 100644
--- a/aurweb/models/ssh_pub_key.py
+++ b/aurweb/models/ssh_pub_key.py
@@ -3,13 +3,26 @@ import tempfile
 
 from subprocess import PIPE, Popen
 
-from sqlalchemy.orm import backref, mapper, relationship
+from sqlalchemy import Column, ForeignKey, Integer, String
+from sqlalchemy.orm import backref, relationship
 
-from aurweb.models.user import User
-from aurweb.schema import SSHPubKeys
+from aurweb.models.declarative import Base
 
 
-class SSHPubKey:
+class SSHPubKey(Base):
+    __tablename__ = "SSHPubKeys"
+
+    UserID = Column(
+        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
+        nullable=False)
+    User = relationship(
+        "User", backref=backref("ssh_pub_key", uselist=False),
+        foreign_keys=[UserID])
+
+    Fingerprint = Column(String(44), primary_key=True)
+
+    __mapper_args__ = {"primary_key": Fingerprint}
+
     def __init__(self, **kwargs):
         self.UserID = kwargs.get("UserID")
         self.Fingerprint = kwargs.get("Fingerprint")
@@ -34,8 +47,3 @@ def get_fingerprint(pubkey):
         fp = parts[1].replace("SHA256:", "")
 
     return fp
-
-
-mapper(SSHPubKey, SSHPubKeys, properties={
-    "User": relationship(User, backref=backref("ssh_pub_key", uselist=False))
-})
diff --git a/aurweb/models/term.py b/aurweb/models/term.py
index 1a0780df..b0da71f7 100644
--- a/aurweb/models/term.py
+++ b/aurweb/models/term.py
@@ -1,10 +1,16 @@
+from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import mapper
 
-from aurweb.schema import Terms
+from aurweb.models.declarative import Base
 
 
-class Term:
+class Term(Base):
+    __tablename__ = "Terms"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
+
     def __init__(self,
                  Description: str = None, URL: str = None,
                  Revision: int = None):
@@ -23,6 +29,3 @@ class Term:
                 params=("NULL"))
 
         self.Revision = Revision
-
-
-mapper(Term, Terms)
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 1961228e..83cde5f1 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -5,50 +5,44 @@ from datetime import datetime
 import bcrypt
 
 from fastapi import Request
-from sqlalchemy.orm import backref, mapper, relationship
+from sqlalchemy import Column, ForeignKey, Integer, String, text
+from sqlalchemy.orm import backref, relationship
 
 import aurweb.config
+import aurweb.models.account_type
+import aurweb.schema
 
-from aurweb.models.account_type import AccountType
 from aurweb.models.ban import is_banned
-from aurweb.schema import Users
+from aurweb.models.declarative import Base
 
 
-class User:
+class User(Base):
     """ An ORM model of a single Users record. """
+    __tablename__ = "Users"
+
+    ID = Column(Integer, primary_key=True)
+
+    AccountTypeID = Column(
+        Integer, ForeignKey("AccountTypes.ID", ondelete="NO ACTION"),
+        nullable=False, server_default=text("1"))
+    AccountType = relationship(
+        "AccountType",
+        backref=backref("users", lazy="dynamic"),
+        foreign_keys=[AccountTypeID],
+        uselist=False)
+
+    Passwd = Column(String(255), default=str())
+
+    __mapper_args__ = {"primary_key": [ID]}
+
+    # High-level variables used to track authentication (not in DB).
     authenticated = False
 
-    def __init__(self, **kwargs):
-        # Set AccountTypeID if it was passed.
-        self.AccountTypeID = kwargs.get("AccountTypeID")
+    def __init__(self, Passwd: str = str(), **kwargs):
+        super().__init__(**kwargs)
 
-        account_type = kwargs.get("AccountType")
-        if account_type:
-            self.AccountType = account_type
-
-        self.Username = kwargs.get("Username")
-
-        self.ResetKey = kwargs.get("ResetKey")
-        self.Email = kwargs.get("Email")
-        self.BackupEmail = kwargs.get("BackupEmail")
-        self.RealName = kwargs.get("RealName")
-        self.LangPreference = kwargs.get("LangPreference")
-        self.Timezone = kwargs.get("Timezone")
-        self.Homepage = kwargs.get("Homepage")
-        self.IRCNick = kwargs.get("IRCNick")
-        self.PGPKey = kwargs.get("PGPKey")
-        self.RegistrationTS = datetime.utcnow()
-        self.CommentNotify = kwargs.get("CommentNotify")
-        self.UpdateNotify = kwargs.get("UpdateNotify")
-        self.OwnershipNotify = kwargs.get("OwnershipNotify")
-        self.SSOAccountID = kwargs.get("SSOAccountID")
-
-        self.Salt = None
-        self.Passwd = str()
-
-        passwd = kwargs.get("Passwd")
-        if passwd:
-            self.update_password(passwd)
+        if Passwd:
+            self.update_password(Passwd)
 
     def update_password(self, password, salt_rounds=12):
         self.Passwd = bcrypt.hashpw(
@@ -154,10 +148,3 @@ class User:
     def __repr__(self):
         return "<User(ID='%s', AccountType='%s', Username='%s')>" % (
             self.ID, str(self.AccountType), self.Username)
-
-
-# Map schema.Users to User and give it some relationships.
-mapper(User, Users, properties={
-    "AccountType": relationship(AccountType,
-                                backref=backref("users", lazy="dynamic"))
-})
diff --git a/test/test_accepted_term.py b/test/test_accepted_term.py
index 4ddf1fc3..8569b021 100644
--- a/test/test_accepted_term.py
+++ b/test/test_accepted_term.py
@@ -22,7 +22,7 @@ def setup():
                          AccountType.AccountType == "User").first()
     user = create(User, Username="test", Email="test@example.org",
                   RealName="Test User", Passwd="testPassword",
-                  account_type=account_type)
+                  AccountType=account_type)
 
     term = create(Term, Description="Test term", URL="https://test.term")
 
@@ -33,7 +33,7 @@ def test_accepted_term():
     # Make sure our AcceptedTerm relationships got initialized properly.
     assert accepted_term.User == user
     assert accepted_term in user.accepted_terms
-    assert accepted_term in term.accepted
+    assert accepted_term in term.accepted_terms
 
 
 def test_accepted_term_null_user_raises_exception():
diff --git a/test/test_account_type.py b/test/test_account_type.py
index 3bd76d1e..fa4bc5ad 100644
--- a/test/test_account_type.py
+++ b/test/test_account_type.py
@@ -43,6 +43,7 @@ def test_user_account_type_relationship():
                   AccountType=account_type)
 
     assert user.AccountType == account_type
-    assert account_type.users.filter(User.ID == user.ID).first()
 
+    # This must be deleted here to avoid foreign key issues when
+    # deleting the temporary AccountType in the fixture.
     delete(User, User.ID == user.ID)
diff --git a/test/test_package.py b/test/test_package.py
index a994f096..9532823d 100644
--- a/test/test_package.py
+++ b/test/test_package.py
@@ -1,7 +1,7 @@
 import pytest
 
 from sqlalchemy import and_
-from sqlalchemy.exc import IntegrityError
+from sqlalchemy.exc import IntegrityError, OperationalError
 
 import aurweb.config
 
@@ -19,7 +19,7 @@ user = pkgbase = package = None
 def setup():
     global user, pkgbase, package
 
-    setup_test_db("Users", "PackageBases", "Packages")
+    setup_test_db("Packages", "PackageBases", "Users")
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
@@ -57,17 +57,17 @@ def test_package():
     assert record is not None
 
 
-def test_package_ci():
+def test_package_package_base_cant_change():
     """ Test case insensitivity of the database table. """
     if aurweb.config.get("database", "backend") == "sqlite":
         return None  # SQLite doesn't seem handle this.
 
     from aurweb.db import session
 
-    with pytest.raises(IntegrityError):
+    with pytest.raises(OperationalError):
         create(Package,
                PackageBase=pkgbase,
-               Name="Beautiful-Package")
+               Name="invalidates-old-package-packagebase-relationship")
     session.rollback()
 
 
diff --git a/test/test_package_group.py b/test/test_package_group.py
index 28047a7f..0e6e41e3 100644
--- a/test/test_package_group.py
+++ b/test/test_package_group.py
@@ -25,7 +25,7 @@ def setup():
                          AccountType.AccountType == "User").first()
     user = create(User, Username="test", Email="test@example.org",
                   RealName="Test User", Passwd="testPassword",
-                  account_type=account_type)
+                  AccountType=account_type)
 
     group = create(Group, Name="Test Group")
     pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
diff --git a/test/test_package_license.py b/test/test_package_license.py
index 72eb3681..f7654dee 100644
--- a/test/test_package_license.py
+++ b/test/test_package_license.py
@@ -25,7 +25,7 @@ def setup():
                          AccountType.AccountType == "User").first()
     user = create(User, Username="test", Email="test@example.org",
                   RealName="Test User", Passwd="testPassword",
-                  account_type=account_type)
+                  AccountType=account_type)
 
     license = create(License, Name="Test License")
     pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
diff --git a/test/test_session.py b/test/test_session.py
index 1dd82db1..1ba11556 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -10,12 +10,12 @@ from aurweb.models.session import Session, generate_unique_sid
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
 
-user = session = None
+account_type = user = session = None
 
 
 @pytest.fixture(autouse=True)
 def setup():
-    global user, session
+    global account_type, user, session
 
     setup_test_db("Users", "Sessions")
 
@@ -35,7 +35,10 @@ def test_session():
 
 def test_session_cs():
     """ Test case sensitivity of the database table. """
-    session_cs = create(Session, UsersID=user.ID,
+    user2 = create(User, Username="test2", Email="test2@example.org",
+                   ResetKey="testReset2", Passwd="testPassword",
+                   AccountType=account_type)
+    session_cs = create(Session, UsersID=user2.ID,
                         SessionID="TESTSESSION",
                         LastUpdateTS=datetime.utcnow().timestamp())
     assert session_cs.SessionID == "TESTSESSION"

From 5de7ff64df0dc33a20999ae7042ff04a77451819 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 10 Jun 2021 13:55:07 -0700
Subject: [PATCH 157/844] add PackageVote SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_vote.py | 53 ++++++++++++++++++++++++++++++++
 test/test_package_vote.py     | 58 +++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 aurweb/models/package_vote.py
 create mode 100644 test/test_package_vote.py

diff --git a/aurweb/models/package_vote.py b/aurweb/models/package_vote.py
new file mode 100644
index 00000000..55a9ecbb
--- /dev/null
+++ b/aurweb/models/package_vote.py
@@ -0,0 +1,53 @@
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import backref, relationship
+
+import aurweb.models.package_base
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
+
+
+class PackageVote(Base):
+    __tablename__ = "PackageVotes"
+
+    UsersID = Column(
+        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
+        nullable=False)
+    User = relationship(
+        "User", backref=backref("package_votes", lazy="dynamic"),
+        foreign_keys=[UsersID])
+
+    PackageBaseID = Column(
+        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
+        nullable=False)
+    PackageBase = relationship(
+        "PackageBase", backref=backref("package_votes", lazy="dynamic"),
+        foreign_keys=[PackageBaseID])
+
+    __mapper_args__ = {"primary_key": [UsersID, PackageBaseID]}
+
+    def __init__(self,
+                 User: aurweb.models.user.User = None,
+                 PackageBase: aurweb.models.package_base.PackageBase = None,
+                 VoteTS: int = None):
+        self.User = User
+        if not self.User:
+            raise IntegrityError(
+                statement="Foreign key UsersID cannot be null.",
+                orig="PackageVotes.UsersID",
+                params=("NULL"))
+
+        self.PackageBase = PackageBase
+        if not self.PackageBase:
+            raise IntegrityError(
+                statement="Foreign key PackageBaseID cannot be null.",
+                orig="PackageVotes.PackageBaseID",
+                params=("NULL"))
+
+        self.VoteTS = VoteTS
+        if not self.VoteTS:
+            raise IntegrityError(
+                statement="Column VoteTS cannot be null.",
+                orig="PackageVotes.VoteTS",
+                params=("NULL"))
diff --git a/test/test_package_vote.py b/test/test_package_vote.py
new file mode 100644
index 00000000..b352bf11
--- /dev/null
+++ b/test/test_package_vote.py
@@ -0,0 +1,58 @@
+from datetime import datetime
+
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query, rollback
+from aurweb.models.account_type import AccountType
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_vote import PackageVote
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase
+
+    setup_test_db("Users", "PackageBases", "PackageVotes")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    print(account_type.ID)
+    print(account_type.AccountType)
+
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword")
+    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+
+
+def test_package_vote_creation():
+    ts = int(datetime.utcnow().timestamp())
+    package_vote = create(PackageVote, User=user, PackageBase=pkgbase,
+                          VoteTS=ts)
+    assert bool(package_vote)
+    assert package_vote.User == user
+    assert package_vote.PackageBase == pkgbase
+    assert package_vote.VoteTS == ts
+
+
+def test_package_vote_null_user_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageVote, PackageBase=pkgbase, VoteTS=1)
+    rollback()
+
+
+def test_package_vote_null_pkgbase_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageVote, User=user, VoteTS=1)
+    rollback()
+
+
+def test_package_vote_null_votets_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageVote, User=user, PackageBase=pkgbase)
+    rollback()

From d18cfad63eeaab54fd21d386a769d85067153f8f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 10 Jun 2021 14:18:39 -0700
Subject: [PATCH 158/844] use djangos method of wiping sqlite3 tables

Django uses a reference graph to determine the order
in table deletions that occur. Do the same here.

This commit also adds in the `REGEXP` sqlite function,
exactly how Django uses it in its reference graphing.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py               | 24 +++++++++++++++++++++++-
 aurweb/testing/__init__.py | 36 ++++++++++++++++++++++++++++++++++++
 test/test_db.py            |  3 +++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 9837c746..04c8653a 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -1,4 +1,8 @@
+import functools
 import math
+import re
+
+from sqlalchemy import event
 
 import aurweb.config
 import aurweb.util
@@ -129,13 +133,31 @@ def get_engine(echo: bool = False):
 
     if engine is None:
         connect_args = dict()
-        if aurweb.config.get("database", "backend") == "sqlite":
+
+        db_backend = aurweb.config.get("database", "backend")
+        if db_backend == "sqlite":
             # check_same_thread is for a SQLite technicality
             # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
             connect_args["check_same_thread"] = False
+
         engine = create_engine(get_sqlalchemy_url(),
                                connect_args=connect_args,
                                echo=echo)
+
+        if db_backend == "sqlite":
+            # For SQLite, we need to add some custom functions as
+            # they are used in the reference graph method.
+            def regexp(regex, item):
+                return bool(re.search(regex, str(item)))
+
+            @event.listens_for(engine, "begin")
+            def do_begin(conn):
+                create_deterministic_function = functools.partial(
+                    conn.connection.create_function,
+                    deterministic=True
+                )
+                create_deterministic_function("REGEXP", 2, regexp)
+
         Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
         session = Session()
 
diff --git a/aurweb/testing/__init__.py b/aurweb/testing/__init__.py
index 02c21a4c..90d46720 100644
--- a/aurweb/testing/__init__.py
+++ b/aurweb/testing/__init__.py
@@ -1,6 +1,28 @@
+from itertools import chain
+
 import aurweb.db
 
 
+def references_graph(table):
+    """ Taken from Django's sqlite3/operations.py. """
+    query = """
+    WITH tables AS (
+    SELECT :table name
+    UNION
+    SELECT sqlite_master.name
+    FROM sqlite_master
+    JOIN tables ON (sql REGEXP :regexp_1 || tables.name || :regexp_2)
+    ) SELECT name FROM tables;
+    """
+    params = {
+        "table": table,
+        "regexp_1": r'(?i)\s+references\s+("|\')?',
+        "regexp_2": r'("|\')?\s*\(',
+    }
+    cursor = aurweb.db.session.execute(query, params=params)
+    return [row[0] for row in cursor.fetchall()]
+
+
 def setup_test_db(*args):
     """ This function is to be used to setup a test database before
     using it. It takes a variable number of table strings, and for
@@ -25,8 +47,22 @@ def setup_test_db(*args):
     aurweb.db.get_engine()
 
     tables = list(args)
+
+    db_backend = aurweb.config.get("database", "backend")
+
+    if db_backend != "sqlite":
+        aurweb.db.session.execute("SET FOREIGN_KEY_CHECKS = 0")
+    else:
+        # We're using sqlite, setup tables to be deleted without violating
+        # foreign key constraints by graphing references.
+        tables = set(chain.from_iterable(
+            references_graph(table) for table in tables))
+
     for table in tables:
         aurweb.db.session.execute(f"DELETE FROM {table}")
 
+    if db_backend != "sqlite":
+        aurweb.db.session.execute("SET FOREIGN_KEY_CHECKS = 1")
+
     # Expunge all objects from SQLAlchemy's IdentityMap.
     aurweb.db.session.expunge_all()
diff --git a/test/test_db.py b/test/test_db.py
index 3911134f..9298c53d 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -200,6 +200,9 @@ def test_connection_execute_paramstyle_format():
             aurweb.db.kill_engine()
             aurweb.initdb.run(Args())
 
+            # Test SQLite route of clearing tables.
+            setup_test_db("Users", "Bans")
+
             conn = db.Connection()
 
             # First, test ? to %s format replacement.

From 11c4926502e0767ee2435a79dd1c8ecaee727086 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 10 Jun 2021 17:46:29 -0700
Subject: [PATCH 159/844] add PackageSource SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_source.py | 31 +++++++++++++++++++++++
 test/test_package_source.py     | 44 +++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 aurweb/models/package_source.py
 create mode 100644 test/test_package_source.py

diff --git a/aurweb/models/package_source.py b/aurweb/models/package_source.py
new file mode 100644
index 00000000..4ffa23df
--- /dev/null
+++ b/aurweb/models/package_source.py
@@ -0,0 +1,31 @@
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import backref, relationship
+
+import aurweb.models.package
+
+from aurweb.models.declarative import Base
+
+
+class PackageSource(Base):
+    __tablename__ = "PackageSources"
+
+    PackageID = Column(Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
+                       nullable=False)
+    Package = relationship(
+        "Package", backref=backref("package_sources", lazy="dynamic"),
+        foreign_keys=[PackageID])
+
+    __mapper_args__ = {"primary_key": [PackageID]}
+
+    def __init__(self,
+                 Package: aurweb.models.package.Package = None,
+                 **kwargs):
+        super().__init__(**kwargs)
+
+        self.Package = Package
+        if not self.Package:
+            raise IntegrityError(
+                statement="Foreign key PackageID cannot be null.",
+                orig="PackageSources.PackageID",
+                params=("NULL"))
diff --git a/test/test_package_source.py b/test/test_package_source.py
new file mode 100644
index 00000000..7453f756
--- /dev/null
+++ b/test/test_package_source.py
@@ -0,0 +1,44 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query, rollback
+from aurweb.models.account_type import AccountType
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_source import PackageSource
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = package = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase, package
+
+    setup_test_db("PackageSources", "Packages", "PackageBases", "Users")
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
+    pkgbase = create(PackageBase,
+                     Name="test-package",
+                     Maintainer=user)
+    package = create(Package, PackageBase=pkgbase, Name="test-package")
+
+
+def test_package_source():
+    pkgsource = create(PackageSource, Package=package)
+    assert pkgsource.Package == package
+    # By default, PackageSources.Source assigns the string '/dev/null'.
+    assert pkgsource.Source == "/dev/null"
+    assert pkgsource.SourceArch is None
+
+
+def test_package_source_null_package_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageSource)
+    rollback()

From fc28c1e5fd137ab36786eae864a19617bdce90e6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 00:35:18 -0700
Subject: [PATCH 160/844] add PackageComment SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_comment.py | 72 ++++++++++++++++++++++++++++++++
 test/test_package_comment.py     | 63 ++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 aurweb/models/package_comment.py
 create mode 100644 test/test_package_comment.py

diff --git a/aurweb/models/package_comment.py b/aurweb/models/package_comment.py
new file mode 100644
index 00000000..42a0661d
--- /dev/null
+++ b/aurweb/models/package_comment.py
@@ -0,0 +1,72 @@
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import backref, relationship
+
+import aurweb.models.package_base
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
+
+
+class PackageComment(Base):
+    __tablename__ = "PackageComments"
+
+    ID = Column(Integer, primary_key=True)
+
+    PackageBaseID = Column(
+        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
+        nullable=False)
+    PackageBase = relationship(
+        "PackageBase", backref=backref("comments", lazy="dynamic"),
+        foreign_keys=[PackageBaseID])
+
+    UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
+    User = relationship(
+        "User", backref=backref("package_comments", lazy="dynamic"),
+        foreign_keys=[UsersID])
+
+    EditedUsersID = Column(
+        Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
+    Editor = relationship(
+        "User", backref=backref("edited_comments", lazy="dynamic"),
+        foreign_keys=[EditedUsersID])
+
+    DelUsersID = Column(
+        Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
+    Deleter = relationship(
+        "User", backref=backref("deleted_comments", lazy="dynamic"),
+        foreign_keys=[DelUsersID])
+
+    __mapper_args__ = {"primary_key": [ID]}
+
+    def __init__(self,
+                 PackageBase: aurweb.models.package_base.PackageBase = None,
+                 User: aurweb.models.user.User = None,
+                 **kwargs):
+        super().__init__(**kwargs)
+
+        self.PackageBase = PackageBase
+        if not self.PackageBase:
+            raise IntegrityError(
+                statement="Foreign key PackageBaseID cannot be null.",
+                orig="PackageComments.PackageBaseID",
+                params=("NULL"))
+
+        self.User = User
+        if not self.User:
+            raise IntegrityError(
+                statement="Foreign key UsersID cannot be null.",
+                orig="PackageComments.UsersID",
+                params=("NULL"))
+
+        if self.Comments is None:
+            raise IntegrityError(
+                statement="Column Comments cannot be null.",
+                orig="PackageComments.Comments",
+                params=("NULL"))
+
+        if self.RenderedComment is None:
+            raise IntegrityError(
+                statement="Column RenderedComment cannot be null.",
+                orig="PackageComments.RenderedComment",
+                params=("NULL"))
diff --git a/test/test_package_comment.py b/test/test_package_comment.py
new file mode 100644
index 00000000..fb734071
--- /dev/null
+++ b/test/test_package_comment.py
@@ -0,0 +1,63 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query, rollback
+from aurweb.models.account_type import AccountType
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comment import PackageComment
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db("PackageBases", "PackageComments", "Users")
+
+    global user, pkgbase
+
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=account_type)
+    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+
+
+def test_package_comment_creation():
+    package_comment = create(PackageComment,
+                             PackageBase=pkgbase,
+                             User=user,
+                             Comments="Test comment.",
+                             RenderedComment="Test rendered comment.")
+    assert bool(package_comment.ID)
+
+
+def test_package_comment_null_package_base_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageComment, User=user, Comments="Test comment.",
+               RenderedComment="Test rendered comment.")
+    rollback()
+
+
+def test_package_comment_null_user_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageComment, PackageBase=pkgbase, Comments="Test comment.",
+               RenderedComment="Test rendered comment.")
+    rollback()
+
+
+def test_package_comment_null_comments_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageComment, PackageBase=pkgbase, User=user,
+               RenderedComment="Test rendered comment.")
+    rollback()
+
+
+def test_package_comment_null_renderedcomment_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageComment, PackageBase=pkgbase, User=user,
+               Comments="Test comment.")
+    rollback()

From ebd216edfd4f78db864f044fdc10d13cdc7b20b9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 16:52:45 -0700
Subject: [PATCH 161/844] add PackageComaintainer SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_comaintainer.py | 53 +++++++++++++++++++++++++++
 test/test_package_comaintainer.py     | 49 +++++++++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 aurweb/models/package_comaintainer.py
 create mode 100644 test/test_package_comaintainer.py

diff --git a/aurweb/models/package_comaintainer.py b/aurweb/models/package_comaintainer.py
new file mode 100644
index 00000000..88fd58ae
--- /dev/null
+++ b/aurweb/models/package_comaintainer.py
@@ -0,0 +1,53 @@
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import backref, relationship
+
+import aurweb.models.package_base
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
+
+
+class PackageComaintainer(Base):
+    __tablename__ = "PackageComaintainers"
+
+    UsersID = Column(
+        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
+        nullable=False)
+    User = relationship(
+        "User", backref=backref("comaintained", lazy="dynamic"),
+        foreign_keys=[UsersID])
+
+    PackageBaseID = Column(
+        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
+        nullable=False)
+    PackageBase = relationship(
+        "PackageBase", backref=backref("comaintainers", lazy="dynamic"),
+        foreign_keys=[PackageBaseID])
+
+    __mapper_args__ = {"primary_key": [UsersID, PackageBaseID]}
+
+    def __init__(self,
+                 User: aurweb.models.user.User = None,
+                 PackageBase: aurweb.models.package_base.PackageBase = None,
+                 Priority: int = None):
+        self.User = User
+        if not self.User:
+            raise IntegrityError(
+                statement="Foreign key UsersID cannot be null.",
+                orig="PackageComaintainers.UsersID",
+                params=("NULL"))
+
+        self.PackageBase = PackageBase
+        if not self.PackageBase:
+            raise IntegrityError(
+                statement="Foreign key PackageBaseID cannot be null.",
+                orig="PackageComaintainers.PackageBaseID",
+                params=("NULL"))
+
+        self.Priority = Priority
+        if not self.Priority:
+            raise IntegrityError(
+                statement="Column Priority cannot be null.",
+                orig="PackageComaintainers.Priority",
+                params=("NULL"))
diff --git a/test/test_package_comaintainer.py b/test/test_package_comaintainer.py
new file mode 100644
index 00000000..ac94a9ba
--- /dev/null
+++ b/test/test_package_comaintainer.py
@@ -0,0 +1,49 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, rollback
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comaintainer import PackageComaintainer
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase
+
+    setup_test_db("Users", "PackageBases", "PackageComaintainers")
+
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword")
+    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+
+
+def test_package_comaintainer_creation():
+    package_comaintainer = create(PackageComaintainer, User=user, PackageBase=pkgbase,
+                                  Priority=5)
+    assert bool(package_comaintainer)
+    assert package_comaintainer.User == user
+    assert package_comaintainer.PackageBase == pkgbase
+    assert package_comaintainer.Priority == 5
+
+
+def test_package_comaintainer_null_user_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageComaintainer, PackageBase=pkgbase, Priority=1)
+    rollback()
+
+
+def test_package_comaintainer_null_pkgbase_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageComaintainer, User=user, Priority=1)
+    rollback()
+
+
+def test_package_comaintainer_null_priority_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageComaintainer, User=user, PackageBase=pkgbase)
+    rollback()

From 229df1adefb709959e70754845ed1bc65501064c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 16:56:15 -0700
Subject: [PATCH 162/844] test_package_vote: remove useless stuff

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_vote.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test/test_package_vote.py b/test/test_package_vote.py
index b352bf11..cb15e217 100644
--- a/test/test_package_vote.py
+++ b/test/test_package_vote.py
@@ -4,8 +4,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query, rollback
-from aurweb.models.account_type import AccountType
+from aurweb.db import create, rollback
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.user import User
@@ -20,11 +19,6 @@ def setup():
 
     setup_test_db("Users", "PackageBases", "PackageVotes")
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    print(account_type.ID)
-    print(account_type.AccountType)
-
     user = create(User, Username="test", Email="test@example.org",
                   RealName="Test User", Passwd="testPassword")
     pkgbase = create(PackageBase, Name="test-package", Maintainer=user)

From 5b856c7af2e023d24ca7ad0208f537aff45239db Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 17:14:28 -0700
Subject: [PATCH 163/844] add PackageNotification SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_notification.py | 47 +++++++++++++++++++++++++++
 test/test_package_notification.py     | 42 ++++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 aurweb/models/package_notification.py
 create mode 100644 test/test_package_notification.py

diff --git a/aurweb/models/package_notification.py b/aurweb/models/package_notification.py
new file mode 100644
index 00000000..ab23a212
--- /dev/null
+++ b/aurweb/models/package_notification.py
@@ -0,0 +1,47 @@
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import backref, relationship
+
+import aurweb.models.package_base
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
+
+
+class PackageNotification(Base):
+    __tablename__ = "PackageNotifications"
+
+    UserID = Column(
+        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
+        nullable=False)
+    User = relationship(
+        "User", backref=backref("package_notifications", lazy="dynamic"),
+        foreign_keys=[UserID])
+
+    PackageBaseID = Column(
+        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
+        nullable=False)
+    PackageBase = relationship(
+        "PackageBase",
+        backref=backref("package_notifications", lazy="dynamic"),
+        foreign_keys=[PackageBaseID])
+
+    __mapper_args__ = {"primary_key": [UserID, PackageBaseID]}
+
+    def __init__(self,
+                 User: aurweb.models.user.User = None,
+                 PackageBase: aurweb.models.package_base.PackageBase = None,
+                 NotificationTS: int = None):
+        self.User = User
+        if not self.User:
+            raise IntegrityError(
+                statement="Foreign key UserID cannot be null.",
+                orig="PackageNotifications.UserID",
+                params=("NULL"))
+
+        self.PackageBase = PackageBase
+        if not self.PackageBase:
+            raise IntegrityError(
+                statement="Foreign key PackageBaseID cannot be null.",
+                orig="PackageNotifications.PackageBaseID",
+                params=("NULL"))
diff --git a/test/test_package_notification.py b/test/test_package_notification.py
new file mode 100644
index 00000000..2898a904
--- /dev/null
+++ b/test/test_package_notification.py
@@ -0,0 +1,42 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, rollback
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase
+
+    setup_test_db("Users", "PackageBases", "PackageNotifications")
+
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword")
+    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+
+
+def test_package_notification_creation():
+    package_notification = create(PackageNotification, User=user,
+                                  PackageBase=pkgbase)
+    assert bool(package_notification)
+    assert package_notification.User == user
+    assert package_notification.PackageBase == pkgbase
+
+
+def test_package_notification_null_user_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageNotification, PackageBase=pkgbase)
+    rollback()
+
+
+def test_package_notification_null_pkgbase_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageNotification, User=user)
+    rollback()

From 163e4d738999932fb7e109aba48170c8f2526ca6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 17:15:18 -0700
Subject: [PATCH 164/844] test_package_comaintainer: sanitize newlines

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_comaintainer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_package_comaintainer.py b/test/test_package_comaintainer.py
index ac94a9ba..cba99ba0 100644
--- a/test/test_package_comaintainer.py
+++ b/test/test_package_comaintainer.py
@@ -23,8 +23,8 @@ def setup():
 
 
 def test_package_comaintainer_creation():
-    package_comaintainer = create(PackageComaintainer, User=user, PackageBase=pkgbase,
-                                  Priority=5)
+    package_comaintainer = create(PackageComaintainer, User=user,
+                                  PackageBase=pkgbase, Priority=5)
     assert bool(package_comaintainer)
     assert package_comaintainer.User == user
     assert package_comaintainer.PackageBase == pkgbase

From 511f174c8ba704b3cf53ae47fcf56e55c74026f8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 17:28:08 -0700
Subject: [PATCH 165/844] add PackageBlacklist SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_blacklist.py | 20 ++++++++++++++++++
 test/test_package_blacklist.py     | 34 ++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 aurweb/models/package_blacklist.py
 create mode 100644 test/test_package_blacklist.py

diff --git a/aurweb/models/package_blacklist.py b/aurweb/models/package_blacklist.py
new file mode 100644
index 00000000..7702c877
--- /dev/null
+++ b/aurweb/models/package_blacklist.py
@@ -0,0 +1,20 @@
+from sqlalchemy import Column, Integer
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.models.declarative import Base
+
+
+class PackageBlacklist(Base):
+    __tablename__ = "PackageBlacklist"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
+
+    def __init__(self, Name: str = None):
+        self.Name = Name
+        if not self.Name:
+            raise IntegrityError(
+                statement="Column Name cannot be null.",
+                orig="PackageBlacklist.Name",
+                params=("NULL"))
diff --git a/test/test_package_blacklist.py b/test/test_package_blacklist.py
new file mode 100644
index 00000000..3c64cc21
--- /dev/null
+++ b/test/test_package_blacklist.py
@@ -0,0 +1,34 @@
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, rollback
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_blacklist import PackageBlacklist
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase
+
+    setup_test_db("PackageBlacklist", "PackageBases", "Users")
+
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword")
+    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+
+
+def test_package_blacklist_creation():
+    package_blacklist = create(PackageBlacklist, Name="evil-package")
+    assert bool(package_blacklist.ID)
+    assert package_blacklist.Name == "evil-package"
+
+
+def test_package_blacklist_null_name_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageBlacklist)
+    rollback()

From 3bf4b3717a6baed1326168053daf5f374a6e5003 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 17:37:51 -0700
Subject: [PATCH 166/844] add RequestType SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/request_type.py | 11 +++++++++++
 test/test_request_type.py     | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 aurweb/models/request_type.py
 create mode 100644 test/test_request_type.py

diff --git a/aurweb/models/request_type.py b/aurweb/models/request_type.py
new file mode 100644
index 00000000..2c8276e8
--- /dev/null
+++ b/aurweb/models/request_type.py
@@ -0,0 +1,11 @@
+from sqlalchemy import Column, Integer
+
+from aurweb.models.declarative import Base
+
+
+class RequestType(Base):
+    __tablename__ = "RequestTypes"
+
+    ID = Column(Integer, primary_key=True)
+
+    __mapper_args__ = {"primary_key": [ID]}
diff --git a/test/test_request_type.py b/test/test_request_type.py
new file mode 100644
index 00000000..a470a60b
--- /dev/null
+++ b/test/test_request_type.py
@@ -0,0 +1,24 @@
+import pytest
+
+from aurweb.db import create, delete
+from aurweb.models.request_type import RequestType
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db()
+
+
+def test_request_type_creation():
+    request_type = create(RequestType, Name="Test Request")
+    assert bool(request_type.ID)
+    assert request_type.Name == "Test Request"
+    delete(RequestType, RequestType.ID == request_type.ID)
+
+
+def test_request_type_null_name_returns_empty_string():
+    request_type = create(RequestType)
+    assert bool(request_type.ID)
+    assert request_type.Name == str()
+    delete(RequestType, RequestType.ID == request_type.ID)

From 65ff0e76da9ea6cf7ba382e38414424148d7c487 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 19:57:52 -0700
Subject: [PATCH 167/844] aurweb.schema: Fix off-by-one String impls of DECIMAL

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/schema.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/schema.py b/aurweb/schema.py
index 9caf6374..fb8f0dee 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -109,7 +109,7 @@ PackageBases = Table(
     Column('NumVotes', INTEGER(unsigned=True), nullable=False, server_default=text("0")),
     Column('Popularity',
            DECIMAL(10, 6, unsigned=True)
-           if db_backend == "mysql" else String(16),  # Stubbed out to test.
+           if db_backend == "mysql" else String(17),
            nullable=False, server_default=text("0")),
     Column('OutOfDateTS', BIGINT(unsigned=True)),
     Column('FlaggerComment', Text, nullable=False),
@@ -388,7 +388,7 @@ TU_VoteInfo = Table(
     Column('End', BIGINT(unsigned=True), nullable=False),
     Column('Quorum',
            DECIMAL(2, 2, unsigned=True)
-           if db_backend == "mysql" else String(4),
+           if db_backend == "mysql" else String(5),
            nullable=False),
     Column('SubmitterID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
     Column('Yes', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),

From 809939ab03c5192d9f06d2ffa138d4e064fd0b35 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 20:36:32 -0700
Subject: [PATCH 168/844] add TUVoteInfo SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/tu_voteinfo.py |  74 +++++++++++++++++++++++
 test/test_tu_voteinfo.py     | 111 +++++++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+)
 create mode 100644 aurweb/models/tu_voteinfo.py
 create mode 100644 test/test_tu_voteinfo.py

diff --git a/aurweb/models/tu_voteinfo.py b/aurweb/models/tu_voteinfo.py
new file mode 100644
index 00000000..2225b4d7
--- /dev/null
+++ b/aurweb/models/tu_voteinfo.py
@@ -0,0 +1,74 @@
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import backref, relationship
+
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
+
+
+class TUVoteInfo(Base):
+    __tablename__ = "TU_VoteInfo"
+
+    ID = Column(Integer, primary_key=True)
+
+    SubmitterID = Column(
+        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
+        nullable=False)
+    Submitter = relationship(
+        "User", backref=backref("tu_voteinfo_set", lazy="dynamic"),
+        foreign_keys=[SubmitterID])
+
+    __mapper_args__ = {"primary_key": [ID]}
+
+    def __init__(self,
+                 Agenda: str = None,
+                 User: str = None,
+                 Submitted: int = None,
+                 End: int = None,
+                 Quorum: float = None,
+                 Submitter: aurweb.models.user.User = None,
+                 **kwargs):
+        super().__init__(**kwargs)
+
+        self.Agenda = Agenda
+        if self.Agenda is None:
+            raise IntegrityError(
+                statement="Column Agenda cannot be null.",
+                orig="TU_VoteInfo.Agenda",
+                params=("NULL"))
+
+        self.User = User
+        if self.User is None:
+            raise IntegrityError(
+                statement="Column User cannot be null.",
+                orig="TU_VoteInfo.User",
+                params=("NULL"))
+
+        self.Submitted = Submitted
+        if self.Submitted is None:
+            raise IntegrityError(
+                statement="Column Submitted cannot be null.",
+                orig="TU_VoteInfo.Submitted",
+                params=("NULL"))
+
+        self.End = End
+        if self.End is None:
+            raise IntegrityError(
+                statement="Column End cannot be null.",
+                orig="TU_VoteInfo.End",
+                params=("NULL"))
+
+        if Quorum is None:
+            raise IntegrityError(
+                statement="Column Quorum cannot be null.",
+                orig="TU_VoteInfo.Quorum",
+                params=("NULL"))
+        self.Quorum = str(Quorum)
+
+        self.Submitter = Submitter
+        if not self.Submitter:
+            raise IntegrityError(
+                statement="Foreign key SubmitterID cannot be null.",
+                orig="TU_VoteInfo.SubmitterID",
+                params=("NULL"))
diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
new file mode 100644
index 00000000..e95f174b
--- /dev/null
+++ b/test/test_tu_voteinfo.py
@@ -0,0 +1,111 @@
+from datetime import datetime
+
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query, rollback
+from aurweb.models.account_type import AccountType
+from aurweb.models.tu_voteinfo import TUVoteInfo
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user
+
+    setup_test_db("Users", "PackageBases", "TU_VoteInfo")
+
+    tu_type = query(AccountType,
+                    AccountType.AccountType == "Trusted User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=tu_type)
+
+
+def test_tu_voteinfo_creation():
+    ts = int(datetime.utcnow().timestamp())
+    tu_voteinfo = create(TUVoteInfo,
+                         Agenda="Blah blah.",
+                         User=user.Username,
+                         Submitted=ts, End=ts + 5,
+                         Quorum=0.5,
+                         Submitter=user)
+    assert bool(tu_voteinfo.ID)
+    assert tu_voteinfo.Agenda == "Blah blah."
+    assert tu_voteinfo.User == user.Username
+    assert tu_voteinfo.Submitted == ts
+    assert tu_voteinfo.End == ts + 5
+    assert float(tu_voteinfo.Quorum) == 0.5
+    assert tu_voteinfo.Submitter == user
+    assert tu_voteinfo.Yes == 0
+    assert tu_voteinfo.No == 0
+    assert tu_voteinfo.Abstain == 0
+    assert tu_voteinfo.ActiveTUs == 0
+
+    assert tu_voteinfo in user.tu_voteinfo_set
+
+
+def test_tu_voteinfo_null_submitter_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(TUVoteInfo,
+               Agenda="Blah blah.",
+               User=user.Username,
+               Submitted=0, End=0,
+               Quorum=0.50)
+    rollback()
+
+
+def test_tu_voteinfo_null_agenda_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(TUVoteInfo,
+               User=user.Username,
+               Submitted=0, End=0,
+               Quorum=0.50,
+               Submitter=user)
+    rollback()
+
+
+def test_tu_voteinfo_null_user_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(TUVoteInfo,
+               Agenda="Blah blah.",
+               Submitted=0, End=0,
+               Quorum=0.50,
+               Submitter=user)
+    rollback()
+
+
+def test_tu_voteinfo_null_submitted_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(TUVoteInfo,
+               Agenda="Blah blah.",
+               User=user.Username,
+               End=0,
+               Quorum=0.50,
+               Submitter=user)
+    rollback()
+
+
+def test_tu_voteinfo_null_end_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(TUVoteInfo,
+               Agenda="Blah blah.",
+               User=user.Username,
+               Submitted=0,
+               Quorum=0.50,
+               Submitter=user)
+    rollback()
+
+
+def test_tu_voteinfo_null_quorum_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(TUVoteInfo,
+               Agenda="Blah blah.",
+               User=user.Username,
+               Submitted=0, End=0,
+               Submitter=user)
+    rollback()

From 541c978ac4a7bdec79e1ce7359c23d0ff42723fd Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 19:14:33 -0700
Subject: [PATCH 169/844] add PackageRequest SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_request.py |  93 ++++++++++++++++++++++++
 test/test_package_request.py     | 119 +++++++++++++++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 aurweb/models/package_request.py
 create mode 100644 test/test_package_request.py

diff --git a/aurweb/models/package_request.py b/aurweb/models/package_request.py
new file mode 100644
index 00000000..00f46ce2
--- /dev/null
+++ b/aurweb/models/package_request.py
@@ -0,0 +1,93 @@
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import backref, relationship
+
+import aurweb.models.package_base
+import aurweb.models.request_type
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
+
+
+class PackageRequest(Base):
+    __tablename__ = "PackageRequests"
+
+    ID = Column(Integer, primary_key=True)
+
+    ReqTypeID = Column(
+        Integer, ForeignKey("RequestTypes.ID", ondelete="NO ACTION"),
+        nullable=False)
+    RequestType = relationship(
+        "RequestType", backref=backref("package_requests", lazy="dynamic"),
+        foreign_keys=[ReqTypeID])
+
+    UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
+    User = relationship(
+        "User", backref=backref("package_requests", lazy="dynamic"),
+        foreign_keys=[UsersID])
+
+    PackageBaseID = Column(
+        Integer, ForeignKey("PackageBases.ID", ondelete="SET NULL"),
+        nullable=False)
+    PackageBase = relationship(
+        "PackageBase", backref=backref("requests", lazy="dynamic"),
+        foreign_keys=[PackageBaseID])
+
+    ClosedUID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
+    Closer = relationship(
+        "User", backref=backref("closed_requests", lazy="dynamic"),
+        foreign_keys=[ClosedUID])
+
+    __mapper_args__ = {"primary_key": [ID]}
+
+    def __init__(self,
+                 RequestType: aurweb.models.request_type.RequestType = None,
+                 PackageBase: aurweb.models.package_base.PackageBase = None,
+                 PackageBaseName: str = None,
+                 User: aurweb.models.user.User = None,
+                 Comments: str = None,
+                 ClosureComment: str = None,
+                 **kwargs):
+        super().__init__(**kwargs)
+
+        self.RequestType = RequestType
+        if not self.RequestType:
+            raise IntegrityError(
+                statement="Foreign key ReqTypeID cannot be null.",
+                orig="PackageRequests.ReqTypeID",
+                params=("NULL"))
+
+        self.PackageBase = PackageBase
+        if not self.PackageBase:
+            raise IntegrityError(
+                statement="Foreign key PackageBaseID cannot be null.",
+                orig="PackageRequests.PackageBaseID",
+                params=("NULL"))
+
+        self.PackageBaseName = PackageBaseName
+        if not self.PackageBaseName:
+            raise IntegrityError(
+                statement="Column PackageBaseName cannot be null.",
+                orig="PackageRequests.PackageBaseName",
+                params=("NULL"))
+
+        self.User = User
+        if not self.User:
+            raise IntegrityError(
+                statement="Foreign key UsersID cannot be null.",
+                orig="PackageRequests.UsersID",
+                params=("NULL"))
+
+        self.Comments = Comments
+        if self.Comments is None:
+            raise IntegrityError(
+                statement="Column Comments cannot be null.",
+                orig="PackageRequests.Comments",
+                params=("NULL"))
+
+        self.ClosureComment = ClosureComment
+        if self.ClosureComment is None:
+            raise IntegrityError(
+                statement="Column ClosureComment cannot be null.",
+                orig="PackageRequests.ClosureComment",
+                params=("NULL"))
diff --git a/test/test_package_request.py b/test/test_package_request.py
new file mode 100644
index 00000000..fc839836
--- /dev/null
+++ b/test/test_package_request.py
@@ -0,0 +1,119 @@
+from datetime import datetime
+
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query, rollback
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_request import PackageRequest
+from aurweb.models.request_type import RequestType
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = pkgbase = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, pkgbase
+
+    setup_test_db("PackageRequests", "PackageBases", "Users")
+
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword")
+    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+
+
+def test_package_request_creation():
+    request_type = query(RequestType, RequestType.Name == "merge").first()
+    assert request_type.Name == "merge"
+
+    package_request = create(PackageRequest, RequestType=request_type,
+                             User=user, PackageBase=pkgbase,
+                             PackageBaseName=pkgbase.Name,
+                             Comments=str(), ClosureComment=str())
+
+    assert bool(package_request.ID)
+    assert package_request.RequestType == request_type
+    assert package_request.User == user
+    assert package_request.PackageBase == pkgbase
+    assert package_request.PackageBaseName == pkgbase.Name
+    assert package_request.Comments == str()
+    assert package_request.ClosureComment == str()
+
+    # Make sure that everything is cross-referenced with relationships.
+    assert package_request in request_type.package_requests
+    assert package_request in user.package_requests
+    assert package_request in pkgbase.requests
+
+
+def test_package_request_closed():
+    request_type = query(RequestType, RequestType.Name == "merge").first()
+    assert request_type.Name == "merge"
+
+    ts = int(datetime.utcnow().timestamp())
+    package_request = create(PackageRequest, RequestType=request_type,
+                             User=user, PackageBase=pkgbase,
+                             PackageBaseName=pkgbase.Name,
+                             Closer=user, ClosedTS=ts,
+                             Comments=str(), ClosureComment=str())
+
+    assert package_request.Closer == user
+    assert package_request.ClosedTS == ts
+
+    # Test relationships.
+    assert package_request in user.closed_requests
+
+
+def test_package_request_null_request_type_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(PackageRequest, User=user, PackageBase=pkgbase,
+               PackageBaseName=pkgbase.Name,
+               Comments=str(), ClosureComment=str())
+    rollback()
+
+
+def test_package_request_null_user_raises_exception():
+    request_type = query(RequestType, RequestType.Name == "merge").first()
+    with pytest.raises(IntegrityError):
+        create(PackageRequest, RequestType=request_type, PackageBase=pkgbase,
+               PackageBaseName=pkgbase.Name,
+               Comments=str(), ClosureComment=str())
+    rollback()
+
+
+def test_package_request_null_package_base_raises_exception():
+    request_type = query(RequestType, RequestType.Name == "merge").first()
+    with pytest.raises(IntegrityError):
+        create(PackageRequest, RequestType=request_type,
+               User=user, PackageBaseName=pkgbase.Name,
+               Comments=str(), ClosureComment=str())
+    rollback()
+
+
+def test_package_request_null_package_base_name_raises_exception():
+    request_type = query(RequestType, RequestType.Name == "merge").first()
+    with pytest.raises(IntegrityError):
+        create(PackageRequest, RequestType=request_type,
+               User=user, PackageBase=pkgbase,
+               Comments=str(), ClosureComment=str())
+    rollback()
+
+
+def test_package_request_null_comments_raises_exception():
+    request_type = query(RequestType, RequestType.Name == "merge").first()
+    with pytest.raises(IntegrityError):
+        create(PackageRequest, RequestType=request_type,
+               User=user, PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+               ClosureComment=str())
+    rollback()
+
+
+def test_package_request_null_closure_comment_raises_exception():
+    request_type = query(RequestType, RequestType.Name == "merge").first()
+    with pytest.raises(IntegrityError):
+        create(PackageRequest, RequestType=request_type,
+               User=user, PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+               Comments=str())
+    rollback()

From 8c345a04488a07b9836cff9559bb17722b5fc77e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 21:48:39 -0700
Subject: [PATCH 170/844] TUVoteInfo: generalize Quorum

SQLite does not support native DECIMAL columns, and for that
reason, we had to switch to using Strings that can hold the data
in the case we are using sqlite.

This commit sets the TUVoteInfo model up in a generic way, that
it always converts to string when setting Quorum (OK for DECIMAL)
and always converts to float when getting Quorum.

This way, we can treat TUVoteInfo.Quorum as the same thing
everywhere.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/tu_voteinfo.py | 15 ++++++++++++++-
 test/test_tu_voteinfo.py     |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/tu_voteinfo.py b/aurweb/models/tu_voteinfo.py
index 2225b4d7..a246f132 100644
--- a/aurweb/models/tu_voteinfo.py
+++ b/aurweb/models/tu_voteinfo.py
@@ -1,3 +1,5 @@
+import typing
+
 from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
@@ -64,7 +66,7 @@ class TUVoteInfo(Base):
                 statement="Column Quorum cannot be null.",
                 orig="TU_VoteInfo.Quorum",
                 params=("NULL"))
-        self.Quorum = str(Quorum)
+        self.Quorum = Quorum
 
         self.Submitter = Submitter
         if not self.Submitter:
@@ -72,3 +74,14 @@ class TUVoteInfo(Base):
                 statement="Foreign key SubmitterID cannot be null.",
                 orig="TU_VoteInfo.SubmitterID",
                 params=("NULL"))
+
+    def __setattr__(self, key: str, value: typing.Any):
+        """ Customize setattr to stringify any Quorum keys given. """
+        if key == "Quorum":
+            value = str(value)
+        return super().__setattr__(key, value)
+
+    def __getattribute__(self, key: str):
+        """ Customize getattr to floatify any fetched Quorum values. """
+        attr = super().__getattribute__(key)
+        return float(attr) if key == "Quorum" else attr
diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index e95f174b..37609efd 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -39,7 +39,7 @@ def test_tu_voteinfo_creation():
     assert tu_voteinfo.User == user.Username
     assert tu_voteinfo.Submitted == ts
     assert tu_voteinfo.End == ts + 5
-    assert float(tu_voteinfo.Quorum) == 0.5
+    assert tu_voteinfo.Quorum == 0.5
     assert tu_voteinfo.Submitter == user
     assert tu_voteinfo.Yes == 0
     assert tu_voteinfo.No == 0

From 0c1241f8bbe53b587cb149d0daee32731bffed46 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 22:14:38 -0700
Subject: [PATCH 171/844] add TUVote SQLAlchemy ORM model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/tu_vote.py | 43 ++++++++++++++++++++++++++++++
 test/test_tu_vote.py     | 56 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 aurweb/models/tu_vote.py
 create mode 100644 test/test_tu_vote.py

diff --git a/aurweb/models/tu_vote.py b/aurweb/models/tu_vote.py
new file mode 100644
index 00000000..2b7bf2d0
--- /dev/null
+++ b/aurweb/models/tu_vote.py
@@ -0,0 +1,43 @@
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import backref, relationship
+
+import aurweb.models.tu_voteinfo
+import aurweb.models.user
+
+from aurweb.models.declarative import Base
+
+
+class TUVote(Base):
+    __tablename__ = "TU_Votes"
+
+    VoteID = Column(Integer, ForeignKey("TU_VoteInfo.ID", ondelete="CASCADE"),
+                    nullable=False)
+    VoteInfo = relationship(
+        "TUVoteInfo", backref=backref("tu_votes", lazy="dynamic"),
+        foreign_keys=[VoteID])
+
+    UserID = Column(Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
+                    nullable=False)
+    User = relationship(
+        "User", backref=backref("tu_votes", lazy="dynamic"),
+        foreign_keys=[UserID])
+
+    __mapper_args__ = {"primary_key": [VoteID, UserID]}
+
+    def __init__(self,
+                 VoteInfo: aurweb.models.tu_voteinfo.TUVoteInfo = None,
+                 User: aurweb.models.user.User = None):
+        self.VoteInfo = VoteInfo
+        if self.VoteInfo is None:
+            raise IntegrityError(
+                statement="Foreign key VoteID cannot be null.",
+                orig="TU_Votes.VoteID",
+                params=("NULL"))
+
+        self.User = User
+        if self.User is None:
+            raise IntegrityError(
+                statement="Foreign key UserID cannot be null.",
+                orig="TU_Votes.UserID",
+                params=("NULL"))
diff --git a/test/test_tu_vote.py b/test/test_tu_vote.py
new file mode 100644
index 00000000..9ff4a8d9
--- /dev/null
+++ b/test/test_tu_vote.py
@@ -0,0 +1,56 @@
+from datetime import datetime
+
+import pytest
+
+from sqlalchemy.exc import IntegrityError
+
+from aurweb.db import create, query, rollback
+from aurweb.models.account_type import AccountType
+from aurweb.models.tu_vote import TUVote
+from aurweb.models.tu_voteinfo import TUVoteInfo
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+user = tu_voteinfo = None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    global user, tu_voteinfo
+
+    setup_test_db("Users", "TU_VoteInfo", "TU_Votes")
+
+    tu_type = query(AccountType,
+                    AccountType.AccountType == "Trusted User").first()
+    user = create(User, Username="test", Email="test@example.org",
+                  RealName="Test User", Passwd="testPassword",
+                  AccountType=tu_type)
+
+    ts = int(datetime.utcnow().timestamp())
+    tu_voteinfo = create(TUVoteInfo,
+                         Agenda="Blah blah.",
+                         User=user.Username,
+                         Submitted=ts, End=ts + 5,
+                         Quorum=0.5,
+                         Submitter=user)
+
+
+def test_tu_vote_creation():
+    tu_vote = create(TUVote, User=user, VoteInfo=tu_voteinfo)
+    assert tu_vote.VoteInfo == tu_voteinfo
+    assert tu_vote.User == user
+
+    assert tu_vote in user.tu_votes
+    assert tu_vote in tu_voteinfo.tu_votes
+
+
+def test_tu_vote_null_user_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(TUVote, VoteInfo=tu_voteinfo)
+    rollback()
+
+
+def test_tu_vote_null_voteinfo_raises_exception():
+    with pytest.raises(IntegrityError):
+        create(TUVote, User=user)
+    rollback()

From 18ec8e3cc8ca3e18f87c1b892b68a0857be39597 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Fri, 20 Nov 2020 00:19:15 +0100
Subject: [PATCH 172/844] RSS: Add ability to specify isPermaLink="false" for
 GUID

---
 web/lib/feedcreator.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/lib/feedcreator.class.php b/web/lib/feedcreator.class.php
index a1fe24c9..bfc29b20 100644
--- a/web/lib/feedcreator.class.php
+++ b/web/lib/feedcreator.class.php
@@ -183,7 +183,7 @@ class FeedItem extends HtmlDescribable {
 	/**
 	 * Optional attributes of an item.
 	 */
-	var $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
+	var $author, $authorEmail, $image, $category, $comments, $guid, $guidIsPermaLink, $source, $creator;
 
 	/**
 	 * Publishing date of an item. May be in one of the following formats:
@@ -995,7 +995,11 @@ class RSSCreator091 extends FeedCreator {
 				$feed.= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
 			}
 			if ($this->items[$i]->guid!="") {
-				$feed.= "            <guid>".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
+				$feed.= "            <guid";
+				if ($this->items[$i]->guidIsPermaLink == false) {
+					$feed.= " isPermaLink=\"false\"";
+				}
+				$feed.= ">".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
 			}
 			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
 			$feed.= "        </item>\n";

From 2bb30f9bf53446189b6079ac349acc82909c3a49 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Fri, 20 Nov 2020 00:19:54 +0100
Subject: [PATCH 173/844] Add RSS feed for modified packages

---
 web/html/modified-rss.php | 62 +++++++++++++++++++++++++++++++++++++++
 web/lib/pkgfuncs.inc.php  | 17 +++++++++--
 web/lib/routing.inc.php   |  1 +
 3 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 web/html/modified-rss.php

diff --git a/web/html/modified-rss.php b/web/html/modified-rss.php
new file mode 100644
index 00000000..4c5c47e0
--- /dev/null
+++ b/web/html/modified-rss.php
@@ -0,0 +1,62 @@
+<?php
+
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+include_once("aur.inc.php");
+include_once("pkgfuncs.inc.php");
+include_once("feedcreator.class.php");
+
+#detect prefix
+$protocol = isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"]=='on' ? "https" : "http";
+$host = $_SERVER['HTTP_HOST'];
+
+$feed_key = 'modified-pkg-feed-' . $protocol;
+
+header("Content-Type: application/rss+xml");
+
+$bool = false;
+$ret = get_cache_value($feed_key, $bool);
+if ($bool) {
+	echo $ret;
+	exit();
+}
+
+$rss = new RSSCreator20();
+$rss->cssStyleSheet = false;
+$rss->xslStyleSheet = false;
+
+# Use UTF-8 (fixes FS#10706).
+$rss->encoding = "UTF-8";
+
+#All the general RSS setup
+$rss->title = "AUR Latest Modified Packages";
+$rss->description = "The latest modified packages in the AUR";
+$rss->link = "${protocol}://{$host}";
+$rss->syndicationURL = "{$protocol}://{$host}" . get_uri('/rss/');
+$image = new FeedImage();
+$image->title = "AUR Latest Modified Packages";
+$image->url = "{$protocol}://{$host}/css/archnavbar/aurlogo.png";
+$image->link = $rss->link;
+$image->description = "AUR Latest Modified Packages Feed";
+$rss->image = $image;
+
+#Get the latest packages and add items for them
+$packages = latest_modified_pkgs(100);
+
+foreach ($packages as $indx => $row) {
+	$item = new FeedItem();
+	$item->title = $row["Name"];
+	$item->link = "{$protocol}://{$host}" . get_pkg_uri($row["Name"]);
+	$item->description = $row["Description"];
+	$item->date = intval($row["ModifiedTS"]);
+	$item->source = "{$protocol}://{$host}";
+	$item->author = username_from_id($row["MaintainerUID"]);
+	$item->guidIsPermaLink = true;
+	$item->guid = $row["Name"] . "-" . $row["ModifiedTS"];
+	$rss->addItem($item);
+}
+
+#save it so that useCached() can find it
+$feedContent = $rss->createFeed();
+set_cache_value($feed_key, $feedContent, 600);
+echo $feedContent;
+?>
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index eb3afab6..140c7ec1 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -925,13 +925,13 @@ function sanitize_ids($ids) {
  *
  * @return array $packages Package info for the specified number of recent packages
  */
-function latest_pkgs($numpkgs) {
+function latest_pkgs($numpkgs, $orderBy='SubmittedTS') {
 	$dbh = DB::connect();
 
-	$q = "SELECT Packages.*, MaintainerUID, SubmittedTS ";
+	$q = "SELECT Packages.*, MaintainerUID, SubmittedTS, ModifiedTS ";
 	$q.= "FROM Packages LEFT JOIN PackageBases ON ";
 	$q.= "PackageBases.ID = Packages.PackageBaseID ";
-	$q.= "ORDER BY SubmittedTS DESC ";
+	$q.= "ORDER BY " . $orderBy . " DESC ";
 	$q.= "LIMIT " . intval($numpkgs);
 	$result = $dbh->query($q);
 
@@ -944,3 +944,14 @@ function latest_pkgs($numpkgs) {
 
 	return $packages;
 }
+
+/**
+ * Determine package information for latest modified packages
+ *
+ * @param int $numpkgs Number of packages to get information on
+ *
+ * @return array $packages Package info for the specified number of recently modified packages
+ */
+function latest_modified_pkgs($numpkgs) {
+	return latest_pkgs($numpkgs, 'ModifiedTS');
+}
diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php
index 7d9750a0..73c667d2 100644
--- a/web/lib/routing.inc.php
+++ b/web/lib/routing.inc.php
@@ -15,6 +15,7 @@ $ROUTES = array(
 	'/logout' => 'logout.php',
 	'/passreset' => 'passreset.php',
 	'/rpc' => 'rpc.php',
+	'/rss/modified' => 'modified-rss.php',
 	'/rss' => 'rss.php',
 	'/tos' => 'tos.php',
 	'/tu' => 'tu.php',

From 537349e124c158a6537b4026ed3a1394a75a7206 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Fri, 20 Nov 2020 00:20:26 +0100
Subject: [PATCH 174/844] Add modified packages RSS feed to frontend

---
 web/html/css/archweb.css             | 4 ++++
 web/template/header.php              | 1 +
 web/template/stats/updates_table.php | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css
index f95e3843..b935d7db 100644
--- a/web/html/css/archweb.css
+++ b/web/html/css/archweb.css
@@ -556,6 +556,10 @@ h3 span.arrow {
         margin: -2em 0 0 0;
     }
 
+    #pkg-updates .rss-icon.latest {
+        margin-right: 1em;
+    }
+
     #pkg-updates table {
         margin: 0;
     }
diff --git a/web/template/header.php b/web/template/header.php
index f7409400..afe7a9b6 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -9,6 +9,7 @@
 	<link rel='stylesheet' type='text/css' href='/css/aurweb.css' />
 	<link rel='shortcut icon' href='/images/favicon.ico' />
 	<link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' />
+	<link rel='alternate' type='application/rss+xml' title='Modified Packages RSS' href='<?= get_uri('/rss/modified/'); ?>' />
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <?php if (isset($details['Description']) && !empty($details['Description'])): ?>
 	<meta name="description" content="<?= htmlspecialchars($details['Description']) ?>" />
diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php
index b4c6215f..23a86288 100644
--- a/web/template/stats/updates_table.php
+++ b/web/template/stats/updates_table.php
@@ -1,6 +1,7 @@
 <h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&amp;SO=d"><?= __('more') ?></a>)</span></h3>
 
-<a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/rss.svg" alt="RSS Feed" /></a>
+<a href="<?= get_uri('/rss/') ?>" title="AUR Latest Packages RSS Feed" class="rss-icon latest"><img src="/images/rss.svg" alt="RSS Feed" /></a>
+<a href="<?= get_uri('/rss/modified/') ?>" title="AUR Modified Packages RSS Feed" class="rss-icon"><img src="/images/rss.svg" alt="RSS Feed" /></a>
 
 <table>
 	<tbody>

From e7db894eb716132411bd88c094bc8df8b5f378de Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Fri, 20 Nov 2020 00:19:15 +0100
Subject: [PATCH 175/844] RSS: Add ability to specify isPermaLink="false" for
 GUID

---
 web/lib/feedcreator.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/lib/feedcreator.class.php b/web/lib/feedcreator.class.php
index a1fe24c9..bfc29b20 100644
--- a/web/lib/feedcreator.class.php
+++ b/web/lib/feedcreator.class.php
@@ -183,7 +183,7 @@ class FeedItem extends HtmlDescribable {
 	/**
 	 * Optional attributes of an item.
 	 */
-	var $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
+	var $author, $authorEmail, $image, $category, $comments, $guid, $guidIsPermaLink, $source, $creator;
 
 	/**
 	 * Publishing date of an item. May be in one of the following formats:
@@ -995,7 +995,11 @@ class RSSCreator091 extends FeedCreator {
 				$feed.= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
 			}
 			if ($this->items[$i]->guid!="") {
-				$feed.= "            <guid>".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
+				$feed.= "            <guid";
+				if ($this->items[$i]->guidIsPermaLink == false) {
+					$feed.= " isPermaLink=\"false\"";
+				}
+				$feed.= ">".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
 			}
 			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
 			$feed.= "        </item>\n";

From 4330fe4f335a2c1b3b68743337576501dc1f6c92 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Fri, 20 Nov 2020 00:19:54 +0100
Subject: [PATCH 176/844] Add RSS feed for modified packages

---
 web/html/modified-rss.php | 62 +++++++++++++++++++++++++++++++++++++++
 web/lib/pkgfuncs.inc.php  | 17 +++++++++--
 web/lib/routing.inc.php   |  1 +
 3 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 web/html/modified-rss.php

diff --git a/web/html/modified-rss.php b/web/html/modified-rss.php
new file mode 100644
index 00000000..4c5c47e0
--- /dev/null
+++ b/web/html/modified-rss.php
@@ -0,0 +1,62 @@
+<?php
+
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+include_once("aur.inc.php");
+include_once("pkgfuncs.inc.php");
+include_once("feedcreator.class.php");
+
+#detect prefix
+$protocol = isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"]=='on' ? "https" : "http";
+$host = $_SERVER['HTTP_HOST'];
+
+$feed_key = 'modified-pkg-feed-' . $protocol;
+
+header("Content-Type: application/rss+xml");
+
+$bool = false;
+$ret = get_cache_value($feed_key, $bool);
+if ($bool) {
+	echo $ret;
+	exit();
+}
+
+$rss = new RSSCreator20();
+$rss->cssStyleSheet = false;
+$rss->xslStyleSheet = false;
+
+# Use UTF-8 (fixes FS#10706).
+$rss->encoding = "UTF-8";
+
+#All the general RSS setup
+$rss->title = "AUR Latest Modified Packages";
+$rss->description = "The latest modified packages in the AUR";
+$rss->link = "${protocol}://{$host}";
+$rss->syndicationURL = "{$protocol}://{$host}" . get_uri('/rss/');
+$image = new FeedImage();
+$image->title = "AUR Latest Modified Packages";
+$image->url = "{$protocol}://{$host}/css/archnavbar/aurlogo.png";
+$image->link = $rss->link;
+$image->description = "AUR Latest Modified Packages Feed";
+$rss->image = $image;
+
+#Get the latest packages and add items for them
+$packages = latest_modified_pkgs(100);
+
+foreach ($packages as $indx => $row) {
+	$item = new FeedItem();
+	$item->title = $row["Name"];
+	$item->link = "{$protocol}://{$host}" . get_pkg_uri($row["Name"]);
+	$item->description = $row["Description"];
+	$item->date = intval($row["ModifiedTS"]);
+	$item->source = "{$protocol}://{$host}";
+	$item->author = username_from_id($row["MaintainerUID"]);
+	$item->guidIsPermaLink = true;
+	$item->guid = $row["Name"] . "-" . $row["ModifiedTS"];
+	$rss->addItem($item);
+}
+
+#save it so that useCached() can find it
+$feedContent = $rss->createFeed();
+set_cache_value($feed_key, $feedContent, 600);
+echo $feedContent;
+?>
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index eb3afab6..140c7ec1 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -925,13 +925,13 @@ function sanitize_ids($ids) {
  *
  * @return array $packages Package info for the specified number of recent packages
  */
-function latest_pkgs($numpkgs) {
+function latest_pkgs($numpkgs, $orderBy='SubmittedTS') {
 	$dbh = DB::connect();
 
-	$q = "SELECT Packages.*, MaintainerUID, SubmittedTS ";
+	$q = "SELECT Packages.*, MaintainerUID, SubmittedTS, ModifiedTS ";
 	$q.= "FROM Packages LEFT JOIN PackageBases ON ";
 	$q.= "PackageBases.ID = Packages.PackageBaseID ";
-	$q.= "ORDER BY SubmittedTS DESC ";
+	$q.= "ORDER BY " . $orderBy . " DESC ";
 	$q.= "LIMIT " . intval($numpkgs);
 	$result = $dbh->query($q);
 
@@ -944,3 +944,14 @@ function latest_pkgs($numpkgs) {
 
 	return $packages;
 }
+
+/**
+ * Determine package information for latest modified packages
+ *
+ * @param int $numpkgs Number of packages to get information on
+ *
+ * @return array $packages Package info for the specified number of recently modified packages
+ */
+function latest_modified_pkgs($numpkgs) {
+	return latest_pkgs($numpkgs, 'ModifiedTS');
+}
diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php
index 7d9750a0..73c667d2 100644
--- a/web/lib/routing.inc.php
+++ b/web/lib/routing.inc.php
@@ -15,6 +15,7 @@ $ROUTES = array(
 	'/logout' => 'logout.php',
 	'/passreset' => 'passreset.php',
 	'/rpc' => 'rpc.php',
+	'/rss/modified' => 'modified-rss.php',
 	'/rss' => 'rss.php',
 	'/tos' => 'tos.php',
 	'/tu' => 'tu.php',

From 8d9f20939c864800a45fc6f8994ad9af8e8fe837 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Fri, 20 Nov 2020 00:20:26 +0100
Subject: [PATCH 177/844] Add modified packages RSS feed to frontend

---
 web/html/css/archweb.css             | 4 ++++
 web/template/header.php              | 1 +
 web/template/stats/updates_table.php | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css
index f95e3843..b935d7db 100644
--- a/web/html/css/archweb.css
+++ b/web/html/css/archweb.css
@@ -556,6 +556,10 @@ h3 span.arrow {
         margin: -2em 0 0 0;
     }
 
+    #pkg-updates .rss-icon.latest {
+        margin-right: 1em;
+    }
+
     #pkg-updates table {
         margin: 0;
     }
diff --git a/web/template/header.php b/web/template/header.php
index f7409400..afe7a9b6 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -9,6 +9,7 @@
 	<link rel='stylesheet' type='text/css' href='/css/aurweb.css' />
 	<link rel='shortcut icon' href='/images/favicon.ico' />
 	<link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' />
+	<link rel='alternate' type='application/rss+xml' title='Modified Packages RSS' href='<?= get_uri('/rss/modified/'); ?>' />
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <?php if (isset($details['Description']) && !empty($details['Description'])): ?>
 	<meta name="description" content="<?= htmlspecialchars($details['Description']) ?>" />
diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php
index b4c6215f..23a86288 100644
--- a/web/template/stats/updates_table.php
+++ b/web/template/stats/updates_table.php
@@ -1,6 +1,7 @@
 <h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&amp;SO=d"><?= __('more') ?></a>)</span></h3>
 
-<a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/rss.svg" alt="RSS Feed" /></a>
+<a href="<?= get_uri('/rss/') ?>" title="AUR Latest Packages RSS Feed" class="rss-icon latest"><img src="/images/rss.svg" alt="RSS Feed" /></a>
+<a href="<?= get_uri('/rss/modified/') ?>" title="AUR Modified Packages RSS Feed" class="rss-icon"><img src="/images/rss.svg" alt="RSS Feed" /></a>
 
 <table>
 	<tbody>

From bd8f5280112b2cf1cf6113453977629be2ee92c5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 13 Jun 2021 10:48:31 -0700
Subject: [PATCH 178/844] add Base.as_dict() and Base.json()

Two utility functions for all of our ORM models that will
allow us to easily convert them to Python structures and
JSON data.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/declarative.py | 30 ++++++++++++++++++++++++++++++
 aurweb/util.py               |  8 ++++++++
 test/test_user.py            | 19 +++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/aurweb/models/declarative.py b/aurweb/models/declarative.py
index 45a629ce..96ee1829 100644
--- a/aurweb/models/declarative.py
+++ b/aurweb/models/declarative.py
@@ -1,10 +1,40 @@
+import json
+
 from sqlalchemy.ext.declarative import declarative_base
 
 import aurweb.db
 
+from aurweb import util
+
+
+def to_dict(model):
+    return {
+        c.name: getattr(model, c.name)
+        for c in model.__table__.columns
+    }
+
+
+def to_json(model, indent: int = None):
+    return json.dumps({
+        k: util.jsonify(v)
+        for k, v in to_dict(model).items()
+    }, indent=indent)
+
+
 Base = declarative_base()
+
+# Setup __table_args__ applicable to every table.
 Base.__table_args__ = {
     "autoload": True,
     "autoload_with": aurweb.db.get_engine(),
     "extend_existing": True
 }
+
+
+# Setup Base.as_dict and Base.json.
+#
+# With this, declarative models can use .as_dict() or .json()
+# at any time to produce a dict and json out of table columns.
+#
+Base.as_dict = to_dict
+Base.json = to_json
diff --git a/aurweb/util.py b/aurweb/util.py
index 8e4b291d..ad8ac6b7 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -3,6 +3,7 @@ import random
 import re
 import string
 
+from datetime import datetime
 from urllib.parse import urlparse
 
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
@@ -94,3 +95,10 @@ def account_url(context, user):
     if request.url.scheme == "http" and request.url.port != 80:
         base += f":{request.url.port}"
     return f"{base}/account/{user.Username}"
+
+
+def jsonify(obj):
+    """ Perform a conversion on obj if it's needed. """
+    if isinstance(obj, datetime):
+        obj = int(obj.timestamp())
+    return obj
diff --git a/test/test_user.py b/test/test_user.py
index 8b4da61e..06585207 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -1,4 +1,5 @@
 import hashlib
+import json
 
 from datetime import datetime, timedelta
 
@@ -198,3 +199,21 @@ def test_user_credential_types():
     assert aurweb.auth.trusted_user(user)
     assert aurweb.auth.developer(user)
     assert aurweb.auth.trusted_user_or_dev(user)
+
+
+def test_user_json():
+    data = json.loads(user.json())
+    assert data.get("ID") == user.ID
+    assert data.get("Username") == user.Username
+    assert data.get("Email") == user.Email
+    # .json() converts datetime values to integer timestamps.
+    assert isinstance(data.get("RegistrationTS"), int)
+
+
+def test_user_as_dict():
+    data = user.as_dict()
+    assert data.get("ID") == user.ID
+    assert data.get("Username") == user.Username
+    assert data.get("Email") == user.Email
+    # .as_dict() does not convert values to json-capable types.
+    assert isinstance(data.get("RegistrationTS"), datetime)

From 40448ccd34d32bcb4c1f5357e6196dc8f5c17dc6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 13 Jun 2021 12:16:13 -0700
Subject: [PATCH 179/844] aurweb.db: add commit(), add() and autocommit arg

With the addition of these two, some code has been swapped
to use these in some of the other db wrappers with an additional
autocommit kwarg in create and delete, to control batch
transactions.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py    | 21 ++++++++++++++++-----
 test/test_db.py | 25 +++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 04c8653a..c0147720 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -59,24 +59,35 @@ def query(model, *args, **kwargs):
     return session.query(model).filter(*args, **kwargs)
 
 
-def create(model, *args, **kwargs):
+def create(model, autocommit: bool = True, *args, **kwargs):
     instance = model(*args, **kwargs)
-    session.add(instance)
-    session.commit()
+    add(instance)
+    if autocommit is True:
+        commit()
     return instance
 
 
-def delete(model, *args, **kwargs):
+def delete(model, *args, autocommit: bool = True, **kwargs):
     instance = session.query(model).filter(*args, **kwargs)
     for record in instance:
         session.delete(record)
-    session.commit()
+    if autocommit is True:
+        commit()
 
 
 def rollback():
     session.rollback()
 
 
+def add(model):
+    session.add(model)
+    return model
+
+
+def commit():
+    session.commit()
+
+
 def get_sqlalchemy_url():
     """
     Build an SQLAlchemy for use with create_engine based on the aurweb configuration.
diff --git a/test/test_db.py b/test/test_db.py
index 9298c53d..d7a91813 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -273,6 +273,31 @@ def test_create_delete():
     record = db.query(AccountType, AccountType.AccountType == "test").first()
     assert record is None
 
+    # Create and delete a record with autocommit=False.
+    db.create(AccountType, AccountType="test", autocommit=False)
+    db.commit()
+    db.delete(AccountType, AccountType.AccountType == "test", autocommit=False)
+    db.commit()
+    record = db.query(AccountType, AccountType.AccountType == "test").first()
+    assert record is None
+
+
+def test_add_commit():
+    # Use db.add and db.commit to add a temporary record.
+    account_type = AccountType(AccountType="test")
+    db.add(account_type)
+    db.commit()
+
+    # Assert it got created in the DB.
+    assert bool(account_type.ID)
+
+    # Query the DB for it and compare the record with our object.
+    record = db.query(AccountType, AccountType.AccountType == "test").first()
+    assert record == account_type
+
+    # Remove the record.
+    db.delete(AccountType, AccountType.ID == account_type.ID)
+
 
 def test_connection_executor_mysql_paramstyle():
     executor = db.ConnectionExecutor(None, backend="mysql")

From 7ae95ac90813dc3f521d810ccb95adfc74a64496 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 18 Jun 2021 04:39:58 -0700
Subject: [PATCH 180/844] bugfix: removed extra space in " My Account" nav link

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/archdev-navbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 4d54f6af..c935fd41 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -9,7 +9,7 @@
         {% if request.user.is_authenticated() %}
             <li>
                 <a href="/account/{{ request.user.Username }}/edit">
-                    {% trans %} My Account{% endtrans %}
+                    {% trans %}My Account{% endtrans %}
                 </a>
             </li>
             <li>

From b7d67bf5fcf02d172fce1a290c500f9fb432c49f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 19 Jun 2021 05:06:24 -0700
Subject: [PATCH 181/844] render_template: convert HTTPStatus objects

This will automate a lot of conversion that happens
around the codebase in terms of status_code.

As of this commit, we should improve usage and remove
int(status_code) casts wherever we can.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index c0472b2e..7474da1c 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -65,7 +65,7 @@ async def make_variable_context(request: Request, title: str, next: str = None):
 def render_template(request: Request,
                     path: str,
                     context: dict,
-                    status_code=int(HTTPStatus.OK)):
+                    status_code: HTTPStatus = HTTPStatus.OK):
     """ Render a Jinja2 multi-lingual template with some context. """
 
     # Create a deep copy of our jinja2 environment. The environment in
@@ -81,7 +81,7 @@ def render_template(request: Request,
     template = templates.get_template(path)
     rendered = template.render(context)
 
-    response = HTMLResponse(rendered, status_code=status_code)
+    response = HTMLResponse(rendered, status_code=int(status_code))
     response.set_cookie("AURLANG", context.get("language"))
     response.set_cookie("AURTZ", context.get("timezone"))
     return response

From f89d06d092aa0f20a7b267b6cb274ae175c294df Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 19 Jun 2021 05:20:23 -0700
Subject: [PATCH 182/844] setup_test_db: remove mysql-dependent coverage path

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/testing/__init__.py b/aurweb/testing/__init__.py
index 90d46720..65d34253 100644
--- a/aurweb/testing/__init__.py
+++ b/aurweb/testing/__init__.py
@@ -50,7 +50,7 @@ def setup_test_db(*args):
 
     db_backend = aurweb.config.get("database", "backend")
 
-    if db_backend != "sqlite":
+    if db_backend != "sqlite":  # pragma: no cover
         aurweb.db.session.execute("SET FOREIGN_KEY_CHECKS = 0")
     else:
         # We're using sqlite, setup tables to be deleted without violating
@@ -61,7 +61,7 @@ def setup_test_db(*args):
     for table in tables:
         aurweb.db.session.execute(f"DELETE FROM {table}")
 
-    if db_backend != "sqlite":
+    if db_backend != "sqlite":  # pragma: no cover
         aurweb.db.session.execute("SET FOREIGN_KEY_CHECKS = 1")
 
     # Expunge all objects from SQLAlchemy's IdentityMap.

From ac67268a28f02dcdc2fb765c6bd6d76555e0056a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 18 Jun 2021 16:49:41 -0700
Subject: [PATCH 183/844] add util.timezone_to_datetime -> `dt` Jinja2 filter

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 3 +++
 aurweb/util.py      | 4 ++++
 test/test_util.py   | 9 +++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 test/test_util.py

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 7474da1c..8c6f3294 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -23,6 +23,9 @@ env = jinja2.Environment(loader=loader, autoescape=True,
 # Add tr translation filter.
 env.filters["tr"] = l10n.tr
 
+# Utility filters.
+env.filters["dt"] = util.timestamp_to_datetime
+
 # Add captcha filters.
 env.filters["captcha_salt"] = captcha.captcha_salt_filter
 env.filters["captcha_cmdline"] = captcha.captcha_cmdline_filter
diff --git a/aurweb/util.py b/aurweb/util.py
index ad8ac6b7..ce18853b 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -97,6 +97,10 @@ def account_url(context, user):
     return f"{base}/account/{user.Username}"
 
 
+def timestamp_to_datetime(timestamp: int):
+    return datetime.utcfromtimestamp(int(timestamp))
+
+
 def jsonify(obj):
     """ Perform a conversion on obj if it's needed. """
     if isinstance(obj, datetime):
diff --git a/test/test_util.py b/test/test_util.py
new file mode 100644
index 00000000..cd7b7a57
--- /dev/null
+++ b/test/test_util.py
@@ -0,0 +1,9 @@
+from datetime import datetime
+
+from aurweb import util
+
+
+def test_timestamp_to_datetime():
+    ts = datetime.utcnow().timestamp()
+    dt = datetime.utcfromtimestamp(int(ts))
+    assert util.timestamp_to_datetime(ts) == dt

From b1baf769985949bfa496c9d8276dbcd2e101072b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 18 Jun 2021 16:55:01 -0700
Subject: [PATCH 184/844] add util.as_timezone -> `as_timezone` Jinja2 filter

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 1 +
 aurweb/util.py      | 5 +++++
 test/test_util.py   | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 8c6f3294..9439f3a3 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -25,6 +25,7 @@ env.filters["tr"] = l10n.tr
 
 # Utility filters.
 env.filters["dt"] = util.timestamp_to_datetime
+env.filters["as_timezone"] = util.as_timezone
 
 # Add captcha filters.
 env.filters["captcha_salt"] = captcha.captcha_salt_filter
diff --git a/aurweb/util.py b/aurweb/util.py
index ce18853b..1615e00a 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -5,6 +5,7 @@ import string
 
 from datetime import datetime
 from urllib.parse import urlparse
+from zoneinfo import ZoneInfo
 
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
 from jinja2 import pass_context
@@ -101,6 +102,10 @@ def timestamp_to_datetime(timestamp: int):
     return datetime.utcfromtimestamp(int(timestamp))
 
 
+def as_timezone(dt: datetime, timezone: str):
+    return dt.astimezone(tz=ZoneInfo(timezone))
+
+
 def jsonify(obj):
     """ Perform a conversion on obj if it's needed. """
     if isinstance(obj, datetime):
diff --git a/test/test_util.py b/test/test_util.py
index cd7b7a57..d58a8ae2 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,4 +1,5 @@
 from datetime import datetime
+from zoneinfo import ZoneInfo
 
 from aurweb import util
 
@@ -7,3 +8,9 @@ def test_timestamp_to_datetime():
     ts = datetime.utcnow().timestamp()
     dt = datetime.utcfromtimestamp(int(ts))
     assert util.timestamp_to_datetime(ts) == dt
+
+
+def test_as_timezone():
+    ts = datetime.utcnow().timestamp()
+    dt = util.timestamp_to_datetime(ts)
+    assert util.as_timezone(dt, "UTC") == dt.astimezone(tz=ZoneInfo("UTC"))

From d5e650a33930286bae0263e8b0aff12ed94a319e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 18 Jun 2021 16:57:06 -0700
Subject: [PATCH 185/844] add util.dedupe_qs -> `dedupe_qs` Jinja2 filter

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py |  1 +
 aurweb/util.py      | 26 +++++++++++++++++++++++++-
 test/test_util.py   | 16 ++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 9439f3a3..1e09bf61 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -26,6 +26,7 @@ env.filters["tr"] = l10n.tr
 # Utility filters.
 env.filters["dt"] = util.timestamp_to_datetime
 env.filters["as_timezone"] = util.as_timezone
+env.filters["dedupe_qs"] = util.dedupe_qs
 
 # Add captcha filters.
 env.filters["captcha_salt"] = captcha.captcha_salt_filter
diff --git a/aurweb/util.py b/aurweb/util.py
index 1615e00a..0aec6f45 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -3,8 +3,9 @@ import random
 import re
 import string
 
+from collections import OrderedDict
 from datetime import datetime
-from urllib.parse import urlparse
+from urllib.parse import quote_plus, urlparse
 from zoneinfo import ZoneInfo
 
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
@@ -106,6 +107,29 @@ def as_timezone(dt: datetime, timezone: str):
     return dt.astimezone(tz=ZoneInfo(timezone))
 
 
+def dedupe_qs(query_string: str, *additions):
+    """ Dedupe keys found in a query string by rewriting it without
+    duplicates found while iterating from the end to the beginning,
+    using an ordered memo to track keys found and persist locations.
+
+    That is, query string 'a=1&b=1&a=2' will be deduped and converted
+    to 'b=1&a=2'.
+
+    :param query_string: An HTTP URL query string.
+    :param *additions: Optional additional fields to add to the query string.
+    :return: Deduped query string, including *additions at the tail.
+    """
+    for addition in list(additions):
+        query_string += f"&{addition}"
+
+    qs = OrderedDict()
+    for item in reversed(query_string.split('&')):
+        key, value = item.split('=')
+        if key not in qs:
+            qs[key] = value
+    return '&'.join([f"{k}={quote_plus(v)}" for k, v in reversed(qs.items())])
+
+
 def jsonify(obj):
     """ Perform a conversion on obj if it's needed. """
     if isinstance(obj, datetime):
diff --git a/test/test_util.py b/test/test_util.py
index d58a8ae2..074de494 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
@@ -14,3 +15,18 @@ def test_as_timezone():
     ts = datetime.utcnow().timestamp()
     dt = util.timestamp_to_datetime(ts)
     assert util.as_timezone(dt, "UTC") == dt.astimezone(tz=ZoneInfo("UTC"))
+
+
+def test_dedupe_qs():
+    items = OrderedDict()
+    items["key1"] = "test"
+    items["key2"] = "blah"
+    items["key3"] = 1
+
+    # Construct and test our query string.
+    query_string = '&'.join([f"{k}={v}" for k, v in items.items()])
+    assert query_string == "key1=test&key2=blah&key3=1"
+
+    # Add key1=changed and key2=changed to the query and dedupe it.
+    deduped = util.dedupe_qs(query_string, "key1=changed", "key3=changed")
+    assert deduped == "key2=blah&key1=changed&key3=changed"

From d7941e6bedfed32df0299a5869df40f33b202374 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 18 Jun 2021 16:57:44 -0700
Subject: [PATCH 186/844] urllib.parse.quote_plus -> `urlencode` Jinja2 filter

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 1e09bf61..015f8c9f 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -4,6 +4,7 @@ import zoneinfo
 
 from datetime import datetime
 from http import HTTPStatus
+from urllib.parse import quote_plus
 
 import jinja2
 
@@ -27,6 +28,7 @@ env.filters["tr"] = l10n.tr
 env.filters["dt"] = util.timestamp_to_datetime
 env.filters["as_timezone"] = util.as_timezone
 env.filters["dedupe_qs"] = util.dedupe_qs
+env.filters["urlencode"] = quote_plus
 
 # Add captcha filters.
 env.filters["captcha_salt"] = captcha.captcha_salt_filter

From 8b6f92f9e907267288c9a2d757c7747b22c7bca8 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Tue, 11 May 2021 00:01:13 +0200
Subject: [PATCH 187/844] Use the clipboard API for copy paste

The Document.execCommand API is deprecated and no longer recommended to
be used. It's replacement is the much simpler navigator.clipboard API
which is supported in all browsers except internet explorer.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 web/template/pkg_details.php     | 10 +++-------
 web/template/pkgbase_details.php | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index c6bb32d8..047de9a7 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -308,14 +308,10 @@ endif;
 </div>
 
 <script>
-$(document).ready(function() {
-	$('.copy').click(function(e) {
-		var tmp = $("<input>");
-		$("body").append(tmp);
-		tmp.val($(this).text()).select();
-		document.execCommand("copy");
-		tmp.remove();
+document.addEventListener('DOMContentLoaded', function() {
+	document.querySelector('.copy').addEventListener('click', function(e) {
 		e.preventDefault();
+		navigator.clipboard.writeText(event.target.text);
 	});
 });
 </script>
diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php
index a6857c4e..35ad217a 100644
--- a/web/template/pkgbase_details.php
+++ b/web/template/pkgbase_details.php
@@ -137,14 +137,10 @@ endif;
 </div>
 
 <script>
-$(document).ready(function() {
-	$('.copy').click(function(e) {
-		var tmp = $("<input>");
-		$("body").append(tmp);
-		tmp.val($(this).text()).select();
-		document.execCommand("copy");
-		tmp.remove();
+document.addEventListener('DOMContentLoaded', function() {
+	document.querySelector('.copy').addEventListener('click', function(e) {
 		e.preventDefault();
+		navigator.clipboard.writeText(event.target.text);
 	});
 });
 </script>

From d7603fa4d3d31e8c50b2988730652809ae1f42b7 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Mon, 10 May 2021 23:55:36 +0200
Subject: [PATCH 188/844] Port package details page to pure JavaScript

Use a CSS animation for jQuery.Animate and replace the rest with pure
vanilla JavaScript.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 web/html/css/aurweb.css |  5 +++
 web/html/packages.php   | 96 +++++++++++++++++++++++++----------------
 2 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index 81bf9ab6..bb4e3ad7 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -199,3 +199,8 @@ label.confirmation,
 .error {
 	color: red;
 }
+
+.article-content > div {
+	overflow: hidden;
+	transition: height 1s;
+}
diff --git a/web/html/packages.php b/web/html/packages.php
index a989428e..559a8f45 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -46,70 +46,94 @@ if (isset($pkgname)) {
 html_header($title, $details);
 ?>
 
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js"></script>
 <script type="text/javascript">
 function collapseDependsList(list) {
-	list = $(list);
+	list = document.getElementById(list);
+
 	// Hide everything past a given limit. Don't do anything if we don't have
 	// enough items, or the link already exists.
-	var limit = 20,
-		linkid = list.attr('id') + 'link',
-		items = list.find('li').slice(limit);
-	if (items.length <= 1 || $('#' + linkid).length > 0) {
+	const limit = 20;
+	const linkid = list.getAttribute('id') + 'link';
+	const items = Array.from(list.querySelectorAll('li')).slice(limit);
+	if (items.length <= 1 || document.getElementById(linkid)) {
 		return;
 	}
-	items.hide();
-	list.after('<p><a id="' + linkid + '" href="#">Show More…</a></p>');
+
+	items.forEach(function(item) {
+		item.style.display = 'none';
+	});
+
+	const link = document.createElement('a');
+	link.id = linkid;
+	link.href = '#';
+	link.textContent = 'Show More…';
+
+	const showMore = document.createElement('p');
+	showMore.appendChild(link);
+
+	list.insertAdjacentElement('afterend', showMore);
 
 	// add link and wire it up to show the hidden items
-	$('#' + linkid).click(function(event) {
+	link.addEventListener('click', function(event) {
 		event.preventDefault();
-		list.find('li').show();
+
+		items.forEach(function(item) {
+			item.style.display = '';
+		});
+
 		// remove the full <p/> node from the DOM
-		$(this).parent().remove();
+		event.target.parentNode.removeChild(event.target);
 	});
 }
 
 function collapseComment(div) {
-	var linkid = div.attr('id') + 'link',
-		inner = div.find('div'),
-		height = inner.height(),
-		maxheight = 200;
+	const linkid = div.getAttribute('id') + 'link';
+	const inner = div.querySelector('div');
+	// max height of a collapsed comment.
+	const maxheight = 200;
+	const height = inner.offsetHeight;
 
 	if (height <= maxheight)
 		return;
 
-	inner.css({ 'overflow': 'hidden', 'height': maxheight + 'px' });
-	inner.addClass('collapsed');
-	inner.after('<p><a id="' + linkid + '" href="#">Show More…</a></p>');
+	inner.style.height = maxheight + 'px';
+	inner.classList.add('collapsed');
 
-	$('#' + linkid).click(function(event) {
-		var inner = $(this).parent().parent().find('div');
+	const link = document.createElement('a');
+	link.id = linkid;
+	link.href = '#';
+	link.textContent = 'Show More…';
+
+	const showMore = document.createElement('p');
+	showMore.appendChild(link);
+
+	inner.insertAdjacentElement('afterend', showMore);
+
+	link.addEventListener('click', function(event) {
+		const showMoreLink = event.target;
+		const inner = showMoreLink.parentNode.parentNode.querySelector('div');
 		var newheight;
 
-		if (inner.hasClass('collapsed')) {
-			inner.css({ 'height': 'auto' });
-			newheight = inner.height();
-			inner.css({ 'height': maxheight });
-			$(this).text('Collapse');
+		if (inner.classList.contains('collapsed')) {
+			inner.style.height = height + 'px';
+			showMoreLink.textContent = 'Collapse';
 		} else {
-			newheight = maxheight;
-			$(this).text('Show More…');
+			newheight = maxheight + 'px';
+			inner.style.height = newheight;
+			showMoreLink.textContent = 'Show More…';
 		}
 
-		inner.animate({ 'height': newheight });
-		inner.toggleClass('collapsed');
+		inner.classList.toggle('collapsed');
 		event.preventDefault();
 	});
 }
 
-$(document).ready(function() {
-	collapseDependsList("#pkgdepslist");
-	collapseDependsList("#pkgreqslist");
-	collapseDependsList("#pkgsrcslist");
-	$(".article-content").each(function() {
-		collapseComment($(this));
-	});
+document.addEventListener('DOMContentLoaded', function() {
+	collapseDependsList("pkgdepslist");
+	collapseDependsList("pkgreqslist");
+	collapseDependsList("pkgsrcslist");
+
+	Array.from(document.querySelectorAll('.article-content')).forEach(collapseComment);
 });
 </script>
 

From 06fa8ab5f32061ae1d06abbe1cc502883f3884da Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Mon, 14 Jun 2021 22:13:07 +0200
Subject: [PATCH 189/844] Convert comment editing to vanilla JavaScript

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 web/template/pkg_comments.php | 90 ++++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 28 deletions(-)

diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php
index 3bcf1a38..ffa9e137 100644
--- a/web/template/pkg_comments.php
+++ b/web/template/pkg_comments.php
@@ -169,37 +169,71 @@ if ($comment_section == "package") {
 </div>
 
 <script>
-$(document).ready(function() {
-	$('.edit-comment').click(function () {
-		var parent_element = this.parentElement,
-			parent_id = parent_element.id,
-			comment_id = parent_id.substr(parent_id.indexOf('-') + 1),
-			edit_form = $(parent_element).next(),
-			_this = $(this);
-		add_busy_indicator(_this);
-		$.getJSON('<?= get_uri('/rpc') ?>', {
-			type: 'get-comment-form',
-			arg: comment_id,
-			base_id: <?= intval($row["PackageBaseID"]) ?>,
-			pkgbase_name: <?= json_encode($pkgbase_name) ?>
-		}, function (data) {
-			remove_busy_indicator(_this);
-			if (data.success) {
-				edit_form.html(data.form);
-				edit_form.find('textarea').focus();
-			} else {
-				alert(data.error);
-			}
-		});
-		return false;
-	});
+function add_busy_indicator(sibling) {
+	const img = document.createElement('img');
+	img.src = "/images/ajax-loader.gif";
+	img.classList.add('ajax-loader');
+	img.style.height = 11;
+	img.style.width = 16;
+	img.alt = "Busy…";
 
-	function add_busy_indicator(sibling) {
-		sibling.after('<img src="/images/ajax-loader.gif" class="ajax-loader" width="16" height="11" alt="Busy…" />');
+	sibling.insertAdjacentElement('afterend', img);
+}
+
+function remove_busy_indicator(sibling) {
+	const elem = sibling.nextElementSibling;
+	elem.parentNode.removeChild(elem);
+}
+
+function getParentsUntil(elem, className) {
+	// Limit to 10 depth
+	for ( ; elem && elem !== document; elem = elem.parentNode) {
+		if (elem.matches(className)) {
+			break;
+		}
 	}
 
-	function remove_busy_indicator(sibling) {
-		sibling.next().remove();
+	return elem;
+}
+
+function handleEditCommentClick(event) {
+	event.preventDefault();
+	const parent_element = getParentsUntil(event.target, '.comment-header');
+	const parent_id = parent_element.id;
+	const comment_id = parent_id.substr(parent_id.indexOf('-') + 1);
+	// The div class="article-content" which contains the comment
+	const edit_form = parent_element.nextElementSibling;
+
+	const params = new URLSearchParams({
+		type: "get-comment-form",
+		arg: comment_id,
+		base_id: <?= intval($row["PackageBaseID"]) ?>,
+		pkgbase_name: <?= json_encode($pkgbase_name) ?>
+	});
+
+	const url = '<?= get_uri('/rpc') ?>' + '?' + params.toString();
+
+	add_busy_indicator(event.target);
+
+	fetch(url, {
+		method: 'GET'
+	})
+	.then(function(response) { return response.json(); })
+	.then(function(data) {
+		remove_busy_indicator(event.target);
+		if (data.success) {
+			edit_form.innerHTML = data.form;
+			edit_form.querySelector('textarea').focus();
+		} else {
+			alert(data.error);
+		}
+	});
+}
+
+document.addEventListener('DOMContentLoaded', function() {
+	const divs = document.querySelectorAll('.edit-comment');;
+	for (let div of divs) {
+		div.addEventListener('click', handleEditCommentClick);
 	}
 });
 </script>

From af76e660d0f03712901d2d1ddda07d383fafcb08 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 21 Jun 2021 21:35:05 -0700
Subject: [PATCH 190/844] auth_required: allow formattable template tuples

See docstring for updates.

template= has been modified.
status_code= has been added as an optional template status_code.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py               | 67 +++++++++++++++++++++++++++++++-----
 aurweb/routers/accounts.py   | 16 ++++++---
 test/test_accounts_routes.py |  1 -
 3 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 401ed6ae..f57e18bf 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -10,9 +10,10 @@ from starlette.requests import HTTPConnection
 
 import aurweb.config
 
+from aurweb import l10n
 from aurweb.models.session import Session
 from aurweb.models.user import User
-from aurweb.templates import make_context, render_template
+from aurweb.templates import make_variable_context, render_template
 
 
 class AnonymousUser:
@@ -60,7 +61,8 @@ class BasicAuthBackend(AuthenticationBackend):
 
 def auth_required(is_required: bool = True,
                   redirect: str = "/",
-                  template: tuple = None):
+                  template: tuple = None,
+                  status_code: HTTPStatus = HTTPStatus.UNAUTHORIZED):
     """ Authentication route decorator.
 
     If redirect is given, the user will be redirected if the auth state
@@ -69,26 +71,73 @@ def auth_required(is_required: bool = True,
     If template is given, it will be rendered with Unauthorized if
     is_required does not match and take priority over redirect.
 
+    A precondition of this function is that, if template is provided,
+    it **must** match the following format:
+
+        template=("template.html", ["Some Template For", "{}"], ["username"])
+
+    Where `username` is a FastAPI request path parameter, fitting
+    a route like: `/some_route/{username}`.
+
+    If you wish to supply a non-formatted template, just omit any Python
+    format strings (with the '{}' substring). The third tuple element
+    will not be used, and so anything can be supplied.
+
+        template=("template.html", ["Some Page"], None)
+
+    All title shards and format parameters will be translated before
+    applying any format operations.
+
     :param is_required: A boolean indicating whether the function requires auth
     :param redirect: Path to redirect to if is_required isn't True
-    :param template: A template tuple: ("template.html", "Template Page")
+    :param template: A three-element template tuple:
+                     (path, title_iterable, variable_iterable)
+    :param status_code: An optional status_code for template render.
+                        Redirects are always SEE_OTHER.
     """
 
     def decorator(func):
         @functools.wraps(func)
         async def wrapper(request, *args, **kwargs):
             if request.user.is_authenticated() != is_required:
-                status_code = int(HTTPStatus.UNAUTHORIZED)
                 url = "/"
                 if redirect:
-                    status_code = int(HTTPStatus.SEE_OTHER)
                     url = redirect
                 if template:
-                    path, title = template
-                    context = make_context(request, title)
+                    # template=("template.html",
+                    #           ["Some Title", "someFormatted {}"],
+                    #           ["variable"])
+                    # => render template.html with title:
+                    #    "Some Title someFormatted variables"
+                    path, title_parts, variables = template
+                    _ = l10n.get_translator_for_request(request)
+
+                    # Step through title_parts; for each part which contains
+                    # a '{}' in it, apply .format(var) where var = the current
+                    # iteration of variables.
+                    #
+                    # This implies that len(variables) is equal to
+                    # len([part for part in title_parts if '{}' in part])
+                    # and this must always be true.
+                    #
+                    sanitized = []
+                    _variables = iter(variables)
+                    for part in title_parts:
+                        if "{}" in part:  # If this part is formattable.
+                            key = next(_variables)
+                            var = request.path_params.get(key)
+                            sanitized.append(_(part.format(var)))
+                        else:  # Otherwise, just add the translated part.
+                            sanitized.append(_(part))
+
+                    # Glue all title parts together, separated by spaces.
+                    title = " ".join(sanitized)
+
+                    context = await make_variable_context(request, title)
                     return render_template(request, path, context,
-                                           status_code=int(HTTPStatus.UNAUTHORIZED))
-                return RedirectResponse(url=url, status_code=status_code)
+                                           status_code=status_code)
+                return RedirectResponse(url,
+                                        status_code=int(HTTPStatus.SEE_OTHER))
             return await func(request, *args, **kwargs)
         return wrapper
 
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index c7c96003..966f8409 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -555,13 +555,21 @@ async def account_edit_post(request: Request,
     return util.migrate_cookies(request, response)
 
 
+account_template = (
+    "account/show.html",
+    ["Account", "{}"],
+    ["username"]  # Query parameters to replace in the title string.
+)
+
+
 @router.get("/account/{username}")
-@auth_required(True, template=("account/show.html", "Accounts"))
+@auth_required(True, template=account_template,
+               status_code=HTTPStatus.UNAUTHORIZED)
 async def account(request: Request, username: str):
+    _ = l10n.get_translator_for_request(request)
+    context = await make_variable_context(request, _("Account") + username)
+
     user = db.query(User, User.Username == username).first()
-
-    context = await make_variable_context(request, "Accounts")
-
     if not user:
         raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
 
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index d5fd089e..bd0d9d4b 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -915,7 +915,6 @@ def test_get_account_not_found():
 def test_get_account_unauthenticated():
     with client as request:
         response = request.get("/account/test", allow_redirects=False)
-
     assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
 
     content = response.content.decode()

From 959e535126bdb6863f62ccf1e4a32482793b1386 Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Wed, 23 Jun 2021 03:09:37 +0200
Subject: [PATCH 191/844] Use the real ml email address instead of alias

All the arch-x@archlinux.org -> arch-x@lists.archlinux.org aliases will
be dropped soon[1].

[1] https://lists.archlinux.org/pipermail/arch-dev-public/2021-June/030462.html
---
 conf/config.defaults | 2 +-
 test/setup.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/config.defaults b/conf/config.defaults
index e6961520..b7bc0368 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -22,7 +22,7 @@ git_clone_uri_anon = https://aur.archlinux.org/%s.git
 git_clone_uri_priv = ssh://aur@aur.archlinux.org/%s.git
 max_rpc_results = 5000
 max_depends = 1000
-aur_request_ml = aur-requests@archlinux.org
+aur_request_ml = aur-requests@lists.archlinux.org
 request_idle_time = 1209600
 request_archive_time = 15552000
 auto_orphan_age = 15552000
diff --git a/test/setup.sh b/test/setup.sh
index 4a6eb3b1..589c8c3f 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -26,7 +26,7 @@ name = aur.db
 
 [options]
 aur_location = https://aur.archlinux.org
-aur_request_ml = aur-requests@archlinux.org
+aur_request_ml = aur-requests@lists.archlinux.org
 enable-maintenance = 0
 maintenance-exceptions = 127.0.0.1
 commit_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s&id=%s

From ec632a7091df6df3940f62cfee3d9a09641dd4b5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 11 Jun 2021 23:09:34 -0700
Subject: [PATCH 192/844] use secure=True when options.disable_http_login is
 enabled

We'll piggyback off of the current existing configuration item,
`disable_http_login`, to decide how we should submit cookies to
an HTTP response.

Previously, in `sso.py`, the http schema was used to make this
decision. There is an issue with that, however: We cannot actually
test properly if we depend on the https schema.

This change allows us to toggle `disable_http_login` to modify
the behavior of cookies sent with an http response to be secure.

We test this behavior in test/test_auth_routes.py#L81:
`test_secure_login(mock)`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/auth.py   |  5 +++-
 aurweb/routers/html.py   |  6 ++++-
 aurweb/routers/sso.py    |  8 ++++---
 aurweb/templates.py      |  9 +++++---
 aurweb/util.py           |  3 ++-
 test/test_auth_routes.py | 50 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index e4864424..4aca9304 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -59,7 +59,10 @@ async def login_post(request: Request,
 
     response = RedirectResponse(url=next,
                                 status_code=int(HTTPStatus.SEE_OTHER))
-    response.set_cookie("AURSID", sid, expires=expires_at)
+
+    secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
+    response.set_cookie("AURSID", sid, expires=expires_at,
+                        secure=secure_cookies, httponly=True)
     return response
 
 
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 890aff88..ed0c039b 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -6,6 +6,8 @@ from http import HTTPStatus
 from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 
+import aurweb.config
+
 from aurweb.templates import make_context, render_template
 
 router = APIRouter()
@@ -45,7 +47,9 @@ async def language(request: Request,
     # In any case, set the response's AURLANG cookie that never expires.
     response = RedirectResponse(url=f"{next}{query_string}",
                                 status_code=int(HTTPStatus.SEE_OTHER))
-    response.set_cookie("AURLANG", set_lang)
+    secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
+    response.set_cookie("AURLANG", set_lang,
+                        secure=secure_cookies, httponly=True)
     return response
 
 
diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index 4b12b932..093807fe 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -131,13 +131,15 @@ async def authenticate(request: Request, redirect: str = None, conn=Depends(aurw
     elif len(aur_accounts) == 1:
         sid = open_session(request, conn, aur_accounts[0][Users.c.ID])
         response = RedirectResponse(redirect if redirect and is_aur_url(redirect) else "/")
+        secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
         response.set_cookie(key="AURSID", value=sid, httponly=True,
-                            secure=request.url.scheme == "https")
+                            secure=secure_cookies)
         if "id_token" in token:
             # We save the id_token for the SSO logout. It’s not too important
             # though, so if we can’t find it, we can live without it.
-            response.set_cookie(key="SSO_ID_TOKEN", value=token["id_token"], path="/sso/",
-                                httponly=True, secure=request.url.scheme == "https")
+            response.set_cookie(key="SSO_ID_TOKEN", value=token["id_token"],
+                                path="/sso/", httponly=True,
+                                secure=secure_cookies)
         return response
     else:
         # We’ve got a severe integrity violation.
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 015f8c9f..640b9447 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -88,7 +88,10 @@ def render_template(request: Request,
     template = templates.get_template(path)
     rendered = template.render(context)
 
-    response = HTMLResponse(rendered, status_code=int(status_code))
-    response.set_cookie("AURLANG", context.get("language"))
-    response.set_cookie("AURTZ", context.get("timezone"))
+    response = HTMLResponse(rendered, status_code=status_code)
+    secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
+    response.set_cookie("AURLANG", context.get("language"),
+                        secure=secure_cookies, httponly=True)
+    response.set_cookie("AURTZ", context.get("timezone"),
+                        secure=secure_cookies, httponly=True)
     return response
diff --git a/aurweb/util.py b/aurweb/util.py
index 0aec6f45..1da85606 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -85,8 +85,9 @@ def valid_ssh_pubkey(pk):
 
 
 def migrate_cookies(request, response):
+    secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     for k, v in request.cookies.items():
-        response.set_cookie(k, v)
+        response.set_cookie(k, v, secure=secure_cookies, httponly=True)
     return response
 
 
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index 360b48cc..a443be72 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -1,5 +1,6 @@
 from datetime import datetime
 from http import HTTPStatus
+from unittest import mock
 
 import pytest
 
@@ -70,6 +71,55 @@ def test_login_logout():
     assert "AURSID" not in response.cookies
 
 
+def mock_getboolean(a, b):
+    if a == "options" and b == "disable_http_login":
+        return True
+    return bool(aurweb.config.get(a, b))
+
+
+@mock.patch("aurweb.config.getboolean", side_effect=mock_getboolean)
+def test_secure_login(mock):
+    """ In this test, we check to verify the course of action taken
+    by starlette when providing secure=True to a response cookie.
+    This is achieved by mocking aurweb.config.getboolean to return
+    True (or 1) when looking for `options.disable_http_login`.
+    When we receive a response with `disable_http_login` enabled,
+    we check the fields in cookies received for the secure and
+    httponly fields, in addition to the rest of the fields given
+    on such a request. """
+
+    # Create a local TestClient here since we mocked configuration.
+    client = TestClient(app)
+
+    # Data used for our upcoming http post request.
+    post_data = {
+        "user": user.Username,
+        "passwd": "testPassword",
+        "next": "/"
+    }
+
+    # Perform a login request with the data matching our user.
+    with client as request:
+        response = request.post("/login", data=post_data,
+                                allow_redirects=False)
+
+    # Make sure we got the expected status out of it.
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Let's check what we got in terms of cookies for AURSID.
+    # Make sure that a secure cookie got passed to us.
+    cookie = next(c for c in response.cookies if c.name == "AURSID")
+    assert cookie.secure is True
+    assert cookie.has_nonstandard_attr("HttpOnly") is True
+    assert cookie.value is not None and len(cookie.value) > 0
+
+    # Let's make sure we actually have a session relationship
+    # with the AURSID we ended up with.
+    record = query(Session, Session.SessionID == cookie.value).first()
+    assert record is not None and record.User == user
+    assert user.session == record
+
+
 def test_authenticated_login_forbidden():
     post_data = {
         "user": "test",

From 91dc3efc75700fd9c559a908028ff39eeb7d2bfe Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 12 Jun 2021 03:23:58 -0700
Subject: [PATCH 193/844] add util.add_samesite_fields(response, value)

This function adds f"SameSite={value}" to each cookie's header
stored in response.

This is needed because starlette does not currently support
the `samesite` argument in Response.set_cookie. It is merged,
however, and waiting for next release.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/auth.py   |  3 ++-
 aurweb/routers/html.py   |  3 ++-
 aurweb/routers/sso.py    |  3 ++-
 aurweb/templates.py      |  2 +-
 aurweb/util.py           | 15 ++++++++++++++-
 test/test_auth_routes.py |  2 ++
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 4aca9304..2b05784b 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -6,6 +6,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 
 import aurweb.config
 
+from aurweb import util
 from aurweb.auth import auth_required
 from aurweb.models.user import User
 from aurweb.templates import make_context, render_template
@@ -63,7 +64,7 @@ async def login_post(request: Request,
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURSID", sid, expires=expires_at,
                         secure=secure_cookies, httponly=True)
-    return response
+    return util.add_samesite_fields(response, "strict")
 
 
 @router.get("/logout")
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index ed0c039b..580ee0d4 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -8,6 +8,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 
 import aurweb.config
 
+from aurweb import util
 from aurweb.templates import make_context, render_template
 
 router = APIRouter()
@@ -50,7 +51,7 @@ async def language(request: Request,
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURLANG", set_lang,
                         secure=secure_cookies, httponly=True)
-    return response
+    return util.add_samesite_fields(response, "strict")
 
 
 @router.get("/", response_class=HTMLResponse)
diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index 093807fe..edeb7c6b 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -14,6 +14,7 @@ from starlette.requests import Request
 import aurweb.config
 import aurweb.db
 
+from aurweb import util
 from aurweb.l10n import get_translator_for_request
 from aurweb.schema import Bans, Sessions, Users
 
@@ -140,7 +141,7 @@ async def authenticate(request: Request, redirect: str = None, conn=Depends(aurw
             response.set_cookie(key="SSO_ID_TOKEN", value=token["id_token"],
                                 path="/sso/", httponly=True,
                                 secure=secure_cookies)
-        return response
+        return util.add_samesite_fields(response, "strict")
     else:
         # We’ve got a severe integrity violation.
         raise Exception("Multiple accounts found for SSO account " + sub)
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 640b9447..bb4047f4 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -94,4 +94,4 @@ def render_template(request: Request,
                         secure=secure_cookies, httponly=True)
     response.set_cookie("AURTZ", context.get("timezone"),
                         secure=secure_cookies, httponly=True)
-    return response
+    return util.add_samesite_fields(response, "strict")
diff --git a/aurweb/util.py b/aurweb/util.py
index 1da85606..b34226a2 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -9,6 +9,7 @@ from urllib.parse import quote_plus, urlparse
 from zoneinfo import ZoneInfo
 
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
+from fastapi.responses import Response
 from jinja2 import pass_context
 
 import aurweb.config
@@ -88,7 +89,7 @@ def migrate_cookies(request, response):
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     for k, v in request.cookies.items():
         response.set_cookie(k, v, secure=secure_cookies, httponly=True)
-    return response
+    return add_samesite_fields(response, "strict")
 
 
 @pass_context
@@ -136,3 +137,15 @@ def jsonify(obj):
     if isinstance(obj, datetime):
         obj = int(obj.timestamp())
     return obj
+
+
+def add_samesite_fields(response: Response, value: str):
+    """ Set the SameSite field on all cookie headers found.
+    Taken from https://github.com/tiangolo/fastapi/issues/1099. """
+    for idx, header in enumerate(response.raw_headers):
+        if header[0].decode() == "set-cookie":
+            cookie = header[1].decode()
+            if f"SameSite={value}" not in cookie:
+                cookie += f"; SameSite={value}"
+                response.raw_headers[idx] = (header[0], cookie.encode())
+    return response
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index a443be72..b0dd5648 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -111,6 +111,8 @@ def test_secure_login(mock):
     cookie = next(c for c in response.cookies if c.name == "AURSID")
     assert cookie.secure is True
     assert cookie.has_nonstandard_attr("HttpOnly") is True
+    assert cookie.has_nonstandard_attr("SameSite") is True
+    assert cookie.get_nonstandard_attr("SameSite") == "strict"
     assert cookie.value is not None and len(cookie.value) > 0
 
     # Let's make sure we actually have a session relationship

From 13456fea1e6eab4971e4ec9f38456ccaeccda352 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 12 Jun 2021 03:26:05 -0700
Subject: [PATCH 194/844] set AURLANG + AURTZ on login

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/auth.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 2b05784b..8f37fe27 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -64,6 +64,10 @@ async def login_post(request: Request,
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURSID", sid, expires=expires_at,
                         secure=secure_cookies, httponly=True)
+    response.set_cookie("AURTZ", user.Timezone,
+                        secure=secure_cookies, httponly=True)
+    response.set_cookie("AURLANG", user.LangPreference,
+                        secure=secure_cookies, httponly=True)
     return util.add_samesite_fields(response, "strict")
 
 

From 865c41450466c8392605f7c1aabc5607b77cb5a1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 12 Jun 2021 03:54:41 -0700
Subject: [PATCH 195/844] aurweb.asgi: add security headers middleware

This commit introduces a middleware function which adds
the following security headers to each response:

- Content-Security-Policy
    - This includes a new `nonce`, which is tied to a user
      via authentication middleware. Both an anonymous user
      and an authenticated user recieve their own random nonces.
- X-Content-Type-Options
- Referrer-Policy
- X-Frame-Options

They are then tested for existence in test/test_routes.py.

Note: The overcomplicated-looking asyncio behavior in the
middleware function is used to avoid a warning about the old
coroutine awaits being deprecated. See
https://docs.python.org/3/library/asyncio-task.html#asyncio.wait
for more detail.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py                    | 43 ++++++++++++++++++++++++++++++-
 aurweb/auth.py                    | 10 ++++++-
 aurweb/models/user.py             |  1 +
 aurweb/util.py                    | 11 ++++++++
 templates/partials/typeahead.html |  2 +-
 test/test_routes.py               | 42 ++++++++++++++++++++++++++++++
 6 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 861f6056..6c4d457d 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,6 +1,8 @@
+import asyncio
 import http
+import typing
 
-from fastapi import FastAPI, HTTPException
+from fastapi import FastAPI, HTTPException, Request
 from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from starlette.middleware.authentication import AuthenticationMiddleware
@@ -55,3 +57,42 @@ async def http_exception_handler(request, exc):
     phrase = http.HTTPStatus(exc.status_code).phrase
     return HTMLResponse(f"<h1>{exc.status_code} {phrase}</h1><p>{exc.detail}</p>",
                         status_code=exc.status_code)
+
+
+@app.middleware("http")
+async def add_security_headers(request: Request, call_next: typing.Callable):
+    """ This middleware adds the CSP, XCTO, XFO and RP security
+    headers to the HTTP response associated with request.
+
+    CSP: Content-Security-Policy
+    XCTO: X-Content-Type-Options
+    RP: Referrer-Policy
+    XFO: X-Frame-Options
+    """
+    response = asyncio.create_task(call_next(request))
+    await asyncio.wait({response}, return_when=asyncio.FIRST_COMPLETED)
+    response = response.result()
+
+    # Add CSP header.
+    nonce = request.user.nonce
+    csp = "default-src 'self'; "
+    script_hosts = [
+        "ajax.googleapis.com",
+        "cdn.jsdelivr.net"
+    ]
+    csp += f"script-src 'self' 'nonce-{nonce}' " + ' '.join(script_hosts)
+    response.headers["Content-Security-Policy"] = csp
+
+    # Add XTCO header.
+    xcto = "nosniff"
+    response.headers["X-Content-Type-Options"] = xcto
+
+    # Add Referrer Policy header.
+    rp = "same-origin"
+    response.headers["Referrer-Policy"] = rp
+
+    # Add X-Frame-Options header.
+    xfo = "SAMEORIGIN"
+    response.headers["X-Frame-Options"] = xfo
+
+    return response
diff --git a/aurweb/auth.py b/aurweb/auth.py
index f57e18bf..ba5f0fea 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -10,7 +10,7 @@ from starlette.requests import HTTPConnection
 
 import aurweb.config
 
-from aurweb import l10n
+from aurweb import l10n, util
 from aurweb.models.session import Session
 from aurweb.models.user import User
 from aurweb.templates import make_variable_context, render_template
@@ -25,6 +25,12 @@ class AnonymousUser:
     # A stub ssh_pub_key relationship.
     ssh_pub_key = None
 
+    # A nonce attribute, needed for all browser sessions; set in __init__.
+    nonce = None
+
+    def __init__(self):
+        self.nonce = util.make_nonce()
+
     @staticmethod
     def is_authenticated():
         return False
@@ -55,7 +61,9 @@ class BasicAuthBackend(AuthenticationBackend):
         # exists, due to ForeignKey constraints in the schema upheld
         # by mysqlclient.
         user = session.query(User).filter(User.ID == record.UsersID).first()
+        user.nonce = util.make_nonce()
         user.authenticated = True
+
         return AuthCredentials(["authenticated"]), user
 
 
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 83cde5f1..9db9add0 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -37,6 +37,7 @@ class User(Base):
 
     # High-level variables used to track authentication (not in DB).
     authenticated = False
+    nonce = None
 
     def __init__(self, Passwd: str = str(), **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/util.py b/aurweb/util.py
index b34226a2..e5f510ce 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -1,6 +1,8 @@
 import base64
+import math
 import random
 import re
+import secrets
 import string
 
 from collections import OrderedDict
@@ -20,6 +22,15 @@ def make_random_string(length):
                                   string.digits, k=length))
 
 
+def make_nonce(length: int = 8):
+    """ Generate a single random nonce. Here, token_hex generates a hex
+    string of 2 hex characters per byte, where the length give is
+    nbytes. This means that to get our proper string length, we need to
+    cut it in half and truncate off any remaining (in the case that
+    length was uneven). """
+    return secrets.token_hex(math.ceil(length / 2))[:length]
+
+
 def valid_username(username):
     min_len = aurweb.config.getint("options", "username_min_len")
     max_len = aurweb.config.getint("options", "username_max_len")
diff --git a/templates/partials/typeahead.html b/templates/partials/typeahead.html
index d943dbc4..c218b8d1 100644
--- a/templates/partials/typeahead.html
+++ b/templates/partials/typeahead.html
@@ -1,6 +1,6 @@
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
 <script type="text/javascript" src="/static/js/bootstrap-typeahead.min.js"></script>
-<script type="text/javascript">
+<script type="text/javascript" nonce="{{ request.user.nonce }}">
     $(document).ready(function() {
         $('#pkgsearch-field').typeahead({
             source: function(query, callback) {
diff --git a/test/test_routes.py b/test/test_routes.py
index f4bb063f..d67f4a48 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -1,7 +1,9 @@
+import re
 import urllib.parse
 
 from http import HTTPStatus
 
+import lxml.etree
 import pytest
 
 from fastapi.testclient import TestClient
@@ -39,6 +41,24 @@ def test_index():
     assert response.status_code == int(HTTPStatus.OK)
 
 
+def test_index_security_headers():
+    """ Check for the existence of CSP, XCTO, XFO and RP security headers.
+
+    CSP: Content-Security-Policy
+    XCTO: X-Content-Type-Options
+    RP: Referrer-Policy
+    XFO: X-Frame-Options
+    """
+    # Use `with` to trigger FastAPI app events.
+    with client as req:
+        response = req.get("/")
+    assert response.status_code == int(HTTPStatus.OK)
+    assert response.headers.get("Content-Security-Policy") is not None
+    assert response.headers.get("X-Content-Type-Options") == "nosniff"
+    assert response.headers.get("Referrer-Policy") == "same-origin"
+    assert response.headers.get("X-Frame-Options") == "SAMEORIGIN"
+
+
 def test_favicon():
     """ Test the favicon route at '/favicon.ico'. """
     response1 = client.get("/static/images/favicon.ico")
@@ -106,3 +126,25 @@ def test_error_messages():
     response2 = client.get("/raisefivethree")
     assert response1.status_code == int(HTTPStatus.NOT_FOUND)
     assert response2.status_code == int(HTTPStatus.SERVICE_UNAVAILABLE)
+
+
+def test_nonce_csp():
+    with client as request:
+        response = request.get("/")
+    data = response.headers.get("Content-Security-Policy")
+    nonce = next(field for field in data.split("; ") if "nonce" in field)
+    match = re.match(r"^script-src .*'nonce-([a-fA-F0-9]{8})' .*$", nonce)
+    nonce = match.group(1)
+    assert nonce is not None and len(nonce) == 8
+
+    parser = lxml.etree.HTMLParser(recover=True)
+    root = lxml.etree.fromstring(response.text, parser=parser)
+
+    nonce_verified = False
+    scripts = root.xpath("//script")
+    for script in scripts:
+        if script.text is not None:
+            assert "nonce" in script.keys()
+            if not (nonce_verified := (script.get("nonce") == nonce)):
+                break
+    assert nonce_verified is True

From 55c0637b984a2b09f22a593b89043770ba4d066c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Jun 2021 18:38:24 -0700
Subject: [PATCH 196/844] add logging.config.fileConfig

This resolves logging issues with alembic on aurweb.initdb
in addition to adding more logging utilities for aurweb
and tests in general.

Developers should fetch a logger for their specific module
via `logging.getLogger(__name__)`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py    |  1 +
 aurweb/initdb.py  |  1 +
 aurweb/logging.py | 11 +++++++++
 logging.conf      | 62 +++++++++++++++++++++++++++++++++++++++++++++++
 test/setup.sh     |  1 +
 5 files changed, 76 insertions(+)
 create mode 100644 aurweb/logging.py
 create mode 100644 logging.conf

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 6c4d457d..45638277 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -9,6 +9,7 @@ from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.middleware.sessions import SessionMiddleware
 
 import aurweb.config
+import aurweb.logging
 
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine
diff --git a/aurweb/initdb.py b/aurweb/initdb.py
index 46f079c0..9a063ba4 100644
--- a/aurweb/initdb.py
+++ b/aurweb/initdb.py
@@ -4,6 +4,7 @@ import alembic.command
 import alembic.config
 
 import aurweb.db
+import aurweb.logging
 import aurweb.schema
 
 
diff --git a/aurweb/logging.py b/aurweb/logging.py
new file mode 100644
index 00000000..d0154634
--- /dev/null
+++ b/aurweb/logging.py
@@ -0,0 +1,11 @@
+import logging
+import logging.config
+import os
+
+import aurweb.config
+
+aurwebdir = aurweb.config.get("options", "aurwebdir")
+config_path = os.path.join(aurwebdir, "logging.conf")
+
+logging.config.fileConfig(config_path, disable_existing_loggers=False)
+logger = logging.getLogger(__name__)
diff --git a/logging.conf b/logging.conf
new file mode 100644
index 00000000..e0959916
--- /dev/null
+++ b/logging.conf
@@ -0,0 +1,62 @@
+[loggers]
+keys=root,aurweb,test,uvicorn,hypercorn,alembic
+
+[handlers]
+keys=simpleHandler,detailedHandler
+
+[formatters]
+keys=simpleFormatter,detailedFormatter
+
+[logger_root]
+level=INFO
+handlers=simpleHandler
+
+[logger_aurweb]
+level=DEBUG
+handlers=detailedHandler
+qualname=aurweb
+propagate=0
+
+[logger_test]
+level=DEBUG
+handlers=detailedHandler
+qualname=test
+propagate=0
+
+[logger_uvicorn]
+level=DEBUG
+handlers=simpleHandler
+qualname=uvicorn
+propagate=0
+
+[logger_hypercorn]
+level=DEBUG
+handlers=simpleHandler
+qualname=hypercorn
+propagate=0
+
+[logger_alembic]
+level=INFO
+handlers=simpleHandler
+qualname=alembic
+propagate=0
+
+[handler_simpleHandler]
+class=StreamHandler
+level=DEBUG
+formatter=simpleFormatter
+args=(sys.stdout,)
+
+[handler_detailedHandler]
+class=StreamHandler
+level=DEBUG
+formatter=detailedFormatter
+args=(sys.stdout,)
+
+[formatter_simpleFormatter]
+format=%(asctime)s %(levelname)-5s | %(name)s: %(message)s
+datefmt=%H:%M:%S
+
+[formatter_detailedFormatter]
+format=%(asctime)s %(levelname)-5s | %(name)s.%(funcName)s() @ L%(lineno)d: %(message)s
+datefmt=%H:%M:%S
diff --git a/test/setup.sh b/test/setup.sh
index 2eebe9cc..191a73d8 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -30,6 +30,7 @@ backend = sqlite
 name = aur.db
 
 [options]
+aurwebdir = $TOPLEVEL
 aur_location = https://aur.archlinux.org
 aur_request_ml = aur-requests@lists.archlinux.org
 enable-maintenance = 0

From 8abb096d7b1071184fecf07b6470a81266ed0b8d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 20 Jun 2021 07:03:46 -0700
Subject: [PATCH 197/844] use aurweb_test for default mysql dev database

This also updates `test/README.md` to be a bit more specific
and precise with our current state of testing.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml  |   8 +--
 conf/config.dev |   2 +-
 test/README.md  | 151 +++++++++++++++++++++++++++++++++++++++++-------
 test/test_db.py |  15 ++++-
 4 files changed, 149 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9947dfe..6a9d80cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,14 +20,14 @@ before_script:
            python-pytest-asyncio python-coverage python-bcrypt
            python-email-validator openssh python-lxml mariadb
            python-isort flake8
-  - bash -c "echo '127.0.0.1' > /etc/hosts"
-  - bash -c "echo '::1' >> /etc/hosts"
+  - bash -c "echo '127.0.0.1 localhost' > /etc/hosts"
+  - bash -c "echo '::1 localhost' >> /etc/hosts"
   - mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
   - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
   - 'until : > /dev/tcp/127.0.0.1/3306; do sleep 1s; done'
   - mysql -u root -e "CREATE USER 'aur'@'localhost' IDENTIFIED BY 'aur';"
-  - mysql -u root -e "CREATE DATABASE aurweb;"
-  - mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb.* TO 'aur'@'localhost';"
+  - mysql -u root -e "CREATE DATABASE aurweb_test;"
+  - mysql -u root -e "GRANT ALL ON aurweb_test.* TO 'aur'@'localhost';"
   - mysql -u root -e "FLUSH PRIVILEGES;"
   - sed -r "s;YOUR_AUR_ROOT;$(pwd);g" conf/config.dev > conf/config
   - cp conf/config conf/config.sqlite
diff --git a/conf/config.dev b/conf/config.dev
index 45d940e6..6ef3bb79 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -10,7 +10,7 @@
 backend = mysql
 
 ; If using sqlite, set name to the database file path.
-name = aurweb
+name = aurweb_test
 
 ; MySQL database information. User defaults to root for containerized
 ; testing with mysqldb. This should be set to a non-root user.
diff --git a/test/README.md b/test/README.md
index 0f3f4cbd..ef8a08f4 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,5 +1,5 @@
-Running tests
--------------
+aurweb Test Collection
+======================
 
 To run all tests, you may run `make check` under `test/` (alternative targets:
 `make pytest`, `make sh`).
@@ -12,7 +12,8 @@ may receive command-line options to help debugging. See for example sharness's
 documentation for shell test scripts:
 https://github.com/chriscool/sharness/blob/master/README.git
 
-### Dependencies
+Dependencies
+------------
 
 For all the test to run, the following Arch packages should be installed:
 
@@ -30,39 +31,149 @@ For all the test to run, the following Arch packages should be installed:
 - postfix
 - openssh
 
+Test Configuration
+------------------
+
+To perform any tests, we need to supply `aurweb` with a valid
+configuration. For development (and testing) purposes, an example
+[conf/config.dev](../conf/config.dev) can be slightly modified.
+
+Start off by copying `config.dev` to a new configuration.
+
+    $ cp -v conf/config.dev conf/config
+
+First, we must tell `aurweb` where the root of our project
+lives by replacing `YOUR_AUR_ROOT` with the path to the aurweb
+repository.
+
+    $ sed -i "s;YOUR_AUR_ROOT;/path/to/aurweb;g" conf/config
+
+Now, one must decide a database backend to use; see
+[Test Database](#test-database) for details on configuring
+the different supported backends.
+
+Test Database
+-------------
+
+Users may choose to configure one of several backends, including:
+`mysql` and `sqlite`. By default, `conf/config.dev` is configured
+for a the `mysql` backend using a test database named `aurweb_test`.
+
+Users can initialize an empty MySQL database by performing the following:
+
+    $ cat conf/config
+    [database]
+    backend = mysql
+    name = aurweb_test
+    user = aur
+    password = aur
+    socket = /var/run/mysqld/mysqld.sock
+    ...
+
+    # mysql -u root -e "CREATE USER 'aur'@'localhost' IDENTIFIED BY 'aur'"
+    # mysql -u root -e "CREATE DATABASE aurweb_test"
+    # mysql -u root -e "GRANT ALL ON aurweb_test.* TO 'aur'@'localhost'"
+    # mysql -u root -e "FLUSH ALL PRIVILEGES"
+
+    $ export AUR_CONFIG=conf/config
+    $ python3 -m aurweb.initdb
+
+Or more lightweight with `sqlite`:
+
+    $ cat $AUR_CONFIG
+    [database]
+    backend = sqlite
+    name = aurweb.sqlite3
+    ...
+
+    $ export AUR_CONFIG=conf/config
+    $ python3 -m aurweb.initdb
+
+After initializing a fresh test database, users can continue on to
+[Running Tests](#running-tests).
+
 Running tests
 -------------
 
 Recommended method of running tests: `make check`.
 
-First, setup the test configuration:
+Makefile test targets: `sh`, `pytest`.
 
-    $ sed -r 's;YOUR_AUR_ROOT;$(pwd);g' conf/config.dev > conf/config
+Run tests from the project root.
 
-You'll need to make sure that emails can be sent out by aurweb.scripts.notify.
-If you don't have anything setup, just install postfix and start it before
-running tests.
+    $ cd /path/to/aurweb
 
-With those installed, one can run Python tests manually with any AUR config
-specified by `AUR_CONFIG`:
+Ensure you have the proper `AUR_CONFIG` exported:
 
-    $ AUR_CONFIG=conf/config coverage run --append /usr/bin/pytest test/
+    $ export AUR_CONFIG=conf/config
 
-After tests are run (particularly, with `coverage run` included), one can
-produce coverage reports.
+To run `sharness` shell test suites (requires Arch Linux):
+
+    $ make -C test sh
+
+To run `pytest` Python test suites:
+
+    $ make -C test pytest
+
+To produce coverage reports related to Python when running tests manually,
+use the following method:
+
+    $ coverage run --append /path/to/python/file.py
+
+**Note:** Sharness test suites (shell) internally run coverage run.
+
+After tests are run, one can produce coverage reports.
 
     # Print out a CLI coverage report.
     $ coverage report
+
     # Produce an HTML-based coverage report.
     $ coverage html
 
-When running `make -C test`, all tests ran will produce coverage data via
-`coverage run --append`. After running `make -C test`, one can continue with
-coverage reporting steps above. Running tests through `make` will test and
-cover code ran by both aurweb scripts and our pytest collection.
+Writing Python tests (current)
+------------------------------
 
-Writing tests
--------------
+Almost all of our `pytest` suites use the database in some way. There
+are a few particular testing utilities in `aurweb` that one should
+keep aware of to aid testing code:
+
+- `aurweb.testing.setup_init_db(*tables)`
+    - Prepares test database tables to be cleared before a test
+      is run. Be careful not to specify any tables we depend on
+      for constant records, like `AccountTypes`, `DependencyTypes`,
+      `RelationTypes` and `RequestTypes`.
+- `aurweb.testing.requests.Request`
+    - A fake stripped down version of `fastapi.Request` that can
+      be passed to any functions in our codebase which use
+      `fastapi.Request` parameters.
+
+Example code:
+
+    import pytest
+
+    from aurweb import db
+    from aurweb.models.user import User
+    from aurweb.testing import setup_test_db
+    from aurweb.testing.requests import Request
+
+
+    @pytest.fixture(autouse=True)
+    def setup():
+        setup_test_db(User.__tablename__)
+
+    @pytest.fixture
+    def user():
+        yield db.create(User, Passwd="testPassword", ...)
+
+    def test_user_login(user):
+        assert isinstance(user, User) is True
+
+        fake_request = Request()
+        sid = user.login(fake_request, "testPassword")
+        assert sid is not None
+
+Writing Sharness tests (legacy)
+-------------------------------
 
 Shell test scripts must follow the Test Anything Protocol specification:
 http://testanything.org/tap-specification.html
@@ -77,7 +188,7 @@ importable without toying with os.path or PYTHONPATH.
 Tests written in shell should use sharness. In general, new tests should be
 consistent with existing tests unless they have a good reason not to.
 
-Debugging tests
+Debugging Sharness tests
 ---------------
 
 By default, `make -C test` is quiet and does not print out verbose information
diff --git a/test/test_db.py b/test/test_db.py
index d7a91813..293fb096 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -119,9 +119,20 @@ def test_sqlalchemy_mysql_port_url():
         aurweb.config.rehash()
 
 
+def test_sqlalchemy_mysql_socket_url():
+    tmpctx, tmp = make_temp_config("conf/config",
+                                   (r"[;]?port = 3306", ";port = 3306"))
+
+    with tmpctx:
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
+            aurweb.config.rehash()
+            assert db.get_sqlalchemy_url()
+        aurweb.config.rehash()
+
+
 def test_sqlalchemy_unknown_backend():
     tmpctx, tmp = make_temp_config("conf/config",
-                                   (r"backend = mysql", "backend = blah"))
+                                   (r"backend = .+", "backend = blah"))
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -156,7 +167,7 @@ def test_connection_class_sqlite_without_fail():
 
 def test_connection_class_unsupported_backend():
     tmpctx, tmp = make_temp_config("conf/config",
-                                   (r"backend = mysql", "backend = blah"))
+                                   (r"backend = .+", "backend = blah"))
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):

From 3b8e3f3e4ba7cb9c2c952a133ed449095f9dfeb5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 20 Jun 2021 13:12:09 -0700
Subject: [PATCH 198/844] test_db: remove user-configuration dependency

We should have been using a config that's stored in the
repo all along.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_db.py | 87 +++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/test/test_db.py b/test/test_db.py
index 293fb096..9ece25ea 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -44,38 +44,55 @@ class DBConnection:
         pass
 
 
-def make_temp_config(config_file, *replacements):
+def make_temp_config(*replacements):
     """ Generate a temporary config file with a set of replacements.
 
     :param *replacements: A variable number of tuple regex replacement pairs
     :return: A tuple containing (temp directory, temp config file)
     """
+    aurwebdir = aurweb.config.get("options", "aurwebdir")
+    config_file = os.path.join(aurwebdir, "conf", "config.dev")
+    config_defaults = os.path.join(aurwebdir, "conf", "config.defaults")
+
+    db_name = aurweb.config.get("database", "name")
+    db_host = aurweb.config.get_with_fallback("database", "host", "localhost")
+    db_port = aurweb.config.get_with_fallback("database", "port", "3306")
+    db_user = aurweb.config.get_with_fallback("database", "user", "root")
+    db_password = aurweb.config.get_with_fallback("database", "password", None)
+
+    # Replacements to perform before *replacements.
+    # These serve as generic replacements in config.dev
+    perform = (
+        (r"name = .+", f"name = {db_name}"),
+        (r"host = .+", f"host = {db_host}"),
+        (r";port = .+", f";port = {db_port}"),
+        (r"user = .+", f"user = {db_user}"),
+        (r"password = .+", f"password = {db_password}"),
+        ("YOUR_AUR_ROOT", aurwebdir),
+    )
+
     tmpdir = tempfile.TemporaryDirectory()
     tmp = os.path.join(tmpdir.name, "config.tmp")
     with open(config_file) as f:
         config = f.read()
-        for repl in list(replacements):
+        for repl in tuple(perform + replacements):
             config = re.sub(repl[0], repl[1], config)
         with open(tmp, "w") as o:
             o.write(config)
-        aurwebdir = aurweb.config.get("options", "aurwebdir")
-        defaults = os.path.join(aurwebdir, "conf/config.defaults")
-        with open(defaults) as i:
+        with open(config_defaults) as i:
             with open(f"{tmp}.defaults", "w") as o:
                 o.write(i.read())
     return tmpdir, tmp
 
 
-def make_temp_sqlite_config(config_file):
-    return make_temp_config(config_file,
-                            (r"backend = .*", "backend = sqlite"),
+def make_temp_sqlite_config():
+    return make_temp_config((r"backend = .*", "backend = sqlite"),
                             (r"name = .*", "name = /tmp/aurweb.sqlite3"))
 
 
-def make_temp_mysql_config(config_file):
-    return make_temp_config(config_file,
-                            (r"backend = .*", "backend = mysql"),
-                            (r"name = .*", "name = aurweb"))
+def make_temp_mysql_config():
+    return make_temp_config((r"backend = .*", "backend = mysql"),
+                            (r"name = .*", "name = aurweb_test"))
 
 
 @pytest.fixture(autouse=True)
@@ -91,7 +108,7 @@ def setup_db():
 
 
 def test_sqlalchemy_sqlite_url():
-    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+    tmpctx, tmp = make_temp_sqlite_config()
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
             aurweb.config.rehash()
@@ -100,7 +117,7 @@ def test_sqlalchemy_sqlite_url():
 
 
 def test_sqlalchemy_mysql_url():
-    tmpctx, tmp = make_temp_mysql_config("conf/config")
+    tmpctx, tmp = make_temp_mysql_config()
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
             aurweb.config.rehash()
@@ -109,8 +126,7 @@ def test_sqlalchemy_mysql_url():
 
 
 def test_sqlalchemy_mysql_port_url():
-    tmpctx, tmp = make_temp_config("conf/config",
-                                   (r";port = 3306", "port = 3306"))
+    tmpctx, tmp = make_temp_config((r";port = 3306", "port = 3306"))
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -120,8 +136,7 @@ def test_sqlalchemy_mysql_port_url():
 
 
 def test_sqlalchemy_mysql_socket_url():
-    tmpctx, tmp = make_temp_config("conf/config",
-                                   (r"[;]?port = 3306", ";port = 3306"))
+    tmpctx, tmp = make_temp_config()
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -131,8 +146,7 @@ def test_sqlalchemy_mysql_socket_url():
 
 
 def test_sqlalchemy_unknown_backend():
-    tmpctx, tmp = make_temp_config("conf/config",
-                                   (r"backend = .+", "backend = blah"))
+    tmpctx, tmp = make_temp_config((r"backend = .+", "backend = blah"))
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -149,7 +163,7 @@ def test_db_connects_without_fail():
 
 
 def test_connection_class_sqlite_without_fail():
-    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+    tmpctx, tmp = make_temp_sqlite_config()
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
             aurweb.config.rehash()
@@ -166,8 +180,7 @@ def test_connection_class_sqlite_without_fail():
 
 
 def test_connection_class_unsupported_backend():
-    tmpctx, tmp = make_temp_config("conf/config",
-                                   (r"backend = .+", "backend = blah"))
+    tmpctx, tmp = make_temp_config((r"backend = .+", "backend = blah"))
 
     with tmpctx:
         with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
@@ -179,12 +192,9 @@ def test_connection_class_unsupported_backend():
 
 @mock.patch("MySQLdb.connect", mock.MagicMock(return_value=True))
 def test_connection_mysql():
-    tmpctx, tmp = make_temp_mysql_config("conf/config")
+    tmpctx, tmp = make_temp_mysql_config()
     with tmpctx:
-        with mock.patch.dict(os.environ, {
-            "AUR_CONFIG": tmp,
-            "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
-        }):
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
             aurweb.config.rehash()
             db.Connection()
         aurweb.config.rehash()
@@ -199,13 +209,10 @@ def test_connection_sqlite():
 @mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
 @mock.patch.object(sqlite3, "paramstyle", "format")
 def test_connection_execute_paramstyle_format():
-    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+    tmpctx, tmp = make_temp_sqlite_config()
 
     with tmpctx:
-        with mock.patch.dict(os.environ, {
-            "AUR_CONFIG": tmp,
-            "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
-        }):
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
             aurweb.config.rehash()
 
             aurweb.db.kill_engine()
@@ -235,13 +242,10 @@ def test_connection_execute_paramstyle_format():
 @mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
 @mock.patch.object(sqlite3, "paramstyle", "qmark")
 def test_connection_execute_paramstyle_qmark():
-    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+    tmpctx, tmp = make_temp_sqlite_config()
 
     with tmpctx:
-        with mock.patch.dict(os.environ, {
-            "AUR_CONFIG": tmp,
-            "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
-        }):
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
             aurweb.config.rehash()
 
             aurweb.db.kill_engine()
@@ -260,12 +264,9 @@ def test_connection_execute_paramstyle_qmark():
 @mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
 @mock.patch.object(sqlite3, "paramstyle", "unsupported")
 def test_connection_execute_paramstyle_unsupported():
-    tmpctx, tmp = make_temp_sqlite_config("conf/config")
+    tmpctx, tmp = make_temp_sqlite_config()
     with tmpctx:
-        with mock.patch.dict(os.environ, {
-            "AUR_CONFIG": tmp,
-            "AUR_CONFIG_DEFAULTS": "conf/config.defaults"
-        }):
+        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
             aurweb.config.rehash()
             conn = db.Connection()
             with pytest.raises(ValueError, match="unsupported paramstyle"):

From 5bd46d18a3cd645ae2164ee3e151ac10524355a2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 20 Jun 2021 12:19:33 -0700
Subject: [PATCH 199/844] Improve Docker ecosystem

Instead of using Dockerfile for everything, we've introduced
a docker-compose.yml file and kept the Dockerfile to producing
a pure base image for the services defined.

docker-compose services:

- `mariadb` - Setup mariadb
- `sharness` - Run sharness suites
- `pytest-mysql` - Run pytest suites with MariaDB
- `pytest-sqlite` - Run pytest suites with SQLite
- `test` - Run all tests and produce a collective coverage report
    - This target mounts a cache volume and copies any successful
      coverage report back to `./cache/.coverage`. Users can run
      `./util/fix-coverage ./cache/.coverage` to rewrite source
      code paths and move coverage into place to view reports
      on your local system.

== Get Started ==

Build `aurweb:latest`.

    $ docker build -t aurweb:latest .

Run all tests via `docker-compose`.

    $ docker-compose up test

You can also purely run `pytest` in SQLite or MariaDB modes.

    $ docker-compose up pytest-sqlite
    $ docker-compose up pytest-mysql

Or `sharness` alone, which only uses SQLite internally.

    $ docker-compose up sharness

After running tests, coverage reports are stored in `./cache/.coverage`.
This database was most likely created in a different path, and so it
needs to be sanitized with `./util/fix-coverage`.

    $ ./util/fix-coverage cache/.coverage
    Copied coverage db to /path/to/aurweb/.coverage.
    $ coverage report
    ...
    $ coverage html
    $ coverage xml
    ...

Defined components:

**Entrypoints**

- mariadb-entrypoint.sh - setup mariadb and run its daemon
- test-mysql-entrypoint.sh - setup mysql configurations
- test-sqlite-entrypoint.sh - setup sqlite configurations
- tests-entrypoint.sh - setup mysql and sqlite configurations

**Scripts**

- run-mariadb.sh - setup databases
- run-pytests.sh - run pytest suites
- run-sharness.sh - run sharness suites
- run-tests.sh - run both pytests and sharness

**Health**

- mariadb.sh - A healthcheck script for the mariadb service
- pytest.sh - A healthcheck script for the pytest-* services
- sharness.sh - A healthcheck script for the sharness service

This Docker configuration is setup for tests, but should be
extendable for web and git servers.

**Changes to Makefile**

- Remove `.coverage` in the `clean` target
- Add a `coverage` target which prints a report and outputs xml

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitignore                       |  1 +
 Dockerfile                       | 40 ++++++++-------
 cache/.gitkeep                   |  0
 docker-compose.yml               | 88 ++++++++++++++++++++++++++++++++
 docker/health/mariadb.sh         |  2 +
 docker/mariadb-entrypoint.sh     |  6 +++
 docker/scripts/run-mariadb.sh    | 19 +++++++
 docker/scripts/run-pytests.sh    | 41 +++++++++++++++
 docker/scripts/run-sharness.sh   |  7 +++
 docker/scripts/run-tests.sh      | 34 ++++++++++++
 docker/test-mysql-entrypoint.sh  | 23 +++++++++
 docker/test-sqlite-entrypoint.sh | 16 ++++++
 docker/tests-entrypoint.sh       |  8 +++
 test/Makefile                    |  7 ++-
 util/fix-coverage                | 68 ++++++++++++++++++++++++
 15 files changed, 340 insertions(+), 20 deletions(-)
 create mode 100644 cache/.gitkeep
 create mode 100644 docker-compose.yml
 create mode 100755 docker/health/mariadb.sh
 create mode 100755 docker/mariadb-entrypoint.sh
 create mode 100755 docker/scripts/run-mariadb.sh
 create mode 100755 docker/scripts/run-pytests.sh
 create mode 100755 docker/scripts/run-sharness.sh
 create mode 100755 docker/scripts/run-tests.sh
 create mode 100755 docker/test-mysql-entrypoint.sh
 create mode 100755 docker/test-sqlite-entrypoint.sh
 create mode 100755 docker/tests-entrypoint.sh
 create mode 100755 util/fix-coverage

diff --git a/.gitignore b/.gitignore
index 35b571d7..2006e838 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ fastapi_aw/
 .pylintrc
 .coverage
 .idea
+/cache/*
diff --git a/Dockerfile b/Dockerfile
index c432f73f..6858bedb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,33 @@
-FROM archlinux
-COPY . /aurweb
-WORKDIR /aurweb
+FROM archlinux:base-devel
+
+# Setup some default system stuff.
+RUN bash -c 'echo "127.0.0.1 localhost" >> /etc/hosts'
+RUN bash -c 'echo "::1 localhost" >> /etc/hosts'
+RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
+
+RUN mkdir -p .pkg-cache
 
 # Install dependencies.
-RUN pacman -Syu --noconfirm base-devel git gpgme protobuf pyalpm \
-    python-mysql-connector python-pygit2 python-srcinfo python-bleach \
+RUN pacman -Syu --noconfirm --noprogressbar \
+    --cachedir .pkg-cache git gpgme protobuf pyalpm \
+    python-mysqlclient python-pygit2 python-srcinfo python-bleach \
     python-markdown python-sqlalchemy python-alembic python-pytest \
     python-werkzeug python-pytest-tap python-fastapi nginx python-authlib \
     python-itsdangerous python-httpx python-jinja python-pytest-cov \
     python-requests python-aiofiles python-python-multipart \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
-    python-email-validator openssh python-lxml
+    python-email-validator openssh python-lxml mariadb mariadb-libs \
+    python-isort flake8
 
-# Remove aurweb.sqlite3 if it was copied over via COPY.
-RUN rm -fv aurweb.sqlite3
+RUN useradd -U -d /aurweb -c 'AUR User' aur
 
-# Setup our test config.
-RUN sed -r "s;YOUR_AUR_ROOT;/aurweb;g" conf/config.dev > conf/config
+COPY docker /docker
 
-# Install translations.
-RUN AUR_CONFIG=conf/config make -C po all install
+WORKDIR /aurweb
+COPY . .
 
-# Initialize the database.
-RUN AUR_CONFIG=conf/config python -m aurweb.initdb
+ENV PYTHONPATH=/aurweb
+ENV AUR_CONFIG=conf/config
 
-# Test everything!
-RUN make -C test
-
-# Produce a coverage report.
-RUN coverage report --include='aurweb/*'
+RUN make -C po all install
+RUN python setup.py install
diff --git a/cache/.gitkeep b/cache/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..7fbd20fd
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,88 @@
+#
+# Docker service definitions for the aurweb project.
+#
+# Notable services:
+#   - `sharness` - Run sharness test suites
+#   - `pytest-mysql` - Run pytest suites with MariaDB
+#   - `pytest-sqlite` - Run pytest suites with SQLite
+#   - `test` - Run sharness, pytest-mysql and pytest-sqlite
+#   - `mariadb` - `port 13306` - MariaDB server for docker
+#
+# Copyright (C) 2021 aurweb Development
+# All Rights Reserved.
+version: "3.8"
+
+services:
+  mariadb:
+    image: aurweb:latest
+    init: true
+    entrypoint: /docker/mariadb-entrypoint.sh
+    command: /docker/scripts/run-mariadb.sh mysqld_safe --datadir=/var/lib/mysql
+    ports:
+      # This will expose mariadbd on 127.0.0.1:13306 in the host.
+      # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
+      - "13306:3306"
+    volumes:
+      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
+      - mariadb_data:/var/lib/mysql
+    healthcheck:
+      test: "bash /docker/health/mariadb.sh"
+      interval: 2s
+      timeout: 60s
+
+  sharness:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=conf/config.sqlite
+    entrypoint: /docker/test-sqlite-entrypoint.sh
+    command: /docker/scripts/run-sharness.sh
+    volumes:
+      - ./cache:/cache
+
+  pytest-mysql:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=conf/config
+    entrypoint: /docker/test-mysql-entrypoint.sh
+    command: /docker/scripts/run-pytests.sh clean
+    depends_on:
+      mariadb:
+        condition: service_healthy
+    links:
+      - mariadb
+    volumes:
+      - mariadb_run:/var/run/mysqld
+      - ./cache:/cache
+
+  pytest-sqlite:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=conf/config.sqlite
+    entrypoint: /docker/test-sqlite-entrypoint.sh
+    command: /docker/scripts/run-pytests.sh clean
+    volumes:
+      - mariadb_run:/var/run/mysqld
+      - ./cache:/cache
+
+  test:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=conf/config
+    entrypoint: /docker/tests-entrypoint.sh
+    command: /docker/scripts/run-tests.sh
+    depends_on:
+      mariadb:
+        condition: service_healthy
+    links:
+      - mariadb
+    volumes:
+      - mariadb_run:/var/run/mysqld
+      - ./cache:/cache
+
+volumes:
+  mariadb_run: {} # Share /var/run/mysqld/mysqld.sock
+  mariadb_data: {} # Share /var/lib/mysql
diff --git a/docker/health/mariadb.sh b/docker/health/mariadb.sh
new file mode 100755
index 00000000..cbae37bd
--- /dev/null
+++ b/docker/health/mariadb.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec mysqladmin ping --silent
diff --git a/docker/mariadb-entrypoint.sh b/docker/mariadb-entrypoint.sh
new file mode 100755
index 00000000..e33c61c7
--- /dev/null
+++ b/docker/mariadb-entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eou pipefail
+
+mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+
+exec "$@"
diff --git a/docker/scripts/run-mariadb.sh b/docker/scripts/run-mariadb.sh
new file mode 100755
index 00000000..7e908129
--- /dev/null
+++ b/docker/scripts/run-mariadb.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+mysqld_safe --datadir=/var/lib/mysql --skip-networking &
+until mysqladmin ping --silent; do
+    sleep 1s
+done
+
+# Create test database.
+mysql -u root -e "CREATE USER 'aur'@'%' IDENTIFIED BY 'aur'" \
+    2>/dev/null || /bin/true
+mysql -u root -e "DROP DATABASE aurweb_test" 2>/dev/null || /bin/true
+mysql -u root -e "CREATE DATABASE aurweb_test"
+mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb_test.* TO 'aur'@'%'"
+mysql -u root -e "FLUSH PRIVILEGES"
+
+# Shutdown mariadb.
+mysqladmin -uroot shutdown
+
+exec "$@"
diff --git a/docker/scripts/run-pytests.sh b/docker/scripts/run-pytests.sh
new file mode 100755
index 00000000..021603b1
--- /dev/null
+++ b/docker/scripts/run-pytests.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+set -eou pipefail
+
+COVERAGE=1
+PARAMS=()
+
+while [ $# -ne 0 ]; do
+    key="$1"
+    case "$key" in
+        --no-coverage)
+            COVERAGE=0
+            shift
+            ;;
+        -*)
+            echo "usage: $0 [--no-coverage] targets ..."
+            exit 1
+            ;;
+        *)
+            PARAMS+=("$key")
+            shift
+            ;;
+    esac
+done
+
+# Initialize the new database; ignore errors.
+python -m aurweb.initdb 2>/dev/null || /bin/true
+
+# Run pytest with optional targets in front of it.
+make -C test "${PARAMS[@]}" pytest
+
+# By default, report coverage and move it into cache.
+if [ $COVERAGE -eq 1 ]; then
+    make -C test coverage
+
+    # /cache is mounted as a volume. Copy coverage into it.
+    # Users can then sanitize the coverage locally in their
+    # aurweb root directory: ./util/fix-coverage ./cache/.coverage
+    rm -f /cache/.coverage
+    cp -v .coverage /cache/.coverage
+    chmod 666 /cache/.coverage
+fi
diff --git a/docker/scripts/run-sharness.sh b/docker/scripts/run-sharness.sh
new file mode 100755
index 00000000..8e928b3f
--- /dev/null
+++ b/docker/scripts/run-sharness.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eou pipefail
+
+# Initialize the new database; ignore errors.
+python -m aurweb.initdb 2>/dev/null || /bin/true
+
+make -C test sh
diff --git a/docker/scripts/run-tests.sh b/docker/scripts/run-tests.sh
new file mode 100755
index 00000000..3181a623
--- /dev/null
+++ b/docker/scripts/run-tests.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -eou pipefail
+dir=$(dirname $0)
+
+# Clean up coverage and stuff.
+make -C test clean
+
+# Run sharness tests.
+bash $dir/run-sharness.sh
+
+# Run Python tests with MariaDB database.
+# Pass --silence to avoid reporting coverage. We will do that below.
+bash $dir/run-pytests.sh --no-coverage
+
+# Export SQLite aurweb configuration.
+export AUR_CONFIG=conf/config.sqlite
+
+# Run Python tests.
+bash $dir/run-pytests.sh --no-coverage
+
+make -C test coverage
+
+# /cache is mounted as a volume. Copy coverage into it.
+# Users can then sanitize the coverage locally in their
+# aurweb root directory: ./util/fix-coverage ./cache/.coverage
+rm -f /cache/.coverage
+cp -v .coverage /cache/.coverage
+chmod 666 /cache/.coverage
+
+# Run flake8 and isort checks.
+for dir in aurweb test migrations; do
+    flake8 --count $dir
+    isort --check-only $dir
+done
diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
new file mode 100755
index 00000000..ea4df868
--- /dev/null
+++ b/docker/test-mysql-entrypoint.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eou pipefail
+
+DB_NAME="aurweb_test"
+DB_HOST="mariadb"
+DB_USER="aur"
+DB_PASS="aur"
+
+# Setup a config for our mysql db.
+cp -vf conf/config.dev conf/config
+sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
+sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
+sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" conf/config
+sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" conf/config
+sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" conf/config
+
+# The port can be excluded from use if properly using
+# volumes to share the mysql socket from the mariadb service.
+# Example port sed:
+# sed -i "s/^;?(port = .+)$/\1/" conf/config
+
+# Continue onto the main command.
+exec "$@"
diff --git a/docker/test-sqlite-entrypoint.sh b/docker/test-sqlite-entrypoint.sh
new file mode 100755
index 00000000..c26f6735
--- /dev/null
+++ b/docker/test-sqlite-entrypoint.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -eou pipefail
+
+DB_BACKEND="sqlite"
+DB_NAME="aurweb.sqlite3"
+
+# Create an SQLite config from the default dev config.
+cp -vf conf/config.dev conf/config.sqlite
+cp -vf conf/config.defaults conf/config.sqlite.defaults
+
+# Modify it for SQLite.
+sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config.sqlite
+sed -ri "s/^(backend) = .+/\1 = ${DB_BACKEND}/" conf/config.sqlite
+sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config.sqlite
+
+exec "$@"
diff --git a/docker/tests-entrypoint.sh b/docker/tests-entrypoint.sh
new file mode 100755
index 00000000..ca3d3d9a
--- /dev/null
+++ b/docker/tests-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -eou pipefail
+dir="$(dirname $0)"
+
+bash $dir/test-mysql-entrypoint.sh
+bash $dir/test-sqlite-entrypoint.sh
+
+exec "$@"
diff --git a/test/Makefile b/test/Makefile
index 920c7113..4a8207f8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -17,10 +17,15 @@ else
 sh: $(T)
 endif
 
+coverage:
+	cd .. && coverage report --include='aurweb/*'
+	cd .. && coverage xml --include='aurweb/*'
+
 clean:
 	$(RM) -r test-results/
+	rm -f ../.coverage
 
 $(T):
 	@echo "*** $@ ***"; $(SHELL) $@
 
-.PHONY: check $(FOREIGN_TARGETS) clean $(T)
+.PHONY: check coverage $(FOREIGN_TARGETS) clean $(T)
diff --git a/util/fix-coverage b/util/fix-coverage
new file mode 100755
index 00000000..aa56591d
--- /dev/null
+++ b/util/fix-coverage
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+""" A simple script which updates paths for .coverage executed
+in another directory. This is particularly useful for fixing
+.coverage files received via ./cache/.coverage after Docker runs.
+
+Copyright (C) 2021 aurweb Development
+All Rights Reserved.
+"""
+import os
+import re
+import sqlite3
+import sys
+import traceback
+
+import aurweb.config
+
+
+def eprint(*args, **kwargs):
+    print(*args, **kwargs, file=sys.stderru)
+
+
+def main():
+    if len(sys.argv) == 1:
+        print(f"usage: {sys.argv[0]} .coverage")
+        return 1
+
+    coverage_db = sys.argv[1]
+    if not os.path.exists(coverage_db):
+        eprint("error: coverage file not found")
+        return 2
+
+    aurwebdir = aurweb.config.get("options", "aurwebdir")
+    new_coverage_db = os.path.join(aurwebdir, ".coverage")
+    with open(coverage_db, "rb") as i:
+        with open(new_coverage_db, "wb") as f:
+            f.write(i.read())
+        print(f"Copied coverage db to {new_coverage_db}.")
+    coverage_db = new_coverage_db
+
+    sqlite3.paramstyle = "format"
+    db = sqlite3.connect(coverage_db)
+
+    cursor = db.cursor()
+    results = cursor.execute("SELECT * FROM file")
+
+    files = dict()
+    for i, path in results:
+        files[i] = path
+
+    for _, i in enumerate(files.keys()):
+        new_path = re.sub(r'^/aurweb', aurwebdir, files[i])
+        cursor.execute("UPDATE file SET path = ? WHERE id = ?", (
+            new_path, i))
+
+    db.commit()
+    db.close()
+
+    return 0
+
+
+if __name__ == "__main__":
+    e = 1
+    try:
+        e = main()
+    except Exception:
+        traceback.print_exc()
+        e = 1
+    sys.exit(e)

From 2a3df086d314fcf5c249cc48a83029662fc50ed0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 20 Jun 2021 21:58:30 -0700
Subject: [PATCH 200/844] Docker: add [c]git, nginx, fastapi, php-fpm, ca

Now, we have a full collection of services used to run
aurweb over HTTPS using a self-signed CA.

New Docker services:

- `ca` - Certificate authority services
    - When the `ca` service is run, it will (if needed) generate
      a CA certificate and leaf certificate for localhost AUR
      access. This ca is then shared with things like nginx to
      use the leaf certificate. Users can import
      `./cache/ca.root.pem` into their browser or ca-certificates
      as a root CA who issued aurweb's certificate.
- `git` - Start sshd and set it up for aur git access
- `cgit` - Serve cgit with uwsgi on port 3000
- `fastapi` - Serve our FastAPI app with `hypercorn` on port 8000
- `php-fpm` - Serve our PHP-wise aurweb
- `nginx` - Serve FastAPI, PHP and CGit with an HTTPS certificate.
    - PHP: https://localhost:8443
    - PHP CGit: https://localhost:8443/cgit
    - FastAPI: https://localhost:8444
    - FastAPI CGit: https://localhost:8444/cgit

Short of it: Run the following in a shell to run PHP and FastAPI
servers on port **8443** and **8444**, respectively.

    $ docker-compose up nginx

This will host the PHP, FastAPI, CGit and Git ecosystems.

Git SSH can be knocked at `aur@localhost:2222` as long as you have a
valid public key in the aurweb database.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitignore                    |   1 +
 Dockerfile                    |   2 +-
 docker-compose.yml            | 158 ++++++++++++++++++++++++++++++++++
 docker/ca-entrypoint.sh       |  36 ++++++++
 docker/ca.ext                 |   7 ++
 docker/cgit-entrypoint.sh     |  13 +++
 docker/fastapi-entrypoint.sh  |  10 +++
 docker/git-entrypoint.sh      |  45 ++++++++++
 docker/health/cgit.sh         |   2 +
 docker/health/fastapi.sh      |   2 +
 docker/health/nginx.sh        |   2 +
 docker/health/php.sh          |   2 +
 docker/health/sshd.sh         |   2 +
 docker/logging.conf           |  27 ++++++
 docker/nginx-entrypoint.sh    | 123 ++++++++++++++++++++++++++
 docker/php-entrypoint.sh      |  18 ++++
 docker/scripts/run-fastapi.sh |  11 +++
 docker/scripts/run-nginx.sh   |  16 ++++
 docker/scripts/run-php.sh     |   7 ++
 docker/scripts/run-sshd.sh    |   2 +
 logs/.gitkeep                 |   0
 21 files changed, 485 insertions(+), 1 deletion(-)
 create mode 100755 docker/ca-entrypoint.sh
 create mode 100644 docker/ca.ext
 create mode 100755 docker/cgit-entrypoint.sh
 create mode 100755 docker/fastapi-entrypoint.sh
 create mode 100755 docker/git-entrypoint.sh
 create mode 100755 docker/health/cgit.sh
 create mode 100755 docker/health/fastapi.sh
 create mode 100755 docker/health/nginx.sh
 create mode 100755 docker/health/php.sh
 create mode 100755 docker/health/sshd.sh
 create mode 100644 docker/logging.conf
 create mode 100755 docker/nginx-entrypoint.sh
 create mode 100755 docker/php-entrypoint.sh
 create mode 100755 docker/scripts/run-fastapi.sh
 create mode 100755 docker/scripts/run-nginx.sh
 create mode 100755 docker/scripts/run-php.sh
 create mode 100755 docker/scripts/run-sshd.sh
 create mode 100644 logs/.gitkeep

diff --git a/.gitignore b/.gitignore
index 2006e838..5d1a4de7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ fastapi_aw/
 .coverage
 .idea
 /cache/*
+/logs/*
diff --git a/Dockerfile b/Dockerfile
index 6858bedb..002f135a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN pacman -Syu --noconfirm --noprogressbar \
     python-requests python-aiofiles python-python-multipart \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
-    python-isort flake8
+    python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm
 
 RUN useradd -U -d /aurweb -c 'AUR User' aur
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7fbd20fd..e21b91bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,12 +7,28 @@
 #   - `pytest-sqlite` - Run pytest suites with SQLite
 #   - `test` - Run sharness, pytest-mysql and pytest-sqlite
 #   - `mariadb` - `port 13306` - MariaDB server for docker
+#   - `ca` - Certificate Authority generation
+#   - `git` - `port 2222` - Git over SSH server
+#   - `fastapi` - hypercorn service for aurweb's FastAPI app
+#   - `php-fpm` - Execution server for PHP aurweb
+#   - `nginx` - `ports 8444 (FastAPI), 8443 (PHP)` - Everything
+#     - You can reach `nginx` via FastAPI at `https://localhost:8444/`
+#       or via PHP at `https://localhost:8443/`. CGit can be reached
+#       via the `/cgit/` request uri on either server.
 #
 # Copyright (C) 2021 aurweb Development
 # All Rights Reserved.
 version: "3.8"
 
 services:
+  ca:
+    image: aurweb:latest
+    init: true
+    entrypoint: /docker/ca-entrypoint.sh
+    command: exit 0
+    volumes:
+      - ./cache:/cache
+
   mariadb:
     image: aurweb:latest
     init: true
@@ -30,6 +46,132 @@ services:
       interval: 2s
       timeout: 60s
 
+  git:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=conf/config
+    entrypoint: /docker/git-entrypoint.sh
+    command: /docker/scripts/run-sshd.sh
+    ports:
+      - "2222:22"
+    healthcheck:
+      test: "bash /docker/health/sshd.sh"
+      interval: 2s
+      timeout: 30s
+    volumes:
+      - mariadb_run:/var/run/mysqld
+      - mariadb_data:/var/lib/mysql
+      - git_data:/aurweb/aur.git
+      - ./cache:/cache
+
+  cgit:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=/aurweb/conf/config
+    entrypoint: /docker/cgit-entrypoint.sh
+    command: >-
+      uwsgi --socket 0.0.0.0:3000
+            --plugins cgi
+            --cgi /usr/share/webapps/cgit/cgit.cgi
+    healthcheck:
+      test: "bash /docker/health/cgit.sh"
+      interval: 2s
+      timeout: 30s
+    depends_on:
+      git:
+        condition: service_healthy
+    links:
+      - git
+    volumes:
+      - git_data:/aurweb/aur.git
+
+  php-fpm:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=/aurweb/conf/config
+    entrypoint: /docker/php-entrypoint.sh
+    command: /docker/scripts/run-php.sh
+    healthcheck:
+      test: "bash /docker/health/php.sh"
+      interval: 2s
+      timeout: 30s
+    depends_on:
+      ca:
+        condition: service_started
+      git:
+        condition: service_healthy
+      mariadb:
+        condition: service_healthy
+    links:
+      - ca
+      - git
+      - mariadb
+    volumes:
+      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
+      - mariadb_data:/var/lib/mysql
+      - ./cache:/cache
+
+
+  fastapi:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=conf/config
+    entrypoint: /docker/fastapi-entrypoint.sh
+    command: /docker/scripts/run-fastapi.sh
+    healthcheck:
+      test: "bash /docker/health/fastapi.sh"
+      interval: 2s
+      timeout: 30s
+    depends_on:
+      ca:
+        condition: service_started
+      git:
+        condition: service_healthy
+      mariadb:
+        condition: service_healthy
+    links:
+      - ca
+      - git
+      - mariadb
+    volumes:
+      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
+      - mariadb_data:/var/lib/mysql
+      - ./cache:/cache
+
+  nginx:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=conf/config
+    entrypoint: /docker/nginx-entrypoint.sh
+    command: /docker/scripts/run-nginx.sh
+    ports:
+      - "8443:8443" # PHP
+      - "8444:8444" # FastAPI
+    healthcheck:
+      test: "bash /docker/health/nginx.sh"
+      interval: 2s
+      timeout: 30s
+    depends_on:
+      cgit:
+        condition: service_healthy
+      fastapi:
+        condition: service_healthy
+      php-fpm:
+        condition: service_healthy
+    links:
+      - cgit
+      - fastapi
+      - php-fpm
+    volumes:
+      - git_data:/aurweb/aur.git
+      - ./cache:/cache
+      - ./logs:/var/log/nginx
+
   sharness:
     image: aurweb:latest
     init: true
@@ -37,7 +179,13 @@ services:
       - AUR_CONFIG=conf/config.sqlite
     entrypoint: /docker/test-sqlite-entrypoint.sh
     command: /docker/scripts/run-sharness.sh
+    depends_on:
+      git:
+        condition: service_healthy
+    links:
+      - git
     volumes:
+      - git_data:/aurweb/aur.git
       - ./cache:/cache
 
   pytest-mysql:
@@ -50,10 +198,14 @@ services:
     depends_on:
       mariadb:
         condition: service_healthy
+      git:
+        condition: service_healthy
     links:
       - mariadb
+      - git
     volumes:
       - mariadb_run:/var/run/mysqld
+      - git_data:/aurweb/aur.git
       - ./cache:/cache
 
   pytest-sqlite:
@@ -65,7 +217,11 @@ services:
     command: /docker/scripts/run-pytests.sh clean
     volumes:
       - mariadb_run:/var/run/mysqld
+      - git_data:/aurweb/aur.git
       - ./cache:/cache
+    depends_on:
+      git:
+        condition: service_healthy
 
   test:
     image: aurweb:latest
@@ -81,8 +237,10 @@ services:
       - mariadb
     volumes:
       - mariadb_run:/var/run/mysqld
+      - git_data:/aurweb/aur.git
       - ./cache:/cache
 
 volumes:
   mariadb_run: {} # Share /var/run/mysqld/mysqld.sock
   mariadb_data: {} # Share /var/lib/mysql
+  git_data: {} # Share aurweb/aur.git
diff --git a/docker/ca-entrypoint.sh b/docker/ca-entrypoint.sh
new file mode 100755
index 00000000..b7514187
--- /dev/null
+++ b/docker/ca-entrypoint.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -eou pipefail
+
+if [ -f /cache/localhost.cert.pem ] && \
+    [ -f /cache/localhost.key.pem ] && \
+    [ -f /cache/ca.root.pem ]; then
+    echo "Already have certs, skipping."
+    exec "$@"
+fi
+
+openssl genrsa -des3 -out ca.key \
+    -passout pass:devca 2048
+
+openssl req -x509 -new -nodes \
+    -key ca.key -sha256 -days 1825 \
+    -out /cache/ca.root.pem \
+    -subj "/C=US/ST=California/L=Nowhere/O=aurweb/CN=localhost" \
+    --passin pass:devca
+
+# Generate keys for aurweb.
+openssl req -nodes -newkey rsa:2048 -keyout /cache/localhost.key.pem \
+    -out localhost.csr \
+    -subj "/C=US/ST=California/L=Nowhere/O=aurweb/CN=localhost"
+
+echo "$(hexdump -n 16 -e '4/4 "%08X" 1 "\n"' /dev/random)" \
+    > /cache/ca.root.srl
+openssl x509 -req -in localhost.csr -CA /cache/ca.root.pem \
+    -CAkey ca.key -CAserial /cache/ca.root.srl \
+    -out /cache/localhost.cert.pem \
+    -days 825 -sha256 -extfile /docker/ca.ext \
+    --passin pass:devca
+
+chmod 666 /cache/localhost.{key,cert}.pem
+chmod 666 /cache/ca.root.pem
+
+exec "$@"
diff --git a/docker/ca.ext b/docker/ca.ext
new file mode 100644
index 00000000..ab9de5fb
--- /dev/null
+++ b/docker/ca.ext
@@ -0,0 +1,7 @@
+authorityKeyIdentifier=keyid,issuer
+basicConstraints=CA:FALSE
+keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
+subjectAltName = @alt_names
+
+[alt_names]
+DNS.1 = localhost
diff --git a/docker/cgit-entrypoint.sh b/docker/cgit-entrypoint.sh
new file mode 100755
index 00000000..e05e1b7a
--- /dev/null
+++ b/docker/cgit-entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -eou pipefail
+
+cp -vf conf/cgitrc.proto /etc/cgitrc
+
+sed -ri 's|clone-prefix=.*|clone-prefix=https://localhost:8443|' /etc/cgitrc
+sed -ri 's|header=.*|header=/aurweb/web/template/cgit/header.html|' /etc/cgitrc
+sed -ri 's|footer=.*|footer=/aurweb/web/template/cgit/footer.html|' /etc/cgitrc
+sed -ri 's|repo\.path=.*|repo.path=/aurweb/aur.git|' /etc/cgitrc
+
+mkdir -p /var/cache/cgit
+
+exec "$@"
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
new file mode 100755
index 00000000..2f04c29f
--- /dev/null
+++ b/docker/fastapi-entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eou pipefail
+dir="$(dirname $0)"
+
+bash $dir/test-mysql-entrypoint.sh
+
+sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8444;" conf/config
+sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
+
+exec "$@"
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
new file mode 100755
index 00000000..d17ceeaf
--- /dev/null
+++ b/docker/git-entrypoint.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -eou pipefail
+
+SSHD_CONFIG=/etc/ssh/sshd_config
+
+GIT_REPO=aur.git
+GIT_KEY=/cache/git.key
+
+# Setup SSH Keys.
+ssh-keygen -A
+
+# Add AUR SSH config.
+cat >> $SSHD_CONFIG << EOF
+Match User aur
+    PasswordAuthentication no
+    AuthorizedKeysCommand /usr/local/bin/aurweb-git-auth "%t" "%k"
+    AuthorizedKeysCommandUser aur
+    AcceptEnv AUR_OVERWRITE
+    SetEnv AUR_CONFIG=/aurweb/config/config
+EOF
+
+# Taken from INSTALL.
+mkdir -pv $GIT_REPO
+
+# Initialize git repository.
+if [ ! -f $GIT_REPO/config ]; then
+    cd $GIT_REPO
+    git init --bare
+    git config --local transfer.hideRefs '^refs/'
+    git config --local --add transfer.hideRefs '!refs/'
+    git config --local --add transfer.hideRefs '!HEAD'
+    ln -sf /usr/local/bin/aurweb-git-update hooks/update
+    chown -R aur .
+    cd ..
+fi
+
+if [ ! -f $GIT_KEY ]; then
+    # Create a DSA ssh private/pubkey at /cache/git.key{.pub,}.
+    ssh-keygen -f $GIT_KEY -t dsa -N '' -C 'AUR Git Key'
+fi
+
+# Users should modify these permissions on their local machines.
+chmod 666 ${GIT_KEY}{.pub,}
+
+exec "$@"
diff --git a/docker/health/cgit.sh b/docker/health/cgit.sh
new file mode 100755
index 00000000..add33031
--- /dev/null
+++ b/docker/health/cgit.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec printf "" >>/dev/tcp/127.0.0.1/3000
diff --git a/docker/health/fastapi.sh b/docker/health/fastapi.sh
new file mode 100755
index 00000000..19a1c733
--- /dev/null
+++ b/docker/health/fastapi.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec pgrep hypercorn
diff --git a/docker/health/nginx.sh b/docker/health/nginx.sh
new file mode 100755
index 00000000..c530103d
--- /dev/null
+++ b/docker/health/nginx.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec curl --no-verify -q https://localhost:8444
diff --git a/docker/health/php.sh b/docker/health/php.sh
new file mode 100755
index 00000000..7325946b
--- /dev/null
+++ b/docker/health/php.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec printf "" >>/dev/tcp/127.0.0.1/9000
diff --git a/docker/health/sshd.sh b/docker/health/sshd.sh
new file mode 100755
index 00000000..6befdfb5
--- /dev/null
+++ b/docker/health/sshd.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec printf "" >>/dev/tcp/127.0.0.1/22
diff --git a/docker/logging.conf b/docker/logging.conf
new file mode 100644
index 00000000..ab754c9f
--- /dev/null
+++ b/docker/logging.conf
@@ -0,0 +1,27 @@
+[loggers]
+keys=root,sampleLogger
+
+[handlers]
+keys=consoleHandler
+
+[formatters]
+keys=sampleFormatter
+
+[logger_root]
+level=DEBUG
+handlers=consoleHandler
+
+[logger_sampleLogger]
+level=DEBUG
+handlers=consoleHandler
+qualname=sampleLogger
+propagate=0
+
+[handler_consoleHandler]
+class=StreamHandler
+level=DEBUG
+formatter=sampleFormatter
+args=(sys.stdout,)
+
+[formatter_sampleFormatter]
+format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
new file mode 100755
index 00000000..1e442ef7
--- /dev/null
+++ b/docker/nginx-entrypoint.sh
@@ -0,0 +1,123 @@
+#!/bin/bash
+set -eou pipefail
+
+# Setup a config for our mysql db.
+cp -vf conf/config.dev conf/config
+sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
+sed -ri 's/^(host) = .+/\1 = mariadb/' conf/config
+sed -ri 's/^(user) = .+/\1 = aur/' conf/config
+sed -ri 's/^;?(password) = .+/\1 = aur/' conf/config
+
+# Setup http(s) stuff.
+sed -ri "s|^(aur_location) = .+|\1 = https://localhost:8444|" conf/config
+sed -ri 's/^(disable_http_login) = .+/\1 = 1/' conf/config
+
+cp -vf /cache/localhost.cert.pem /etc/ssl/certs/localhost.cert.pem
+cp -vf /cache/localhost.key.pem /etc/ssl/private/localhost.key.pem
+
+cat > /etc/nginx/nginx.conf << EOF
+daemon off;
+user root;
+worker_processes auto;
+pid /var/run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+events {
+    worker_connections 256;
+}
+
+http {
+    sendfile on;
+    tcp_nopush on;
+    types_hash_max_size 4096;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_prefer_server_ciphers on;
+
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
+
+    gzip on;
+
+    upstream hypercorn {
+        server fastapi:8000;
+    }
+
+    upstream cgit {
+        server cgit:3000;
+    }
+
+    server {
+        listen 8443 ssl http2;
+        server_name localhost default_server;
+
+        ssl_certificate /etc/ssl/certs/localhost.cert.pem;
+        ssl_certificate_key /etc/ssl/private/localhost.key.pem;
+
+        root /aurweb/web/html;
+        index index.php;
+
+        location ~ ^/cgit {
+            include uwsgi_params;
+            rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=\$1&\$2 last;
+            uwsgi_modifier1 9;
+            uwsgi_param CGIT_CONFIG /etc/cgitrc;
+            uwsgi_pass uwsgi://cgit;
+        }
+
+        location ~ ^/[^/]+\.php($|/) {
+            fastcgi_pass   php-fpm:9000;
+            fastcgi_index  index.php;
+            fastcgi_split_path_info ^(/[^/]+\.php)(/.*)\$;
+            fastcgi_param  SCRIPT_FILENAME  \$document_root\$fastcgi_script_name;
+            fastcgi_param  PATH_INFO        \$fastcgi_path_info;
+            include        fastcgi_params;
+        }
+
+        location ~ .* {
+            rewrite ^/(.*)$ /index.php/\$1 last;
+        }
+
+    }
+
+    server {
+        listen 8444 ssl http2;
+        server_name localhost default_server;
+
+        ssl_certificate /etc/ssl/certs/localhost.cert.pem;
+        ssl_certificate_key /etc/ssl/private/localhost.key.pem;
+
+        root /aurweb/web/html;
+
+        location / {
+            try_files \$uri @proxy_to_app;
+        }
+
+        location ~ ^/cgit {
+            include uwsgi_params;
+            rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=\$1&\$2 last;
+            uwsgi_modifier1 9;
+            uwsgi_param CGIT_CONFIG /etc/cgitrc;
+            uwsgi_pass uwsgi://cgit;
+        }
+
+        location @proxy_to_app {
+            proxy_set_header Host \$http_host;
+            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto \$scheme;
+            proxy_redirect off;
+            proxy_buffering off;
+            proxy_pass https://hypercorn;
+        }
+    }
+
+    map \$http_upgrade \$connection_upgrade {
+        default upgrade;
+        '' close;
+    }
+}
+EOF
+
+exec "$@"
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
new file mode 100755
index 00000000..19c6d059
--- /dev/null
+++ b/docker/php-entrypoint.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -eou pipefail
+dir="$(dirname $0)"
+
+bash $dir/test-mysql-entrypoint.sh
+
+sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8443;" conf/config
+sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
+
+sed -ri 's/^(listen).*/\1 = 0.0.0.0:9000/' /etc/php/php-fpm.d/www.conf
+sed -ri 's/^;?(clear_env).*/\1 = no/' /etc/php/php-fpm.d/www.conf
+
+sed -ri 's/^;?(extension=pdo_mysql)/\1/' /etc/php/php.ini
+sed -ri 's/^;?(open_basedir).*$/\1 = \//' /etc/php/php.ini
+
+python -m aurweb.initdb 2>/dev/null || /bin/true
+
+exec "$@"
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
new file mode 100755
index 00000000..6c420497
--- /dev/null
+++ b/docker/scripts/run-fastapi.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Initialize the new database; ignore errors.
+python -m aurweb.initdb 2>/dev/null || /bin/true
+
+exec hypercorn --reload \
+    --certfile /cache/localhost.cert.pem \
+    --keyfile /cache/localhost.key.pem \
+    --error-logfile - \
+    --log-config docker/logging.conf \
+    -b "0.0.0.0:8000" aurweb.asgi:app
diff --git a/docker/scripts/run-nginx.sh b/docker/scripts/run-nginx.sh
new file mode 100755
index 00000000..7780dae8
--- /dev/null
+++ b/docker/scripts/run-nginx.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+echo "=== Running nginx server! ==="
+echo
+echo " Services:"
+echo "  - FastAPI : https://localhost:8444/"
+echo "     (cgit) : https://localhost:8444/cgit/"
+echo "  - PHP     : https://localhost:8443/"
+echo "     (cgit) : https://localhost:8443/cgit/"
+echo
+echo " Note: Copy root CA (./cache/ca.root.pem) to ca-certificates or browser."
+echo
+echo " Thanks for using aurweb!"
+echo
+
+exec nginx -c /etc/nginx/nginx.conf
diff --git a/docker/scripts/run-php.sh b/docker/scripts/run-php.sh
new file mode 100755
index 00000000..22346b47
--- /dev/null
+++ b/docker/scripts/run-php.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eou pipefail
+
+# Initialize the new database; ignore errors.
+python -m aurweb.initdb 2>/dev/null || /bin/true
+
+exec php-fpm --fpm-config /etc/php/php-fpm.conf --nodaemonize
diff --git a/docker/scripts/run-sshd.sh b/docker/scripts/run-sshd.sh
new file mode 100755
index 00000000..a69af7e2
--- /dev/null
+++ b/docker/scripts/run-sshd.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/sbin/sshd -D
diff --git a/logs/.gitkeep b/logs/.gitkeep
new file mode 100644
index 00000000..e69de29b

From e624e25c0fe4e8c9ede1bf93347964b0680c7bbe Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 21 Jun 2021 15:46:30 -0700
Subject: [PATCH 201/844] Docker: Add colored output to tests

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index e21b91bf..f9f808ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -179,6 +179,8 @@ services:
       - AUR_CONFIG=conf/config.sqlite
     entrypoint: /docker/test-sqlite-entrypoint.sh
     command: /docker/scripts/run-sharness.sh
+    stdin_open: true
+    tty: true
     depends_on:
       git:
         condition: service_healthy
@@ -195,6 +197,8 @@ services:
       - AUR_CONFIG=conf/config
     entrypoint: /docker/test-mysql-entrypoint.sh
     command: /docker/scripts/run-pytests.sh clean
+    stdin_open: true
+    tty: true
     depends_on:
       mariadb:
         condition: service_healthy
@@ -215,6 +219,8 @@ services:
       - AUR_CONFIG=conf/config.sqlite
     entrypoint: /docker/test-sqlite-entrypoint.sh
     command: /docker/scripts/run-pytests.sh clean
+    stdin_open: true
+    tty: true
     volumes:
       - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
@@ -230,6 +236,8 @@ services:
       - AUR_CONFIG=conf/config
     entrypoint: /docker/tests-entrypoint.sh
     command: /docker/scripts/run-tests.sh
+    stdin_open: true
+    tty: true
     depends_on:
       mariadb:
         condition: service_healthy

From adb42882c525089ec9888dacd7eb1bbe14a16d96 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 13 Jun 2021 12:18:17 -0700
Subject: [PATCH 202/844] [FastAPI] add /tos routes (get, post)

This clones the end goal behavior of PHP, but it does not
concern itself with the revision form array at all.

Since this page on PHP renders out the entire list of
terms that a user needs to accept, we can treat a
POST request with the "accept" checkbox enabled as a
request to accept all unaccepted (or outdated revision)
terms.

This commit also adds in a new http middleware used to
redirect authenticated users to '/tos' if they have not
yet accepted all terms.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py               |  26 +++++++-
 aurweb/routers/accounts.py   |  77 ++++++++++++++++++++++++
 templates/tos/index.html     |  46 ++++++++++++++
 test/test_accounts_routes.py | 113 ++++++++++++++++++++++++++++++++++-
 4 files changed, 258 insertions(+), 4 deletions(-)
 create mode 100644 templates/tos/index.html

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 45638277..65318907 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -3,8 +3,9 @@ import http
 import typing
 
 from fastapi import FastAPI, HTTPException, Request
-from fastapi.responses import HTMLResponse
+from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
+from sqlalchemy import and_, or_
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.middleware.sessions import SessionMiddleware
 
@@ -12,7 +13,9 @@ import aurweb.config
 import aurweb.logging
 
 from aurweb.auth import BasicAuthBackend
-from aurweb.db import get_engine
+from aurweb.db import get_engine, query
+from aurweb.models.accepted_term import AcceptedTerm
+from aurweb.models.term import Term
 from aurweb.routers import accounts, auth, errors, html, sso
 
 # Setup the FastAPI app.
@@ -97,3 +100,22 @@ async def add_security_headers(request: Request, call_next: typing.Callable):
     response.headers["X-Frame-Options"] = xfo
 
     return response
+
+
+@app.middleware("http")
+async def check_terms_of_service(request: Request, call_next: typing.Callable):
+    """ This middleware function redirects authenticated users if they
+    have any outstanding Terms to agree to. """
+    if request.user.is_authenticated() and request.url.path != "/tos":
+        unaccepted = query(Term).join(AcceptedTerm).filter(
+            or_(AcceptedTerm.UsersID != request.user.ID,
+                and_(AcceptedTerm.UsersID == request.user.ID,
+                     AcceptedTerm.TermsID == Term.ID,
+                     AcceptedTerm.Revision < Term.Revision)))
+        if query(Term).count() > unaccepted.count():
+            return RedirectResponse(
+                "/tos", status_code=int(http.HTTPStatus.SEE_OTHER))
+
+    task = asyncio.create_task(call_next(request))
+    await asyncio.wait({task}, return_when=asyncio.FIRST_COMPLETED)
+    return task.result()
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 966f8409..3e3469ca 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -1,4 +1,5 @@
 import copy
+import typing
 
 from datetime import datetime
 from http import HTTPStatus
@@ -13,9 +14,11 @@ from aurweb import db, l10n, time, util
 from aurweb.auth import auth_required
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.l10n import get_translator_for_request
+from aurweb.models.accepted_term import AcceptedTerm
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
+from aurweb.models.term import Term
 from aurweb.models.user import User
 from aurweb.scripts.notify import ResetKeyNotification
 from aurweb.templates import make_variable_context, render_template
@@ -576,3 +579,77 @@ async def account(request: Request, username: str):
     context["user"] = user
 
     return render_template(request, "account/show.html", context)
+
+
+def render_terms_of_service(request: Request,
+                            context: dict,
+                            terms: typing.Iterable):
+    if not terms:
+        return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
+    context["unaccepted_terms"] = terms
+    return render_template(request, "tos/index.html", context)
+
+
+@router.get("/tos")
+@auth_required(True, redirect="/")
+async def terms_of_service(request: Request):
+    # Query the database for terms that were previously accepted,
+    # but now have a bumped Revision that needs to be accepted.
+    diffs = db.query(Term).join(AcceptedTerm).filter(
+        AcceptedTerm.Revision < Term.Revision).all()
+
+    # Query the database for any terms that have not yet been accepted.
+    unaccepted = db.query(Term).filter(
+        ~Term.ID.in_(db.query(AcceptedTerm.TermsID))).all()
+
+    # Translate the 'Terms of Service' part of our page title.
+    _ = l10n.get_translator_for_request(request)
+    title = f"AUR {_('Terms of Service')}"
+    context = await make_variable_context(request, title)
+
+    accept_needed = sorted(unaccepted + diffs)
+    return render_terms_of_service(request, context, accept_needed)
+
+
+@router.post("/tos")
+@auth_required(True, redirect="/")
+async def terms_of_service_post(request: Request,
+                                accept: bool = Form(default=False)):
+    # Query the database for terms that were previously accepted,
+    # but now have a bumped Revision that needs to be accepted.
+    diffs = db.query(Term).join(AcceptedTerm).filter(
+        AcceptedTerm.Revision < Term.Revision).all()
+
+    # Query the database for any terms that have not yet been accepted.
+    unaccepted = db.query(Term).filter(
+        ~Term.ID.in_(db.query(AcceptedTerm.TermsID))).all()
+
+    if not accept:
+        # Translate the 'Terms of Service' part of our page title.
+        _ = l10n.get_translator_for_request(request)
+        title = f"AUR {_('Terms of Service')}"
+        context = await make_variable_context(request, title)
+
+        # We already did the database filters here, so let's just use
+        # them instead of reiterating the process in terms_of_service.
+        accept_needed = sorted(unaccepted + diffs)
+        return render_terms_of_service(request, context, accept_needed)
+
+    # For each term we found, query for the matching accepted term
+    # and update its Revision to the term's current Revision.
+    for term in diffs:
+        accepted_term = request.user.accepted_terms.filter(
+            AcceptedTerm.TermsID == term.ID).first()
+        accepted_term.Revision = term.Revision
+
+    # For each term that was never accepted, accept it!
+    for term in unaccepted:
+        db.create(AcceptedTerm, User=request.user,
+                  Term=term, Revision=term.Revision,
+                  autocommit=False)
+
+    if diffs or unaccepted:
+        # If we had any terms to update, commit the changes.
+        db.commit()
+
+    return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/tos/index.html b/templates/tos/index.html
new file mode 100644
index 00000000..a084034e
--- /dev/null
+++ b/templates/tos/index.html
@@ -0,0 +1,46 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div id="dev-login" class="box">
+        <h2>AUR {% trans %}Terms of Service{% endtrans %}</h2>
+        <form method="post" action="/tos">
+            <fieldset>
+                <p>
+                    {{
+                        "Logged-in as: %s"
+                        | tr | format(
+                            "<strong>" + request.user.Username + "</strong>")
+                        | safe
+                    }}
+                </p>
+                <p>
+                    {{
+                        "The following documents have been updated. "
+                        "Please review them carefully:" | tr
+                    }}
+                </p>
+                <ul>
+                    {% for term in unaccepted_terms %}
+                        <li>
+                            <a href="{{ term.URL }}">{{ term.Description }}</a>
+                            (revision {{ term.Revision }})
+                        </li>
+                    {% endfor %}
+                </ul>
+                <p>
+                    {% for term in unaccepted_terms %}
+                        <input type="hidden"
+                               name="rev[{{ loop.index }}]"
+                               value="{{ term.Revision }}" />
+                    {% endfor %}
+                    <input type="checkbox" name="accept" />
+                    {{ "I accept the terms and conditions above." | tr }}
+                </p>
+                <p>
+                    <input type="submit" name="submit"
+                           value="{{ 'Continue' | tr }}" />
+                </p>
+            </fieldset>
+        </form>
+    </div>
+{% endblock %}
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index bd0d9d4b..96ee3be8 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -12,11 +12,13 @@ from fastapi.testclient import TestClient
 
 from aurweb import captcha
 from aurweb.asgi import app
-from aurweb.db import create, query
+from aurweb.db import commit, create, query
+from aurweb.models.accepted_term import AcceptedTerm
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
+from aurweb.models.term import Term
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
@@ -48,7 +50,7 @@ def make_ssh_pubkey():
 def setup():
     global user
 
-    setup_test_db("Users", "Sessions", "Bans")
+    setup_test_db("Users", "Sessions", "Bans", "Terms", "AcceptedTerms")
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
@@ -919,3 +921,110 @@ def test_get_account_unauthenticated():
 
     content = response.content.decode()
     assert "You must log in to view user information." in content
+
+
+def test_get_terms_of_service():
+    term = create(Term, Description="Test term.",
+                  URL="http://localhost", Revision=1)
+
+    with client as request:
+        response = request.get("/tos", allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+    request = Request()
+    sid = user.login(request, "testPassword")
+    cookies = {"AURSID": sid}
+
+    # First of all, let's test that we get redirected to /tos
+    # when attempting to browse authenticated without accepting terms.
+    with client as request:
+        response = request.get("/", cookies=cookies, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/tos"
+
+    with client as request:
+        response = request.get("/tos", cookies=cookies, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    accepted_term = create(AcceptedTerm, User=user,
+                           Term=term, Revision=term.Revision)
+
+    with client as request:
+        response = request.get("/tos", cookies=cookies, allow_redirects=False)
+    # We accepted the term, there's nothing left to accept.
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Bump the term's revision.
+    term.Revision = 2
+    commit()
+
+    with client as request:
+        response = request.get("/tos", cookies=cookies, allow_redirects=False)
+    # This time, we have a modified term Revision that hasn't
+    # yet been agreed to via AcceptedTerm update.
+    assert response.status_code == int(HTTPStatus.OK)
+
+    accepted_term.Revision = term.Revision
+    commit()
+
+    with client as request:
+        response = request.get("/tos", cookies=cookies, allow_redirects=False)
+    # We updated the term revision, there's nothing left to accept.
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_post_terms_of_service():
+    request = Request()
+    sid = user.login(request, "testPassword")
+
+    data = {"accept": True}  # POST data.
+    cookies = {"AURSID": sid}  # Auth cookie.
+
+    # Create a fresh Term.
+    term = create(Term, Description="Test term.",
+                  URL="http://localhost", Revision=1)
+
+    # Test that the term we just created is listed.
+    with client as request:
+        response = request.get("/tos", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Make a POST request to /tos with the agree checkbox disabled (False).
+    with client as request:
+        response = request.post("/tos", data={"accept": False},
+                                cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Make a POST request to /tos with the agree checkbox enabled (True).
+    with client as request:
+        response = request.post("/tos", data=data, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Query the db for the record created by the post request.
+    accepted_term = query(AcceptedTerm,
+                          AcceptedTerm.TermsID == term.ID).first()
+    assert accepted_term.User == user
+    assert accepted_term.Term == term
+
+    # Update the term to revision 2.
+    term.Revision = 2
+    commit()
+
+    # A GET request gives us the new revision to accept.
+    with client as request:
+        response = request.get("/tos", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Let's POST again and agree to the new term revision.
+    with client as request:
+        response = request.post("/tos", data=data, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Check that the records ended up matching.
+    assert accepted_term.Revision == term.Revision
+
+    # Now, see that GET redirects us to / with no terms left to accept.
+    with client as request:
+        response = request.get("/tos", cookies=cookies, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/"

From a36cc0c00a447dd78ca9c3c8dc8198ea1fc704cc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Jun 2021 19:50:42 -0700
Subject: [PATCH 203/844] eradicate Term records after testing them

Otherwise, Terms can leak out into other tests causing /tos
redirects unexpectedly.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_accepted_term.py   | 5 +++++
 test/test_accounts_routes.py | 6 ++++++
 test/test_term.py            | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/test/test_accepted_term.py b/test/test_accepted_term.py
index 8569b021..cd8bd7af 100644
--- a/test/test_accepted_term.py
+++ b/test/test_accepted_term.py
@@ -26,6 +26,11 @@ def setup():
 
     term = create(Term, Description="Test term", URL="https://test.term")
 
+    yield term
+
+    # Eradicate any terms we created.
+    setup_test_db("AcceptedTerms", "Terms")
+
 
 def test_accepted_term():
     accepted_term = create(AcceptedTerm, User=user, Term=term)
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 96ee3be8..dbf13d19 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -58,6 +58,12 @@ def setup():
                   RealName="Test User", Passwd="testPassword",
                   AccountType=account_type)
 
+    yield user
+
+    # Remove term records so other tests don't get them
+    # and falsely redirect.
+    setup_test_db("Terms", "AcceptedTerms")
+
 
 def test_get_passreset_authed_redirects():
     sid = user.login(Request(), "testPassword")
diff --git a/test/test_term.py b/test/test_term.py
index aa1dfcc6..25108419 100644
--- a/test/test_term.py
+++ b/test/test_term.py
@@ -11,6 +11,11 @@ from aurweb.testing import setup_test_db
 def setup():
     setup_test_db("Terms")
 
+    yield None
+
+    # Wipe em out just in case records are leftover.
+    setup_test_db("Terms")
+
 
 def test_term_creation():
     term = create(Term, Description="Term description",

From 565b928a59ff1c2d7c2e41913c9dd084f809f36e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Jun 2021 20:33:02 -0700
Subject: [PATCH 204/844] Docker: mount codebase volumes

Before, docker build was the only way to transfer new code
over to the docker image. This allows users to execute code
in their working directory.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f9f808ef..eadf7a5c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -113,7 +113,10 @@ services:
       - mariadb_run:/var/run/mysqld # Bind socket in this volume.
       - mariadb_data:/var/lib/mysql
       - ./cache:/cache
-
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web:/aurweb/web
 
   fastapi:
     image: aurweb:latest
@@ -141,6 +144,10 @@ services:
       - mariadb_run:/var/run/mysqld # Bind socket in this volume.
       - mariadb_data:/var/lib/mysql
       - ./cache:/cache
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web:/aurweb/web
 
   nginx:
     image: aurweb:latest
@@ -171,6 +178,10 @@ services:
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./logs:/var/log/nginx
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web:/aurweb/web
 
   sharness:
     image: aurweb:latest
@@ -189,6 +200,10 @@ services:
     volumes:
       - git_data:/aurweb/aur.git
       - ./cache:/cache
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web:/aurweb/web
 
   pytest-mysql:
     image: aurweb:latest
@@ -211,6 +226,10 @@ services:
       - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
       - ./cache:/cache
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web:/aurweb/web
 
   pytest-sqlite:
     image: aurweb:latest
@@ -225,6 +244,10 @@ services:
       - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
       - ./cache:/cache
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web:/aurweb/web
     depends_on:
       git:
         condition: service_healthy
@@ -247,6 +270,10 @@ services:
       - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
       - ./cache:/cache
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web:/aurweb/web
 
 volumes:
   mariadb_run: {} # Share /var/run/mysqld/mysqld.sock

From 495dd2d821ea3d42853725f6011393826c11cb55 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Jun 2021 20:35:29 -0700
Subject: [PATCH 205/844] Docker: add missing git link to pytest-sqlite

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index eadf7a5c..0f61db75 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -251,6 +251,8 @@ services:
     depends_on:
       git:
         condition: service_healthy
+    links:
+      - git
 
   test:
     image: aurweb:latest

From df161ef38ecf872855b9639547a540af9c3d999c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Jun 2021 21:31:49 -0700
Subject: [PATCH 206/844] Docker: add .env configurable FASTAPI_BACKEND

By default we now use uvicorn because it has a much
better developer feedback out of the box. We'll work
on hypercorn logging, but for now, hypercorn is usable
via: `docker-compose --env-file docker/hypercorn.env up nginx`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .env                          |  1 +
 Dockerfile                    |  4 ++--
 docker-compose.yml            |  4 ++--
 docker/health/fastapi.sh      |  2 +-
 docker/hypercorn.env          |  1 +
 docker/scripts/run-fastapi.sh | 22 ++++++++++++++++------
 6 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 .env
 create mode 100644 docker/hypercorn.env

diff --git a/.env b/.env
new file mode 100644
index 00000000..f4a585ba
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+FASTAPI_BACKEND="uvicorn"
diff --git a/Dockerfile b/Dockerfile
index 002f135a..5fd3ec07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,8 @@ RUN pacman -Syu --noconfirm --noprogressbar \
     python-requests python-aiofiles python-python-multipart \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
-    python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm
+    python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
+    python-asgiref uvicorn
 
 RUN useradd -U -d /aurweb -c 'AUR User' aur
 
@@ -30,4 +31,3 @@ ENV PYTHONPATH=/aurweb
 ENV AUR_CONFIG=conf/config
 
 RUN make -C po all install
-RUN python setup.py install
diff --git a/docker-compose.yml b/docker-compose.yml
index 0f61db75..f99264af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -124,9 +124,9 @@ services:
     environment:
       - AUR_CONFIG=conf/config
     entrypoint: /docker/fastapi-entrypoint.sh
-    command: /docker/scripts/run-fastapi.sh
+    command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:
-      test: "bash /docker/health/fastapi.sh"
+      test: "bash /docker/health/fastapi.sh ${FASTAPI_BACKEND}"
       interval: 2s
       timeout: 30s
     depends_on:
diff --git a/docker/health/fastapi.sh b/docker/health/fastapi.sh
index 19a1c733..e1df348d 100755
--- a/docker/health/fastapi.sh
+++ b/docker/health/fastapi.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec pgrep hypercorn
+exec pgrep "$1"
diff --git a/docker/hypercorn.env b/docker/hypercorn.env
new file mode 100644
index 00000000..0d65e241
--- /dev/null
+++ b/docker/hypercorn.env
@@ -0,0 +1 @@
+FASTAPI_BACKEND="hypercorn"
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index 6c420497..1db4c505 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -3,9 +3,19 @@
 # Initialize the new database; ignore errors.
 python -m aurweb.initdb 2>/dev/null || /bin/true
 
-exec hypercorn --reload \
-    --certfile /cache/localhost.cert.pem \
-    --keyfile /cache/localhost.key.pem \
-    --error-logfile - \
-    --log-config docker/logging.conf \
-    -b "0.0.0.0:8000" aurweb.asgi:app
+if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
+    exec uvicorn --reload \
+        --ssl-certfile /cache/localhost.cert.pem \
+        --ssl-keyfile /cache/localhost.key.pem \
+        --log-config /docker/logging.conf \
+        --host "0.0.0.0" \
+        --port 8000 \
+        aurweb.asgi:app
+else
+    exec hypercorn --reload \
+        --certfile /cache/localhost.cert.pem \
+        --keyfile /cache/localhost.key.pem \
+        --log-config /docker/logging.conf \
+        -b "0.0.0.0:8000" \
+        aurweb.asgi:app
+fi

From 61c473405fd1cf92662e1343db0b6060a24e70fd Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Jun 2021 21:42:19 -0700
Subject: [PATCH 207/844] Docker: add ./templates volume mount

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f99264af..c2c948f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -117,6 +117,7 @@ services:
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
       - ./web:/aurweb/web
+      - ./templates:/aurweb/templates
 
   fastapi:
     image: aurweb:latest
@@ -148,6 +149,7 @@ services:
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
       - ./web:/aurweb/web
+      - ./templates:/aurweb/templates
 
   nginx:
     image: aurweb:latest
@@ -178,9 +180,6 @@ services:
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./logs:/var/log/nginx
-      - ./aurweb:/aurweb/aurweb
-      - ./migrations:/aurweb/migrations
-      - ./test:/aurweb/test
       - ./web:/aurweb/web
 
   sharness:
@@ -204,6 +203,7 @@ services:
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
       - ./web:/aurweb/web
+      - ./templates:/aurweb/templates
 
   pytest-mysql:
     image: aurweb:latest
@@ -230,6 +230,7 @@ services:
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
       - ./web:/aurweb/web
+      - ./templates:/aurweb/templates
 
   pytest-sqlite:
     image: aurweb:latest
@@ -248,6 +249,7 @@ services:
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
       - ./web:/aurweb/web
+      - ./templates:/aurweb/templates
     depends_on:
       git:
         condition: service_healthy
@@ -276,6 +278,7 @@ services:
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
       - ./web:/aurweb/web
+      - ./templates:/aurweb/templates
 
 volumes:
   mariadb_run: {} # Share /var/run/mysqld/mysqld.sock

From 512f8064c1cd84bc99e07ea8101db43b27b5dfb2 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Tue, 22 Jun 2021 21:56:12 +0200
Subject: [PATCH 208/844] Fix JavaScript error on packages overview page

---
 web/html/packages.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/html/packages.php b/web/html/packages.php
index 559a8f45..d19d2ad1 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -49,6 +49,11 @@ html_header($title, $details);
 <script type="text/javascript">
 function collapseDependsList(list) {
 	list = document.getElementById(list);
+	// Packages overview page also triggers collapseDependsList, ideally the Javascript
+	// is only included for the package details view.
+	if (!list) {
+		return;
+	}
 
 	// Hide everything past a given limit. Don't do anything if we don't have
 	// enough items, or the link already exists.

From 42bd0027b38bb39e08d9317b69fc3c8e170935c1 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Tue, 22 Jun 2021 22:27:17 +0200
Subject: [PATCH 209/844] Add archweb typeahead implementation

Use a pure vanilla JavaScript typeahead implementation to finally
deprecate the old jQuery version and typeahead library.
---
 web/html/home.php                      |  37 ++----
 web/html/index.php                     |   2 +-
 web/html/js/bootstrap-typeahead.min.js |   1 -
 web/html/js/typeahead.js               | 151 +++++++++++++++++++++++++
 web/html/pkgmerge.php                  |  24 ++--
 web/template/pkgreq_form.php           |  43 ++++---
 6 files changed, 188 insertions(+), 70 deletions(-)
 delete mode 100644 web/html/js/bootstrap-typeahead.min.js
 create mode 100644 web/html/js/typeahead.js

diff --git a/web/html/home.php b/web/html/home.php
index be37e970..5ea79ee9 100644
--- a/web/html/home.php
+++ b/web/html/home.php
@@ -185,7 +185,7 @@ if (isset($_COOKIE["AURSID"])) {
 			<fieldset>
 				<label for="pkgsearch-field"><?= __('Package Search') ?>:</label>
 				<input type="hidden" name="O" value="0" />
-				<input id="pkgsearch-field" type="text" name="K" size="30" value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength="35" />
+				<input id="pkgsearch-field" type="text" name="K" size="30" value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength="35" autocomplete="off"/>
 			</fieldset>
 		</form>
 	</div>
@@ -202,34 +202,13 @@ if (isset($_COOKIE["AURSID"])) {
 	<?php endif; ?>
 
 </div>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="/js/bootstrap-typeahead.min.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-    $('#pkgsearch-field').typeahead({
-        source: function(query, callback) {
-            $.getJSON('<?= get_uri('/rpc'); ?>', {type: "suggest", arg: query}, function(data) {
-                callback(data);
-            });
-        },
-        matcher: function(item) { return true; },
-        sorter: function(items) { return items; },
-        menu: '<ul class="pkgsearch-typeahead"></ul>',
-        items: 20,
-        updater: function(item) {
-            document.location = '/packages/' + item;
-            return item;
-	}
-    }).attr('autocomplete', 'off');
-
-    $('#pkgsearch-field').keydown(function(e) {
-        if (e.keyCode == 13) {
-            var selectedItem = $('ul.pkgsearch-typeahead li.active');
-            if (selectedItem.length == 0) {
-                $('#pkgsearch-form').submit();
-            }
-        }
-    });
+<script type="text/javascript" src="/js/typeahead.js"></script>
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+	const input = document.getElementById('pkgsearch-field');
+	const form = document.getElementById('pkgsearch-form');
+	const type = "suggest";
+	typeahead.init(type, input, form);
 });
 </script>
 <?php
diff --git a/web/html/index.php b/web/html/index.php
index b2cd840e..e57e7708 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -184,7 +184,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
 		header("Content-Type: image/svg+xml");
 		readfile("./$path");
 		break;
-	case "/js/bootstrap-typeahead.min.js":
+	case "/js/typeahead.js":
 		header("Content-Type: application/javascript");
 		readfile("./$path");
 		break;
diff --git a/web/html/js/bootstrap-typeahead.min.js b/web/html/js/bootstrap-typeahead.min.js
deleted file mode 100644
index 7d555ed9..00000000
--- a/web/html/js/bootstrap-typeahead.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return e&&this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery)
\ No newline at end of file
diff --git a/web/html/js/typeahead.js b/web/html/js/typeahead.js
new file mode 100644
index 00000000..1b7252d7
--- /dev/null
+++ b/web/html/js/typeahead.js
@@ -0,0 +1,151 @@
+"use strict";
+
+const typeahead = (function() {
+  var input;
+  var form;
+  var suggest_type;
+  var list;
+  var submit = true;
+
+  function resetResults() {
+    if (!list) return;
+    list.style.display = "none";
+    list.innerHTML = "";
+  }
+
+  function getCompleteList() {
+    if (!list) {
+      list = document.createElement("UL");
+      list.setAttribute("class", "pkgsearch-typeahead");
+      form.appendChild(list);
+      setListLocation();
+    }
+    return list;
+  }
+
+  function onListClick(e) {
+      let target = e.target;
+      while (!target.getAttribute('data-value')) {
+        target = target.parentNode;
+      }
+      input.value = target.getAttribute('data-value');
+      if (submit) {
+        form.submit();
+      }
+  }
+
+  function setListLocation() {
+    if (!list) return;
+    const rects = input.getClientRects()[0];
+    list.style.top = (rects.top + rects.height) + "px";
+    list.style.left = rects.left + "px";
+  }
+
+  function loadData(letter, data) {
+    const pkgs = data.slice(0, 10); // Show maximum of 10 results
+
+    resetResults();
+
+    if (pkgs.length === 0) {
+      return;
+    }
+
+    const ul = getCompleteList();
+    ul.style.display = "block";
+    const fragment = document.createDocumentFragment();
+
+    for (let i = 0; i < pkgs.length; i++) {
+      const item = document.createElement("li");
+      const text = pkgs[i].replace(letter, '<b>' + letter + '</b>');
+      item.innerHTML = '<a href="#">' + text + '</a>';
+      item.setAttribute('data-value', pkgs[i]);
+      fragment.appendChild(item);
+    }
+
+    ul.appendChild(fragment);
+    ul.addEventListener('click', onListClick);
+  }
+
+  function fetchData(letter) {
+    const url = '/rpc?type=' + suggest_type + '&arg=' + letter;
+    fetch(url).then(function(response) {
+      return response.json();
+    }).then(function(data) {
+      loadData(letter, data);
+    });
+  }
+
+  function onInputClick() {
+    if (input.value === "") {
+      resetResults();
+      return;
+    }
+    fetchData(input.value);
+  }
+
+  function onKeyDown(e) {
+    if (!list) return;
+
+    const elem = document.querySelector(".pkgsearch-typeahead li.active");
+    switch(e.keyCode) {
+      case 13: // enter
+        if (!submit) {
+          return;
+        }
+        if (elem) {
+          input.value = elem.getAttribute('data-value');
+          form.submit();
+        } else {
+          form.submit();
+        }
+        e.preventDefault();
+        break;
+      case 38: // up
+        if (elem && elem.previousElementSibling) {
+          elem.className = "";
+          elem.previousElementSibling.className = "active";
+        }
+        e.preventDefault();
+        break;
+      case 40: // down
+        if (elem && elem.nextElementSibling) {
+          elem.className = "";
+          elem.nextElementSibling.className = "active";
+        } else if (!elem && list.childElementCount !== 0) {
+          list.children[0].className = "active";
+        }
+        e.preventDefault();
+        break;
+    }
+  }
+
+  // debounce https://davidwalsh.name/javascript-debounce-function
+  function debounce(func, wait, immediate) {
+    var timeout;
+    return function() {
+      var context = this, args = arguments;
+      var later = function() {
+        timeout = null;
+        if (!immediate) func.apply(context, args);
+      };
+      var callNow = immediate && !timeout;
+      clearTimeout(timeout);
+      timeout = setTimeout(later, wait);
+      if (callNow) func.apply(context, args);
+    };
+  }
+
+  return {
+    init: function(type, inputfield, formfield, submitdata  = true) {
+      suggest_type = type;
+      input = inputfield;
+      form = formfield;
+      submit = submitdata;
+
+      input.addEventListener("input", onInputClick);
+      input.addEventListener("keydown", onKeyDown);
+      window.addEventListener('resize', debounce(setListLocation, 150));
+      document.addEventListener("click", resetResults);
+    }
+  }
+}());
diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php
index d583c239..d96562a7 100644
--- a/web/html/pkgmerge.php
+++ b/web/html/pkgmerge.php
@@ -25,7 +25,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 		<?= __('Enter the package name you wish to merge the package into. '); ?>
 		<?= __('Select the checkbox to confirm action.') ?>
 	</p>
-	<form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post">
+	<form id="merge-form" action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post">
 		<fieldset>
 			<input type="hidden" name="IDs[<?= $base_id ?>]" value="1" />
 			<input type="hidden" name="ID" value="<?= $base_id ?>" />
@@ -33,25 +33,17 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 			<?php if (isset($_GET['via'])): ?>
 			<input type="hidden" name="via" value="<?= intval($_GET['via']) ?>" />
 			<?php endif; ?>
-			<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js"></script>
-			<script type="text/javascript" src="/js/bootstrap-typeahead.min.js"></script>
+			<script type="text/javascript" src="/js/typeahead.js"></script>
 			<script type="text/javascript">
-			$(document).ready(function() {
-				$('#merge_Into').typeahead({
-					source: function(query, callback) {
-						$.getJSON('<?= get_uri('/rpc'); ?>', {type: "suggest-pkgbase", arg: query}, function(data) {
-							callback(data);
-						});
-					},
-					matcher: function(item) { return true; },
-					sorter: function(items) { return items; },
-					menu: '<ul class="pkgsearch-typeahead"></ul>',
-					items: 20
-				}).attr('autocomplete', 'off');
+			document.addEventListener('DOMContentLoaded', function() {
+				const input = document.getElementById('merge_Into');
+				const form = document.getElementById('merge-form');
+				const type = "suggest-pkgbase";
+				typeahead.init(type, input, form, false);
 			});
 			</script>
 			<p><label id="merge-into" for="merge_Into" ><?= __("Merge into:") ?></label>
-			<input type="text" id="merge_Into" name="merge_Into" value="<?= isset($_GET['into']) ? $_GET['into'] : '' ?>" /></p>
+			<input type="text" id="merge_Into" name="merge_Into" value="<?= isset($_GET['into']) ? $_GET['into'] : '' ?>" autocomplete="off"/></p>
 			<p><label class="confirmation"><input type="checkbox" name="confirm" value="1" />
 			<?= __("Confirm package merge") ?></label></p>
 			<p><input type="submit" class="button" name="do_Delete" value="<?= __("Merge") ?>" /></p>
diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php
index d80a422c..9d74093e 100644
--- a/web/template/pkgreq_form.php
+++ b/web/template/pkgreq_form.php
@@ -9,7 +9,7 @@
 		<li><?= htmlspecialchars($pkgname) ?></li>
 		<?php endforeach; ?>
 	</ul>
-	<form action="<?= get_uri('/pkgbase/'); ?>" method="post">
+	<form action="<?= get_uri('/pkgbase/'); ?>" id="request-form" method="post">
 		<fieldset>
 			<input type="hidden" name="IDs[<?= $base_id ?>]" value="1" />
 			<input type="hidden" name="ID" value="<?= $base_id ?>" />
@@ -24,44 +24,41 @@
 					<?php endif; ?>
 				</select>
 			</p>
-			<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js"></script>
-			<script type="text/javascript" src="/js/bootstrap-typeahead.min.js"></script>
+			<script type="text/javascript" src="/js/typeahead.js"></script>
 			<script type="text/javascript">
 			function showHideMergeSection() {
-				if ($('#id_type').val() == 'merge') {
-					$('#merge_section').show();
+				const elem = document.getElementById('id_type');
+				const merge_section = document.getElementById('merge_section');
+				if (elem.value == 'merge') {
+					merge_section.style.display = '';
 				} else {
-					$('#merge_section').hide();
+					merge_section.style.display = 'none';
 				}
 			}
 
 			function showHideRequestHints() {
-				$('#deletion_hint').hide();
-				$('#merge_hint').hide();
-				$('#orphan_hint').hide();
-				$('#' + $('#id_type').val() + '_hint').show();
+				document.getElementById('deletion_hint').style.display = 'none';
+				document.getElementById('merge_hint').style.display = 'none';
+				document.getElementById('orphan_hint').style.display = 'none';
+
+				const elem = document.getElementById('id_type');
+				document.getElementById(elem.value + '_hint').style.display = '';
 			}
 
-			$(document).ready(function() {
+			document.addEventListener('DOMContentLoaded', function() {
 				showHideMergeSection();
 				showHideRequestHints();
 
-				$('#id_merge_into').typeahead({
-					source: function(query, callback) {
-						$.getJSON('<?= get_uri('/rpc'); ?>', {type: "suggest-pkgbase", arg: query}, function(data) {
-							callback(data);
-						});
-					},
-					matcher: function(item) { return true; },
-					sorter: function(items) { return items; },
-					menu: '<ul class="pkgsearch-typeahead"></ul>',
-					items: 20
-				}).attr('autocomplete', 'off');
+				const input = document.getElementById('id_merge_into');
+                                const form = document.getElementById('request-form');
+                                const type = "suggest-pkgbase";
+
+				typeahead.init(type, input, form, false);
 			});
 			</script>
 			<p id="merge_section">
 				<label for="id_merge_into"><?= __("Merge into") ?>:</label>
-				<input type="text" name="merge_into" id="id_merge_into" />
+				<input type="text" name="merge_into" id="id_merge_into" autocomplete="off"/>
 			</p>
 			<p>
 				<label for="id_comments"><?= __("Comments") ?>:</label>

From c8d88464b1f62154a58d8ee403f3eefb3168aa0f Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Fri, 25 Jun 2021 17:25:24 +0200
Subject: [PATCH 210/844] Update mailing list address

https://lists.archlinux.org/pipermail/arch-dev-public/2021-June/030462.html
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7b9ff466..9c8d747e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-Patches should be sent to the [aur-dev@archlinux.org][1] mailing list.
+Patches should be sent to the [aur-dev@lists.archlinux.org][1] mailing list.
 
 Before sending patches, you are recommended to run `flake8` and `isort`.
 

From d95e4ec4431ff4e08e409eb1a670f1b0c90035cc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Jun 2021 17:09:21 -0700
Subject: [PATCH 211/844] Docker: create missing 'aurweb' DB if needed

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/run-mariadb.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docker/scripts/run-mariadb.sh b/docker/scripts/run-mariadb.sh
index 7e908129..d27d8124 100755
--- a/docker/scripts/run-mariadb.sh
+++ b/docker/scripts/run-mariadb.sh
@@ -8,9 +8,16 @@ done
 # Create test database.
 mysql -u root -e "CREATE USER 'aur'@'%' IDENTIFIED BY 'aur'" \
     2>/dev/null || /bin/true
+
+# Create a brand new 'aurweb_test' DB.
 mysql -u root -e "DROP DATABASE aurweb_test" 2>/dev/null || /bin/true
 mysql -u root -e "CREATE DATABASE aurweb_test"
 mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb_test.* TO 'aur'@'%'"
+
+# Create the 'aurweb' DB if it does not yet exist.
+mysql -u root -e "CREATE DATABASE aurweb" 2>/dev/null || /bin/true
+mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb.* TO 'aur'@'%'"
+
 mysql -u root -e "FLUSH PRIVILEGES"
 
 # Shutdown mariadb.

From 201a04ffb9dddadbd7be2fc587057017426ace2e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Jun 2021 16:17:38 -0700
Subject: [PATCH 212/844] gendummydata: employ a salted hash for users

As of Python updates, we are no longer considering rows with
empty salts to be legacy hashes. Update gendummydata.py to
generate salts for the legacy passwords it uses with
salt rounds = 4.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 schema/gendummydata.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index 35805d6c..11f2838a 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -16,6 +16,8 @@ import random
 import sys
 import time
 
+import bcrypt
+
 LOG_LEVEL = logging.DEBUG  # logging level. set to logging.INFO to reduce output
 SEED_FILE = "/usr/share/dict/words"
 USER_ID = 5            # Users.ID of first bogus user
@@ -182,11 +184,17 @@ for u in user_keys:
             #
             pass
 
+    # For dummy data, we just use 4 salt rounds.
+    salt = bcrypt.gensalt(rounds=4).decode()
+
+    # "{salt}{username}"
+    to_hash = f"{salt}{u}"
+
     h = hashlib.new('md5')
-    h.update(u.encode())
-    s = ("INSERT INTO Users (ID, AccountTypeID, Username, Email, Passwd)"
-         " VALUES (%d, %d, '%s', '%s@example.com', '%s');\n")
-    s = s % (seen_users[u], account_type, u, u, h.hexdigest())
+    h.update(to_hash.encode())
+    s = ("INSERT INTO Users (ID, AccountTypeID, Username, Email, Passwd, Salt)"
+         " VALUES (%d, %d, '%s', '%s@example.com', '%s', '%s');\n")
+    s = s % (seen_users[u], account_type, u, u, h.hexdigest(), salt)
     out.write(s)
 
 log.debug("Number of developers: %d" % len(developers))

From eb56305091f13c44716e45746d23fe850c22803c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Jun 2021 17:27:43 -0700
Subject: [PATCH 213/844] gendummydata: lower record counts

This commit halves MAX_USERS and MAX_PKGS, in addition
to setting OPEN_PROPOSALS to 15 and CLOSE_PROPOSALS to 50.

A few counts are now configurable via environment variable:

- MAX_USERS, default: 38000
- MAX_PKGS, default: 32000
- OPEN_PROPOSALS, default: 15
- CLOSE_PROPOSALS, default: 15

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 schema/gendummydata.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index 11f2838a..9224b051 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -22,18 +22,22 @@ LOG_LEVEL = logging.DEBUG  # logging level. set to logging.INFO to reduce output
 SEED_FILE = "/usr/share/dict/words"
 USER_ID = 5            # Users.ID of first bogus user
 PKG_ID = 1             # Packages.ID of first package
-MAX_USERS = 76000      # how many users to 'register'
+# how many users to 'register'
+MAX_USERS = int(os.environ.get("MAX_USERS", 38000))
 MAX_DEVS = .1          # what percentage of MAX_USERS are Developers
 MAX_TUS = .2           # what percentage of MAX_USERS are Trusted Users
-MAX_PKGS = 64000       # how many packages to load
+# how many packages to load
+MAX_PKGS = int(os.environ.get("MAX_PKGS", 32000))
 PKG_DEPS = (1, 15)     # min/max depends a package has
 PKG_RELS = (1, 5)      # min/max relations a package has
 PKG_SRC = (1, 3)       # min/max sources a package has
 PKG_CMNTS = (1, 5)     # min/max number of comments a package has
 CATEGORIES_COUNT = 17  # the number of categories from aur-schema
 VOTING = (0, .001)     # percentage range for package voting
-OPEN_PROPOSALS = 5     # number of open trusted user proposals
-CLOSE_PROPOSALS = 15   # number of closed trusted user proposals
+# number of open trusted user proposals
+OPEN_PROPOSALS = int(os.environ.get("OPEN_PROPOSALS", 15))
+# number of closed trusted user proposals
+CLOSE_PROPOSALS = int(os.environ.get("CLOSE_PROPOSALS", 50))
 RANDOM_TLDS = ("edu", "com", "org", "net", "tw", "ru", "pl", "de", "es")
 RANDOM_URL = ("http://www.", "ftp://ftp.", "http://", "ftp://")
 RANDOM_LOCS = ("pub", "release", "files", "downloads", "src")

From d8556b0d868ef4d3696bbe5a3fe1d5d400537ee4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Jun 2021 21:22:54 -0700
Subject: [PATCH 214/844] config: add options.salt_rounds

During development, the lower this value is (must be >= 4)
equals faster User generation. This is particularly useful
for running tests.

In production, a higher value (like 12 which is used by various
popular frameworks) should be used.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.defaults | 1 +
 conf/config.dev      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/conf/config.defaults b/conf/config.defaults
index 6da4d754..ebc21e51 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -40,6 +40,7 @@ localedir = /srv/http/aurweb/aur.git/web/locale/
 cache = none
 cache_pkginfo_ttl = 86400
 memcache_servers = 127.0.0.1:11211
+salt_rounds = 12
 
 [ratelimit]
 request_limit = 4000
diff --git a/conf/config.dev b/conf/config.dev
index 6ef3bb79..fc3bde91 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -26,6 +26,8 @@ aur_location = http://127.0.0.1:8080
 disable_http_login = 0
 enable-maintenance = 0
 localedir = YOUR_AUR_ROOT/web/locale
+; In production, salt_rounds should be higher; suggested: 12.
+salt_rounds = 4
 
 [notifications]
 ; For development/testing, use /usr/bin/sendmail

From cec07c76b63460865de326e60ab4be8c148b6bc0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Jun 2021 21:24:33 -0700
Subject: [PATCH 215/844] User: use aurweb.config options.salt_rounds

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/config.py      |  4 ++--
 aurweb/models/user.py | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/aurweb/config.py b/aurweb/config.py
index 2a6cfc3e..73db58dc 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -44,5 +44,5 @@ def getboolean(section, option):
     return _get_parser().getboolean(section, option)
 
 
-def getint(section, option):
-    return _get_parser().getint(section, option)
+def getint(section, option, fallback=None):
+    return _get_parser().getint(section, option, fallback=fallback)
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 9db9add0..bcb47754 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -15,6 +15,8 @@ import aurweb.schema
 from aurweb.models.ban import is_banned
 from aurweb.models.declarative import Base
 
+SALT_ROUNDS_DEFAULT = 12
+
 
 class User(Base):
     """ An ORM model of a single Users record. """
@@ -39,16 +41,24 @@ class User(Base):
     authenticated = False
     nonce = None
 
+    # Make this static to the class just in case SQLAlchemy ever
+    # does something to bypass our constructor.
+    salt_rounds = aurweb.config.getint("options", "salt_rounds",
+                                       SALT_ROUNDS_DEFAULT)
+
     def __init__(self, Passwd: str = str(), **kwargs):
         super().__init__(**kwargs)
 
+        # Run this again in the constructor in case we rehashed config.
+        self.salt_rounds = aurweb.config.getint("options", "salt_rounds",
+                                                SALT_ROUNDS_DEFAULT)
         if Passwd:
             self.update_password(Passwd)
 
-    def update_password(self, password, salt_rounds=12):
+    def update_password(self, password):
         self.Passwd = bcrypt.hashpw(
             password.encode(),
-            bcrypt.gensalt(rounds=salt_rounds)).decode()
+            bcrypt.gensalt(rounds=self.salt_rounds)).decode()
 
     @staticmethod
     def minimum_passwd_length():

From ff3519ae113dd0f8b19051e9f08ddffefb7adf56 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 25 Jun 2021 22:12:01 -0700
Subject: [PATCH 216/844] [alembic] Log db name being used in a migration

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 migrations/env.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/migrations/env.py b/migrations/env.py
index dfe14804..7130d141 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -1,3 +1,4 @@
+import logging
 import logging.config
 
 import sqlalchemy
@@ -19,12 +20,14 @@ target_metadata = aurweb.schema.metadata
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
 
-
 # If configure_logger is either True or not specified,
 # configure the logger via fileConfig.
 if config.attributes.get("configure_logger", True):
     logging.config.fileConfig(config.config_file_name)
 
+# This grabs the root logger in env.py.
+logger = logging.getLogger(__name__)
+
 
 def run_migrations_offline():
     """Run migrations in 'offline' mode.
@@ -38,6 +41,8 @@ def run_migrations_offline():
     script output.
 
     """
+    db_name = aurweb.config.get("database", "name")
+    logging.info(f"Performing offline migration on database '{db_name}'.")
     context.configure(
         url=aurweb.db.get_sqlalchemy_url(),
         target_metadata=target_metadata,
@@ -56,6 +61,8 @@ def run_migrations_online():
     and associate a connection with the context.
 
     """
+    db_name = aurweb.config.get("database", "name")
+    logging.info(f"Performing online migration on database '{db_name}'.")
     connectable = sqlalchemy.create_engine(
         aurweb.db.get_sqlalchemy_url(),
         poolclass=sqlalchemy.pool.NullPool,

From 9ee7be4a1c8299010df384e91c8e56ec25cc925a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Jun 2021 00:33:32 -0700
Subject: [PATCH 217/844] Docker: remove web/locale from volume mounts

This caused a bug where generated locale would not be used.

Also, removed appending to /etc/hosts which was bugging out
on Mac OS X. archlinux:base-devel seems to come with a valid
/etc/hosts.

Additionally, remove AUR_CONFIG from Dockerfile. We don't
set it up; just use the defaults during installation.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile         |  3 ---
 docker-compose.yml | 28 +++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5fd3ec07..da9c8d3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
 FROM archlinux:base-devel
 
 # Setup some default system stuff.
-RUN bash -c 'echo "127.0.0.1 localhost" >> /etc/hosts'
-RUN bash -c 'echo "::1 localhost" >> /etc/hosts'
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 
 RUN mkdir -p .pkg-cache
@@ -28,6 +26,5 @@ WORKDIR /aurweb
 COPY . .
 
 ENV PYTHONPATH=/aurweb
-ENV AUR_CONFIG=conf/config
 
 RUN make -C po all install
diff --git a/docker-compose.yml b/docker-compose.yml
index c2c948f5..795236c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -116,7 +116,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
   fastapi:
@@ -148,7 +150,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
   nginx:
@@ -180,7 +184,9 @@ services:
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./logs:/var/log/nginx
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
 
   sharness:
     image: aurweb:latest
@@ -202,7 +208,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
   pytest-mysql:
@@ -229,7 +237,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
   pytest-sqlite:
@@ -248,7 +258,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
     depends_on:
       git:
@@ -277,7 +289,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
 volumes:

From 07c4be0afbfb467d7c09620a6f01c0761dc0ba6e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Jun 2021 00:42:20 -0700
Subject: [PATCH 218/844] Docker: add .dockerignore

Currently, this ignores compiled translation files.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .dockerignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..30747517
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+*/*.mo

From 4927a61378a15cdd8ab0fe277c4acdc8cfd973d9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 18 Jun 2021 04:40:54 -0700
Subject: [PATCH 219/844] add TUVoteInfo.is_running() method

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/tu_voteinfo.py |  5 +++++
 test/test_tu_voteinfo.py     | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/aurweb/models/tu_voteinfo.py b/aurweb/models/tu_voteinfo.py
index a246f132..fd0031a7 100644
--- a/aurweb/models/tu_voteinfo.py
+++ b/aurweb/models/tu_voteinfo.py
@@ -1,5 +1,7 @@
 import typing
 
+from datetime import datetime
+
 from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
@@ -85,3 +87,6 @@ class TUVoteInfo(Base):
         """ Customize getattr to floatify any fetched Quorum values. """
         attr = super().__getattribute__(key)
         return float(attr) if key == "Quorum" else attr
+
+    def is_running(self):
+        return self.End > int(datetime.utcnow().timestamp())
diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index 37609efd..bd5709fb 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -4,7 +4,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query, rollback
+from aurweb.db import commit, create, query, rollback
 from aurweb.models.account_type import AccountType
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
@@ -49,6 +49,21 @@ def test_tu_voteinfo_creation():
     assert tu_voteinfo in user.tu_voteinfo_set
 
 
+def test_tu_voteinfo_is_running():
+    ts = int(datetime.utcnow().timestamp())
+    tu_voteinfo = create(TUVoteInfo,
+                         Agenda="Blah blah.",
+                         User=user.Username,
+                         Submitted=ts, End=ts + 1000,
+                         Quorum=0.5,
+                         Submitter=user)
+    assert tu_voteinfo.is_running() is True
+
+    tu_voteinfo.End = ts - 5
+    commit()
+    assert tu_voteinfo.is_running() is False
+
+
 def test_tu_voteinfo_null_submitter_raises_exception():
     with pytest.raises(IntegrityError):
         create(TUVoteInfo,

From ef4a7308ee16e0e42b6adff170dccc259807cade Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Jun 2021 19:28:36 -0700
Subject: [PATCH 220/844] add AccountType constants

New constants (in aurweb.models.account_type):

- USER: "User"
- USER_ID: USER's ID
- TRUSTED_USER: "Trusted User"
- TRUSTED_USER_ID: TRUSTED_USER's ID
- DEVELOPER: "Developer"
- DEVELOPER_ID: DEVELOPER's ID
- TRUSTED_USER_AND_DEV: "TRUSTED_USER_AND_DEV"
- TRUSTED_USER_AND_DEV_ID: TRUSTED_USER_AND_DEV's ID

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/account_type.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/aurweb/models/account_type.py b/aurweb/models/account_type.py
index 502a86b1..ca302e5b 100644
--- a/aurweb/models/account_type.py
+++ b/aurweb/models/account_type.py
@@ -1,5 +1,6 @@
 from sqlalchemy import Column, Integer
 
+from aurweb import db
 from aurweb.models.declarative import Base
 
 
@@ -20,3 +21,30 @@ class AccountType(Base):
     def __repr__(self):
         return "<AccountType(ID='%s', AccountType='%s')>" % (
             self.ID, str(self))
+
+
+# Define some AccountType.AccountType constants.
+USER = "User"
+TRUSTED_USER = "Trusted User"
+DEVELOPER = "Developer"
+TRUSTED_USER_AND_DEV = "Trusted User & Developer"
+
+# Fetch account type IDs from the database for constants.
+_account_types = db.query(AccountType)
+USER_ID = _account_types.filter(
+    AccountType.AccountType == USER).first().ID
+TRUSTED_USER_ID = _account_types.filter(
+    AccountType.AccountType == TRUSTED_USER).first().ID
+DEVELOPER_ID = _account_types.filter(
+    AccountType.AccountType == DEVELOPER).first().ID
+TRUSTED_USER_AND_DEV_ID = _account_types.filter(
+    AccountType.AccountType == TRUSTED_USER_AND_DEV).first().ID
+_account_types = None  # Get rid of the query handle.
+
+# Map string constants to integer constants.
+ACCOUNT_TYPE_ID = {
+    USER: USER_ID,
+    TRUSTED_USER: TRUSTED_USER_ID,
+    DEVELOPER: DEVELOPER_ID,
+    TRUSTED_USER_AND_DEV: TRUSTED_USER_AND_DEV_ID
+}

From d606ebc0f1c5805d92a2a1dae86d097dde38ab30 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 18 Jun 2021 04:41:28 -0700
Subject: [PATCH 221/844] add User.is_trusted_user() and User.is_developer()

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py | 12 ++++++++++++
 test/test_user.py     | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index bcb47754..1762f004 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -156,6 +156,18 @@ class User(Base):
             session.delete(self.session)
             session.commit()
 
+    def is_trusted_user(self):
+        return self.AccountType.ID in {
+            aurweb.models.account_type.TRUSTED_USER_ID,
+            aurweb.models.account_type.TRUSTED_USER_AND_DEV_ID
+        }
+
+    def is_developer(self):
+        return self.AccountType.ID in {
+            aurweb.models.account_type.DEVELOPER_ID,
+            aurweb.models.account_type.TRUSTED_USER_AND_DEV_ID
+        }
+
     def __repr__(self):
         return "<User(ID='%s', AccountType='%s', Username='%s')>" % (
             self.ID, str(self.AccountType), self.Username)
diff --git a/test/test_user.py b/test/test_user.py
index 06585207..9ab40801 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -9,7 +9,7 @@ import pytest
 import aurweb.auth
 import aurweb.config
 
-from aurweb.db import create, query
+from aurweb.db import commit, create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.session import Session
@@ -217,3 +217,35 @@ def test_user_as_dict():
     assert data.get("Email") == user.Email
     # .as_dict() does not convert values to json-capable types.
     assert isinstance(data.get("RegistrationTS"), datetime)
+
+
+def test_user_is_trusted_user():
+    tu_type = query(AccountType,
+                    AccountType.AccountType == "Trusted User").first()
+    user.AccountType = tu_type
+    commit()
+    assert user.is_trusted_user() is True
+
+    # Do it again with the combined role.
+    tu_type = query(
+        AccountType,
+        AccountType.AccountType == "Trusted User & Developer").first()
+    user.AccountType = tu_type
+    commit()
+    assert user.is_trusted_user() is True
+
+
+def test_user_is_developer():
+    dev_type = query(AccountType,
+                     AccountType.AccountType == "Developer").first()
+    user.AccountType = dev_type
+    commit()
+    assert user.is_developer() is True
+
+    # Do it again with the combined role.
+    dev_type = query(
+        AccountType,
+        AccountType.AccountType == "Trusted User & Developer").first()
+    user.AccountType = dev_type
+    commit()
+    assert user.is_developer() is True

From a6bba601a98aef9b19a4a2b5114557b21706c1d5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 19 Jun 2021 10:46:44 -0700
Subject: [PATCH 222/844] add util.get_vote -> `get_vote` Jinja2 filter

This filter gets a vote of a request's user toward a voteinfo.

Example: {% set vote = (voteinfo | get_vote(request)) %}

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 1 +
 aurweb/util.py      | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index bb4047f4..b8853593 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -29,6 +29,7 @@ env.filters["dt"] = util.timestamp_to_datetime
 env.filters["as_timezone"] = util.as_timezone
 env.filters["dedupe_qs"] = util.dedupe_qs
 env.filters["urlencode"] = quote_plus
+env.filters["get_vote"] = util.get_vote
 
 # Add captcha filters.
 env.filters["captcha_salt"] = captcha.captcha_salt_filter
diff --git a/aurweb/util.py b/aurweb/util.py
index e5f510ce..adbff755 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -10,6 +10,8 @@ from datetime import datetime
 from urllib.parse import quote_plus, urlparse
 from zoneinfo import ZoneInfo
 
+import fastapi
+
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
 from fastapi.responses import Response
 from jinja2 import pass_context
@@ -143,6 +145,11 @@ def dedupe_qs(query_string: str, *additions):
     return '&'.join([f"{k}={quote_plus(v)}" for k, v in reversed(qs.items())])
 
 
+def get_vote(voteinfo, request: fastapi.Request):
+    from aurweb.models.tu_vote import TUVote
+    return voteinfo.tu_votes.filter(TUVote.User == request.user).first()
+
+
 def jsonify(obj):
     """ Perform a conversion on obj if it's needed. """
     if isinstance(obj, datetime):

From d674aaf736383a82d0bc900a5b8bcfc7e41537b9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 18 Jun 2021 04:33:48 -0700
Subject: [PATCH 223/844] add /tu/ (get) index

This commit implements the '/tu' Trusted User index page.

In addition to this functionality, this commit introduces
the following jinja2 filters:

- dt: util.timestamp_to_datetime
- as_timezone: util.as_timezone
- dedupe_qs: util.dedupe_qs
- urlencode: urllib.parse.quote_plus

There's also a new decorator that can be used to enforce
permissions: `account_type_required`. If a user does not
meet account type requirements, they are redirected to '/'.

```
@auth_required(True)
@account_type_required({"Trusted User"})
async def some_route(request: fastapi.Request):
    return Response("You are a Trusted User!")
```

Routes added:

- `GET /tu`: aurweb.routers.trusted_user.trusted_user

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py                         |   3 +-
 aurweb/auth.py                         |  39 +++
 aurweb/models/account_type.py          |   5 +
 aurweb/routers/trusted_user.py         |  97 ++++++
 templates/partials/archdev-navbar.html |  18 +
 templates/partials/tu/last_votes.html  |  33 ++
 templates/partials/tu/proposals.html   | 120 +++++++
 templates/tu/index.html                |  35 ++
 test/test_auth.py                      |  18 +-
 test/test_trusted_user_routes.py       | 443 +++++++++++++++++++++++++
 10 files changed, 808 insertions(+), 3 deletions(-)
 create mode 100644 aurweb/routers/trusted_user.py
 create mode 100644 templates/partials/tu/last_votes.html
 create mode 100644 templates/partials/tu/proposals.html
 create mode 100644 templates/tu/index.html
 create mode 100644 test/test_trusted_user_routes.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 65318907..a674fec6 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -16,7 +16,7 @@ from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models.accepted_term import AcceptedTerm
 from aurweb.models.term import Term
-from aurweb.routers import accounts, auth, errors, html, sso
+from aurweb.routers import accounts, auth, errors, html, sso, trusted_user
 
 # Setup the FastAPI app.
 app = FastAPI(exception_handlers=errors.exceptions)
@@ -47,6 +47,7 @@ async def app_startup():
     app.include_router(html.router)
     app.include_router(auth.router)
     app.include_router(accounts.router)
+    app.include_router(trusted_user.router)
 
     # Initialize the database engine and ORM.
     get_engine()
diff --git a/aurweb/auth.py b/aurweb/auth.py
index ba5f0fea..316e7293 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -3,6 +3,8 @@ import functools
 from datetime import datetime
 from http import HTTPStatus
 
+import fastapi
+
 from fastapi.responses import RedirectResponse
 from sqlalchemy import and_
 from starlette.authentication import AuthCredentials, AuthenticationBackend
@@ -11,6 +13,7 @@ from starlette.requests import HTTPConnection
 import aurweb.config
 
 from aurweb import l10n, util
+from aurweb.models.account_type import ACCOUNT_TYPE_ID
 from aurweb.models.session import Session
 from aurweb.models.user import User
 from aurweb.templates import make_variable_context, render_template
@@ -152,6 +155,42 @@ def auth_required(is_required: bool = True,
     return decorator
 
 
+def account_type_required(one_of: set):
+    """ A decorator that can be used on FastAPI routes to dictate
+    that a user belongs to one of the types defined in one_of.
+
+    This decorator should be run after an @auth_required(True) is
+    dictated.
+
+    - Example code:
+
+    @router.get('/some_route')
+    @auth_required(True)
+    @account_type_required({"Trusted User", "Trusted User & Developer"})
+    async def some_route(request: fastapi.Request):
+        return Response()
+
+    :param one_of: A set consisting of strings to match against AccountType.
+    :return: Return the FastAPI function this decorator wraps.
+    """
+    # Convert any account type string constants to their integer IDs.
+    one_of = {
+        ACCOUNT_TYPE_ID[atype]
+        for atype in one_of
+        if isinstance(atype, str)
+    }
+
+    def decorator(func):
+        @functools.wraps(func)
+        async def wrapper(request: fastapi.Request, *args, **kwargs):
+            if request.user.AccountType.ID not in one_of:
+                return RedirectResponse("/",
+                                        status_code=int(HTTPStatus.SEE_OTHER))
+            return await func(request, *args, **kwargs)
+        return wrapper
+    return decorator
+
+
 CRED_ACCOUNT_CHANGE_TYPE = 1
 CRED_ACCOUNT_EDIT = 2
 CRED_ACCOUNT_EDIT_DEV = 3
diff --git a/aurweb/models/account_type.py b/aurweb/models/account_type.py
index ca302e5b..0db37ced 100644
--- a/aurweb/models/account_type.py
+++ b/aurweb/models/account_type.py
@@ -3,6 +3,11 @@ from sqlalchemy import Column, Integer
 from aurweb import db
 from aurweb.models.declarative import Base
 
+USER = "User"
+TRUSTED_USER = "Trusted User"
+DEVELOPER = "Developer"
+TRUSTED_USER_AND_DEV = "Trusted User & Developer"
+
 
 class AccountType(Base):
     """ An ORM model of a single AccountTypes record. """
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
new file mode 100644
index 00000000..c027f67d
--- /dev/null
+++ b/aurweb/routers/trusted_user.py
@@ -0,0 +1,97 @@
+from datetime import datetime
+from urllib.parse import quote_plus
+
+from fastapi import APIRouter, Request
+from sqlalchemy import and_, or_
+
+from aurweb import db
+from aurweb.auth import account_type_required, auth_required
+from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND_DEV
+from aurweb.models.tu_vote import TUVote
+from aurweb.models.tu_voteinfo import TUVoteInfo
+from aurweb.models.user import User
+from aurweb.templates import make_context, render_template
+
+router = APIRouter()
+
+# Some TU route specific constants.
+ITEMS_PER_PAGE = 10  # Paged table size.
+MAX_AGENDA_LENGTH = 75  # Agenda table column length.
+
+# A set of account types that will approve a user for TU actions.
+REQUIRED_TYPES = {
+    TRUSTED_USER,
+    DEVELOPER,
+    TRUSTED_USER_AND_DEV
+}
+
+
+@router.get("/tu")
+@auth_required(True, redirect="/")
+@account_type_required(REQUIRED_TYPES)
+async def trusted_user(request: Request,
+                       coff: int = 0,  # current offset
+                       cby: str = "desc",  # current by
+                       poff: int = 0,  # past offset
+                       pby: str = "desc"):  # past by
+    context = make_context(request, "Trusted User")
+
+    current_by, past_by = cby, pby
+    current_off, past_off = coff, poff
+
+    context["pp"] = pp = ITEMS_PER_PAGE
+    context["prev_len"] = MAX_AGENDA_LENGTH
+
+    ts = int(datetime.utcnow().timestamp())
+
+    if current_by not in {"asc", "desc"}:
+        # If a malicious by was given, default to desc.
+        current_by = "desc"
+    context["current_by"] = current_by
+
+    if past_by not in {"asc", "desc"}:
+        # If a malicious by was given, default to desc.
+        past_by = "desc"
+    context["past_by"] = past_by
+
+    current_votes = db.query(TUVoteInfo, TUVoteInfo.End > ts).order_by(
+        TUVoteInfo.Submitted.desc())
+    context["current_votes_count"] = current_votes.count()
+    current_votes = current_votes.limit(pp).offset(current_off)
+    context["current_votes"] = reversed(current_votes.all()) \
+        if current_by == "asc" else current_votes.all()
+    context["current_off"] = current_off
+
+    past_votes = db.query(TUVoteInfo, TUVoteInfo.End <= ts).order_by(
+        TUVoteInfo.Submitted.desc())
+    context["past_votes_count"] = past_votes.count()
+    past_votes = past_votes.limit(pp).offset(past_off)
+    context["past_votes"] = reversed(past_votes.all()) \
+        if past_by == "asc" else past_votes.all()
+    context["past_off"] = past_off
+
+    # TODO
+    # We order last votes by TUVote.VoteID and User.Username.
+    # This is really bad. We should add a Created column to
+    # TUVote of type Timestamp and order by that instead.
+    last_votes_by_tu = db.query(TUVote).filter(
+        and_(TUVote.VoteID == TUVoteInfo.ID,
+             TUVoteInfo.End <= ts,
+             TUVote.UserID == User.ID,
+             or_(User.AccountTypeID == 2,
+                 User.AccountTypeID == 4))
+    ).group_by(User.ID).order_by(
+        TUVote.VoteID.desc(), User.Username.asc())
+    context["last_votes_by_tu"] = last_votes_by_tu.all()
+
+    context["current_by_next"] = "asc" if current_by == "desc" else "desc"
+    context["past_by_next"] = "asc" if past_by == "desc" else "desc"
+
+    context["q"] = '&'.join([
+        f"coff={current_off}",
+        f"cby={quote_plus(current_by)}",
+        f"poff={past_off}",
+        f"pby={quote_plus(past_by)}"
+    ])
+
+    return render_template(request, "tu/index.html", context)
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index c935fd41..c6cd3f19 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -7,11 +7,29 @@
         {% endif %}
         <li><a href="/packages/">{% trans %}Packages{% endtrans %}</a></li>
         {% if request.user.is_authenticated() %}
+
+            {% if request.user.is_trusted_user() or request.user.is_developer() %}
+                <li>
+                    <a href="/requests/">{% trans %}Requests{% endtrans %}</a>
+                </li>
+
+                <li>
+                    <a href="/accounts/">{% trans %}Accounts{% endtrans %}</a>
+                </li>
+            {% endif %}
+
             <li>
                 <a href="/account/{{ request.user.Username }}/edit">
                     {% trans %}My Account{% endtrans %}
                 </a>
             </li>
+
+            {% if request.user.is_trusted_user() %}
+                <li>
+                    <a href="/tu">{% trans %}Trusted User{% endtrans %}</a>
+                </li>
+            {% endif %}
+
             <li>
                 <a href="/logout/?next={{ next }}">
                     {% trans %}Logout{% endtrans %}
diff --git a/templates/partials/tu/last_votes.html b/templates/partials/tu/last_votes.html
new file mode 100644
index 00000000..94b9c1e8
--- /dev/null
+++ b/templates/partials/tu/last_votes.html
@@ -0,0 +1,33 @@
+<div class="box">
+    <h2>{% trans %}{{ title }}{% endtrans %}</h2>
+
+    <table class="results last-votes">
+        <thead>
+            <th>{{ "User" | tr }}</th>
+            <th>{{ "Last vote" | tr }}</th>
+        </thead>
+
+        <tbody>
+            {% if not votes %}
+                <tr>
+                    <td align="center" colspan="0">
+                        {{ "No results found." | tr }}
+                    </td>
+                    <td></td>
+                </tr>
+            {% else %}
+                {% for vote in votes %}
+                    <tr>
+                        <td>{{ vote.User.Username }}</td>
+                        <td>
+                            <a href="/tu/{{ vote.VoteID }}">
+                                {{ vote.VoteID }}
+                            </a>
+                        </td>
+                    </tr>
+                {% endfor %}
+            {% endif %}
+        </tbody>
+    </table>
+
+</div>
diff --git a/templates/partials/tu/proposals.html b/templates/partials/tu/proposals.html
new file mode 100644
index 00000000..13e705fc
--- /dev/null
+++ b/templates/partials/tu/proposals.html
@@ -0,0 +1,120 @@
+<div class="box">
+    <h2>{% trans %}{{ title }}{% endtrans %}</h2>
+
+    {% if title == "Current Votes" %}
+        <ul class="admin-actions">
+            <li>
+                <a href="/addvote/">
+                    {% trans %}Add Proposal{% endtrans %}
+                </a>
+            </li>
+        </ul>
+    {% endif %}
+
+    {% if not results %}
+        <p>
+            {% trans %}No results found.{% endtrans %}
+        </p>
+    {% else %}
+        <table class="results {{ table_class }}">
+
+            <thead>
+                <tr>
+                    <th>{{ "Proposal" | tr }}</th>
+                    <th>
+                        {% set off_qs = "%s=%d" | format(off_param, off) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by_next | urlencode) %}
+                        <a href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
+                            {{ "Start" | tr }}
+                        </a>
+                    </th>
+                    <th>{{ "End" | tr }}</th>
+                    <th>{{ "User" | tr }}</th>
+                    {% if title != "Current Votes" %}
+                        <th>{{ "Yes" | tr }}</th>
+                        <th>{{ "No" | tr }}</th>
+                    {% endif %}
+                    <th>{{ "Voted" | tr }}</th>
+                </tr>
+            </thead>
+
+            <tbody>
+                {% for result in results %}
+                    <tr>
+                        <td>
+                            <!-- Truncate the agenda back to prev_len. -->
+                            {% set agenda = result.Agenda[:prev_len] %}
+                            <a href="/tu/{{ result.ID }}">{{ agenda }}</a>
+                        </td>
+
+                        <!-- Convert result.Submitted (timestamp) to datetime,
+                        then apply the request's timezone to it. -->
+                        {% set submitted = result.Submitted | dt | as_timezone(timezone) %}
+                        <td>{{ submitted.strftime("%Y-%m-%d") }}</td>
+
+                        <!-- Convert result.End (timestamp) to datetime,
+                        then apply the request's timezone to it. -->
+                        {% set end = result.End | dt | as_timezone(timezone) %}
+                        <td>{{ end.strftime("%Y-%m-%d") }}</td>
+
+                        <td>
+                            {% if not result.User %}
+                                N/A
+                            {% else %}
+                                <a href="/packages/?K={{ result.User }}&amp;SeB=m">
+                                    {{ result.User }}
+                                </a>
+                            {% endif %}
+                        </td>
+
+                        {% if title != "Current Votes" %}
+                            <td>{{ result.Yes }}</td>
+                            <td>{{ result.No }}</td>
+                        {% endif %}
+
+                        {% set vote = (result | get_vote(request)) %}
+                        <td>
+                            {% if vote %}
+                                <span style="color: green; font-weight: bold">
+                                    {{ "Yes" | tr }}
+                                </span>
+                            {% else %}
+                                <span style="color: red; font-weight: bold">
+                                    {{ "No" | tr }}
+                                </span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+
+        <div class="pkglist-stats">
+            <p class="pkglist-nav">
+                {% if total_votes > pp %}
+
+                    {% if off > 0 %}
+                        {% set off_qs = "%s=%d" | format(off_param, off - 10) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by | urlencode) %}
+                        <a class="page"
+                           href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
+                            ‹ Back
+                        </a>
+                    {% endif %}
+
+                    {% if off < total_votes - pp %}
+                        {% set off_qs = "%s=%d" | format(off_param, off + 10) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by | urlencode) %}
+                        <a class="page"
+                           href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
+                            Next ›
+                        </a>
+                    {% endif %}
+
+                {% endif %}
+            </p>
+        </div>
+
+    {% endif %}
+
+</div>
diff --git a/templates/tu/index.html b/templates/tu/index.html
new file mode 100644
index 00000000..5060e1f7
--- /dev/null
+++ b/templates/tu/index.html
@@ -0,0 +1,35 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    {%
+        with table_class = "current-votes",
+        total_votes = current_votes_count,
+        results = current_votes,
+        off_param = "coff",
+        by_param = "cby",
+        by_next = current_by_next,
+        title = "Current Votes",
+        off = current_off,
+        by = current_by
+    %}
+        {% include "partials/tu/proposals.html" %}
+    {% endwith %}
+
+    {%
+        with table_class = "past-votes",
+        total_votes = past_votes_count,
+        results = past_votes,
+        off_param = "poff",
+        by_param = "pby",
+        by_next = past_by_next,
+        title = "Past Votes",
+        off = past_off,
+        by = past_by
+    %}
+        {% include "partials/tu/proposals.html" %}
+    {% endwith %}
+
+    {% with title = "Last Votes by TU", votes = last_votes_by_tu %}
+        {% include "partials/tu/last_votes.html" %}
+    {% endwith %}
+{% endblock %}
diff --git a/test/test_auth.py b/test/test_auth.py
index e5e1de11..b386bea1 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -4,9 +4,9 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.auth import BasicAuthBackend, has_credential
+from aurweb.auth import BasicAuthBackend, account_type_required, has_credential
 from aurweb.db import create, query
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER, USER_ID, AccountType
 from aurweb.models.session import Session
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
@@ -76,3 +76,17 @@ async def test_basic_auth_backend():
 def test_has_fake_credential_fails():
     # Fake credential 666 does not exist.
     assert not has_credential(user, 666)
+
+
+def test_account_type_required():
+    """ This test merely asserts that a few different paths
+    do not raise exceptions. """
+    # This one shouldn't raise.
+    account_type_required({USER})
+
+    # This one also shouldn't raise.
+    account_type_required({USER_ID})
+
+    # But this one should! We have no "FAKE" key.
+    with pytest.raises(KeyError):
+        account_type_required({'FAKE'})
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
new file mode 100644
index 00000000..a6527e6f
--- /dev/null
+++ b/test/test_trusted_user_routes.py
@@ -0,0 +1,443 @@
+import re
+
+from datetime import datetime
+from http import HTTPStatus
+from io import StringIO
+
+import lxml.etree
+import pytest
+
+from fastapi.testclient import TestClient
+
+from aurweb import db
+from aurweb.models.account_type import AccountType
+from aurweb.models.tu_vote import TUVote
+from aurweb.models.tu_voteinfo import TUVoteInfo
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+from aurweb.testing.requests import Request
+
+DATETIME_REGEX = r'^[0-9]{4}-[0-9]{2}-[0-9]{2}$'
+
+
+def parse_root(html):
+    parser = lxml.etree.HTMLParser(recover=True)
+    tree = lxml.etree.parse(StringIO(html), parser)
+    return tree.getroot()
+
+
+def get_table(root, class_name):
+    table = root.xpath(f'//table[contains(@class, "{class_name}")]')[0]
+    return table
+
+
+def get_table_rows(table):
+    tbody = table.xpath("./tbody")[0]
+    return tbody.xpath("./tr")
+
+
+def get_pkglist_directions(table):
+    stats = table.getparent().xpath("./div[@class='pkglist-stats']")[0]
+    nav = stats.xpath("./p[@class='pkglist-nav']")[0]
+    return nav.xpath("./a")
+
+
+def get_a(node):
+    return node.xpath('./a')[0].text.strip()
+
+
+def get_span(node):
+    return node.xpath('./span')[0].text.strip()
+
+
+def assert_current_vote_html(row, expected):
+    columns = row.xpath("./td")
+    proposal, start, end, user, voted = columns
+    p, s, e, u, v = expected  # Column expectations.
+    assert re.match(p, get_a(proposal)) is not None
+    assert re.match(s, start.text) is not None
+    assert re.match(e, end.text) is not None
+    assert re.match(u, get_a(user)) is not None
+    assert re.match(v, get_span(voted)) is not None
+
+
+def assert_past_vote_html(row, expected):
+    columns = row.xpath("./td")
+    proposal, start, end, user, yes, no, voted = columns  # Real columns.
+    p, s, e, u, y, n, v = expected  # Column expectations.
+    assert re.match(p, get_a(proposal)) is not None
+    assert re.match(s, start.text) is not None
+    assert re.match(e, end.text) is not None
+    assert re.match(u, get_a(user)) is not None
+    assert re.match(y, yes.text) is not None
+    assert re.match(n, no.text) is not None
+    assert re.match(v, get_span(voted)) is not None
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db("TU_Votes", "TU_VoteInfo", "Users")
+
+
+@pytest.fixture
+def client():
+    from aurweb.asgi import app
+    yield TestClient(app=app)
+
+
+@pytest.fixture
+def tu_user():
+    tu_type = db.query(AccountType,
+                       AccountType.AccountType == "Trusted User").first()
+    yield db.create(User, Username="test_tu", Email="test_tu@example.org",
+                    RealName="Test TU", Passwd="testPassword",
+                    AccountType=tu_type)
+
+
+@pytest.fixture
+def user():
+    user_type = db.query(AccountType,
+                         AccountType.AccountType == "User").first()
+    yield db.create(User, Username="test", Email="test@example.org",
+                    RealName="Test User", Passwd="testPassword",
+                    AccountType=user_type)
+
+
+def test_tu_index_guest(client):
+    with client as request:
+        response = request.get("/tu", allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/"
+
+
+def test_tu_index_unauthorized(client, user):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        # Login as a normal user, not a TU.
+        response = request.get("/tu", cookies=cookies, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/"
+
+
+def test_tu_empty_index(client, tu_user):
+    """ Check an empty index when we don't create any records. """
+
+    # Make a default get request to /tu.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/tu", cookies=cookies, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Parse lxml root.
+    root = parse_root(response.text)
+
+    # Check that .current-votes does not exist.
+    tables = root.xpath('//table[contains(@class, "current-votes")]')
+    assert len(tables) == 0
+
+    # Check that .past-votes has does not exist.
+    tables = root.xpath('//table[contains(@class, "current-votes")]')
+    assert len(tables) == 0
+
+
+def test_tu_index(client, tu_user):
+    ts = int(datetime.utcnow().timestamp())
+
+    # Create some test votes: (Agenda, Start, End).
+    votes = [
+        ("Test agenda 1", ts - 5, ts + 1000),  # Still running.
+        ("Test agenda 2", ts - 1000, ts - 5)  # Not running anymore.
+    ]
+    vote_records = []
+    for vote in votes:
+        agenda, start, end = vote
+        vote_records.append(
+            db.create(TUVoteInfo, Agenda=agenda,
+                      User=tu_user.Username,
+                      Submitted=start, End=end,
+                      Quorum=0.0,
+                      Submitter=tu_user))
+
+    # Vote on an ended proposal.
+    vote_record = vote_records[1]
+    vote_record.Yes += 1
+    vote_record.ActiveTUs += 1
+    db.create(TUVote, VoteInfo=vote_record, User=tu_user)
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        # Pass an invalid cby and pby; let them default to "desc".
+        response = request.get("/tu", cookies=cookies, params={
+            "cby": "BAD!",
+            "pby": "blah"
+        }, allow_redirects=False)
+
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Rows we expect to exist in HTML produced by /tu for current votes.
+    expected_rows = [
+        (
+            r'Test agenda 1',
+            DATETIME_REGEX,
+            DATETIME_REGEX,
+            tu_user.Username,
+            r'^(Yes|No)$'
+        )
+    ]
+
+    # Assert that we are matching the number of current votes.
+    current_votes = [c for c in votes if c[2] > ts]
+    assert len(current_votes) == len(expected_rows)
+
+    # Parse lxml.etree root.
+    root = parse_root(response.text)
+
+    table = get_table(root, "current-votes")
+    rows = get_table_rows(table)
+    for i, row in enumerate(rows):
+        assert_current_vote_html(row, expected_rows[i])
+
+    # Assert that we are matching the number of past votes.
+    past_votes = [c for c in votes if c[2] <= ts]
+    assert len(past_votes) == len(expected_rows)
+
+    # Rows we expect to exist in HTML produced by /tu for past votes.
+    expected_rows = [
+        (
+            r'Test agenda 2',
+            DATETIME_REGEX,
+            DATETIME_REGEX,
+            tu_user.Username,
+            r'^\d+$',
+            r'^\d+$',
+            r'^(Yes|No)$'
+        )
+    ]
+
+    table = get_table(root, "past-votes")
+    rows = get_table_rows(table)
+    for i, row in enumerate(rows):
+        assert_past_vote_html(row, expected_rows[i])
+
+    # Get the .last-votes table and check that our vote shows up.
+    table = get_table(root, "last-votes")
+    rows = get_table_rows(table)
+    assert len(rows) == 1
+
+    # Check to see the rows match up to our user and related vote.
+    username, vote_id = rows[0]
+    vote_id = vote_id.xpath("./a")[0]
+    assert username.text.strip() == tu_user.Username
+    assert int(vote_id.text.strip()) == vote_records[1].ID
+
+
+def test_tu_index_table_paging(client, tu_user):
+    ts = int(datetime.utcnow().timestamp())
+
+    for i in range(25):
+        # Create 25 current votes.
+        db.create(TUVoteInfo, Agenda=f"Agenda #{i}",
+                  User=tu_user.Username,
+                  Submitted=(ts - 5), End=(ts + 1000),
+                  Quorum=0.0,
+                  Submitter=tu_user, autocommit=False)
+
+    for i in range(25):
+        # Create 25 past votes.
+        db.create(TUVoteInfo, Agenda=f"Agenda #{25 + i}",
+                  User=tu_user.Username,
+                  Submitted=(ts - 1000), End=(ts - 5),
+                  Quorum=0.0,
+                  Submitter=tu_user, autocommit=False)
+    db.commit()
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/tu", cookies=cookies, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Parse lxml.etree root.
+    root = parse_root(response.text)
+
+    table = get_table(root, "current-votes")
+    rows = get_table_rows(table)
+    assert len(rows) == 10
+
+    def make_expectation(offset, i):
+        return [
+            f"Agenda #{offset + i}",
+            DATETIME_REGEX,
+            DATETIME_REGEX,
+            tu_user.Username,
+            r'^(Yes|No)$'
+        ]
+
+    for i, row in enumerate(rows):
+        assert_current_vote_html(row, make_expectation(0, i))
+
+    # Parse out Back/Next buttons.
+    directions = get_pkglist_directions(table)
+    assert len(directions) == 1
+    assert "Next" in directions[0].text
+
+    # Now, get the next page of current votes.
+    offset = 10  # Specify coff=10
+    with client as request:
+        response = request.get("/tu", cookies=cookies, params={
+            "coff": offset
+        }, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    old_rows = rows
+    root = parse_root(response.text)
+
+    table = get_table(root, "current-votes")
+    rows = get_table_rows(table)
+    assert rows != old_rows
+
+    for i, row in enumerate(rows):
+        assert_current_vote_html(row, make_expectation(offset, i))
+
+    # Parse out Back/Next buttons.
+    directions = get_pkglist_directions(table)
+    assert len(directions) == 2
+    assert "Back" in directions[0].text
+    assert "Next" in directions[1].text
+
+    # Make sure past-votes' Back/Next were not affected.
+    past_votes = get_table(root, "past-votes")
+    past_directions = get_pkglist_directions(past_votes)
+    assert len(past_directions) == 1
+    assert "Next" in past_directions[0].text
+
+    offset = 20  # Specify coff=10
+    with client as request:
+        response = request.get("/tu", cookies=cookies, params={
+            "coff": offset
+        }, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Do it again, we only have five left.
+    old_rows = rows
+    root = parse_root(response.text)
+
+    table = get_table(root, "current-votes")
+    rows = get_table_rows(table)
+    assert rows != old_rows
+    for i, row in enumerate(rows):
+        assert_current_vote_html(row, make_expectation(offset, i))
+
+    # Parse out Back/Next buttons.
+    directions = get_pkglist_directions(table)
+    assert len(directions) == 1
+    assert "Back" in directions[0].text
+
+    # Make sure past-votes' Back/Next were not affected.
+    past_votes = get_table(root, "past-votes")
+    past_directions = get_pkglist_directions(past_votes)
+    assert len(past_directions) == 1
+    assert "Next" in past_directions[0].text
+
+
+def test_tu_index_sorting(client, tu_user):
+    ts = int(datetime.utcnow().timestamp())
+
+    for i in range(2):
+        # Create 'Agenda #1' and 'Agenda #2'.
+        db.create(TUVoteInfo, Agenda=f"Agenda #{i + 1}",
+                  User=tu_user.Username,
+                  Submitted=(ts + 5), End=(ts + 1000),
+                  Quorum=0.0,
+                  Submitter=tu_user, autocommit=False)
+
+        # Let's order each vote one day after the other.
+        # This will allow us to test the sorting nature
+        # of the tables.
+        ts += 86405
+
+    # Make a default request to /tu.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/tu", cookies=cookies, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Get lxml handles of the document.
+    root = parse_root(response.text)
+    table = get_table(root, "current-votes")
+    rows = get_table_rows(table)
+
+    # The latest Agenda is at the top by default.
+    expected = [
+        "Agenda #2",
+        "Agenda #1"
+    ]
+
+    assert len(rows) == len(expected)
+    for i, row in enumerate(rows):
+        assert_current_vote_html(row, [
+            expected[i],
+            DATETIME_REGEX,
+            DATETIME_REGEX,
+            tu_user.Username,
+            r'^(Yes|No)$'
+        ])
+
+    # Make another request; one that sorts the current votes
+    # in ascending order instead of the default descending order.
+    with client as request:
+        response = request.get("/tu", cookies=cookies, params={
+            "cby": "asc"
+        }, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Get lxml handles of the document.
+    root = parse_root(response.text)
+    table = get_table(root, "current-votes")
+    rows = get_table_rows(table)
+
+    # Reverse our expectations and assert that the proposals got flipped.
+    rev_expected = list(reversed(expected))
+    assert len(rows) == len(rev_expected)
+    for i, row in enumerate(rows):
+        assert_current_vote_html(row, [
+            rev_expected[i],
+            DATETIME_REGEX,
+            DATETIME_REGEX,
+            tu_user.Username,
+            r'^(Yes|No)$'
+        ])
+
+
+def test_tu_index_last_votes(client, tu_user, user):
+    ts = int(datetime.utcnow().timestamp())
+
+    # Create a proposal which has ended.
+    voteinfo = db.create(TUVoteInfo, Agenda="Test agenda",
+                         User=user.Username,
+                         Submitted=(ts - 1000),
+                         End=(ts - 5),
+                         Yes=1,
+                         ActiveTUs=1,
+                         Quorum=0.0,
+                         Submitter=tu_user)
+
+    # Create a vote on it from tu_user.
+    db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
+
+    # Now, check that tu_user got populated in the .last-votes table.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/tu", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    table = get_table(root, "last-votes")
+    rows = get_table_rows(table)
+    assert len(rows) == 1
+
+    last_vote = rows[0]
+    user, vote_id = last_vote.xpath("./td")
+    vote_id = vote_id.xpath("./a")[0]
+
+    assert user.text.strip() == tu_user.Username
+    assert int(vote_id.text.strip()) == voteinfo.ID

From e534704a98ed7d421c04279e0c4f57aa8ea837b1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Jun 2021 01:10:20 -0700
Subject: [PATCH 224/844] [FastAPI] remove unused Requests navbar item

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/archdev-navbar.html | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index c6cd3f19..13459e1a 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -7,17 +7,13 @@
         {% endif %}
         <li><a href="/packages/">{% trans %}Packages{% endtrans %}</a></li>
         {% if request.user.is_authenticated() %}
-
             {% if request.user.is_trusted_user() or request.user.is_developer() %}
                 <li>
-                    <a href="/requests/">{% trans %}Requests{% endtrans %}</a>
-                </li>
-
-                <li>
-                    <a href="/accounts/">{% trans %}Accounts{% endtrans %}</a>
+                    <a href="/accounts/">
+                        {% trans %}Accounts{% endtrans %}
+                    </a>
                 </li>
             {% endif %}
-
             <li>
                 <a href="/account/{{ request.user.Username }}/edit">
                     {% trans %}My Account{% endtrans %}

From dc4cc9b604a9085f631c2649909f6767e6f2ce3e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 19 Jun 2021 01:10:53 -0700
Subject: [PATCH 225/844] add aurweb.asgi.id_redirect_middleware

A new middleware which redirects requests going to '/route?id=some_id'
to '/route/some_id'. In the FastAPI application, we'll prefer using
restful layouts where possible where resource-based ids are
parameters of the request uri: '/route/{resource_id}'.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py      | 22 ++++++++++++++++++++++
 test/test_routes.py | 10 ++++++++++
 2 files changed, 32 insertions(+)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index a674fec6..35166c73 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -2,6 +2,8 @@ import asyncio
 import http
 import typing
 
+from urllib.parse import quote_plus
+
 from fastapi import FastAPI, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
@@ -120,3 +122,23 @@ async def check_terms_of_service(request: Request, call_next: typing.Callable):
     task = asyncio.create_task(call_next(request))
     await asyncio.wait({task}, return_when=asyncio.FIRST_COMPLETED)
     return task.result()
+
+
+@app.middleware("http")
+async def id_redirect_middleware(request: Request, call_next: typing.Callable):
+    id = request.query_params.get("id")
+
+    if id is not None:
+        # Preserve query string.
+        qs = []
+        for k, v in request.query_params.items():
+            if k != "id":
+                qs.append(f"{k}={quote_plus(str(v))}")
+        qs = str() if not qs else '?' + '&'.join(qs)
+
+        path = request.url.path.rstrip('/')
+        return RedirectResponse(f"{path}/{id}{qs}")
+
+    task = asyncio.create_task(call_next(request))
+    await asyncio.wait({task}, return_when=asyncio.FIRST_COMPLETED)
+    return task.result()
diff --git a/test/test_routes.py b/test/test_routes.py
index d67f4a48..a2d1786e 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -148,3 +148,13 @@ def test_nonce_csp():
             if not (nonce_verified := (script.get("nonce") == nonce)):
                 break
     assert nonce_verified is True
+
+
+def test_id_redirect():
+    with client as request:
+        response = request.get("/", params={
+            "id": "test",  # This param will be rewritten into Location.
+            "key": "value",  # Test that this param persists.
+            "key2": "value2"  # And this one.
+        }, allow_redirects=False)
+    assert response.headers.get("location") == "/test?key=value&key2=value2"

From ac1779b705d9b0ad87deaa1856e9b5e05d9ae944 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 19 Jun 2021 01:14:10 -0700
Subject: [PATCH 226/844] add util.number_format -> `number_format` Jinja2
 filter

Implement a `number_format` equivalent to PHP's version.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 1 +
 aurweb/util.py      | 5 +++++
 test/test_util.py   | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index b8853593..8b507425 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -30,6 +30,7 @@ env.filters["as_timezone"] = util.as_timezone
 env.filters["dedupe_qs"] = util.dedupe_qs
 env.filters["urlencode"] = quote_plus
 env.filters["get_vote"] = util.get_vote
+env.filters["number_format"] = util.number_format
 
 # Add captcha filters.
 env.filters["captcha_salt"] = captcha.captcha_salt_filter
diff --git a/aurweb/util.py b/aurweb/util.py
index adbff755..539af40e 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -150,6 +150,11 @@ def get_vote(voteinfo, request: fastapi.Request):
     return voteinfo.tu_votes.filter(TUVote.User == request.user).first()
 
 
+def number_format(value: float, places: int):
+    """ A converter function similar to PHP's number_format. """
+    return f"{value:.{places}f}"
+
+
 def jsonify(obj):
     """ Perform a conversion on obj if it's needed. """
     if isinstance(obj, datetime):
diff --git a/test/test_util.py b/test/test_util.py
index 074de494..f54a98a0 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -30,3 +30,8 @@ def test_dedupe_qs():
     # Add key1=changed and key2=changed to the query and dedupe it.
     deduped = util.dedupe_qs(query_string, "key1=changed", "key3=changed")
     assert deduped == "key2=blah&key1=changed&key3=changed"
+
+
+def test_number_format():
+    assert util.number_format(0.222, 2) == "0.22"
+    assert util.number_format(0.226, 2) == "0.23"

From 83c038a42ac50a087bff82490b21acc7e55d65b9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 19 Jun 2021 01:18:40 -0700
Subject: [PATCH 227/844] add TUVoteInfo.total_votes()

Returns the sum of TUVoteInfo.Yes, TUVoteInfo.No and
TUVoteInfo.Abstain.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/tu_voteinfo.py |  3 +++
 test/test_tu_voteinfo.py     | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/aurweb/models/tu_voteinfo.py b/aurweb/models/tu_voteinfo.py
index fd0031a7..b80073f4 100644
--- a/aurweb/models/tu_voteinfo.py
+++ b/aurweb/models/tu_voteinfo.py
@@ -90,3 +90,6 @@ class TUVoteInfo(Base):
 
     def is_running(self):
         return self.End > int(datetime.utcnow().timestamp())
+
+    def total_votes(self):
+        return self.Yes + self.No + self.Abstain
diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index bd5709fb..494300c5 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -64,6 +64,24 @@ def test_tu_voteinfo_is_running():
     assert tu_voteinfo.is_running() is False
 
 
+def test_tu_voteinfo_total_votes():
+    ts = int(datetime.utcnow().timestamp())
+    tu_voteinfo = create(TUVoteInfo,
+                         Agenda="Blah blah.",
+                         User=user.Username,
+                         Submitted=ts, End=ts + 1000,
+                         Quorum=0.5,
+                         Submitter=user)
+
+    tu_voteinfo.Yes = 1
+    tu_voteinfo.No = 3
+    tu_voteinfo.Abstain = 5
+    commit()
+
+    # total_votes() should be the sum of Yes, No and Abstain: 1 + 3 + 5 = 9.
+    assert tu_voteinfo.total_votes() == 9
+
+
 def test_tu_voteinfo_null_submitter_raises_exception():
     with pytest.raises(IntegrityError):
         create(TUVoteInfo,

From 85ba4a33a865ab78cd9e3e1b4e9bd6e410ea8816 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 19 Jun 2021 05:08:25 -0700
Subject: [PATCH 228/844] add /tu/{proposal_id} (get, post) routes

This commit ports the `/tu/?id={proposal_id}` PHP routes to
FastAPI into two individual GET and POST routes.

With this port of the single proposal view and POST logic,
several things have changed.

- The only parameter used is now `decision`, which
  must contain `Yes`, `No`, or `Abstain` as a string.
  When an invalid value is given, a BAD_REQUEST response
  is returned in plaintext: Invalid 'decision' value.
- The `doVote` parameter has been removed.
- The details section has been rearranged into a set
  of divs with specific classes that can be used for
  testing. CSS has been added to persist the layout with
  the element changes.
- Several errors that can be discovered in the POST path
  now trigger their own non-200 HTTPStatus codes.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/trusted_user.py              | 127 ++++++++-
 templates/partials/tu/proposal/details.html | 106 +++++++
 templates/partials/tu/proposal/form.html    |  14 +
 templates/partials/tu/proposal/voters.html  |  10 +
 templates/tu/show.html                      |  20 ++
 test/test_trusted_user_routes.py            | 288 ++++++++++++++++++++
 web/html/css/aurweb.css                     |   8 +
 7 files changed, 571 insertions(+), 2 deletions(-)
 create mode 100644 templates/partials/tu/proposal/details.html
 create mode 100644 templates/partials/tu/proposal/form.html
 create mode 100644 templates/partials/tu/proposal/voters.html
 create mode 100644 templates/tu/show.html

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index c027f67d..efdcfc73 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -1,7 +1,11 @@
+import typing
+
 from datetime import datetime
+from http import HTTPStatus
 from urllib.parse import quote_plus
 
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Form, HTTPException, Request
+from fastapi.responses import Response
 from sqlalchemy import and_, or_
 
 from aurweb import db
@@ -10,7 +14,7 @@ from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
-from aurweb.templates import make_context, render_template
+from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
 
@@ -95,3 +99,122 @@ async def trusted_user(request: Request,
     ])
 
     return render_template(request, "tu/index.html", context)
+
+
+def render_proposal(request: Request,
+                    context: dict,
+                    proposal: int,
+                    voteinfo: TUVoteInfo,
+                    voters: typing.Iterable[User],
+                    vote: TUVote,
+                    status_code: HTTPStatus = HTTPStatus.OK):
+    """ Render a single TU proposal. """
+    context["proposal"] = proposal
+    context["voteinfo"] = voteinfo
+    context["voters"] = voters
+
+    participation = voteinfo.ActiveTUs / voteinfo.total_votes() \
+        if voteinfo.total_votes() else 0
+    context["participation"] = participation
+
+    accepted = (voteinfo.Yes > voteinfo.ActiveTUs / 2) or \
+        (participation > voteinfo.Quorum and voteinfo.Yes > voteinfo.No)
+    context["accepted"] = accepted
+
+    can_vote = voters.filter(TUVote.User == request.user).first() is None
+    context["can_vote"] = can_vote
+
+    if not voteinfo.is_running():
+        context["error"] = "Voting is closed for this proposal."
+
+    context["vote"] = vote
+    context["has_voted"] = vote is not None
+
+    return render_template(request, "tu/show.html", context,
+                           status_code=status_code)
+
+
+@router.get("/tu/{proposal}")
+@auth_required(True, redirect="/")
+@account_type_required(REQUIRED_TYPES)
+async def trusted_user_proposal(request: Request, proposal: int):
+    context = await make_variable_context(request, "Trusted User")
+    proposal = int(proposal)
+
+    voteinfo = db.query(TUVoteInfo, TUVoteInfo.ID == proposal).first()
+    if not voteinfo:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+
+    voters = db.query(User).join(TUVote).filter(TUVote.VoteID == voteinfo.ID)
+    vote = db.query(TUVote, and_(TUVote.UserID == request.user.ID,
+                                 TUVote.VoteID == voteinfo.ID)).first()
+
+    if not request.user.is_trusted_user():
+        context["error"] = "Only Trusted Users are allowed to vote."
+    elif voteinfo.User == request.user.Username:
+        context["error"] = "You cannot vote in an proposal about you."
+    elif vote is not None:
+        context["error"] = "You've already voted for this proposal."
+
+    context["vote"] = vote
+    return render_proposal(request, context, proposal, voteinfo, voters, vote)
+
+
+@router.post("/tu/{proposal}")
+@auth_required(True, redirect="/")
+@account_type_required(REQUIRED_TYPES)
+async def trusted_user_proposal_post(request: Request,
+                                     proposal: int,
+                                     decision: str = Form(...)):
+    context = await make_variable_context(request, "Trusted User")
+    proposal = int(proposal)  # Make sure it's an int.
+
+    voteinfo = db.query(TUVoteInfo, TUVoteInfo.ID == proposal).first()
+    if not voteinfo:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+
+    voters = db.query(User).join(TUVote).filter(TUVote.VoteID == voteinfo.ID)
+
+    # status_code we'll use for responses later.
+    status_code = HTTPStatus.OK
+
+    if not request.user.is_trusted_user():
+        # Test: Create a proposal and view it as a "Developer". It
+        # should give us this error.
+        context["error"] = "Only Trusted Users are allowed to vote."
+        status_code = HTTPStatus.UNAUTHORIZED
+    elif voteinfo.User == request.user.Username:
+        context["error"] = "You cannot vote in an proposal about you."
+        status_code = HTTPStatus.BAD_REQUEST
+
+    vote = db.query(TUVote, and_(TUVote.UserID == request.user.ID,
+                                 TUVote.VoteID == voteinfo.ID)).first()
+
+    if status_code != HTTPStatus.OK:
+        return render_proposal(request, context, proposal,
+                               voteinfo, voters, vote,
+                               status_code=status_code)
+
+    if vote is not None:
+        context["error"] = "You've already voted for this proposal."
+        status_code = HTTPStatus.BAD_REQUEST
+
+    if status_code != HTTPStatus.OK:
+        return render_proposal(request, context, proposal,
+                               voteinfo, voters, vote,
+                               status_code=status_code)
+
+    if decision in {"Yes", "No", "Abstain"}:
+        # Increment whichever decision was given to us.
+        setattr(voteinfo, decision, getattr(voteinfo, decision) + 1)
+    else:
+        return Response("Invalid 'decision' value.",
+                        status_code=int(HTTPStatus.BAD_REQUEST))
+
+    vote = db.create(TUVote, User=request.user, VoteInfo=voteinfo,
+                     autocommit=False)
+    voteinfo.ActiveTUs += 1
+    db.commit()
+
+    context["error"] = "You've already voted for this proposal."
+    return render_proposal(request, context, proposal, voteinfo, voters, vote)
diff --git a/templates/partials/tu/proposal/details.html b/templates/partials/tu/proposal/details.html
new file mode 100644
index 00000000..3f15a6eb
--- /dev/null
+++ b/templates/partials/tu/proposal/details.html
@@ -0,0 +1,106 @@
+<h2>{% trans %}Proposal Details{% endtrans %}</h2>
+
+{% if voteinfo.is_running() %}
+    <p class="vote-running" style="font-weight: bold; color: red">
+        {% trans %}This vote is still running.{% endtrans %}
+    </p>
+{% endif %}
+
+<!-- The margin style here mimics the margin on the old <p> element. -->
+<div class="proposal details">
+    <div class="field user">
+        {{ "User" | tr }}:
+        <strong>
+            {% if voteinfo.User %}
+                <a href="{{ '/packages/?K=%s&SeB=m' | format(voteinfo.User)}}">
+                    {{ voteinfo.User }}
+                </a>
+            {% else %}
+                N/A
+            {% endif %}
+        </strong>
+    </div>
+
+    {% set submitted = voteinfo.Submitted | dt | as_timezone(timezone) %}
+    {% set end = voteinfo.End | dt | as_timezone(timezone) %}
+    <div class="field submitted">
+        {{
+            "Submitted: %s by %s" | tr
+            | format(submitted.strftime("%Y-%m-%d %H:%M"),
+                     voteinfo.Submitter.Username | e)
+        }}
+    </div>
+
+    <div class="field end">
+        {{ "End" | tr }}:
+        <strong>
+            {{ end.strftime("%Y-%m-%d %H:%M") }}
+        </strong>
+    </div>
+
+    {% if not voteinfo.is_running() %}
+        <div class="field result">
+            {{ "Result" | tr }}:
+            {% if not voteinfo.ActiveTUs %}
+                <span>{{ "unknown" | tr }}</span>
+            {% elif accepted %}
+                <span style="color: green; font-weight: bold">
+                    {{ "Accepted" | tr }}
+                </span>
+            {% else %}
+                <span style="color: red; font-weight: bold">
+                    {{ "Rejected" | tr }}
+                </span>
+            {% endif %}
+        </div>
+    {% endif %}
+</div>
+
+<div class="proposal agenda">
+    <p class="field agenda">
+        <!-- The `e` filter manually escapes content. -->
+        {{ voteinfo.Agenda | replace("\n", "<br />\n") | safe | e }}
+    </p>
+</div>
+
+<table class="vote-status">
+    <tr>
+        {% if not voteinfo.is_running() %}
+            <th>{{ "Yes" | tr }}</th>
+            <th>{{ "No" | tr }}</th>
+            <th>{{ "Abstain" | tr }}</th>
+        {% endif %}
+
+        <th>{{ "Total" | tr }}</th>
+        <th>{{ "Voted" | tr }}</th>
+        <th>{{ "Participation" | tr }}</th>
+    </tr>
+
+    <tr>
+        {% if not voteinfo.is_running() %}
+            <td>{{ voteinfo.Yes }}</td>
+            <td>{{ voteinfo.No }}</td>
+            <td>{{ voteinfo.Abstain }}</td>
+        {% endif %}
+
+        <td>{{ voteinfo.total_votes() }}</td>
+        <td>
+            {% if not has_voted %}
+                <span style="color: red; font-weight: bold">
+                    {{ "No" | tr }}
+                </span>
+            {% else %}
+                <span style="color: green; font-weight: bold">
+                    {{ "Yes" | tr }}
+                </span>
+            {% endif %}
+        </td>
+        <td>
+            {% if voteinfo.ActiveTUs %}
+                {{ (participation * 100) | number_format(2) }}%
+            {% else %}
+                {{ "unknown" | tr }}
+            {% endif %}
+        </td>
+    </tr>
+</table>
diff --git a/templates/partials/tu/proposal/form.html b/templates/partials/tu/proposal/form.html
new file mode 100644
index 00000000..d783a622
--- /dev/null
+++ b/templates/partials/tu/proposal/form.html
@@ -0,0 +1,14 @@
+<form class="action-form" action="/tu/{{ proposal }}" method="POST">
+    <!-- Translate each button's text but leave the value alone. -->
+    <fieldset>
+        <button type="submit" class="button" name="decision" value="Yes">
+            {{ "Yes" | tr }}
+        </button>
+        <button type="submit" class="button" name="decision" value="No">
+            {{ "No" | tr }}
+        </button>
+        <button type="submit" class="button" name="decision" value="Abstain">
+            {{ "Abstain" | tr }}
+        </button>
+    </fieldset>
+</form>
diff --git a/templates/partials/tu/proposal/voters.html b/templates/partials/tu/proposal/voters.html
new file mode 100644
index 00000000..2fd42bdf
--- /dev/null
+++ b/templates/partials/tu/proposal/voters.html
@@ -0,0 +1,10 @@
+<h2>{{ "Voters" | tr }}</h2>
+<ul id="voters">
+    {% for voter in voters %}
+        <li>
+            <a href="/account/{{ voter.Username | urlencode }}">
+                {{ voter.Username | e }}
+            </a>
+        </li>
+    {% endfor %}
+</ul>
diff --git a/templates/tu/show.html b/templates/tu/show.html
new file mode 100644
index 00000000..ca5cbe63
--- /dev/null
+++ b/templates/tu/show.html
@@ -0,0 +1,20 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        {% include "partials/tu/proposal/details.html" %}
+    </div>
+
+    <div class="box">
+        {% include "partials/tu/proposal/voters.html" %}
+    </div>
+
+    <div class="box">
+        {% if error %}
+            <span class="status">{{ error | tr }}</span>
+        {% else %}
+            {% include "partials/tu/proposal/form.html" %}
+        {% endif %}
+    </div>
+
+{% endblock %}
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index a6527e6f..73cea9bf 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -18,6 +18,7 @@ from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
 
 DATETIME_REGEX = r'^[0-9]{4}-[0-9]{2}-[0-9]{2}$'
+PARTICIPATION_REGEX = r'^1?[0-9]{2}[%]$'  # 0% - 100%
 
 
 def parse_root(html):
@@ -103,6 +104,26 @@ def user():
                     AccountType=user_type)
 
 
+@pytest.fixture
+def proposal(tu_user):
+    ts = int(datetime.utcnow().timestamp())
+    agenda = "Test proposal."
+    start = ts - 5
+    end = ts + 1000
+
+    user_type = db.query(AccountType,
+                         AccountType.AccountType == "User").first()
+    user = db.create(User, Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword",
+                     AccountType=user_type)
+
+    voteinfo = db.create(TUVoteInfo,
+                         Agenda=agenda, Quorum=0.0,
+                         User=user.Username, Submitter=tu_user,
+                         Submitted=start, End=end)
+    yield (tu_user, user, voteinfo)
+
+
 def test_tu_index_guest(client):
     with client as request:
         response = request.get("/tu", allow_redirects=False)
@@ -441,3 +462,270 @@ def test_tu_index_last_votes(client, tu_user, user):
 
     assert user.text.strip() == tu_user.Username
     assert int(vote_id.text.strip()) == voteinfo.ID
+
+
+def test_tu_proposal_not_found(client, tu_user):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/tu", params={"id": 1}, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_tu_running_proposal(client, proposal):
+    tu_user, user, voteinfo = proposal
+
+    # Initiate an authenticated GET request to /tu/{proposal_id}.
+    proposal_id = voteinfo.ID
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get(f"/tu/{proposal_id}", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Alright, now let's continue on to verifying some markup.
+    # First, let's verify that the proposal details match.
+    root = parse_root(response.text)
+    details = root.xpath('//div[@class="proposal details"]')[0]
+
+    vote_running = root.xpath('//p[contains(@class, "vote-running")]')[0]
+    assert vote_running.text.strip() == "This vote is still running."
+
+    # Verify User field.
+    username = details.xpath(
+        './div[contains(@class, "user")]/strong/a/text()')[0]
+    assert username.strip() == user.Username
+
+    submitted = details.xpath(
+        './div[contains(@class, "submitted")]/text()')[0]
+    assert re.match(r'^Submitted: \d{4}-\d{2}-\d{2} \d{2}:\d{2} by .+$',
+                    submitted.strip()) is not None
+
+    end = details.xpath('./div[contains(@class, "end")]')[0]
+    end_label = end.xpath("./text()")[0]
+    assert end_label.strip() == "End:"
+
+    end_datetime = end.xpath("./strong/text()")[0]
+    assert re.match(r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
+                    end_datetime.strip()) is not None
+
+    # We have not voted yet. Assert that our voting form is shown.
+    form = root.xpath('//form[contains(@class, "action-form")]')[0]
+    fields = form.xpath("./fieldset")[0]
+    buttons = fields.xpath('./button[@name="decision"]')
+    assert len(buttons) == 3
+
+    # Check the button names and values.
+    yes, no, abstain = buttons
+
+    # Yes
+    assert yes.attrib["name"] == "decision"
+    assert yes.attrib["value"] == "Yes"
+
+    # No
+    assert no.attrib["name"] == "decision"
+    assert no.attrib["value"] == "No"
+
+    # Abstain
+    assert abstain.attrib["name"] == "decision"
+    assert abstain.attrib["value"] == "Abstain"
+
+    # Create a vote.
+    db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
+    voteinfo.ActiveTUs += 1
+    voteinfo.Yes += 1
+    db.commit()
+
+    # Make another request now that we've voted.
+    with client as request:
+        response = request.get(
+            "/tu", params={"id": voteinfo.ID}, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Parse our new root.
+    root = parse_root(response.text)
+
+    # Check that we no longer have a voting form.
+    form = root.xpath('//form[contains(@class, "action-form")]')
+    assert not form
+
+    # Check that we're told we've voted.
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "You've already voted for this proposal."
+
+
+def test_tu_ended_proposal(client, proposal):
+    tu_user, user, voteinfo = proposal
+
+    ts = int(datetime.utcnow().timestamp())
+    voteinfo.End = ts - 5  # 5 seconds ago.
+    db.commit()
+
+    # Initiate an authenticated GET request to /tu/{proposal_id}.
+    proposal_id = voteinfo.ID
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get(f"/tu/{proposal_id}", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Alright, now let's continue on to verifying some markup.
+    # First, let's verify that the proposal details match.
+    root = parse_root(response.text)
+    details = root.xpath('//div[@class="proposal details"]')[0]
+
+    vote_running = root.xpath('//p[contains(@class, "vote-running")]')
+    assert not vote_running
+
+    result_node = details.xpath('./div[contains(@class, "result")]')[0]
+    result_label = result_node.xpath("./text()")[0]
+    assert result_label.strip() == "Result:"
+
+    result = result_node.xpath("./span/text()")[0]
+    assert result.strip() == "unknown"
+
+    # Check that voting has ended.
+    form = root.xpath('//form[contains(@class, "action-form")]')
+    assert not form
+
+    # We should see a status about it.
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "Voting is closed for this proposal."
+
+
+def test_tu_proposal_vote_not_found(client, tu_user):
+    """ Test POST request to a missing vote. """
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        data = {"decision": "Yes"}
+        response = request.post("/tu/1", cookies=cookies,
+                                data=data, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_tu_proposal_vote(client, proposal):
+    tu_user, user, voteinfo = proposal
+
+    # Store the current related values.
+    yes = voteinfo.Yes
+    active_tus = voteinfo.ActiveTUs
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        data = {"decision": "Yes"}
+        response = request.post(f"/tu/{voteinfo.ID}", cookies=cookies,
+                                data=data)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Check that the proposal record got updated.
+    assert voteinfo.Yes == yes + 1
+    assert voteinfo.ActiveTUs == active_tus + 1
+
+    # Check that the new TUVote exists.
+    vote = db.query(TUVote, TUVote.VoteInfo == voteinfo,
+                    TUVote.User == tu_user).first()
+    assert vote is not None
+
+    root = parse_root(response.text)
+
+    # Check that we're told we've voted.
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "You've already voted for this proposal."
+
+
+def test_tu_proposal_vote_unauthorized(client, proposal):
+    tu_user, user, voteinfo = proposal
+
+    dev_type = db.query(AccountType,
+                        AccountType.AccountType == "Developer").first()
+    tu_user.AccountType = dev_type
+    db.commit()
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        data = {"decision": "Yes"}
+        response = request.post(f"/tu/{voteinfo.ID}", cookies=cookies,
+                                data=data, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+    root = parse_root(response.text)
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "Only Trusted Users are allowed to vote."
+
+    with client as request:
+        data = {"decision": "Yes"}
+        response = request.get(f"/tu/{voteinfo.ID}", cookies=cookies,
+                               data=data, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "Only Trusted Users are allowed to vote."
+
+
+def test_tu_proposal_vote_cant_self_vote(client, proposal):
+    tu_user, user, voteinfo = proposal
+
+    # Update voteinfo.User.
+    voteinfo.User = tu_user.Username
+    db.commit()
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        data = {"decision": "Yes"}
+        response = request.post(f"/tu/{voteinfo.ID}", cookies=cookies,
+                                data=data, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    root = parse_root(response.text)
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "You cannot vote in an proposal about you."
+
+    with client as request:
+        data = {"decision": "Yes"}
+        response = request.get(f"/tu/{voteinfo.ID}", cookies=cookies,
+                               data=data, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "You cannot vote in an proposal about you."
+
+
+def test_tu_proposal_vote_already_voted(client, proposal):
+    tu_user, user, voteinfo = proposal
+
+    db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
+    voteinfo.Yes += 1
+    voteinfo.ActiveTUs += 1
+    db.commit()
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        data = {"decision": "Yes"}
+        response = request.post(f"/tu/{voteinfo.ID}", cookies=cookies,
+                                data=data, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    root = parse_root(response.text)
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "You've already voted for this proposal."
+
+    with client as request:
+        data = {"decision": "Yes"}
+        response = request.get(f"/tu/{voteinfo.ID}", cookies=cookies,
+                               data=data, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    status = root.xpath('//span[contains(@class, "status")]/text()')[0]
+    assert status == "You've already voted for this proposal."
+
+
+def test_tu_proposal_vote_invalid_decision(client, proposal):
+    tu_user, user, voteinfo = proposal
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        data = {"decision": "EVIL"}
+        response = request.post(f"/tu/{voteinfo.ID}", cookies=cookies,
+                                data=data)
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+    assert response.text == "Invalid 'decision' value."
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index bb4e3ad7..2748462f 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -204,3 +204,11 @@ label.confirmation,
 	overflow: hidden;
 	transition: height 1s;
 }
+
+.proposal.details {
+    margin: .33em 0 1em;
+}
+
+button[type="submit"] {
+    padding: 0 0.6em;
+}

From bfffdd4d912eb012f947a81ff4c51489015fa2df Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Jun 2021 04:13:28 -0700
Subject: [PATCH 229/844] aurweb.asgi: Allow unsafe-inline style-src in CSP

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 35166c73..26893232 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -88,6 +88,8 @@ async def add_security_headers(request: Request, call_next: typing.Callable):
         "cdn.jsdelivr.net"
     ]
     csp += f"script-src 'self' 'nonce-{nonce}' " + ' '.join(script_hosts)
+    # It's fine if css is inlined.
+    csp += f"; style-src 'self' 'unsafe-inline'"
     response.headers["Content-Security-Policy"] = csp
 
     # Add XTCO header.

From 04ab98907aa6b7e432bbc3b0bd71462bf9ecd513 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Jun 2021 04:20:55 -0700
Subject: [PATCH 230/844] aurweb.asgi: patch invalid f-string

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 26893232..228b9a65 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -89,7 +89,7 @@ async def add_security_headers(request: Request, call_next: typing.Callable):
     ]
     csp += f"script-src 'self' 'nonce-{nonce}' " + ' '.join(script_hosts)
     # It's fine if css is inlined.
-    csp += f"; style-src 'self' 'unsafe-inline'"
+    csp += "; style-src 'self' 'unsafe-inline'"
     response.headers["Content-Security-Policy"] = csp
 
     # Add XTCO header.

From 97c1247b577adb13fac793577d411f0f2be9274a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Jun 2021 04:43:00 -0700
Subject: [PATCH 231/844] /tu/{proposal_id}: Do not show voters if there are
 none

This was different than PHP.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/trusted_user.py |  2 +-
 templates/tu/show.html         | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index efdcfc73..55f7b7e1 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -111,7 +111,7 @@ def render_proposal(request: Request,
     """ Render a single TU proposal. """
     context["proposal"] = proposal
     context["voteinfo"] = voteinfo
-    context["voters"] = voters
+    context["voters"] = voters.all()
 
     participation = voteinfo.ActiveTUs / voteinfo.total_votes() \
         if voteinfo.total_votes() else 0
diff --git a/templates/tu/show.html b/templates/tu/show.html
index ca5cbe63..ff2d4bb6 100644
--- a/templates/tu/show.html
+++ b/templates/tu/show.html
@@ -4,10 +4,12 @@
     <div class="box">
         {% include "partials/tu/proposal/details.html" %}
     </div>
-
-    <div class="box">
-        {% include "partials/tu/proposal/voters.html" %}
-    </div>
+    
+    {% if voters %}
+        <div class="box">
+            {% include "partials/tu/proposal/voters.html" %}
+        </div>
+    {% endif %}
 
     <div class="box">
         {% if error %}

From 83f93c8dbb1bc823fa8bcc3966d572255dc742e2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 27 Jun 2021 03:54:13 -0700
Subject: [PATCH 232/844] aurweb.routers.accounts: strip host out of ssh
 pubkeys

We must store the paired key, otherwise aurweb-git-auth
will fail.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 3e3469ca..36871595 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -1,4 +1,5 @@
 import copy
+import logging
 import typing
 
 from datetime import datetime
@@ -24,6 +25,7 @@ from aurweb.scripts.notify import ResetKeyNotification
 from aurweb.templates import make_variable_context, render_template
 
 router = APIRouter()
+logger = logging.getLogger(__name__)
 
 
 @router.get("/passreset", response_class=HTMLResponse)
@@ -402,6 +404,10 @@ async def account_register_post(request: Request,
     if PK:
         # Get the second element in the PK, which is the actual key.
         pubkey = PK.strip().rstrip()
+        parts = pubkey.split(" ")
+        if len(parts) == 3:
+            # Remove the host part.
+            pubkey = parts[0] + " " + parts[1]
         fingerprint = get_fingerprint(pubkey)
         user.ssh_pub_key = SSHPubKey(UserID=user.ID,
                                      PubKey=pubkey,
@@ -522,15 +528,19 @@ async def account_edit_post(request: Request,
     if PK:
         # Get the second token in the public key, which is the actual key.
         pubkey = PK.strip().rstrip()
+        parts = pubkey.split(" ")
+        if len(parts) == 3:
+            # Remove the host part.
+            pubkey = parts[0] + " " + parts[1]
         fingerprint = get_fingerprint(pubkey)
         if not user.ssh_pub_key:
             # No public key exists, create one.
             user.ssh_pub_key = SSHPubKey(UserID=user.ID,
-                                         PubKey=PK,
+                                         PubKey=pubkey,
                                          Fingerprint=fingerprint)
-        elif user.ssh_pub_key.Fingerprint != fingerprint:
+        elif user.ssh_pub_key.PubKey != pubkey:
             # A public key already exists, update it.
-            user.ssh_pub_key.PubKey = PK
+            user.ssh_pub_key.PubKey = pubkey
             user.ssh_pub_key.Fingerprint = fingerprint
     elif user.ssh_pub_key:
         # Else, if the user has a public key already, delete it.

From 0a3aa40f209e755f4a345ff86015d7a42acdb1f4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 27 Jun 2021 05:16:12 -0700
Subject: [PATCH 233/844] Docker: Fix `git` sshd

This was completely bugged out. This commit fixes git, provides
two separate cgit servers for the different URL bases and also
supplies a smartgit service for $AURWEB_URL/repo.git interaction.

Docker image needs to be rebuilt with this change:

    $ docker build -t aurweb:latest .

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile                     | 11 +++--
 docker-compose.yml             | 72 +++++++++++++++++++++++++-----
 docker/cgit-entrypoint.sh      |  7 ++-
 docker/fastapi-entrypoint.sh   |  3 ++
 docker/git-entrypoint.sh       | 81 +++++++++++++++++++++++++++-------
 docker/health/cgit.sh          |  2 +-
 docker/health/smartgit.sh      |  2 +
 docker/health/sshd.sh          |  5 ++-
 docker/nginx-entrypoint.sh     | 38 ++++++++++++++--
 docker/php-entrypoint.sh       |  3 ++
 docker/scripts/run-cgit.sh     |  4 ++
 docker/scripts/run-smartgit.sh |  9 ++++
 docker/scripts/run-sshd.sh     |  2 +-
 docker/smartgit-entrypoint.sh  |  4 ++
 14 files changed, 202 insertions(+), 41 deletions(-)
 create mode 100755 docker/health/smartgit.sh
 create mode 100755 docker/scripts/run-cgit.sh
 create mode 100755 docker/scripts/run-smartgit.sh
 create mode 100755 docker/smartgit-entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index da9c8d3b..4141a4c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
 FROM archlinux:base-devel
+ENV PYTHONPATH=/aurweb
+ENV AUR_CONFIG=conf/config
 
 # Setup some default system stuff.
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
@@ -16,7 +18,7 @@ RUN pacman -Syu --noconfirm --noprogressbar \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
     python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
-    python-asgiref uvicorn
+    python-asgiref uvicorn python-pip python-wheel
 
 RUN useradd -U -d /aurweb -c 'AUR User' aur
 
@@ -25,6 +27,9 @@ COPY docker /docker
 WORKDIR /aurweb
 COPY . .
 
-ENV PYTHONPATH=/aurweb
-
 RUN make -C po all install
+RUN pip3 install -t /aurweb/app --upgrade -I .
+
+# Set permissions on directories and binaries.
+RUN bash -c 'find /aurweb/app -type d -exec chmod 755 {} \;'
+RUN chmod 755 /aurweb/app/bin/*
diff --git a/docker-compose.yml b/docker-compose.yml
index 795236c7..6bf36166 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,33 +50,77 @@ services:
     image: aurweb:latest
     init: true
     environment:
-      - AUR_CONFIG=conf/config
+      - AUR_CONFIG=/aurweb/conf/config
     entrypoint: /docker/git-entrypoint.sh
     command: /docker/scripts/run-sshd.sh
     ports:
-      - "2222:22"
+      - "2222:2222"
     healthcheck:
       test: "bash /docker/health/sshd.sh"
       interval: 2s
       timeout: 30s
+    depends_on:
+      mariadb:
+        condition: service_healthy
+    links:
+      - mariadb
     volumes:
       - mariadb_run:/var/run/mysqld
       - mariadb_data:/var/lib/mysql
       - git_data:/aurweb/aur.git
       - ./cache:/cache
 
-  cgit:
+  smartgit:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=/aurweb/conf/config
+    entrypoint: /docker/smartgit-entrypoint.sh
+    command: /docker/scripts/run-smartgit.sh
+    healthcheck:
+      test: "bash /docker/health/smartgit.sh"
+      interval: 2s
+      timeout: 30s
+    depends_on:
+      mariadb:
+        condition: service_healthy
+    links:
+      - mariadb
+    volumes:
+      - mariadb_run:/var/run/mysqld
+      - mariadb_data:/var/lib/mysql
+      - git_data:/aurweb/aur.git
+      - ./cache:/cache
+      - smartgit_run:/var/run/smartgit
+
+  cgit-php:
     image: aurweb:latest
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
     entrypoint: /docker/cgit-entrypoint.sh
-    command: >-
-      uwsgi --socket 0.0.0.0:3000
-            --plugins cgi
-            --cgi /usr/share/webapps/cgit/cgit.cgi
+    command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8443/cgit"
     healthcheck:
-      test: "bash /docker/health/cgit.sh"
+      test: "bash /docker/health/cgit.sh 3000"
+      interval: 2s
+      timeout: 30s
+    depends_on:
+      git:
+        condition: service_healthy
+    links:
+      - git
+    volumes:
+      - git_data:/aurweb/aur.git
+
+  cgit-fastapi:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=/aurweb/conf/config
+    entrypoint: /docker/cgit-entrypoint.sh
+    command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8444/cgit"
+    healthcheck:
+      test: "bash /docker/health/cgit.sh 3000"
       interval: 2s
       timeout: 30s
     depends_on:
@@ -170,14 +214,20 @@ services:
       interval: 2s
       timeout: 30s
     depends_on:
-      cgit:
+      cgit-php:
+        condition: service_healthy
+      cgit-fastapi:
+        condition: service_healthy
+      smartgit:
         condition: service_healthy
       fastapi:
         condition: service_healthy
       php-fpm:
         condition: service_healthy
     links:
-      - cgit
+      - cgit-php
+      - cgit-fastapi
+      - smartgit
       - fastapi
       - php-fpm
     volumes:
@@ -187,6 +237,7 @@ services:
       - ./web/html:/aurweb/web/html
       - ./web/template:/aurweb/web/template
       - ./web/lib:/aurweb/web/lib
+      - smartgit_run:/var/run/smartgit
 
   sharness:
     image: aurweb:latest
@@ -298,3 +349,4 @@ volumes:
   mariadb_run: {} # Share /var/run/mysqld/mysqld.sock
   mariadb_data: {} # Share /var/lib/mysql
   git_data: {} # Share aurweb/aur.git
+  smartgit_run: {}
diff --git a/docker/cgit-entrypoint.sh b/docker/cgit-entrypoint.sh
index e05e1b7a..9abc5091 100755
--- a/docker/cgit-entrypoint.sh
+++ b/docker/cgit-entrypoint.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 set -eou pipefail
 
-cp -vf conf/cgitrc.proto /etc/cgitrc
+mkdir -p /var/cache/cgit
 
-sed -ri 's|clone-prefix=.*|clone-prefix=https://localhost:8443|' /etc/cgitrc
+cp -vf conf/cgitrc.proto /etc/cgitrc
+sed -ri "s|clone-prefix=.*|clone-prefix=${2}|" /etc/cgitrc
 sed -ri 's|header=.*|header=/aurweb/web/template/cgit/header.html|' /etc/cgitrc
 sed -ri 's|footer=.*|footer=/aurweb/web/template/cgit/footer.html|' /etc/cgitrc
 sed -ri 's|repo\.path=.*|repo.path=/aurweb/aur.git|' /etc/cgitrc
 
-mkdir -p /var/cache/cgit
-
 exec "$@"
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 2f04c29f..11b8ac5a 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -7,4 +7,7 @@ bash $dir/test-mysql-entrypoint.sh
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8444;" conf/config
 sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
 
+sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8444/cgit/aur.git -b %s|" conf/config.defaults
+sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
+
 exec "$@"
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index d17ceeaf..e6d3ad97 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -2,44 +2,91 @@
 set -eou pipefail
 
 SSHD_CONFIG=/etc/ssh/sshd_config
+AUTH_SCRIPT=/aurweb/app/git-auth.sh
 
-GIT_REPO=aur.git
-GIT_KEY=/cache/git.key
+GIT_REPO=/aurweb/aur.git
+GIT_BRANCH=master # 'Master' branch.
 
-# Setup SSH Keys.
-ssh-keygen -A
+if ! grep -q 'PYTHONPATH' /etc/environment; then
+    echo "PYTHONPATH='/aurweb:/aurweb/app'" >> /etc/environment
+else
+    sed -ri "s|^(PYTHONPATH)=.*$|\1='/aurweb:/aurweb/app'|" /etc/environment
+fi
+
+if ! grep -q 'AUR_CONFIG' /etc/environment; then
+    echo "AUR_CONFIG='/aurweb/conf/config'" >> /etc/environment
+else
+    sed -ri "s|^(AUR_CONFIG)=.*$|\1='/aurweb/conf/config'|" /etc/environment
+fi
+
+if ! grep -q '/aurweb/app/bin' /etc/environment; then
+    echo "PATH='/aurweb/app/bin:\${PATH}'" >> /etc/environment
+fi
 
 # Add AUR SSH config.
 cat >> $SSHD_CONFIG << EOF
 Match User aur
     PasswordAuthentication no
-    AuthorizedKeysCommand /usr/local/bin/aurweb-git-auth "%t" "%k"
+    AuthorizedKeysCommand $AUTH_SCRIPT "%t" "%k"
     AuthorizedKeysCommandUser aur
     AcceptEnv AUR_OVERWRITE
-    SetEnv AUR_CONFIG=/aurweb/config/config
 EOF
 
+cat >> $AUTH_SCRIPT << EOF
+#!/usr/bin/env bash
+export PYTHONPATH="$PYTHONPATH"
+export AUR_CONFIG="$AUR_CONFIG"
+export PATH="/aurweb/app/bin:\${PATH}"
+
+exec /aurweb/app/bin/aurweb-git-auth "\$@"
+EOF
+chmod 755 $AUTH_SCRIPT
+
+DB_NAME="aurweb"
+DB_HOST="mariadb"
+DB_USER="aur"
+DB_PASS="aur"
+
+# Setup a config for our mysql db.
+cp -vf conf/config.dev $AUR_CONFIG
+sed -i "s;YOUR_AUR_ROOT;$(pwd);g" $AUR_CONFIG
+sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" $AUR_CONFIG
+sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" $AUR_CONFIG
+sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" $AUR_CONFIG
+sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" $AUR_CONFIG
+sed -i "s|/usr/local/bin|/aurweb/app/bin|g" $AUR_CONFIG
+
+AUR_CONFIG_DEFAULTS="${AUR_CONFIG}.defaults"
+
+if [[ "$AUR_CONFIG_DEFAULTS" != "/aurweb/conf/config.defaults" ]]; then
+    cp -vf conf/config.defaults $AUR_CONFIG_DEFAULTS
+fi
+
+# Set some defaults needed for pathing and ssh uris.
+sed -i "s|/usr/local/bin|/aurweb/app/bin|g" $AUR_CONFIG_DEFAULTS
+sed -ri "s|^(repo-path) = .+|\1 = /aurweb/aur.git/|" $AUR_CONFIG_DEFAULTS
+
+ssh_cmdline='ssh ssh://aur@localhost:2222'
+sed -ri "s|^(ssh-cmdline) = .+|\1 = $ssh_cmdline|" $AUR_CONFIG_DEFAULTS
+
+# Setup SSH Keys.
+ssh-keygen -A
+
 # Taken from INSTALL.
 mkdir -pv $GIT_REPO
 
 # Initialize git repository.
 if [ ! -f $GIT_REPO/config ]; then
+    curdir="$(pwd)"
     cd $GIT_REPO
+    git config --global init.defaultBranch $GIT_BRANCH
     git init --bare
     git config --local transfer.hideRefs '^refs/'
     git config --local --add transfer.hideRefs '!refs/'
     git config --local --add transfer.hideRefs '!HEAD'
-    ln -sf /usr/local/bin/aurweb-git-update hooks/update
-    chown -R aur .
-    cd ..
+    ln -sf /aurweb/app/bin/aurweb-git-update hooks/update
+    cd $curdir
+    chown -R aur:aur $GIT_REPO
 fi
 
-if [ ! -f $GIT_KEY ]; then
-    # Create a DSA ssh private/pubkey at /cache/git.key{.pub,}.
-    ssh-keygen -f $GIT_KEY -t dsa -N '' -C 'AUR Git Key'
-fi
-
-# Users should modify these permissions on their local machines.
-chmod 666 ${GIT_KEY}{.pub,}
-
 exec "$@"
diff --git a/docker/health/cgit.sh b/docker/health/cgit.sh
index add33031..2f0cfeb1 100755
--- a/docker/health/cgit.sh
+++ b/docker/health/cgit.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec printf "" >>/dev/tcp/127.0.0.1/3000
+exec printf "" >>/dev/tcp/127.0.0.1/${1}
diff --git a/docker/health/smartgit.sh b/docker/health/smartgit.sh
new file mode 100755
index 00000000..b4e7ebd4
--- /dev/null
+++ b/docker/health/smartgit.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec pgrep uwsgi
diff --git a/docker/health/sshd.sh b/docker/health/sshd.sh
index 6befdfb5..d9da9ea1 100755
--- a/docker/health/sshd.sh
+++ b/docker/health/sshd.sh
@@ -1,2 +1,5 @@
 #!/bin/bash
-exec printf "" >>/dev/tcp/127.0.0.1/22
+# Opt to just pgrep sshd instead of connecting here. This health
+# script is used on a regular interval and it ends up spamming
+# the git service's logs with accesses.
+exec pgrep sshd
diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
index 1e442ef7..238cd167 100755
--- a/docker/nginx-entrypoint.sh
+++ b/docker/nginx-entrypoint.sh
@@ -45,8 +45,16 @@ http {
         server fastapi:8000;
     }
 
-    upstream cgit {
-        server cgit:3000;
+    upstream cgit-php {
+        server cgit-php:3000;
+    }
+
+    upstream cgit-fastapi {
+        server cgit-fastapi:3000;
+    }
+
+    upstream smartgit {
+        server unix:/var/run/smartgit/smartgit.sock;
     }
 
     server {
@@ -59,12 +67,23 @@ http {
         root /aurweb/web/html;
         index index.php;
 
+        location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" {
+            include      uwsgi_params;
+            uwsgi_pass   smartgit;
+            uwsgi_modifier1 9;
+            uwsgi_param  SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
+            uwsgi_param  PATH_INFO /aur.git/\$3;
+            uwsgi_param  GIT_HTTP_EXPORT_ALL "";
+            uwsgi_param  GIT_NAMESPACE \$1;
+            uwsgi_param  GIT_PROJECT_ROOT /aurweb;
+        }
+
         location ~ ^/cgit {
             include uwsgi_params;
             rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=\$1&\$2 last;
             uwsgi_modifier1 9;
             uwsgi_param CGIT_CONFIG /etc/cgitrc;
-            uwsgi_pass uwsgi://cgit;
+            uwsgi_pass uwsgi://cgit-php;
         }
 
         location ~ ^/[^/]+\.php($|/) {
@@ -95,12 +114,23 @@ http {
             try_files \$uri @proxy_to_app;
         }
 
+        location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" {
+            include      uwsgi_params;
+            uwsgi_pass   smartgit;
+            uwsgi_modifier1 9;
+            uwsgi_param  SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
+            uwsgi_param  PATH_INFO /aur.git/\$3;
+            uwsgi_param  GIT_HTTP_EXPORT_ALL "";
+            uwsgi_param  GIT_NAMESPACE \$1;
+            uwsgi_param  GIT_PROJECT_ROOT /aurweb;
+        }
+
         location ~ ^/cgit {
             include uwsgi_params;
             rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=\$1&\$2 last;
             uwsgi_modifier1 9;
             uwsgi_param CGIT_CONFIG /etc/cgitrc;
-            uwsgi_pass uwsgi://cgit;
+            uwsgi_pass uwsgi://cgit-fastapi;
         }
 
         location @proxy_to_app {
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 19c6d059..4d49ef17 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -7,6 +7,9 @@ bash $dir/test-mysql-entrypoint.sh
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8443;" conf/config
 sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
 
+sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8443/cgit/aur.git -b %s|" conf/config.defaults
+sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
+
 sed -ri 's/^(listen).*/\1 = 0.0.0.0:9000/' /etc/php/php-fpm.d/www.conf
 sed -ri 's/^;?(clear_env).*/\1 = no/' /etc/php/php-fpm.d/www.conf
 
diff --git a/docker/scripts/run-cgit.sh b/docker/scripts/run-cgit.sh
new file mode 100755
index 00000000..67bdc079
--- /dev/null
+++ b/docker/scripts/run-cgit.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+exec uwsgi --socket 0.0.0.0:${1} \
+    --plugins cgi \
+    --cgi /usr/share/webapps/cgit/cgit.cgi
diff --git a/docker/scripts/run-smartgit.sh b/docker/scripts/run-smartgit.sh
new file mode 100755
index 00000000..b6869a6c
--- /dev/null
+++ b/docker/scripts/run-smartgit.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+exec uwsgi \
+    --socket /var/run/smartgit/smartgit.sock \
+    --uid root \
+    --gid http \
+    --chmod-socket=666 \
+    --plugins cgi \
+    --cgi /usr/lib/git-core/git-http-backend
diff --git a/docker/scripts/run-sshd.sh b/docker/scripts/run-sshd.sh
index a69af7e2..d488e80d 100755
--- a/docker/scripts/run-sshd.sh
+++ b/docker/scripts/run-sshd.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /usr/sbin/sshd -D
+exec /usr/sbin/sshd -e -p 2222 -D
diff --git a/docker/smartgit-entrypoint.sh b/docker/smartgit-entrypoint.sh
new file mode 100755
index 00000000..daa9edeb
--- /dev/null
+++ b/docker/smartgit-entrypoint.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -eou pipefail
+
+exec "$@"

From 12911a101e8a5adb4097ed503c3923bedaf98fa9 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sun, 27 Jun 2021 13:55:51 +0200
Subject: [PATCH 234/844] Port homepage intro to fastapi

Port the main home page content to fastapi.
---
 aurweb/config.py       |  6 +++
 aurweb/routers/html.py |  2 +
 aurweb/util.py         | 10 +++++
 templates/index.html   | 92 ++++++++++++++++++++++++++++++++++++++++++
 test/test_homepage.py  | 36 +++++++++++++++++
 5 files changed, 146 insertions(+)
 create mode 100644 test/test_homepage.py

diff --git a/aurweb/config.py b/aurweb/config.py
index 73db58dc..52fadda2 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -46,3 +46,9 @@ def getboolean(section, option):
 
 def getint(section, option, fallback=None):
     return _get_parser().getint(section, option, fallback=fallback)
+
+
+def get_section(section_name):
+    for section in _get_parser().sections():
+        if section == section_name:
+            return _get_parser()[section]
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 580ee0d4..f6f1a54e 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -58,6 +58,8 @@ async def language(request: Request,
 async def index(request: Request):
     """ Homepage route. """
     context = make_context(request, "Home")
+    context['ssh_fingerprints'] = util.get_ssh_fingerprints()
+
     return render_template(request, "index.html", context)
 
 
diff --git a/aurweb/util.py b/aurweb/util.py
index 539af40e..d4a0b221 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -172,3 +172,13 @@ def add_samesite_fields(response: Response, value: str):
                 cookie += f"; SameSite={value}"
                 response.raw_headers[idx] = (header[0], cookie.encode())
     return response
+
+
+def get_ssh_fingerprints():
+    fingerprints = {}
+    fingerprint_section = aurweb.config.get_section("fingerprints")
+
+    if fingerprint_section:
+        fingerprints = {key: fingerprint_section[key] for key in fingerprint_section.keys()}
+
+    return fingerprints
diff --git a/templates/index.html b/templates/index.html
index 27d3375d..8cd1cc78 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,4 +1,96 @@
 {% extends 'partials/layout.html' %}
 
 {% block pageContent %}
+<div id="intro" class="box">
+    <h2>AUR  {% trans %}Home{% endtrans %}</h2>
+    <p>
+        {{ "Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information."
+            | tr
+            | format('<a href="https://wiki.archlinux.org/title/AUR_User_Guidelines">', "</a>",
+                     '<a href="https://wiki.archlinux.org/title/AUR_Trusted_User_Guidelines">', "</a>")
+            | safe 
+        }}
+        {{ "Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!"
+            | tr
+	    | format("<strong>", "</strong>",
+		     '<a href="https://wiki.archlinux.org/title/Arch_Packaging_Standards">',
+		     "</a>")
+            | safe
+        }}
+        {% trans %}Remember to vote for your favourite packages!{% endtrans %}
+        {% trans %}Some packages may be provided as binaries in [community].{% endtrans %}
+        <p class="important">
+            {% trans %}DISCLAIMER{% endtrans %}:
+            {% trans %}AUR packages are user produced content. Any use of the provided files is at your own risk.{% endtrans %}
+        </p>
+        <p class="readmore"><a href="https://wiki.archlinux.org/title/AUR">{% trans %}Learn more...{% endtrans %}</a></p>
+    </p>
+</div>
+<div id="news">
+    <h3><a>{% trans %}Support{% endtrans %}</a><span class="arrow"></span></h3>
+    <h4>{% trans %}Package Requests{% endtrans %}</h4>
+    <div class="article-content">
+        <p>
+        {{ "There are three types of requests that can be filed in the %sPackage Actions%s box on the package details page:"
+           | tr
+           | format("<var>", "</var>")
+           | safe
+        }}
+        </p>
+        <ul>
+            <li><em>{% trans %}Orphan Request{% endtrans %}</em>: {% trans %}Request a package to be disowned, e.g. when the maintainer is inactive and the package has been flagged out-of-date for a long time.{% endtrans %}</li>
+            <li><em>{% trans %}Deletion Request{% endtrans %}</em>: {%trans %}Request a package to be removed from the Arch User Repository. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.{% endtrans %}</li>
+            <li><em>{% trans %}Merge Request{% endtrans %}</em>: {% trans %}Request a package to be merged into another one. Can be used when a package needs to be renamed or replaced by a split package.{% endtrans %}</li>
+	</ul>
+        <p>
+	{{ "If you want to discuss a request, you can use the %saur-requests%s mailing list. However, please do not use that list to file requests."
+           | tr
+           | format('<a href="https://mailman.archlinux.org/mailman/listinfo/aur-requests">', "</a>")
+           | safe
+        }}
+        </p>
+    </div>
+    <h4>{% trans %}Submitting Packages{% endtrans %}</h4>
+    <div class="article-content">
+    <p>
+        {{ "Git over SSH is now used to submit packages to the AUR. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details."
+           | tr
+           | format('<a href="https://wiki.archlinux.org/title/Arch_User_Repository#Submitting_packages">', "</a>")
+           | safe
+        }}
+    </p>
+    {% if ssh_fingerprints %}
+        <p>
+            {% trans %}The following SSH fingerprints are used for the AUR:{% endtrans %}
+        <p>
+        <ul>
+        {% for keytype in ssh_fingerprints %} 
+            <li><code>{{ keytype }}</code>: <code>{{ ssh_fingerprints[keytype] }}</code>
+        {% endfor %}
+    </ul>
+    {% endif %}
+    </div>
+    <h4>{% trans %}Discussion{% endtrans %}</h4>
+    <div class="article-content">
+        <p>
+        {{ "General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list."
+           | tr
+           | format('<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', "</a>",
+                    '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', "</a>")
+           | safe
+        }}
+        <p>
+    </div>
+    <h4>{% trans %}Bug Reporting{% endtrans %}</h4>
+    <div class="article-content">
+        <p>
+        {{ "If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page."
+           | tr
+           | format('<a href="https://bugs.archlinux.org/index.php?project=2">', "</a>",
+                    "<strong>", "</strong>")
+           | safe 
+        }}
+        </p>
+    </div>
+</div>
 {% endblock %}
diff --git a/test/test_homepage.py b/test/test_homepage.py
new file mode 100644
index 00000000..23d7185f
--- /dev/null
+++ b/test/test_homepage.py
@@ -0,0 +1,36 @@
+from http import HTTPStatus
+from unittest.mock import patch
+
+from fastapi.testclient import TestClient
+
+from aurweb.asgi import app
+
+client = TestClient(app)
+
+
+def test_homepage():
+    with client as request:
+        response = request.get("/")
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+@patch('aurweb.util.get_ssh_fingerprints')
+def test_homepage_ssh_fingerprints(get_ssh_fingerprints_mock):
+    fingerprints = {'Ed25519': "SHA256:RFzBCUItH9LZS0cKB5UE6ceAYhBD5C8GeOBip8Z11+4"}
+    get_ssh_fingerprints_mock.return_value = fingerprints
+
+    with client as request:
+        response = request.get("/")
+
+    assert list(fingerprints.values())[0] in response.content.decode()
+    assert 'The following SSH fingerprints are used for the AUR' in response.content.decode()
+
+
+@patch('aurweb.util.get_ssh_fingerprints')
+def test_homepage_no_ssh_fingerprints(get_ssh_fingerprints_mock):
+    get_ssh_fingerprints_mock.return_value = {}
+
+    with client as request:
+        response = request.get("/")
+
+    assert 'The following SSH fingerprints are used for the AUR' not in response.content.decode()

From acc100eb5220169b257d33e40818ab9361ecb5e5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 27 Jun 2021 06:26:18 -0700
Subject: [PATCH 235/844] Docker: Fix installation, remove pip, simplify sshd

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile               |  8 ++------
 docker/git-entrypoint.sh | 28 +++++++++++-----------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4141a4c9..cec36158 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN pacman -Syu --noconfirm --noprogressbar \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
     python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
-    python-asgiref uvicorn python-pip python-wheel
+    python-asgiref uvicorn
 
 RUN useradd -U -d /aurweb -c 'AUR User' aur
 
@@ -28,8 +28,4 @@ WORKDIR /aurweb
 COPY . .
 
 RUN make -C po all install
-RUN pip3 install -t /aurweb/app --upgrade -I .
-
-# Set permissions on directories and binaries.
-RUN bash -c 'find /aurweb/app -type d -exec chmod 755 {} \;'
-RUN chmod 755 /aurweb/app/bin/*
+RUN python3 setup.py install --install-scripts=/usr/local/bin
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index e6d3ad97..89537853 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -2,7 +2,7 @@
 set -eou pipefail
 
 SSHD_CONFIG=/etc/ssh/sshd_config
-AUTH_SCRIPT=/aurweb/app/git-auth.sh
+AUTH_SCRIPT=/app/git-auth.sh
 
 GIT_REPO=/aurweb/aur.git
 GIT_BRANCH=master # 'Master' branch.
@@ -10,7 +10,7 @@ GIT_BRANCH=master # 'Master' branch.
 if ! grep -q 'PYTHONPATH' /etc/environment; then
     echo "PYTHONPATH='/aurweb:/aurweb/app'" >> /etc/environment
 else
-    sed -ri "s|^(PYTHONPATH)=.*$|\1='/aurweb:/aurweb/app'|" /etc/environment
+    sed -ri "s|^(PYTHONPATH)=.*$|\1='/aurweb'|" /etc/environment
 fi
 
 if ! grep -q 'AUR_CONFIG' /etc/environment; then
@@ -19,9 +19,15 @@ else
     sed -ri "s|^(AUR_CONFIG)=.*$|\1='/aurweb/conf/config'|" /etc/environment
 fi
 
-if ! grep -q '/aurweb/app/bin' /etc/environment; then
-    echo "PATH='/aurweb/app/bin:\${PATH}'" >> /etc/environment
-fi
+mkdir -p /app
+chmod 755 /app
+
+cat >> $AUTH_SCRIPT << EOF
+#!/usr/bin/env bash
+export AUR_CONFIG="$AUR_CONFIG"
+exec /usr/local/bin/aurweb-git-auth "\$@"
+EOF
+chmod 755 $AUTH_SCRIPT
 
 # Add AUR SSH config.
 cat >> $SSHD_CONFIG << EOF
@@ -32,16 +38,6 @@ Match User aur
     AcceptEnv AUR_OVERWRITE
 EOF
 
-cat >> $AUTH_SCRIPT << EOF
-#!/usr/bin/env bash
-export PYTHONPATH="$PYTHONPATH"
-export AUR_CONFIG="$AUR_CONFIG"
-export PATH="/aurweb/app/bin:\${PATH}"
-
-exec /aurweb/app/bin/aurweb-git-auth "\$@"
-EOF
-chmod 755 $AUTH_SCRIPT
-
 DB_NAME="aurweb"
 DB_HOST="mariadb"
 DB_USER="aur"
@@ -54,7 +50,6 @@ sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" $AUR_CONFIG
 sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" $AUR_CONFIG
 sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" $AUR_CONFIG
 sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" $AUR_CONFIG
-sed -i "s|/usr/local/bin|/aurweb/app/bin|g" $AUR_CONFIG
 
 AUR_CONFIG_DEFAULTS="${AUR_CONFIG}.defaults"
 
@@ -63,7 +58,6 @@ if [[ "$AUR_CONFIG_DEFAULTS" != "/aurweb/conf/config.defaults" ]]; then
 fi
 
 # Set some defaults needed for pathing and ssh uris.
-sed -i "s|/usr/local/bin|/aurweb/app/bin|g" $AUR_CONFIG_DEFAULTS
 sed -ri "s|^(repo-path) = .+|\1 = /aurweb/aur.git/|" $AUR_CONFIG_DEFAULTS
 
 ssh_cmdline='ssh ssh://aur@localhost:2222'

From b2491ddc07fefe9612a14fb8ac9ed4bac9da8f79 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sun, 27 Jun 2021 17:25:46 +0200
Subject: [PATCH 236/844] Use type=email for email fields

Setting the input type gives the use a hint that the field should be an
email and also shows an error when a non-email is filled into the email
field.
---
 templates/partials/account_form.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 5ae18131..6455c351 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -89,7 +89,7 @@
                 {% trans %}Email Address{% endtrans %}:
             </label>
 
-            <input id="id_email" type="text"
+            <input id="id_email" type="email"
                    size="30" maxlength="254" name="E" value="{{ email }}">
             ({% trans %}required{% endtrans %})
         </p>
@@ -119,7 +119,7 @@
                 {% trans %}Backup Email Address{% endtrans %}:
             </label>
 
-            <input id="id_backup_email" type="text" size="30"
+            <input id="id_backup_email" type="email" size="30"
                    maxlength="254" name="BE" value="{{ backup }}">
         </p>
         <p>

From 222d995e95ebedab00169be9e44e161d36efc292 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sun, 27 Jun 2021 17:27:44 +0200
Subject: [PATCH 237/844] Use backup_email field for backup email

The context gives backup_email and not backup for the backup email
field.

Fixes: #91
---
 templates/partials/account_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 6455c351..05009594 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -120,7 +120,7 @@
             </label>
 
             <input id="id_backup_email" type="email" size="30"
-                   maxlength="254" name="BE" value="{{ backup }}">
+                   maxlength="254" name="BE" value="{{ backup_email }}">
         </p>
         <p>
             <em>

From a26e70334333c99ade535d92c5957fd19f7d796e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 28 Jun 2021 04:04:52 -0700
Subject: [PATCH 238/844] bugfix: use empty string if backup_email is None

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/account_form.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 05009594..6374fd5e 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -90,7 +90,7 @@
             </label>
 
             <input id="id_email" type="email"
-                   size="30" maxlength="254" name="E" value="{{ email }}">
+                   size="30" maxlength="254" name="E" value="{{ email or '' }}">
             ({% trans %}required{% endtrans %})
         </p>
         <p>
@@ -120,7 +120,7 @@
             </label>
 
             <input id="id_backup_email" type="email" size="30"
-                   maxlength="254" name="BE" value="{{ backup_email }}">
+                   maxlength="254" name="BE" value="{{ backup_email or '' }}">
         </p>
         <p>
             <em>

From 28300ee889f74eaf29fec5dc0bb2f4492375b0d2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 28 Jun 2021 04:12:29 -0700
Subject: [PATCH 239/844] bugfix: populate context on invalid password (account
 edit)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 36871595..5d798ae8 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -483,15 +483,15 @@ async def account_edit_post(request: Request,
     context = await make_variable_context(request, "Accounts")
     context["user"] = user
 
+    args = dict(await request.form())
+    context = make_account_form_context(context, request, user, args)
+    ok, errors = process_account_form(request, user, args)
+
     if not passwd:
         context["errors"] = ["Invalid password."]
         return render_template(request, "account/edit.html", context,
                                status_code=int(HTTPStatus.BAD_REQUEST))
 
-    args = dict(await request.form())
-    context = make_account_form_context(context, request, user, args)
-    ok, errors = process_account_form(request, user, args)
-
     if not ok:
         context["errors"] = errors
         return render_template(request, "account/edit.html", context,

From 3c6b2203e92e8359f421aed5f421a8d6424fe8de Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 28 Jun 2021 05:36:12 -0700
Subject: [PATCH 240/844] Docker: bugfix: /usr/local/bin instead of
 /aurweb/app/bin

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/git-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index 89537853..57752ac5 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -78,7 +78,7 @@ if [ ! -f $GIT_REPO/config ]; then
     git config --local transfer.hideRefs '^refs/'
     git config --local --add transfer.hideRefs '!refs/'
     git config --local --add transfer.hideRefs '!HEAD'
-    ln -sf /aurweb/app/bin/aurweb-git-update hooks/update
+    ln -sf /usr/local/bin/aurweb-git-update hooks/update
     cd $curdir
     chown -R aur:aur $GIT_REPO
 fi

From f8d2d4c82a5fd442e10fa205811548cffea59da7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 28 Jun 2021 08:22:34 -0700
Subject: [PATCH 241/844] PackageBase.package -> PackageBase.packages

A PackageBase can have more than one package
associated with it.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package.py |  2 +-
 test/test_package.py     | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/aurweb/models/package.py b/aurweb/models/package.py
index ff518f20..e8159d85 100644
--- a/aurweb/models/package.py
+++ b/aurweb/models/package.py
@@ -17,7 +17,7 @@ class Package(Base):
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         nullable=False)
     PackageBase = relationship(
-        "PackageBase", backref=backref("package", uselist=False),
+        "PackageBase", backref=backref("packages", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
     __mapper_args__ = {"primary_key": [ID]}
diff --git a/test/test_package.py b/test/test_package.py
index 9532823d..1e940164 100644
--- a/test/test_package.py
+++ b/test/test_package.py
@@ -1,9 +1,7 @@
 import pytest
 
 from sqlalchemy import and_
-from sqlalchemy.exc import IntegrityError, OperationalError
-
-import aurweb.config
+from sqlalchemy.exc import IntegrityError
 
 from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
@@ -57,20 +55,6 @@ def test_package():
     assert record is not None
 
 
-def test_package_package_base_cant_change():
-    """ Test case insensitivity of the database table. """
-    if aurweb.config.get("database", "backend") == "sqlite":
-        return None  # SQLite doesn't seem handle this.
-
-    from aurweb.db import session
-
-    with pytest.raises(OperationalError):
-        create(Package,
-               PackageBase=pkgbase,
-               Name="invalidates-old-package-packagebase-relationship")
-    session.rollback()
-
-
 def test_package_null_pkgbase_raises_exception():
     from aurweb.db import session
 

From 7d695f0c6af4b35688aa53c3602aee09e05eff68 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 28 Jun 2021 08:32:46 -0700
Subject: [PATCH 242/844] Update .gitignore

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5d1a4de7..27ff977a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@ fastapi_aw/
 .idea
 /cache/*
 /logs/*
+/build/
+/dist/
+/aurweb.egg-info/

From dbbafc15fae9567deba5fd02b7a4dfdc5969d1ad Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 28 Jun 2021 12:44:55 -0700
Subject: [PATCH 243/844] bugfix: PackageKeyword should have two PKs

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_keyword.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py
index 2926740d..803e6bca 100644
--- a/aurweb/models/package_keyword.py
+++ b/aurweb/models/package_keyword.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy import Column, ForeignKey, Integer, String, text
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
@@ -18,7 +18,11 @@ class PackageKeyword(Base):
         "PackageBase", backref=backref("keywords", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
-    __mapper_args__ = {"primary_key": [PackageBaseID]}
+    Keyword = Column(
+        String(255), primary_key=True, nullable=False,
+        server_default=text("''"))
+
+    __mapper_args__ = {"primary_key": [PackageBaseID, Keyword]}
 
     def __init__(self,
                  PackageBase: aurweb.models.package_base.PackageBase = None,

From 2f5d9c63c479211aec63a5c29ef5a7dc8c464225 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 28 Jun 2021 22:32:56 +0100
Subject: [PATCH 244/844] [php] Support DB mysql backend with port instead of
 socket

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
 web/lib/DB.class.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/lib/DB.class.php b/web/lib/DB.class.php
index dfdbbf96..c7b3c745 100644
--- a/web/lib/DB.class.php
+++ b/web/lib/DB.class.php
@@ -20,15 +20,23 @@ class DB {
 				$backend = config_get('database', 'backend');
 				$host = config_get('database', 'host');
 				$socket = config_get('database', 'socket');
+				$port = config_get('database', 'port');
 				$name = config_get('database', 'name');
 				$user = config_get('database', 'user');
 				$password = config_get('database', 'password');
 
 				if ($backend == "mysql") {
-					$dsn = $backend .
-						':host=' . $host .
-						';unix_socket=' . $socket .
-						';dbname=' . $name;
+					if ($port != '') {
+						$dsn = $backend .
+							':host=' . $host .
+							';port=' . $port .
+							';dbname=' . $name;
+					} else {
+						$dsn = $backend .
+							':host=' . $host .
+							';unix_socket=' . $socket .
+							';dbname=' . $name;
+					}
 
 					self::$dbh = new PDO($dsn, $user, $password);
 					self::$dbh->exec("SET NAMES 'utf8' COLLATE 'utf8_general_ci';");

From c3a29171cde3b7fa16de82c1f60aa9e3329393bc Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 28 Jun 2021 22:33:51 +0100
Subject: [PATCH 245/844] [php] aurweb.spawn avoid permission denied when
 running as user

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
 aurweb/spawn.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index f7c07dd7..6d553dde 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -58,6 +58,11 @@ def generate_nginx_config():
         pid {os.path.join(temporary_dir, "nginx.pid")};
         http {{
             access_log /dev/stdout;
+            client_body_temp_path {os.path.join(temporary_dir, "client_body")};
+            proxy_temp_path {os.path.join(temporary_dir, "proxy")};
+            fastcgi_temp_path {os.path.join(temporary_dir, "fastcgi")}1 2;
+            uwsgi_temp_path {os.path.join(temporary_dir, "uwsgi")};
+            scgi_temp_path {os.path.join(temporary_dir, "scgi")};
             server {{
                 listen {aur_location_parts.netloc};
                 location / {{

From af96be7d0928172a42f92d9a4a264ca6eb2c4710 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 10:27:45 -0700
Subject: [PATCH 246/844] Docker: move nginx config to its own file

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf   | 133 ++++++++++++++++++++++++++++++++++++
 docker/nginx-entrypoint.sh | 135 +------------------------------------
 2 files changed, 134 insertions(+), 134 deletions(-)
 create mode 100644 docker/config/nginx.conf

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
new file mode 100644
index 00000000..c1957d71
--- /dev/null
+++ b/docker/config/nginx.conf
@@ -0,0 +1,133 @@
+daemon off;
+user root;
+worker_processes auto;
+pid /var/run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+events {
+    worker_connections 256;
+}
+
+http {
+    sendfile on;
+    tcp_nopush on;
+    types_hash_max_size 4096;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_prefer_server_ciphers on;
+
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
+
+    gzip on;
+
+    upstream hypercorn {
+        server fastapi:8000;
+    }
+
+    upstream cgit-php {
+        server cgit-php:3000;
+    }
+
+    upstream cgit-fastapi {
+        server cgit-fastapi:3000;
+    }
+
+    upstream smartgit {
+        server unix:/var/run/smartgit/smartgit.sock;
+    }
+
+    server {
+        listen 8443 ssl http2;
+        server_name localhost default_server;
+
+        ssl_certificate /etc/ssl/certs/localhost.cert.pem;
+        ssl_certificate_key /etc/ssl/private/localhost.key.pem;
+
+        root /aurweb/web/html;
+        index index.php;
+
+        location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" {
+            include      uwsgi_params;
+            uwsgi_pass   smartgit;
+            uwsgi_modifier1 9;
+            uwsgi_param  SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
+            uwsgi_param  PATH_INFO /aur.git/$3;
+            uwsgi_param  GIT_HTTP_EXPORT_ALL "";
+            uwsgi_param  GIT_NAMESPACE $1;
+            uwsgi_param  GIT_PROJECT_ROOT /aurweb;
+        }
+
+        location ~ ^/cgit {
+            include uwsgi_params;
+            rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=$1&$2 last;
+            uwsgi_modifier1 9;
+            uwsgi_param CGIT_CONFIG /etc/cgitrc;
+            uwsgi_pass uwsgi://cgit-php;
+        }
+
+        location ~ ^/[^/]+\.php($|/) {
+            fastcgi_pass   php-fpm:9000;
+            fastcgi_index  index.php;
+            fastcgi_split_path_info ^(/[^/]+\.php)(/.*)$;
+            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+            fastcgi_param  PATH_INFO        $fastcgi_path_info;
+            include        fastcgi_params;
+        }
+
+        location ~ .* {
+            rewrite ^/(.*)$ /index.php/$1 last;
+        }
+
+    }
+
+    server {
+        listen 8444 ssl http2;
+        server_name localhost default_server;
+
+        ssl_certificate /etc/ssl/certs/localhost.cert.pem;
+        ssl_certificate_key /etc/ssl/private/localhost.key.pem;
+
+        root /aurweb/web/html;
+
+        location / {
+            try_files $uri @proxy_to_app;
+        }
+
+        location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" {
+            include      uwsgi_params;
+            uwsgi_pass   smartgit;
+            uwsgi_modifier1 9;
+            uwsgi_param  SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
+            uwsgi_param  PATH_INFO /aur.git/$3;
+            uwsgi_param  GIT_HTTP_EXPORT_ALL "";
+            uwsgi_param  GIT_NAMESPACE $1;
+            uwsgi_param  GIT_PROJECT_ROOT /aurweb;
+        }
+
+        location ~ ^/cgit {
+            include uwsgi_params;
+            rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=$1&$2 last;
+            uwsgi_modifier1 9;
+            uwsgi_param CGIT_CONFIG /etc/cgitrc;
+            uwsgi_pass uwsgi://cgit-fastapi;
+        }
+
+        location @proxy_to_app {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_redirect off;
+            proxy_buffering off;
+            proxy_pass https://hypercorn;
+        }
+    }
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        '' close;
+    }
+}
+
diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
index 238cd167..347af50f 100755
--- a/docker/nginx-entrypoint.sh
+++ b/docker/nginx-entrypoint.sh
@@ -15,139 +15,6 @@ sed -ri 's/^(disable_http_login) = .+/\1 = 1/' conf/config
 cp -vf /cache/localhost.cert.pem /etc/ssl/certs/localhost.cert.pem
 cp -vf /cache/localhost.key.pem /etc/ssl/private/localhost.key.pem
 
-cat > /etc/nginx/nginx.conf << EOF
-daemon off;
-user root;
-worker_processes auto;
-pid /var/run/nginx.pid;
-include /etc/nginx/modules-enabled/*.conf;
-
-events {
-    worker_connections 256;
-}
-
-http {
-    sendfile on;
-    tcp_nopush on;
-    types_hash_max_size 4096;
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    access_log /var/log/nginx/access.log;
-    error_log /var/log/nginx/error.log;
-
-    gzip on;
-
-    upstream hypercorn {
-        server fastapi:8000;
-    }
-
-    upstream cgit-php {
-        server cgit-php:3000;
-    }
-
-    upstream cgit-fastapi {
-        server cgit-fastapi:3000;
-    }
-
-    upstream smartgit {
-        server unix:/var/run/smartgit/smartgit.sock;
-    }
-
-    server {
-        listen 8443 ssl http2;
-        server_name localhost default_server;
-
-        ssl_certificate /etc/ssl/certs/localhost.cert.pem;
-        ssl_certificate_key /etc/ssl/private/localhost.key.pem;
-
-        root /aurweb/web/html;
-        index index.php;
-
-        location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" {
-            include      uwsgi_params;
-            uwsgi_pass   smartgit;
-            uwsgi_modifier1 9;
-            uwsgi_param  SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
-            uwsgi_param  PATH_INFO /aur.git/\$3;
-            uwsgi_param  GIT_HTTP_EXPORT_ALL "";
-            uwsgi_param  GIT_NAMESPACE \$1;
-            uwsgi_param  GIT_PROJECT_ROOT /aurweb;
-        }
-
-        location ~ ^/cgit {
-            include uwsgi_params;
-            rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=\$1&\$2 last;
-            uwsgi_modifier1 9;
-            uwsgi_param CGIT_CONFIG /etc/cgitrc;
-            uwsgi_pass uwsgi://cgit-php;
-        }
-
-        location ~ ^/[^/]+\.php($|/) {
-            fastcgi_pass   php-fpm:9000;
-            fastcgi_index  index.php;
-            fastcgi_split_path_info ^(/[^/]+\.php)(/.*)\$;
-            fastcgi_param  SCRIPT_FILENAME  \$document_root\$fastcgi_script_name;
-            fastcgi_param  PATH_INFO        \$fastcgi_path_info;
-            include        fastcgi_params;
-        }
-
-        location ~ .* {
-            rewrite ^/(.*)$ /index.php/\$1 last;
-        }
-
-    }
-
-    server {
-        listen 8444 ssl http2;
-        server_name localhost default_server;
-
-        ssl_certificate /etc/ssl/certs/localhost.cert.pem;
-        ssl_certificate_key /etc/ssl/private/localhost.key.pem;
-
-        root /aurweb/web/html;
-
-        location / {
-            try_files \$uri @proxy_to_app;
-        }
-
-        location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" {
-            include      uwsgi_params;
-            uwsgi_pass   smartgit;
-            uwsgi_modifier1 9;
-            uwsgi_param  SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
-            uwsgi_param  PATH_INFO /aur.git/\$3;
-            uwsgi_param  GIT_HTTP_EXPORT_ALL "";
-            uwsgi_param  GIT_NAMESPACE \$1;
-            uwsgi_param  GIT_PROJECT_ROOT /aurweb;
-        }
-
-        location ~ ^/cgit {
-            include uwsgi_params;
-            rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=\$1&\$2 last;
-            uwsgi_modifier1 9;
-            uwsgi_param CGIT_CONFIG /etc/cgitrc;
-            uwsgi_pass uwsgi://cgit-fastapi;
-        }
-
-        location @proxy_to_app {
-            proxy_set_header Host \$http_host;
-            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto \$scheme;
-            proxy_redirect off;
-            proxy_buffering off;
-            proxy_pass https://hypercorn;
-        }
-    }
-
-    map \$http_upgrade \$connection_upgrade {
-        default upgrade;
-        '' close;
-    }
-}
-EOF
+cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf
 
 exec "$@"

From 3bacfe6cd97049926893a37595bbb40158be7a48 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 10:29:24 -0700
Subject: [PATCH 247/844] Docker: increase nginx and php-fpm logging

Log toward stdout/stderr which is accessible via
`docker-compose logs <service>`.

Examples:

- `docker-compose logs nginx`
- `docker-compose logs php-fpm`

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf | 4 ++--
 docker/php-entrypoint.sh | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index c1957d71..d7c0196a 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -18,8 +18,8 @@ http {
     ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
     ssl_prefer_server_ciphers on;
 
-    access_log /var/log/nginx/access.log;
-    error_log /var/log/nginx/error.log;
+    access_log /dev/stdout;
+    error_log /dev/stderr;
 
     gzip on;
 
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 4d49ef17..350871d6 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -13,6 +13,11 @@ sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" con
 sed -ri 's/^(listen).*/\1 = 0.0.0.0:9000/' /etc/php/php-fpm.d/www.conf
 sed -ri 's/^;?(clear_env).*/\1 = no/' /etc/php/php-fpm.d/www.conf
 
+# Log to stderr. View logs via `docker-compose logs php-fpm`.
+sed -ri 's|^(error_log) = .*$|\1 = /proc/self/fd/2|g' /etc/php/php-fpm.conf
+sed -ri 's|^;?(access\.log) = .*$|\1 = /proc/self/fd/2|g' \
+    /etc/php/php-fpm.d/www.conf
+
 sed -ri 's/^;?(extension=pdo_mysql)/\1/' /etc/php/php.ini
 sed -ri 's/^;?(open_basedir).*$/\1 = \//' /etc/php/php.ini
 

From a120af5a005450b348dd260ac4c9b92e979d95e7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 10:30:26 -0700
Subject: [PATCH 248/844] Docker: remove asset forward to index.php

This makes logging look a little better for development purposes.
Now, `docker-compose logs php-fpm` will only show details about PHP
accesses, while `docker-compose logs nginx` will show accesses
regarding PHP assets.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index d7c0196a..3a8de801 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -77,6 +77,10 @@ http {
             include        fastcgi_params;
         }
 
+        location ~ .+\.(css|js?|jpe?g|png|svg|ico)/?$ {
+            try_files $uri =404;
+        }
+
         location ~ .* {
             rewrite ^/(.*)$ /index.php/$1 last;
         }

From 4442ba6703de42b1cba568f582ea4f668629ac14 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 10:41:54 -0700
Subject: [PATCH 249/844] bugfix: return null if config key doesn't exist

This was previously causing a PHP warning due to returning
a missing key.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 web/lib/confparser.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php
index 1152e132..fdd2b78e 100644
--- a/web/lib/confparser.inc.php
+++ b/web/lib/confparser.inc.php
@@ -30,7 +30,9 @@ function config_get($section, $key) {
 	global $AUR_CONFIG;
 	config_load();
 
-	return $AUR_CONFIG[$section][$key];
+	return isset($AUR_CONFIG[$section][$key])
+		? $AUR_CONFIG[$section][$key]
+		: null;
 }
 
 function config_get_int($section, $key) {

From 6c7bb04b93161580946c2ee96d0002f3bd7858d1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 21:33:47 -0700
Subject: [PATCH 250/844] Docker: Improve mariadb init

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml              |  8 +++++++-
 docker/mariadb-entrypoint.sh    | 29 ++++++++++++++++++++++++++++-
 docker/scripts/run-mariadb.sh   | 26 --------------------------
 docker/scripts/run-pytests.sh   |  3 ++-
 docker/test-mysql-entrypoint.sh |  3 ++-
 5 files changed, 39 insertions(+), 30 deletions(-)
 delete mode 100755 docker/scripts/run-mariadb.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 6bf36166..40d9bc5b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,8 +32,10 @@ services:
   mariadb:
     image: aurweb:latest
     init: true
+    environment:
+      - DB_HOST="%"
     entrypoint: /docker/mariadb-entrypoint.sh
-    command: /docker/scripts/run-mariadb.sh mysqld_safe --datadir=/var/lib/mysql
+    command: /usr/bin/mysqld_safe --datadir=/var/lib/mysql
     ports:
       # This will expose mariadbd on 127.0.0.1:13306 in the host.
       # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
@@ -136,6 +138,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
+      - DB_HOST=mariadb
     entrypoint: /docker/php-entrypoint.sh
     command: /docker/scripts/run-php.sh
     healthcheck:
@@ -170,6 +173,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
+      - DB_HOST=mariadb
     entrypoint: /docker/fastapi-entrypoint.sh
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:
@@ -269,6 +273,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
+      - DB_HOST=mariadb
     entrypoint: /docker/test-mysql-entrypoint.sh
     command: /docker/scripts/run-pytests.sh clean
     stdin_open: true
@@ -324,6 +329,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
+      - DB_HOST=mariadb
     entrypoint: /docker/tests-entrypoint.sh
     command: /docker/scripts/run-tests.sh
     stdin_open: true
diff --git a/docker/mariadb-entrypoint.sh b/docker/mariadb-entrypoint.sh
index e33c61c7..48e87045 100755
--- a/docker/mariadb-entrypoint.sh
+++ b/docker/mariadb-entrypoint.sh
@@ -1,6 +1,33 @@
 #!/bin/bash
 set -eou pipefail
 
-mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+MYSQL_DATA=/var/lib/mysql
+DB_HOST="localhost"
+
+mariadb-install-db --user=mysql --basedir=/usr --datadir=$MYSQL_DATA
+
+# Start it up.
+mysqld_safe --datadir=$MYSQL_DATA --skip-networking &
+while ! mysqladmin ping 2>/dev/null; do
+    sleep 1s
+done
+
+# Configure databases.
+DATABASE="aurweb" # Persistent database for fastapi/php-fpm.
+TEST_DB="aurweb_test" # Test database (ephemereal).
+
+echo "Taking care of primary database '${DATABASE}'..."
+mysql -u root -e "CREATE USER IF NOT EXISTS 'aur'@'$DB_HOST' IDENTIFIED BY 'aur';"
+mysql -u root -e "CREATE DATABASE IF NOT EXISTS $DATABASE;"
+mysql -u root -e "GRANT ALL ON ${DATABASE}.* TO 'aur'@'$DB_HOST';"
+
+# Drop and create our test database.
+echo "Dropping test database '$TEST_DB'..."
+mysql -u root -e "DROP DATABASE IF EXISTS $TEST_DB;"
+mysql -u root -e "CREATE DATABASE $TEST_DB;"
+mysql -u root -e "GRANT ALL ON ${TEST_DB}.* TO 'aur'@'$DB_HOST';"
+echo "Created new '$TEST_DB'!"
+
+mysqladmin -uroot shutdown
 
 exec "$@"
diff --git a/docker/scripts/run-mariadb.sh b/docker/scripts/run-mariadb.sh
deleted file mode 100755
index d27d8124..00000000
--- a/docker/scripts/run-mariadb.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-mysqld_safe --datadir=/var/lib/mysql --skip-networking &
-until mysqladmin ping --silent; do
-    sleep 1s
-done
-
-# Create test database.
-mysql -u root -e "CREATE USER 'aur'@'%' IDENTIFIED BY 'aur'" \
-    2>/dev/null || /bin/true
-
-# Create a brand new 'aurweb_test' DB.
-mysql -u root -e "DROP DATABASE aurweb_test" 2>/dev/null || /bin/true
-mysql -u root -e "CREATE DATABASE aurweb_test"
-mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb_test.* TO 'aur'@'%'"
-
-# Create the 'aurweb' DB if it does not yet exist.
-mysql -u root -e "CREATE DATABASE aurweb" 2>/dev/null || /bin/true
-mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb.* TO 'aur'@'%'"
-
-mysql -u root -e "FLUSH PRIVILEGES"
-
-# Shutdown mariadb.
-mysqladmin -uroot shutdown
-
-exec "$@"
diff --git a/docker/scripts/run-pytests.sh b/docker/scripts/run-pytests.sh
index 021603b1..c6baa939 100755
--- a/docker/scripts/run-pytests.sh
+++ b/docker/scripts/run-pytests.sh
@@ -23,7 +23,8 @@ while [ $# -ne 0 ]; do
 done
 
 # Initialize the new database; ignore errors.
-python -m aurweb.initdb 2>/dev/null || /bin/true
+python -m aurweb.initdb 2>/dev/null || \
+    (echo "Error: aurweb.initdb failed; already initialized?" && /bin/true)
 
 # Run pytest with optional targets in front of it.
 make -C test "${PARAMS[@]}" pytest
diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
index ea4df868..9594318f 100755
--- a/docker/test-mysql-entrypoint.sh
+++ b/docker/test-mysql-entrypoint.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 set -eou pipefail
 
+[[ -z "$DB_HOST" ]] && echo 'Error: $DB_HOST required but missing.' && exit 1
+
 DB_NAME="aurweb_test"
-DB_HOST="mariadb"
 DB_USER="aur"
 DB_PASS="aur"
 

From f4406ccf5cc27806843d7bb8a216c5aa6ad1a214 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 21:28:12 -0700
Subject: [PATCH 251/844] Docker: Centralize repo dependencies

Now, we have `docker/scripts/install-deps.sh`, a script used
by both Docker and .gitlab-ci.yml. We can now focus on changing
deps in this script along as well as documentation going forward.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml                 | 47 +++++++++++-----------------------
 Dockerfile                     | 37 +++++++++++++-------------
 docker/scripts/install-deps.sh | 19 ++++++++++++++
 3 files changed, 52 insertions(+), 51 deletions(-)
 create mode 100755 docker/scripts/install-deps.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a9d80cb..7b8da2ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: archlinux
+image: archlinux:base-devel
 
 cache:
   key: system-v1
@@ -7,45 +7,28 @@ cache:
     - .pkg-cache
 
 variables:
-  AUR_CONFIG: conf/config
+  AUR_CONFIG: conf/config # Default MySQL config setup in before_script.
+  DB_HOST: localhost
 
 before_script:
-  - pacman -Syu --noconfirm --noprogressbar --needed --cachedir .pkg-cache
-           base-devel git gpgme protobuf pyalpm python-mysqlclient
-           python-pygit2 python-srcinfo python-bleach python-markdown
-           python-sqlalchemy python-alembic python-pytest python-werkzeug
-           python-pytest-tap python-fastapi hypercorn nginx python-authlib
-           python-itsdangerous python-httpx python-jinja python-pytest-cov
-           python-requests python-aiofiles python-python-multipart
-           python-pytest-asyncio python-coverage python-bcrypt
-           python-email-validator openssh python-lxml mariadb
-           python-isort flake8
-  - bash -c "echo '127.0.0.1 localhost' > /etc/hosts"
-  - bash -c "echo '::1 localhost' >> /etc/hosts"
-  - mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+  - ./docker/scripts/install-deps.sh
+  - useradd -U -d /aurweb -c 'AUR User' aur
+  - ./docker/mariadb-entrypoint.sh
   - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
   - 'until : > /dev/tcp/127.0.0.1/3306; do sleep 1s; done'
-  - mysql -u root -e "CREATE USER 'aur'@'localhost' IDENTIFIED BY 'aur';"
-  - mysql -u root -e "CREATE DATABASE aurweb_test;"
-  - mysql -u root -e "GRANT ALL ON aurweb_test.* TO 'aur'@'localhost';"
-  - mysql -u root -e "FLUSH PRIVILEGES;"
-  - sed -r "s;YOUR_AUR_ROOT;$(pwd);g" conf/config.dev > conf/config
-  - cp conf/config conf/config.sqlite
-  - cp conf/config.defaults conf/config.sqlite.defaults
-  - sed -i -r 's;backend = .*;backend = sqlite;' conf/config.sqlite
-  - sed -i -r "s;name = .*;name = $(pwd)/aurweb.sqlite3;" conf/config.sqlite
+  - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
+  - ./docker/test-sqlite-entrypoint.sh # Create sqlite AUR_CONFIG.
+  - make -C po all install
+  - python setup.py install --install-scripts=/usr/local/bin
+  - python -m aurweb.initdb # Initialize MySQL tables.
   - AUR_CONFIG=conf/config.sqlite python -m aurweb.initdb
+  - make -C test clean
 
 test:
   script:
-    - python setup.py install
-    - make -C po all install
-    - python -m aurweb.initdb
-    - make -C test sh # sharness tests use sqlite.
-    - make -C test pytest # pytest with mysql.
-    - AUR_CONFIG=conf/config.sqlite make -C test pytest # pytest with sqlite.
-    - coverage report --include='aurweb/*'
-    - coverage xml --include='aurweb/*'
+    - make -C test sh pytest # sharness tests use sqlite & pytest w/ mysql.
+    - AUR_CONFIG=conf/config.sqlite make -C test pytest
+    - make -C test coverage # Produce coverage reports.
     - flake8 --count aurweb # Assert no flake8 violations in aurweb.
     - flake8 --count test # Assert no flake8 violations in test.
     - flake8 --count migrations # Assert no flake8 violations in migrations.
diff --git a/Dockerfile b/Dockerfile
index cec36158..2843fa1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,30 @@
 FROM archlinux:base-devel
+
 ENV PYTHONPATH=/aurweb
 ENV AUR_CONFIG=conf/config
 
+# Copy our single bootstrap script.
+COPY docker/scripts/install-deps.sh /install-deps.sh
+RUN /install-deps.sh
+
+# Add our aur user.
+RUN useradd -U -d /aurweb -c 'AUR User' aur
+
 # Setup some default system stuff.
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 
-RUN mkdir -p .pkg-cache
+# Copy the rest of docker.
+COPY ./docker /docker
+COPY ./docker/scripts/*.sh /usr/local/bin/
 
-# Install dependencies.
-RUN pacman -Syu --noconfirm --noprogressbar \
-    --cachedir .pkg-cache git gpgme protobuf pyalpm \
-    python-mysqlclient python-pygit2 python-srcinfo python-bleach \
-    python-markdown python-sqlalchemy python-alembic python-pytest \
-    python-werkzeug python-pytest-tap python-fastapi nginx python-authlib \
-    python-itsdangerous python-httpx python-jinja python-pytest-cov \
-    python-requests python-aiofiles python-python-multipart \
-    python-pytest-asyncio python-coverage hypercorn python-bcrypt \
-    python-email-validator openssh python-lxml mariadb mariadb-libs \
-    python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
-    python-asgiref uvicorn
-
-RUN useradd -U -d /aurweb -c 'AUR User' aur
-
-COPY docker /docker
+# Copy from host to container.
+COPY . /aurweb
 
+# Working directory is aurweb root @ /aurweb.
 WORKDIR /aurweb
-COPY . .
 
+# Install translations.
 RUN make -C po all install
-RUN python3 setup.py install --install-scripts=/usr/local/bin
+
+# Install package and scripts.
+RUN python setup.py install --install-scripts=/usr/local/bin
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
new file mode 100755
index 00000000..fc15313f
--- /dev/null
+++ b/docker/scripts/install-deps.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Install Arch Linux dependencies. This is centralized here
+# for CI and Docker usage and should always reflect the most
+# robust development ecosystem.
+set -eou pipefail
+
+pacman -Syu --noconfirm --noprogressbar \
+    --cachedir .pkg-cache git gpgme protobuf pyalpm \
+    python-mysqlclient python-pygit2 python-srcinfo python-bleach \
+    python-markdown python-sqlalchemy python-alembic python-pytest \
+    python-werkzeug python-pytest-tap python-fastapi nginx python-authlib \
+    python-itsdangerous python-httpx python-jinja python-pytest-cov \
+    python-requests python-aiofiles python-python-multipart \
+    python-pytest-asyncio python-coverage hypercorn python-bcrypt \
+    python-email-validator openssh python-lxml mariadb mariadb-libs \
+    python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
+    python-asgiref uvicorn
+
+exec "$@"

From 3f60f5048e210f5248bb2b56fcfbe346e5ebac2a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 21:35:00 -0700
Subject: [PATCH 252/844] Docker: add scripts/setup-sqlite.sh

This script purely removes any existing sqlite and is
used before tests are run. This causes the test flow
to run `aurweb.initdb` again (if ever).

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml             | 4 ++--
 docker/scripts/setup-sqlite.sh | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100755 docker/scripts/setup-sqlite.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 40d9bc5b..22495a95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -304,7 +304,7 @@ services:
     environment:
       - AUR_CONFIG=conf/config.sqlite
     entrypoint: /docker/test-sqlite-entrypoint.sh
-    command: /docker/scripts/run-pytests.sh clean
+    command: setup-sqlite.sh run-pytests.sh clean
     stdin_open: true
     tty: true
     volumes:
@@ -331,7 +331,7 @@ services:
       - AUR_CONFIG=conf/config
       - DB_HOST=mariadb
     entrypoint: /docker/tests-entrypoint.sh
-    command: /docker/scripts/run-tests.sh
+    command: setup-sqlite.sh run-tests.sh
     stdin_open: true
     tty: true
     depends_on:
diff --git a/docker/scripts/setup-sqlite.sh b/docker/scripts/setup-sqlite.sh
new file mode 100755
index 00000000..e0b8de50
--- /dev/null
+++ b/docker/scripts/setup-sqlite.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Run an sqlite test. This script really just prepares sqlite
+# tests by deleting any existing databases so the test can
+# initialize cleanly.
+DB_NAME="$(grep 'name =' conf/config.sqlite | sed -r 's/^name = (.+)$/\1/')"
+rm -vf $DB_NAME
+exec "$@"

From 427a30ef8adb9ff92c9ee6745c3d2985929f3a7a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 21:37:45 -0700
Subject: [PATCH 253/844] Docker: Remove deprecated `links`

In addition, remove some unneeded dependencies on tests.
Though, in the future we _should_ craft tests that use these.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 22495a95..ab8d7c41 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,8 +64,6 @@ services:
     depends_on:
       mariadb:
         condition: service_healthy
-    links:
-      - mariadb
     volumes:
       - mariadb_run:/var/run/mysqld
       - mariadb_data:/var/lib/mysql
@@ -86,8 +84,6 @@ services:
     depends_on:
       mariadb:
         condition: service_healthy
-    links:
-      - mariadb
     volumes:
       - mariadb_run:/var/run/mysqld
       - mariadb_data:/var/lib/mysql
@@ -109,8 +105,6 @@ services:
     depends_on:
       git:
         condition: service_healthy
-    links:
-      - git
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -128,8 +122,6 @@ services:
     depends_on:
       git:
         condition: service_healthy
-    links:
-      - git
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -152,10 +144,6 @@ services:
         condition: service_healthy
       mariadb:
         condition: service_healthy
-    links:
-      - ca
-      - git
-      - mariadb
     volumes:
       - mariadb_run:/var/run/mysqld # Bind socket in this volume.
       - mariadb_data:/var/lib/mysql
@@ -187,10 +175,6 @@ services:
         condition: service_healthy
       mariadb:
         condition: service_healthy
-    links:
-      - ca
-      - git
-      - mariadb
     volumes:
       - mariadb_run:/var/run/mysqld # Bind socket in this volume.
       - mariadb_data:/var/lib/mysql
@@ -228,12 +212,6 @@ services:
         condition: service_healthy
       php-fpm:
         condition: service_healthy
-    links:
-      - cgit-php
-      - cgit-fastapi
-      - smartgit
-      - fastapi
-      - php-fpm
     volumes:
       - git_data:/aurweb/aur.git
       - ./cache:/cache
@@ -255,8 +233,6 @@ services:
     depends_on:
       git:
         condition: service_healthy
-    links:
-      - git
     volumes:
       - git_data:/aurweb/aur.git
       - ./cache:/cache
@@ -281,11 +257,6 @@ services:
     depends_on:
       mariadb:
         condition: service_healthy
-      git:
-        condition: service_healthy
-    links:
-      - mariadb
-      - git
     volumes:
       - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
@@ -318,11 +289,6 @@ services:
       - ./web/template:/aurweb/web/template
       - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
-    depends_on:
-      git:
-        condition: service_healthy
-    links:
-      - git
 
   test:
     image: aurweb:latest
@@ -337,8 +303,6 @@ services:
     depends_on:
       mariadb:
         condition: service_healthy
-    links:
-      - mariadb
     volumes:
       - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git

From 3a74f76ff9835dd03b4709a585195611f6a20e38 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 22:44:41 -0700
Subject: [PATCH 254/844] FastAPI: use internal typeahead and remove jquery

Awesome!

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py                    |  5 +----
 templates/index.html              | 10 ++++++++++
 templates/partials/head.html      |  3 +++
 templates/partials/layout.html    |  1 -
 templates/partials/typeahead.html | 30 ------------------------------
 web/html/js/typeahead-home.js     |  6 ++++++
 6 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 templates/partials/typeahead.html
 create mode 100644 web/html/js/typeahead-home.js

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 228b9a65..5f0ad01d 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -83,10 +83,7 @@ async def add_security_headers(request: Request, call_next: typing.Callable):
     # Add CSP header.
     nonce = request.user.nonce
     csp = "default-src 'self'; "
-    script_hosts = [
-        "ajax.googleapis.com",
-        "cdn.jsdelivr.net"
-    ]
+    script_hosts = []
     csp += f"script-src 'self' 'nonce-{nonce}' " + ' '.join(script_hosts)
     # It's fine if css is inlined.
     csp += "; style-src 'self' 'unsafe-inline'"
diff --git a/templates/index.html b/templates/index.html
index 8cd1cc78..f8745f33 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -93,4 +93,14 @@
         </p>
     </div>
 </div>
+
+<!-- Bootstrap typeahead for the homepage. -->
+<script type="text/javascript" src="/static/js/typeahead-home.js"></script>
+
+<!-- Stub inline javascript with a nonce. Used for testing purposes. -->
+<script type="text/javascript" nonce={{ request.user.nonce }}>
+function NONEXISTENT() {}
+NONEXISTENT();
+</script>
+
 {% endblock %}
diff --git a/templates/partials/head.html b/templates/partials/head.html
index 0351fd6e..9b438255 100644
--- a/templates/partials/head.html
+++ b/templates/partials/head.html
@@ -12,5 +12,8 @@
     <link rel="alternate" type="application/rss+xml"
           title="Newest Packages RSS" href="/rss/">
 
+    <!-- Include local typeahead -->
+    <script type="text/javascript" src="/static/js/typeahead.js"></script>
+
     <title>AUR ({{ language }}) - {{ title | tr }}</title>
 </head>
diff --git a/templates/partials/layout.html b/templates/partials/layout.html
index 019ebff7..68637ed7 100644
--- a/templates/partials/layout.html
+++ b/templates/partials/layout.html
@@ -6,6 +6,5 @@
     <body>
         {% include 'partials/navbar.html' %}
         {% extends 'partials/body.html' %}
-        {% include 'partials/typeahead.html' %}
     </body>
 </html>
diff --git a/templates/partials/typeahead.html b/templates/partials/typeahead.html
deleted file mode 100644
index c218b8d1..00000000
--- a/templates/partials/typeahead.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-<script type="text/javascript" src="/static/js/bootstrap-typeahead.min.js"></script>
-<script type="text/javascript" nonce="{{ request.user.nonce }}">
-    $(document).ready(function() {
-        $('#pkgsearch-field').typeahead({
-            source: function(query, callback) {
-                $.getJSON('/rpc', {type: "suggest", arg: query}, function(data) {
-                        callback(data);
-                    });
-                },
-                matcher: function(item) { return true; },
-                sorter: function(items) { return items; },
-                menu: '<ul class="pkgsearch-typeahead"></ul>',
-                items: 20,
-                updater: function(item) {
-                document.location = '/packages/' + item;
-                return item;
-            }
-        }).attr('autocomplete', 'off');
-
-        $('#pkgsearch-field').keydown(function(e) {
-            if (e.keyCode == 13) {
-                var selectedItem = $('ul.pkgsearch-typeahead li.active');
-                if (selectedItem.length == 0) {
-                        $('#pkgsearch-form').submit();
-                }
-            }
-        });
-    });
-</script>
diff --git a/web/html/js/typeahead-home.js b/web/html/js/typeahead-home.js
new file mode 100644
index 00000000..5af51c53
--- /dev/null
+++ b/web/html/js/typeahead-home.js
@@ -0,0 +1,6 @@
+document.addEventListener('DOMContentLoaded', function() {
+    const input = document.getElementById('pkgsearch-field');
+    const form = document.getElementById('pkgsearch-form');
+    const type = 'suggest';
+    typeahead.init(type, input, form);
+});

From 450469e3d66059d2002a68c4ad8d435793a7bfe4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 19 Jun 2021 08:54:22 -0700
Subject: [PATCH 255/844] add /addvote/ (get, post) routes

Another part of the "Trusted User" collection of routes.
This allows a Trusted User to create a proposal.

New Routes:

- get `/addvote/`
- post `/addvote/`

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/trusted_user.py   | 119 ++++++++++++++++++++++++++-----
 templates/addvote.html           |  68 ++++++++++++++++++
 test/test_trusted_user_routes.py |  93 ++++++++++++++++++++++++
 3 files changed, 264 insertions(+), 16 deletions(-)
 create mode 100644 templates/addvote.html

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index 55f7b7e1..fd5ebb04 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -1,3 +1,6 @@
+import html
+import logging
+import re
 import typing
 
 from datetime import datetime
@@ -5,10 +8,10 @@ from http import HTTPStatus
 from urllib.parse import quote_plus
 
 from fastapi import APIRouter, Form, HTTPException, Request
-from fastapi.responses import Response
+from fastapi.responses import RedirectResponse, Response
 from sqlalchemy import and_, or_
 
-from aurweb import db
+from aurweb import db, l10n
 from aurweb.auth import account_type_required, auth_required
 from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND_DEV
 from aurweb.models.tu_vote import TUVote
@@ -17,6 +20,7 @@ from aurweb.models.user import User
 from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
+logger = logging.getLogger(__name__)
 
 # Some TU route specific constants.
 ITEMS_PER_PAGE = 10  # Paged table size.
@@ -29,6 +33,17 @@ REQUIRED_TYPES = {
     TRUSTED_USER_AND_DEV
 }
 
+ADDVOTE_SPECIFICS = {
+    # This dict stores a vote duration and quorum for a proposal.
+    # When a proposal is added, duration is added to the current
+    # timestamp.
+    # "addvote_type": (duration, quorum)
+    "add_tu": (7 * 24 * 60 * 60, 0.66),
+    "remove_tu": (7 * 24 * 60 * 60, 0.75),
+    "remove_inactive_tu": (5 * 24 * 60 * 60, 0.66),
+    "bylaws": (7 * 24 * 60 * 60, 0.75)
+}
+
 
 @router.get("/tu")
 @auth_required(True, redirect="/")
@@ -174,28 +189,17 @@ async def trusted_user_proposal_post(request: Request,
         raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
 
     voters = db.query(User).join(TUVote).filter(TUVote.VoteID == voteinfo.ID)
+    vote = db.query(TUVote, and_(TUVote.UserID == request.user.ID,
+                                 TUVote.VoteID == voteinfo.ID)).first()
 
-    # status_code we'll use for responses later.
     status_code = HTTPStatus.OK
-
     if not request.user.is_trusted_user():
-        # Test: Create a proposal and view it as a "Developer". It
-        # should give us this error.
         context["error"] = "Only Trusted Users are allowed to vote."
         status_code = HTTPStatus.UNAUTHORIZED
     elif voteinfo.User == request.user.Username:
         context["error"] = "You cannot vote in an proposal about you."
         status_code = HTTPStatus.BAD_REQUEST
-
-    vote = db.query(TUVote, and_(TUVote.UserID == request.user.ID,
-                                 TUVote.VoteID == voteinfo.ID)).first()
-
-    if status_code != HTTPStatus.OK:
-        return render_proposal(request, context, proposal,
-                               voteinfo, voters, vote,
-                               status_code=status_code)
-
-    if vote is not None:
+    elif vote is not None:
         context["error"] = "You've already voted for this proposal."
         status_code = HTTPStatus.BAD_REQUEST
 
@@ -218,3 +222,86 @@ async def trusted_user_proposal_post(request: Request,
 
     context["error"] = "You've already voted for this proposal."
     return render_proposal(request, context, proposal, voteinfo, voters, vote)
+
+
+@router.get("/addvote")
+@auth_required(True)
+@account_type_required({"Trusted User", "Trusted User & Developer"})
+async def trusted_user_addvote(request: Request,
+                               user: str = str(),
+                               type: str = "add_tu",
+                               agenda: str = str()):
+    context = await make_variable_context(request, "Add Proposal")
+
+    if type not in ADDVOTE_SPECIFICS:
+        context["error"] = "Invalid type."
+        type = "add_tu"  # Default it.
+
+    context["user"] = user
+    context["type"] = type
+    context["agenda"] = agenda
+
+    return render_template(request, "addvote.html", context)
+
+
+@router.post("/addvote")
+@auth_required(True)
+@account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
+async def trusted_user_addvote_post(request: Request,
+                                    user: str = Form(default=str()),
+                                    type: str = Form(default=str()),
+                                    agenda: str = Form(default=str())):
+    # Build a context.
+    context = await make_variable_context(request, "Add Proposal")
+
+    context["type"] = type
+    context["user"] = user
+    context["agenda"] = agenda
+
+    def render_addvote(context, status_code):
+        """ Simplify render_template a bit for this test. """
+        return render_template(request, "addvote.html", context, status_code)
+
+    # Alright, get some database records, if we can.
+    if type != "bylaws":
+        user_record = db.query(User, User.Username == user).first()
+        if user_record is None:
+            context["error"] = "Username does not exist."
+            return render_addvote(context, HTTPStatus.NOT_FOUND)
+
+        voteinfo = db.query(TUVoteInfo, TUVoteInfo.User == user).count()
+        if voteinfo:
+            _ = l10n.get_translator_for_request(request)
+            context["error"] = _(
+                "%s already has proposal running for them.") % (
+                html.escape(user),)
+            return render_addvote(context, HTTPStatus.BAD_REQUEST)
+
+    if type not in ADDVOTE_SPECIFICS:
+        context["error"] = "Invalid type."
+        context["type"] = type = "add_tu"  # Default for rendering.
+        return render_addvote(context, HTTPStatus.BAD_REQUEST)
+
+    if not agenda:
+        context["error"] = "Proposal cannot be empty."
+        return render_addvote(context, HTTPStatus.BAD_REQUEST)
+
+    # Gather some mapped constants and the current timestamp.
+    duration, quorum = ADDVOTE_SPECIFICS.get(type)
+    timestamp = int(datetime.utcnow().timestamp())
+
+    # Remove <script> and <style> tags.
+    agenda = re.sub(r'<[/]?script.*>', '', agenda)
+    agenda = re.sub(r'<[/]?style.*>', '', agenda)
+
+    # Create a new TUVoteInfo (proposal)!
+    voteinfo = db.create(TUVoteInfo,
+                         User=user,
+                         Agenda=agenda,
+                         Submitted=timestamp, End=timestamp + duration,
+                         Quorum=quorum,
+                         Submitter=request.user)
+
+    # Redirect to the new proposal.
+    return RedirectResponse(f"/tu/{voteinfo.ID}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/addvote.html b/templates/addvote.html
new file mode 100644
index 00000000..eebae06f
--- /dev/null
+++ b/templates/addvote.html
@@ -0,0 +1,68 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    {% if error %}
+        <p class="pkgoutput error">{{ error | e }}</p></p>
+    {% endif %}
+
+    <div class="box">
+        <h2>{{ "Submit a proposal to vote on." | tr }}</h2>
+
+        <form action="/addvote/" method="post">
+
+            <p class="vote-applicant">
+                <label for="id_user">{{ "Applicant/TU" | tr }}</label>
+                <input type="text" name="user" id="id_user"
+                       value="{{ user }}" />
+                {{ "(empty if not applicable)" | tr }}
+            </p>
+            <p class="vote-type">
+                <label for="id_type">{{ "Type" | tr }}</label>
+                <select name="type" id="id_type">
+                    <option value="add_tu"
+                        {% if "add_tu" == type %}
+                            selected
+                        {% endif %}
+                    >
+                        {{ "Addition of a TU" | tr }}
+                    </option>
+                    <option value="remove_tu"
+                        {% if "remove_tu" == type %}
+                            selected
+                        {% endif %}
+                    >
+                        {{ "Removal of a TU" | tr }}
+                    </option>
+                    <option value="remove_inactive_tu"
+                        {% if "remove_inactive_tu" == type %}
+                            selected
+                        {% endif %}
+                    >
+                        {{ "Removal of a TU (undeclared inactivity)" | tr }}
+                    </option>
+                    <option value="bylaws"
+                        {% if "bylaws" == type %}
+                            selected
+                        {% endif %}
+                    >
+                        {{ "Amendment of Bylaws" | tr }}
+                    </option>
+                </select>
+            </p>
+
+            <p class="vote-agenda">
+                <label for="id_agenda">{{ "Proposal" | tr }}</label><br />
+                <textarea name="agenda"
+                          id="id_agenda"
+                          rows="15"
+                          cols="80">{{ agenda | e }}</textarea>
+                <br />
+                <button type="submit" class="button" value="Submit">
+                    {{ "Submit" | tr }}
+                </button>
+            </p>
+
+        </form>
+    </div>
+{% endblock %}
+
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index 73cea9bf..0c33f958 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -729,3 +729,96 @@ def test_tu_proposal_vote_invalid_decision(client, proposal):
                                 data=data)
     assert response.status_code == int(HTTPStatus.BAD_REQUEST)
     assert response.text == "Invalid 'decision' value."
+
+
+def test_tu_addvote(client: TestClient, tu_user: User):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/addvote", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_tu_addvote_invalid_type(client: TestClient, tu_user: User):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/addvote", params={"type": "faketype"},
+                               cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    error = root.xpath('//*[contains(@class, "error")]/text()')[0]
+    assert error.strip() == "Invalid type."
+
+
+def test_tu_addvote_post(client: TestClient, tu_user: User, user: User):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+
+    data = {
+        "user": user.Username,
+        "type": "add_tu",
+        "agenda": "Blah"
+    }
+
+    with client as request:
+        response = request.post("/addvote", cookies=cookies, data=data)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+    voteinfo = db.query(TUVoteInfo, TUVoteInfo.Agenda == "Blah").first()
+    assert voteinfo is not None
+
+
+def test_tu_addvote_post_cant_duplicate_username(client: TestClient,
+                                                 tu_user: User, user: User):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+
+    data = {
+        "user": user.Username,
+        "type": "add_tu",
+        "agenda": "Blah"
+    }
+
+    with client as request:
+        response = request.post("/addvote", cookies=cookies, data=data)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+
+    voteinfo = db.query(TUVoteInfo, TUVoteInfo.Agenda == "Blah").first()
+    assert voteinfo is not None
+
+    with client as request:
+        response = request.post("/addvote", cookies=cookies, data=data)
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_tu_addvote_post_invalid_username(client: TestClient, tu_user: User):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    data = {"user": "fakeusername"}
+    with client as request:
+        response = request.post("/addvote", cookies=cookies, data=data)
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_tu_addvote_post_invalid_type(client: TestClient, tu_user: User,
+                                      user: User):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    data = {"user": user.Username}
+    with client as request:
+        response = request.post("/addvote", cookies=cookies, data=data)
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_tu_addvote_post_invalid_agenda(client: TestClient,
+                                        tu_user: User, user: User):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    data = {"user": user.Username, "type": "add_tu"}
+    with client as request:
+        response = request.post("/addvote", cookies=cookies, data=data)
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_tu_addvote_post_bylaws(client: TestClient, tu_user: User):
+    # Bylaws votes do not need a user specified.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    data = {"type": "bylaws", "agenda": "Blah blah!"}
+    with client as request:
+        response = request.post("/addvote", cookies=cookies, data=data)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)

From 021a1c8fb6a0c74082617d465490efeafe99e98d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 24 Jun 2021 22:39:16 -0700
Subject: [PATCH 256/844] add /accounts/ (get, post) routes

Slight markup changes, same style overall and same
form parameters as the PHP implementation.

In addition, we've disabled the "left" and "right"
navigation buttons when we're at the border of the
table.

CSS Changes:

- Added similar styling to submit `<buttons>` that submit `<input>` had.
- Added .results tr td[align="{left,right}"] styling to align
  the result table's `More -->` button to the right of the table.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py                   |   9 +
 aurweb/routers/accounts.py              |  92 ++++-
 templates/account/index.html            |  13 +
 templates/account/search.html           |  69 ++++
 templates/partials/account/results.html |  82 ++++
 test/test_accounts_routes.py            | 490 +++++++++++++++++++++++-
 web/html/css/aurweb.css                 |  12 +-
 7 files changed, 760 insertions(+), 7 deletions(-)
 create mode 100644 templates/account/index.html
 create mode 100644 templates/account/search.html
 create mode 100644 templates/partials/account/results.html

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 1762f004..4705c050 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -168,6 +168,15 @@ class User(Base):
             aurweb.models.account_type.TRUSTED_USER_AND_DEV_ID
         }
 
+    def can_edit_user(self, user):
+        """ Can this account record edit the target user? It must either
+        be the target user or a user with enough permissions to do so.
+
+        :param user: Target user
+        :return: Boolean indicating whether this instance can edit `user`
+        """
+        return self == user or self.is_trusted_user() or self.is_developer()
+
     def __repr__(self):
         return "<User(ID='%s', AccountType='%s', Username='%s')>" % (
             self.ID, str(self.AccountType), self.Username)
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 5d798ae8..466d129d 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -12,17 +12,18 @@ from sqlalchemy import and_, func, or_
 import aurweb.config
 
 from aurweb import db, l10n, time, util
-from aurweb.auth import auth_required
+from aurweb.auth import account_type_required, auth_required
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.l10n import get_translator_for_request
 from aurweb.models.accepted_term import AcceptedTerm
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import (DEVELOPER, DEVELOPER_ID, TRUSTED_USER, TRUSTED_USER_AND_DEV, TRUSTED_USER_AND_DEV_ID,
+                                        TRUSTED_USER_ID, USER_ID, AccountType)
 from aurweb.models.ban import Ban
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.term import Term
 from aurweb.models.user import User
 from aurweb.scripts.notify import ResetKeyNotification
-from aurweb.templates import make_variable_context, render_template
+from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -591,6 +592,91 @@ async def account(request: Request, username: str):
     return render_template(request, "account/show.html", context)
 
 
+@router.get("/accounts/")
+@auth_required(True)
+@account_type_required({TRUSTED_USER, DEVELOPER, TRUSTED_USER_AND_DEV})
+async def accounts(request: Request):
+    context = make_context(request, "Accounts")
+    return render_template(request, "account/search.html", context)
+
+
+@router.post("/accounts/")
+@auth_required(True)
+@account_type_required({TRUSTED_USER, DEVELOPER, TRUSTED_USER_AND_DEV})
+async def accounts_post(request: Request,
+                        O: int = Form(default=0),  # Offset
+                        SB: str = Form(default=str()),  # Search By
+                        U: str = Form(default=str()),  # Username
+                        T: str = Form(default=str()),  # Account Type
+                        S: bool = Form(default=False),  # Suspended
+                        E: str = Form(default=str()),  # Email
+                        R: str = Form(default=str()),  # Real Name
+                        I: str = Form(default=str()),  # IRC Nick
+                        K: str = Form(default=str())):  # PGP Key
+    context = await make_variable_context(request, "Accounts")
+    context["pp"] = pp = 50  # Hits per page.
+
+    offset = max(O, 0)  # Minimize offset at 0.
+    context["offset"] = offset  # Offset.
+
+    context["params"] = dict(await request.form())
+    if "O" in context["params"]:
+        context["params"].pop("O")
+
+    # Setup order by criteria based on SB.
+    order_by_columns = {
+        "t": (AccountType.ID.asc(), User.Username.asc()),
+        "r": (User.RealName.asc(), AccountType.ID.asc()),
+        "i": (User.IRCNick.asc(), AccountType.ID.asc()),
+    }
+    default_order = (User.Username.asc(), AccountType.ID.asc())
+    order_by = order_by_columns.get(SB, default_order)
+
+    # Convert parameter T to an AccountType ID.
+    account_types = {
+        "u": USER_ID,
+        "t": TRUSTED_USER_ID,
+        "d": DEVELOPER_ID,
+        "td": TRUSTED_USER_AND_DEV_ID
+    }
+    account_type_id = account_types.get(T, None)
+
+    # Get a query handle to users, populate the total user
+    # count into a jinja2 context variable.
+    query = db.query(User).join(AccountType)
+    context["total_users"] = query.count()
+
+    # Populate this list with any additional statements to
+    # be ANDed together.
+    statements = []
+    if account_type_id is not None:
+        statements.append(AccountType.ID == account_type_id)
+    if U:
+        statements.append(User.Username.like(f"%{U}%"))
+    if S:
+        statements.append(User.Suspended == S)
+    if E:
+        statements.append(User.Email.like(f"%{E}%"))
+    if R:
+        statements.append(User.RealName.like(f"%{R}%"))
+    if I:
+        statements.append(User.IRCNick.like(f"%{I}%"))
+    if K:
+        statements.append(User.PGPKey.like(f"%{K}%"))
+
+    # Filter the query by combining all statements added above into
+    # an AND statement, unless there's just one statement, which
+    # we pass on to filter() as args.
+    if statements:
+        query = query.filter(and_(*statements))
+
+    # Finally, order and truncate our users for the current page.
+    users = query.order_by(*order_by).limit(pp).offset(offset)
+    context["users"] = users
+
+    return render_template(request, "account/index.html", context)
+
+
 def render_terms_of_service(request: Request,
                             context: dict,
                             terms: typing.Iterable):
diff --git a/templates/account/index.html b/templates/account/index.html
new file mode 100644
index 00000000..32b2ca16
--- /dev/null
+++ b/templates/account/index.html
@@ -0,0 +1,13 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Accounts" | tr }}</h2>
+
+        {% if not users %}
+            {{ "No results matched your search criteria." | tr }}
+        {% else %}
+            {% include "partials/account/results.html" %}
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/templates/account/search.html b/templates/account/search.html
new file mode 100644
index 00000000..3f83d25b
--- /dev/null
+++ b/templates/account/search.html
@@ -0,0 +1,69 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Accounts" | tr }}</h2>
+        {{ "Use this form to search existing accounts." | tr }}
+        <br />
+        <br />
+        <form class="account-search-form" action="/accounts/" method="post">
+            <fieldset>
+                <p>
+                    <label for="id_username">{{ "Username" | tr }}:</label>
+                    <input type="text" size="30" maxlength="64" name="U"
+                           id="id_username" />
+                </p>
+
+
+                <p>
+                    <label for="id_type">{{ "Account Type" | tr }}:</label>
+                    <select name="T" id="id_type">
+                        <option value="">{{ "Any type" | tr }}</option>
+                        <option value="u">{{ "Normal user" | tr }}</option>
+                        <option value="t">{{ "Trusted user" | tr }}</option>
+                        <option value="d">{{ "Developer" | tr }}</option>
+                        <option value="td">{{ "Trusted User & Developer" | tr }}</option>
+                    </select>
+                </p>
+                <p>
+                <label for="id_suspended">{{ "Account Suspended" | tr }}:</label>
+                <input type="checkbox" name="S" id="id_suspended" />
+                </p>
+                <p>
+                    <label for="id_email">{{ "Email Address" | tr }}:</label>
+                    <input type="text" size="30" maxlength="64" name="E"
+                           id="id_email" />
+                </p>
+                <p>
+                    <label for="id_realname">{{ "Real Name" | tr }}:</label>
+                    <input type="text" size="30" maxlength="32" name="R"
+                           id="id_realname" />
+                </p>
+                <p>
+                    <label for="id_irc">{{ "IRC Nick" | tr }}:</label>
+                    <input type="text" size="30" maxlength="32" name="I"
+                           id="id_irc" />
+                </p>
+                <p>
+                    <label for="id_sortby">{{ "Sort by" | tr }}:</label>
+                    <select name="SB" id="id_sortby">
+                        <option value="u">{{ "Username" | tr }}</option>
+                        <option value="t">{{ "Account Type" | tr }}</option>
+                        <option value="r">{{ "Real Name" | tr }}</option>
+                        <option value="i">{{ "IRC Nick" | tr }}</option>
+                    </select>
+                </p>
+                <p>
+                    <label></label>
+                    <button type="submit" class="button">
+                        {{ "Search" | tr }}
+                    </button>
+                    &nbsp;
+                    <button type="reset" class="button">
+                        {{ "Reset" | tr }}
+                    </button>
+                </p>
+            </fieldset>
+        </form>
+    </div>
+{% endblock %}
diff --git a/templates/partials/account/results.html b/templates/partials/account/results.html
new file mode 100644
index 00000000..910ae637
--- /dev/null
+++ b/templates/partials/account/results.html
@@ -0,0 +1,82 @@
+<table class="results users">
+    <thead>
+        <tr>
+            <th>{{ "Username" | tr }}</th>
+            <th>{{ "Type" | tr }}</th>
+            <th>{{ "Status" | tr }}</th>
+            <th>{{ "Real Name" | tr }}</th>
+            <th>{{ "IRC Nick" | tr }}</th>
+            <th>{{ "PGP Key Fingerprint" | tr }}</th>
+            <th>{{ "Edit Account" | tr }}</th>
+        </tr>
+    </thead>
+
+    <tbody>
+        {% for user in users %}
+            <tr>
+                <td>
+                    <a href="/packages/?K={{ user.Username }}&amp;SeB=m">
+                        {{ user.Username }}
+                    </a>
+                </td>
+                <td>{{ user.AccountType.AccountType }}</td>
+                <td>{{ "Suspended" if user.Suspended else "Active" }}</td>
+                <td>{{ user.RealName | e }}</td>
+                <td>{{ user.IRCNick | e }}</td>
+                <td>{{ user.PGPKey or '' | e }}</td>
+                <td>
+                    {% if request.user.can_edit_user(user) %}
+                        <a href="/account/{{ user.Username }}/edit">
+                            {{ "Edit" | tr }}
+                        </a>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
+    </tbody>
+
+</table>
+
+<table class="results">
+    <tr>
+        <td align="left">
+            <form action="/accounts/" method="post">
+                <fieldset>
+                    <input type="hidden" name="O"
+                           value="{{ offset - pp }}" />
+                    {% for k, v in params.items() %}
+                        <input type="hidden" name="{{ k }}"
+                               value="{{ v }}" />
+                    {% endfor %}
+                    <button type="submit" class="button page-prev"
+                        {% if offset <= 0 %}
+                            disabled
+                        {% endif %}
+                    >
+                        &lt;-- {{ "Less" | tr }}
+                    </button>
+                </fieldset>
+            </form>
+        </td>
+        <td align="right">
+            <form action="/accounts/" method="post">
+                <fieldset>
+                    <input type="hidden" name="O"
+                           value="{{ offset + pp }}" />
+                    {% for k, v in params.items() %}
+                        <input type="hidden" name="{{ k }}"
+                               value="{{ v }}" />
+                    {% endfor %}
+                    <button type="submit" class="button page-next"
+                        {% if offset + pp >= total_users %}
+                            disabled
+                        {% endif %}
+                    >
+                        {{ "More" | tr }}--&gt;
+                    </button>
+                </fieldset>
+            </form>
+        </td>
+    </tr>
+</table>
+
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index dbf13d19..567b3426 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -1,3 +1,4 @@
+import logging
 import re
 import tempfile
 
@@ -14,7 +15,7 @@ from aurweb import captcha
 from aurweb.asgi import app
 from aurweb.db import commit, create, query
 from aurweb.models.accepted_term import AcceptedTerm
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID, AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
@@ -31,6 +32,8 @@ TEST_EMAIL = "test@example.org"
 client = TestClient(app)
 user = None
 
+logger = logging.getLogger(__name__)
+
 
 def make_ssh_pubkey():
     # Create a public key with ssh-keygen (this adds ssh-keygen as a
@@ -55,8 +58,8 @@ def setup():
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
     user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+                  RealName="Test UserZ", Passwd="testPassword",
+                  IRCNick="testZ", AccountType=account_type)
 
     yield user
 
@@ -65,6 +68,14 @@ def setup():
     setup_test_db("Terms", "AcceptedTerms")
 
 
+@pytest.fixture
+def tu_user():
+    user.AccountType = query(AccountType,
+                             AccountType.ID == TRUSTED_USER_AND_DEV_ID).first()
+    commit()
+    yield user
+
+
 def test_get_passreset_authed_redirects():
     sid = user.login(Request(), "testPassword")
     assert sid is not None
@@ -929,6 +940,479 @@ def test_get_account_unauthenticated():
     assert "You must log in to view user information." in content
 
 
+def test_get_accounts(tu_user):
+    """ Test that we can GET request /accounts/ and receive
+    a form which can be used to POST /accounts/. """
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    with client as request:
+        response = request.get("/accounts/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    parser = lxml.etree.HTMLParser()
+    root = lxml.etree.fromstring(response.text, parser=parser)
+
+    # Get the form.
+    form = root.xpath('//form[contains(@class, "account-search-form")]')
+
+    # Make sure there's only one form and it goes where it should.
+    assert len(form) == 1
+    form = next(iter(form))
+    assert form.attrib.get("method") == "post"
+    assert form.attrib.get("action") == "/accounts/"
+
+    def field(element):
+        """ Return the given element string as a valid
+        selector in the form. """
+        return f"./fieldset/p/{element}"
+
+    username = form.xpath(field('input[@id="id_username"]'))
+    assert bool(username)
+
+    account_type = form.xpath(field('select[@id="id_type"]'))
+    assert bool(account_type)
+
+    suspended = form.xpath(field('input[@id="id_suspended"]'))
+    assert bool(suspended)
+
+    email = form.xpath(field('input[@id="id_email"]'))
+    assert bool(email)
+
+    realname = form.xpath(field('input[@id="id_realname"]'))
+    assert bool(realname)
+
+    irc = form.xpath(field('input[@id="id_irc"]'))
+    assert bool(irc)
+
+    sortby = form.xpath(field('select[@id="id_sortby"]'))
+    assert bool(sortby)
+
+
+def parse_root(html):
+    parser = lxml.etree.HTMLParser()
+    return lxml.etree.fromstring(html, parser=parser)
+
+
+def get_rows(html):
+    root = parse_root(html)
+    return root.xpath('//table[contains(@class, "users")]/tbody/tr')
+
+
+def test_post_accounts(tu_user):
+    # Set a PGPKey.
+    user.PGPKey = "5F18B20346188419750745D7335F2CB41F253D30"
+
+    # Create a few more users.
+    users = [user]
+    for i in range(10):
+        _user = create(User, Username=f"test_{i}",
+                       Email=f"test_{i}@example.org",
+                       RealName=f"Test #{i}",
+                       Passwd="testPassword",
+                       IRCNick=f"test_#{i}",
+                       autocommit=False)
+        users.append(_user)
+
+    # Commit everything to the database.
+    commit()
+
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 11
+
+    # Simulate default ascending ORDER_BY.
+    sorted_users = sorted(users, key=lambda u: u.Username)
+    for i, _user in enumerate(sorted_users):
+        columns = rows[i].xpath("./td")
+        assert len(columns) == 7
+
+        username, atype, suspended, real_name, \
+            irc_nick, pgp_key, edit = columns
+
+        username = next(iter(username.xpath("./a")))
+        assert username.text.strip() == _user.Username
+
+        assert atype.text.strip() == str(_user.AccountType)
+        assert suspended.text.strip() == "Active"
+        assert real_name.text.strip() == _user.RealName
+        assert irc_nick.text == _user.IRCNick
+        assert pgp_key.text == (_user.PGPKey or None)
+
+        edit = edit.xpath("./a")
+        if user.can_edit_user(_user):
+            edit = next(iter(edit))
+            assert edit.text.strip() == "Edit"
+        else:
+            assert not edit
+
+        logger.debug('Checked user row {"id": %s, "username": "%s"}.'
+                     % (_user.ID, _user.Username))
+
+
+def test_post_accounts_username(tu_user):
+    # Test the U parameter path.
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"U": user.Username})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+    row = next(iter(rows))
+    username, type, status, realname, irc, pgp_key, edit = row
+
+    username = next(iter(username.xpath("./a")))
+    assert username.text.strip() == user.Username
+
+
+def test_post_accounts_account_type(tu_user):
+    # Check the different account type options.
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    # Make a user with the "User" role here so we can
+    # test the `u` parameter.
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    create(User, Username="test_2",
+           Email="test_2@example.org",
+           RealName="Test User 2",
+           Passwd="testPassword",
+           AccountType=account_type)
+
+    # Expect no entries; we marked our only user as a User type.
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"T": "t"})
+    assert response.status_code == int(HTTPStatus.OK)
+    assert len(get_rows(response.text)) == 0
+
+    # So, let's also ensure that specifying "u" returns our user.
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"T": "u"})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+    row = next(iter(rows))
+    username, type, status, realname, irc, pgp_key, edit = row
+
+    assert type.text.strip() == "User"
+
+    # Set our only user to a Trusted User.
+    user.AccountType = query(AccountType,
+                             AccountType.ID == TRUSTED_USER_ID).first()
+    commit()
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"T": "t"})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+    row = next(iter(rows))
+    username, type, status, realname, irc, pgp_key, edit = row
+
+    assert type.text.strip() == "Trusted User"
+
+    user.AccountType = query(AccountType,
+                             AccountType.ID == DEVELOPER_ID).first()
+    commit()
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"T": "d"})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+    row = next(iter(rows))
+    username, type, status, realname, irc, pgp_key, edit = row
+
+    assert type.text.strip() == "Developer"
+
+    user.AccountType = query(AccountType,
+                             AccountType.ID == TRUSTED_USER_AND_DEV_ID
+                             ).first()
+    commit()
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"T": "td"})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+    row = next(iter(rows))
+    username, type, status, realname, irc, pgp_key, edit = row
+
+    assert type.text.strip() == "Trusted User & Developer"
+
+
+def test_post_accounts_status(tu_user):
+    # Test the functionality of Suspended.
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+    row = next(iter(rows))
+    username, type, status, realname, irc, pgp_key, edit = row
+    assert status.text.strip() == "Active"
+
+    user.Suspended = True
+    commit()
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"S": True})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+    row = next(iter(rows))
+    username, type, status, realname, irc, pgp_key, edit = row
+    assert status.text.strip() == "Suspended"
+
+
+def test_post_accounts_email(tu_user):
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    # Search via email.
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"E": user.Email})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+
+def test_post_accounts_realname(tu_user):
+    # Test the R parameter path.
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"R": user.RealName})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+
+def test_post_accounts_irc(tu_user):
+    # Test the I parameter path.
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"I": user.IRCNick})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+
+def test_post_accounts_sortby(tu_user):
+    # Create a second user so we can compare sorts.
+    account_type = query(AccountType,
+                         AccountType.ID == DEVELOPER_ID).first()
+    create(User, Username="test2",
+           Email="test2@example.org",
+           RealName="Test User 2",
+           Passwd="testPassword",
+           IRCNick="test2",
+           AccountType=account_type)
+
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    # Show that "u" is the default search order, by username.
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+    rows = get_rows(response.text)
+    assert len(rows) == 2
+    first_rows = rows
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"SB": "u"})
+    assert response.status_code == int(HTTPStatus.OK)
+    rows = get_rows(response.text)
+    assert len(rows) == 2
+
+    def compare_text_values(column, lhs, rhs):
+        return [row[column].text.strip() for row in lhs] \
+            == [row[column].text.strip() for row in rhs]
+
+    # Test the username rows are ordered the same.
+    assert compare_text_values(0, first_rows, rows) is True
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"SB": "i"})
+    assert response.status_code == int(HTTPStatus.OK)
+    rows = get_rows(response.text)
+    assert len(rows) == 2
+
+    # Test the rows are reversed when ordering by IRCNick.
+    assert compare_text_values(4, first_rows, reversed(rows)) is True
+
+    # Sort by "i" -> RealName.
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"SB": "r"})
+    assert response.status_code == int(HTTPStatus.OK)
+    rows = get_rows(response.text)
+    assert len(rows) == 2
+
+    # Test the rows are reversed when ordering by RealName.
+    assert compare_text_values(4, first_rows, reversed(rows)) is True
+
+    user.AccountType = query(AccountType,
+                             AccountType.ID == TRUSTED_USER_AND_DEV_ID).first()
+    commit()
+
+    # Fetch first_rows again with our new AccountType ordering.
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+    rows = get_rows(response.text)
+    assert len(rows) == 2
+    first_rows = rows
+
+    # Sort by "t" -> AccountType.
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"SB": "t"})
+    assert response.status_code == int(HTTPStatus.OK)
+    rows = get_rows(response.text)
+    assert len(rows) == 2
+
+    # Test that rows again got reversed.
+    assert compare_text_values(1, first_rows, reversed(rows))
+
+
+def test_post_accounts_pgp_key(tu_user):
+    user.PGPKey = "5F18B20346188419750745D7335F2CB41F253D30"
+    commit()
+
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    # Search via PGPKey.
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"K": user.PGPKey})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 1
+
+
+def test_post_accounts_paged(tu_user):
+    # Create 150 users.
+    users = [user]
+    account_type = query(AccountType,
+                         AccountType.AccountType == "User").first()
+    for i in range(150):
+        _user = create(User, Username=f"test_#{i}",
+                       Email=f"test_#{i}@example.org",
+                       RealName=f"Test User #{i}",
+                       Passwd="testPassword",
+                       AccountType=account_type,
+                       autocommit=False)
+        users.append(_user)
+    commit()
+
+    sid = user.login(Request(), "testPassword")
+    cookies = {"AURSID": sid}
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 50  # `pp`, or hits per page is defined at 50.
+
+    # Sort users in ascending default sort by order.
+    sorted_users = sorted(users, key=lambda u: u.Username)
+
+    # Get the first fifty sorted users and assert that's what
+    # we got in the first search result page.
+    first_fifty = sorted_users[:50]
+
+    for i, _user in enumerate(first_fifty):
+        row = rows[i]
+        username = row[0].xpath("./a")[0]  # First column
+        assert username.text.strip() == _user.Username
+
+    root = parse_root(response.text)
+    page_prev = root.xpath('//button[contains(@class, "page-prev")]')[0]
+    page_next = root.xpath('//button[contains(@class, "page-next")]')[0]
+
+    assert page_prev.attrib["disabled"] == "disabled"
+    assert "disabled" not in page_next.attrib
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"O": 50})  # +50 offset.
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 50
+
+    second_fifty = sorted_users[50:100]
+
+    for i, _user in enumerate(second_fifty):
+        row = rows[i]
+        username = row[0].xpath("./a")[0]  # First column
+        assert username.text.strip() == _user.Username
+
+    with client as request:
+        response = request.post("/accounts/", cookies=cookies,
+                                data={"O": 101})  # Last page.
+    assert response.status_code == int(HTTPStatus.OK)
+
+    rows = get_rows(response.text)
+    assert len(rows) == 50
+
+    root = parse_root(response.text)
+    page_prev = root.xpath('//button[contains(@class, "page-prev")]')[0]
+    page_next = root.xpath('//button[contains(@class, "page-next")]')[0]
+
+    assert "disabled" not in page_prev.attrib
+    assert page_next.attrib["disabled"] == "disabled"
+
+
 def test_get_terms_of_service():
     term = create(Term, Description="Test term.",
                   URL="http://localhost", Revision=1)
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index 2748462f..b36dbd4d 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -209,6 +209,16 @@ label.confirmation,
     margin: .33em 0 1em;
 }
 
-button[type="submit"] {
+button[type="submit"],
+button[type="reset"] {
     padding: 0 0.6em;
 }
+
+.results tr td[align="left"] fieldset {
+    text-align: left;
+}
+
+.results tr td[align="right"] fieldset {
+    text-align: right;
+}
+

From 8d6e782ba1410da172283426ab8b91f49beb7416 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 29 Jun 2021 22:10:30 -0700
Subject: [PATCH 257/844] add python-feedgen dependency

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL                        | 2 +-
 docker/scripts/install-deps.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index 3381daf5..f192f9f5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -52,7 +52,7 @@ read the instructions below.
                 python-itsdangerous python-authlib python-httpx \
                 python-jinja python-aiofiles python-python-multipart \
                 python-requests hypercorn python-bcrypt python-email-validator \
-                python-lxml
+                python-lxml python-feedgen
     # python3 setup.py install
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index fc15313f..8d4525de 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -14,6 +14,6 @@ pacman -Syu --noconfirm --noprogressbar \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
     python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
-    python-asgiref uvicorn
+    python-asgiref uvicorn python-feedgen
 
 exec "$@"

From eec09dec3e85c601ad9592684ff06dfbea44599d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 27 Jun 2021 09:02:22 -0700
Subject: [PATCH 258/844] [FastAPI] add /rss and /rss/modified

There are slight differences in that, with `python-feedgen`,
an empty description field completely omits the description,
but includes the description when there is one.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py        |   3 +-
 aurweb/routers/rss.py |  84 ++++++++++++++++++++++++++++++++
 test/test_rss.py      | 110 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 aurweb/routers/rss.py
 create mode 100644 test/test_rss.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 5f0ad01d..cf878294 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -18,7 +18,7 @@ from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models.accepted_term import AcceptedTerm
 from aurweb.models.term import Term
-from aurweb.routers import accounts, auth, errors, html, sso, trusted_user
+from aurweb.routers import accounts, auth, errors, html, rss, sso, trusted_user
 
 # Setup the FastAPI app.
 app = FastAPI(exception_handlers=errors.exceptions)
@@ -50,6 +50,7 @@ async def app_startup():
     app.include_router(auth.router)
     app.include_router(accounts.router)
     app.include_router(trusted_user.router)
+    app.include_router(rss.router)
 
     # Initialize the database engine and ORM.
     get_engine()
diff --git a/aurweb/routers/rss.py b/aurweb/routers/rss.py
new file mode 100644
index 00000000..50127dd2
--- /dev/null
+++ b/aurweb/routers/rss.py
@@ -0,0 +1,84 @@
+from datetime import datetime
+
+from fastapi import APIRouter, Request
+from fastapi.responses import Response
+from feedgen.feed import FeedGenerator
+
+from aurweb import db, util
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+
+router = APIRouter()
+
+
+def make_rss_feed(request: Request, packages: list,
+                  date_attr: str):
+    """ Create an RSS Feed string for some packages.
+
+    :param request: A FastAPI request
+    :param packages: A list of packages to add to the RSS feed
+    :param date_attr: The date attribute (DB column) to use
+    :return: RSS Feed string
+    """
+
+    feed = FeedGenerator()
+    feed.title("AUR Newest Packages")
+    feed.description("The latest and greatest packages in the AUR")
+    base = f"{request.url.scheme}://{request.url.netloc}"
+    feed.link(href=base, rel="alternate")
+    feed.link(href=f"{base}/rss", rel="self")
+    feed.image(title="AUR Newest Packages",
+               url=f"{base}/css/archnavbar/aurlogo.png",
+               link=base,
+               description="AUR Newest Packages Feed")
+
+    for pkg in packages:
+        entry = feed.add_entry(order="append")
+        entry.title(pkg.Name)
+        entry.link(href=f"{base}/packages/{pkg.Name}", rel="alternate")
+        entry.link(href=f"{base}/rss", rel="self", type="application/rss+xml")
+        entry.description(pkg.Description or str())
+
+        attr = getattr(pkg.PackageBase, date_attr)
+        dt = util.timestamp_to_datetime(attr)
+        dt = util.as_timezone(dt, request.user.Timezone)
+        entry.pubDate(dt.strftime("%Y-%m-%d %H:%M:%S%z"))
+
+        entry.source(f"{base}")
+        if pkg.PackageBase.Maintainer:
+            entry.author(author={"name": pkg.PackageBase.Maintainer.Username})
+        entry.guid(f"{pkg.Name} - {attr}")
+
+    return feed.rss_str()
+
+
+@router.get("/rss/")
+async def rss(request: Request):
+    packages = db.query(Package).join(PackageBase).order_by(
+        PackageBase.SubmittedTS.desc()).limit(100)
+    feed = make_rss_feed(request, packages, "SubmittedTS")
+
+    response = Response(feed, media_type="application/rss+xml")
+    package = packages.first()
+    if package:
+        dt = datetime.utcfromtimestamp(package.PackageBase.SubmittedTS)
+        modified = dt.strftime("%a, %d %m %Y %H:%M:%S GMT")
+        response.headers["Last-Modified"] = modified
+
+    return response
+
+
+@router.get("/rss/modified")
+async def rss_modified(request: Request):
+    packages = db.query(Package).join(PackageBase).order_by(
+        PackageBase.ModifiedTS.desc()).limit(100)
+    feed = make_rss_feed(request, packages, "ModifiedTS")
+
+    response = Response(feed, media_type="application/rss+xml")
+    package = packages.first()
+    if package:
+        dt = datetime.utcfromtimestamp(package.PackageBase.ModifiedTS)
+        modified = dt.strftime("%a, %d %m %Y %H:%M:%S GMT")
+        response.headers["Last-Modified"] = modified
+
+    return response
diff --git a/test/test_rss.py b/test/test_rss.py
new file mode 100644
index 00000000..7dd5bb47
--- /dev/null
+++ b/test/test_rss.py
@@ -0,0 +1,110 @@
+import logging
+
+from datetime import datetime
+from http import HTTPStatus
+
+import lxml.etree
+import pytest
+
+from fastapi.testclient import TestClient
+
+from aurweb import db
+from aurweb.asgi import app
+from aurweb.models.account_type import AccountType
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+logger = logging.getLogger(__name__)
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db(
+        Package.__tablename__,
+        PackageBase.__tablename__,
+        User.__tablename__)
+
+
+@pytest.fixture
+def client():
+    yield TestClient(app=app)
+
+
+@pytest.fixture
+def user():
+    account_type = db.query(AccountType,
+                            AccountType.AccountType == "User").first()
+    yield db.create(User, Username="test",
+                    Email="test@example.org",
+                    RealName="Test User",
+                    Passwd="testPassword",
+                    AccountType=account_type)
+
+
+@pytest.fixture
+def packages(user):
+    pkgs = []
+    now = int(datetime.utcnow().timestamp())
+
+    # Create 101 packages; we limit 100 on RSS feeds.
+    for i in range(101):
+        pkgbase = db.create(
+            PackageBase, Maintainer=user, Name=f"test-package-{i}",
+            SubmittedTS=(now + i), ModifiedTS=(now + i), autocommit=False)
+        pkg = db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase,
+                        autocommit=False)
+        pkgs.append(pkg)
+    db.commit()
+    yield pkgs
+
+
+def parse_root(xml):
+    return lxml.etree.fromstring(xml)
+
+
+def test_rss(client, user, packages):
+    with client as request:
+        response = request.get("/rss/")
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Test that the RSS we got is sorted by descending SubmittedTS.
+    def key_(pkg):
+        return pkg.PackageBase.SubmittedTS
+    packages = list(reversed(sorted(packages, key=key_)))
+
+    # Just take the first 100.
+    packages = packages[:100]
+
+    root = parse_root(response.content)
+    items = root.xpath("//channel/item")
+    assert len(items) == 100
+
+    for i, item in enumerate(items):
+        title = next(iter(item.xpath('./title')))
+        logger.debug(f"title: '{title.text}' vs name: '{packages[i].Name}'")
+        assert title.text == packages[i].Name
+
+
+def test_rss_modified(client, user, packages):
+    with client as request:
+        response = request.get("/rss/modified")
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Test that the RSS we got is sorted by descending SubmittedTS.
+    def key_(pkg):
+        return pkg.PackageBase.ModifiedTS
+    packages = list(reversed(sorted(packages, key=key_)))
+
+    # Just take the first 100.
+    packages = packages[:100]
+
+    root = parse_root(response.content)
+    items = root.xpath("//channel/item")
+    assert len(items) == 100
+
+    for i, item in enumerate(items):
+        title = next(iter(item.xpath('./title')))
+        logger.debug(f"title: '{title.text}' vs name: '{packages[i].Name}'")
+        assert title.text == packages[i].Name

From 80ce10eb0fd6501a7694b5b71b12a0e36de2ee1a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 2 Jul 2021 11:28:28 -0700
Subject: [PATCH 259/844] add /pyrightconfig.json to .gitignore

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 27ff977a..af314b23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ fastapi_aw/
 /build/
 /dist/
 /aurweb.egg-info/
+/pyrightconfig.json

From 7542798335614d4c492180ef42b71d0da04cc318 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 10 Jul 2021 14:56:37 -0700
Subject: [PATCH 260/844] .gitignore: add more user configs and Python build
 files

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitignore | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitignore b/.gitignore
index af314b23..4fdfa790 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,10 @@ schema/aur-schema-sqlite.sql
 data.sql
 aurweb.sqlite3
 conf/config
+conf/config.sqlite
+conf/config.sqlite.defaults
+conf/docker
+conf/docker.defaults
 htmlcov/
 fastapi_aw/
 .vim/
@@ -24,3 +28,9 @@ fastapi_aw/
 /dist/
 /aurweb.egg-info/
 /pyrightconfig.json
+
+# Do not stage compiled asciidoc: make -C doc
+doc/rpc.html
+
+# Ignore any user-configured .envrc files at the root.
+/.envrc

From c54000045c5deda12c96c48b690716e3d1881373 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 9 Jul 2021 22:23:26 -0700
Subject: [PATCH 261/844] add [pycodestyle] config to setup.cfg

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 31a0eb8a..1d67ca96 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,6 @@
+[pycodestyle]
+max-line-length = 127
+
 [flake8]
 max-line-length = 127
 max-complexity = 10

From e0ee881b67f1fccd7130bc6c9003479c6e74087b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 1 Jul 2021 12:29:12 -0700
Subject: [PATCH 262/844] Docker: fix mariadb-entrypoint user host

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/mariadb-entrypoint.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/mariadb-entrypoint.sh b/docker/mariadb-entrypoint.sh
index 48e87045..e38900c8 100755
--- a/docker/mariadb-entrypoint.sh
+++ b/docker/mariadb-entrypoint.sh
@@ -2,7 +2,8 @@
 set -eou pipefail
 
 MYSQL_DATA=/var/lib/mysql
-DB_HOST="localhost"
+
+[[ -z "$DB_HOST" ]] && DB_HOST="localhost"
 
 mariadb-install-db --user=mysql --basedir=/usr --datadir=$MYSQL_DATA
 

From 07e70690e1158dbfec630f1f47f20a2a4db49ab2 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Fri, 8 Feb 2019 11:06:41 -0500
Subject: [PATCH 263/844] tests: disable gpgsign in the git configuration

If the person running the tests has a global configuration to sign git
commits, this breaks the testsuite which looks for a key capable of
committing dummy data under a dummy author

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 test/setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/setup.sh b/test/setup.sh
index 589c8c3f..764d4518 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -141,6 +141,7 @@ export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
 	mkdir aur.git
 	cd aur.git
 	git init -q
+	git config --local commit.gpgsign false
 
 	git checkout -q --orphan refs/namespaces/foobar/refs/heads/master
 

From 8bf638450468b743ce2b3a61a8a27e6db4fdf3dd Mon Sep 17 00:00:00 2001
From: turret-dev <turret@turret-studios.tk>
Date: Wed, 14 Jul 2021 20:10:12 -0500
Subject: [PATCH 264/844] migrate all links from git.archlinux.org ->
 gitlab.archlinux.org

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 INSTALL                 | 2 +-
 README.md               | 2 +-
 TESTING                 | 2 +-
 doc/i18n.txt            | 2 +-
 web/template/footer.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index a32d6f5a..9bcd0759 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,7 +12,7 @@ read the instructions below.
 1) Clone the aurweb project:
 
    $ cd /srv/http/
-   $ git clone git://git.archlinux.org/aurweb.git
+   $ git clone https://gitlab.archlinux.org/archlinux/aurweb.git
 
 2) Setup a web server with PHP and MySQL. Configure the web server to redirect
    all URLs to /index.php/foo/bar/. The following block can be used with nginx:
diff --git a/README.md b/README.md
index 77f3b13d..4e091a14 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Directory Layout
 Links
 -----
 
-* The repository is hosted at git://git.archlinux.org/aurweb.git -- see
+* The repository is hosted at https://gitlab.archlinux.org/archlinux/aurweb -- see
   doc/CodingGuidelines for information on the patch submission process.
 
 * Bugs can (and should) be submitted to the aurweb bug tracker:
diff --git a/TESTING b/TESTING
index 972bce2c..a88464a5 100644
--- a/TESTING
+++ b/TESTING
@@ -7,7 +7,7 @@ INSTALL.
 
 1) Clone the aurweb project:
 
-    $ git clone git://git.archlinux.org/aurweb.git
+    $ git clone https://gitlab.archlinux.org/archlinux/aurweb.git
 
 2) Install the necessary packages:
 
diff --git a/doc/i18n.txt b/doc/i18n.txt
index 8216c084..44fb0f1f 100644
--- a/doc/i18n.txt
+++ b/doc/i18n.txt
@@ -21,7 +21,7 @@ strings for the translation to be usable, and it may have to be disabled.
 
 1. Check out the aurweb source using git:
 
-$ git clone git://git.archlinux.org/aurweb.git aurweb-git
+$ git clone https://gitlab.archlinux.org/archlinux/aurweb.git aurweb-git
 
 2. Go into the "po/" directory in the aurweb source and run msginit(1) to
    create a initial translation file from our translation catalog:
diff --git a/web/template/footer.php b/web/template/footer.php
index 572dbb26..7f97aae0 100644
--- a/web/template/footer.php
+++ b/web/template/footer.php
@@ -3,7 +3,7 @@
 
 			<div id="footer">
 				<?php if ($ver): ?>
-				<p>aurweb <a href="https://git.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p>
+				<p>aurweb <a href="https://gitlab.archlinux.org/archlinux/aurweb/-/tree/<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p>
 				<?php endif; ?>
 				<p><?= __('Copyright %s 2004-%d aurweb Development Team.', '&copy;', date('Y')) ?></p>
 				<p><?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.') ?></p>

From ec38d2f5a0545cf07e59cce3fa2d012f23451c5b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 18 Jul 2021 01:55:39 -0700
Subject: [PATCH 265/844] PackageBase: automatically cast Popularity to float

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_base.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/aurweb/models/package_base.py b/aurweb/models/package_base.py
index 261c30f3..9177c422 100644
--- a/aurweb/models/package_base.py
+++ b/aurweb/models/package_base.py
@@ -35,6 +35,9 @@ class PackageBase(Base):
         "User", backref=backref("package_bases", lazy="dynamic"),
         foreign_keys=[PackagerUID])
 
+    # A set used to check for floatable values.
+    TO_FLOAT = {"Popularity"}
+
     def __init__(self, Name: str = None,
                  Flagger: aurweb.models.user.User = None,
                  Maintainer: aurweb.models.user.User = None,
@@ -62,3 +65,9 @@ class PackageBase(Base):
                                       datetime.utcnow().timestamp())
         self.ModifiedTS = kwargs.get("ModifiedTS",
                                      datetime.utcnow().timestamp())
+
+    def __getattribute__(self, key: str):
+        attr = super().__getattribute__(key)
+        if key in PackageBase.TO_FLOAT and not isinstance(attr, float):
+            return float(attr)
+        return attr

From b4e46450b57fa5d97383ded5a30344fb05669016 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 18 Jul 2021 01:56:24 -0700
Subject: [PATCH 266/844] PackageDependency: fix primary key relationships

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_dependency.py | 10 ++++++----
 test/test_package_dependency.py     | 17 +++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index 0bd84073..b7bee246 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
@@ -16,7 +16,7 @@ class PackageDependency(Base):
         nullable=False)
     Package = relationship(
         "Package", backref=backref("package_dependencies", lazy="dynamic"),
-        foreign_keys=[PackageID], lazy="select")
+        foreign_keys=[PackageID])
 
     DepTypeID = Column(
         Integer, ForeignKey("DependencyTypes.ID", ondelete="NO ACTION"),
@@ -24,9 +24,11 @@ class PackageDependency(Base):
     DependencyType = relationship(
         "DependencyType",
         backref=backref("package_dependencies", lazy="dynamic"),
-        foreign_keys=[DepTypeID], lazy="select")
+        foreign_keys=[DepTypeID])
 
-    __mapper_args__ = {"primary_key": [PackageID, DepTypeID]}
+    DepName = Column(String(255), nullable=False)
+
+    __mapper_args__ = {"primary_key": [PackageID, DepName]}
 
     def __init__(self,
                  Package: aurweb.models.package.Package = None,
diff --git a/test/test_package_dependency.py b/test/test_package_dependency.py
index fc21a08c..d39091aa 100644
--- a/test/test_package_dependency.py
+++ b/test/test_package_dependency.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query
+from aurweb.db import commit, create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.dependency_type import DependencyType
 from aurweb.models.package import Package
@@ -49,9 +49,8 @@ def test_package_dependencies():
 
     makedepends = query(DependencyType,
                         DependencyType.Name == "makedepends").first()
-    pkgdep = create(PackageDependency, Package=package,
-                    DependencyType=makedepends,
-                    DepName="test-dep")
+    pkgdep.DependencyType = makedepends
+    commit()
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
     assert pkgdep.DependencyType == makedepends
@@ -60,9 +59,8 @@ def test_package_dependencies():
 
     checkdepends = query(DependencyType,
                          DependencyType.Name == "checkdepends").first()
-    pkgdep = create(PackageDependency, Package=package,
-                    DependencyType=checkdepends,
-                    DepName="test-dep")
+    pkgdep.DependencyType = checkdepends
+    commit()
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
     assert pkgdep.DependencyType == checkdepends
@@ -71,9 +69,8 @@ def test_package_dependencies():
 
     optdepends = query(DependencyType,
                        DependencyType.Name == "optdepends").first()
-    pkgdep = create(PackageDependency, Package=package,
-                    DependencyType=optdepends,
-                    DepName="test-dep")
+    pkgdep.DependencyType = optdepends
+    commit()
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
     assert pkgdep.DependencyType == optdepends

From 13b4dbf5414775ba8f72485cd3a57a2e98e6c064 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 18 Jul 2021 01:57:00 -0700
Subject: [PATCH 267/844] PackageRelation: fix primary key relationships

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_relation.py |  6 ++++--
 test/test_package_relation.py     | 12 +++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
index 9204af59..1e6c146c 100644
--- a/aurweb/models/package_relation.py
+++ b/aurweb/models/package_relation.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
@@ -26,7 +26,9 @@ class PackageRelation(Base):
         "RelationType", backref=backref("package_relations", lazy="dynamic"),
         foreign_keys=[RelTypeID])
 
-    __mapper_args__ = {"primary_key": [PackageID, RelTypeID]}
+    RelName = Column(String(255), unique=True)
+
+    __mapper_args__ = {"primary_key": [PackageID, RelName]}
 
     def __init__(self,
                  Package: aurweb.models.package.Package = None,
diff --git a/test/test_package_relation.py b/test/test_package_relation.py
index 96932f40..766d0017 100644
--- a/test/test_package_relation.py
+++ b/test/test_package_relation.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError, OperationalError
 
-from aurweb.db import create, query
+from aurweb.db import commit, create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -48,9 +48,8 @@ def test_package_relation():
     assert pkgrel in package.package_relations
 
     provides = query(RelationType, RelationType.Name == "provides").first()
-    pkgrel = create(PackageRelation, Package=package,
-                    RelationType=provides,
-                    RelName="test-relation")
+    pkgrel.RelationType = provides
+    commit()
     assert pkgrel.RelName == "test-relation"
     assert pkgrel.Package == package
     assert pkgrel.RelationType == provides
@@ -58,9 +57,8 @@ def test_package_relation():
     assert pkgrel in package.package_relations
 
     replaces = query(RelationType, RelationType.Name == "replaces").first()
-    pkgrel = create(PackageRelation, Package=package,
-                    RelationType=replaces,
-                    RelName="test-relation")
+    pkgrel.RelationType = replaces
+    commit()
     assert pkgrel.RelName == "test-relation"
     assert pkgrel.Package == package
     assert pkgrel.RelationType == replaces

From c05fafea0e7ce79bf1df8a6784314415c74049c6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 19 Jul 2021 19:42:41 -0700
Subject: [PATCH 268/844] PackageComment: default RenderedComment to str()

With this, `bool(PackageComment.RenderedComment) == False`

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_comment.py |  5 +----
 test/test_package_comment.py     | 11 ++++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/aurweb/models/package_comment.py b/aurweb/models/package_comment.py
index 42a0661d..c52ee270 100644
--- a/aurweb/models/package_comment.py
+++ b/aurweb/models/package_comment.py
@@ -66,7 +66,4 @@ class PackageComment(Base):
                 params=("NULL"))
 
         if self.RenderedComment is None:
-            raise IntegrityError(
-                statement="Column RenderedComment cannot be null.",
-                orig="PackageComments.RenderedComment",
-                params=("NULL"))
+            self.RenderedComment = str()
diff --git a/test/test_package_comment.py b/test/test_package_comment.py
index fb734071..ca77b511 100644
--- a/test/test_package_comment.py
+++ b/test/test_package_comment.py
@@ -56,8 +56,9 @@ def test_package_comment_null_comments_raises_exception():
     rollback()
 
 
-def test_package_comment_null_renderedcomment_raises_exception():
-    with pytest.raises(IntegrityError):
-        create(PackageComment, PackageBase=pkgbase, User=user,
-               Comments="Test comment.")
-    rollback()
+def test_package_comment_null_renderedcomment_defaults():
+    record = create(PackageComment,
+                    PackageBase=pkgbase,
+                    User=user,
+                    Comments="Test comment.")
+    assert record.RenderedComment == str()

From d57dfd4d36daa3d356d0709018a4821de158e099 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 20 Jul 2021 14:13:07 -0700
Subject: [PATCH 269/844] PackageBase: test Popularity conversion

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_base.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/test_package_base.py b/test/test_package_base.py
index 7f608c2c..0c0d0526 100644
--- a/test/test_package_base.py
+++ b/test/test_package_base.py
@@ -36,6 +36,11 @@ def test_package_base():
     assert pkgbase.SubmittedTS > 0
     assert pkgbase.ModifiedTS > 0
 
+    # Set Popularity to a string, then get it by attribute to
+    # exercise the string -> float conversion path.
+    pkgbase.Popularity = "0.0"
+    assert pkgbase.Popularity == 0.0
+
 
 def test_package_base_ci():
     """ Test case insensitivity of the database table. """

From a6ca345af4dbfd018d86fb6725759f20c7cb0c11 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 14 Jul 2021 13:27:15 -0700
Subject: [PATCH 270/844] Docker: Fix git clone url in fastapi/php-fpm

Signed-off-by: Kevin Morris <kevr@0cost.org>

Docker: fix php-entrypoint git clone uri

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/fastapi-entrypoint.sh | 2 +-
 docker/php-entrypoint.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 11b8ac5a..c46a33eb 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -7,7 +7,7 @@ bash $dir/test-mysql-entrypoint.sh
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8444;" conf/config
 sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
 
-sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8444/cgit/aur.git -b %s|" conf/config.defaults
+sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8444/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
 
 exec "$@"
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 350871d6..b4f6c631 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -7,7 +7,7 @@ bash $dir/test-mysql-entrypoint.sh
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8443;" conf/config
 sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
 
-sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8443/cgit/aur.git -b %s|" conf/config.defaults
+sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8443/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
 
 sed -ri 's/^(listen).*/\1 = 0.0.0.0:9000/' /etc/php/php-fpm.d/www.conf

From 4959f62cf58f449600c0bd185ccc12c8490f5c0d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 20 Jul 2021 11:28:18 -0700
Subject: [PATCH 271/844] rendercomment: move Repository init to __init__

This makes rendercomment a slight bit more lazy. Now,
it will only actually initialize a pygit2.Repository
when it needs to produce a Git commit inline.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/rendercomment.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index 422dd33b..f6dfd058 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -60,9 +60,8 @@ class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor):
     considered.
     """
 
-    _repo = pygit2.Repository(repo_path)
-
     def __init__(self, md, head):
+        self._repo = pygit2.Repository(repo_path)
         self._head = head
         super().__init__(r'\b([0-9a-f]{7,40})\b', md)
 

From 53391bec1a6c5ec06853371f3b534ac69b909d5f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 27 Jul 2021 16:23:22 -0700
Subject: [PATCH 272/844] sharness: do not use spaces in trash directory

With a recent curl update, it now rejects URLs with spaces in it.
We should probably fix this so that we can sanitize urls with spaces
to be used properly, but for now, just remove spaces in the directory.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/sharness.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sharness.sh b/test/sharness.sh
index ace5a5b5..ac13b7b6 100644
--- a/test/sharness.sh
+++ b/test/sharness.sh
@@ -895,7 +895,7 @@ SHARNESS_TEST_FILE="$0"
 export SHARNESS_TEST_FILE
 
 # Prepare test area.
-SHARNESS_TRASH_DIRECTORY="trash directory.$(basename "$SHARNESS_TEST_FILE" ".$SHARNESS_TEST_EXTENSION")"
+SHARNESS_TRASH_DIRECTORY="trash_directory.$(basename "$SHARNESS_TEST_FILE" ".$SHARNESS_TEST_EXTENSION")"
 test -n "$root" && SHARNESS_TRASH_DIRECTORY="$root/$SHARNESS_TRASH_DIRECTORY"
 case "$SHARNESS_TRASH_DIRECTORY" in
 /*) ;; # absolute path is good

From 565f62471baaa9ea57748cba9cfa6e6e7f297d99 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 27 Jul 2021 16:23:22 -0700
Subject: [PATCH 273/844] sharness: do not use spaces in trash directory

With a recent curl update, it now rejects URLs with spaces in it.
We should probably fix this so that we can sanitize urls with spaces
to be used properly, but for now, just remove spaces in the directory.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/sharness.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sharness.sh b/test/sharness.sh
index ace5a5b5..ac13b7b6 100644
--- a/test/sharness.sh
+++ b/test/sharness.sh
@@ -895,7 +895,7 @@ SHARNESS_TEST_FILE="$0"
 export SHARNESS_TEST_FILE
 
 # Prepare test area.
-SHARNESS_TRASH_DIRECTORY="trash directory.$(basename "$SHARNESS_TEST_FILE" ".$SHARNESS_TEST_EXTENSION")"
+SHARNESS_TRASH_DIRECTORY="trash_directory.$(basename "$SHARNESS_TEST_FILE" ".$SHARNESS_TEST_EXTENSION")"
 test -n "$root" && SHARNESS_TRASH_DIRECTORY="$root/$SHARNESS_TRASH_DIRECTORY"
 case "$SHARNESS_TRASH_DIRECTORY" in
 /*) ;; # absolute path is good

From 9197f86a03e57fcde95c4c9557b33e029a3823f4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 21 Jul 2021 19:31:07 -0700
Subject: [PATCH 274/844] .dockerignore: ignore user-produced configs

We don't want these to even enter the Docker environment.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .dockerignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index 30747517..6ec5547d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,6 @@
 */*.mo
+conf/config
+conf/config.sqlite
+conf/config.sqlite.defaults
+conf/docker
+conf/docker.defaults

From 1e1c0c3fe5e9254a33d068d48373b1948ed41b41 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 28 Jun 2021 22:57:21 +0100
Subject: [PATCH 275/844] [FastAPI] Basic pkgbase template

Co-author: Kevin Morris <kevr@0cost.org>

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py                                |  3 +-
 aurweb/routers/packages.py                    | 37 ++++++++
 templates/partials/packages/comments.html     | 73 +++++++++++++++
 .../partials/packages/package_actions.html    | 33 +++++++
 templates/partials/packages/search.html       | 69 ++++++++++++++
 templates/pkgbase.html                        | 89 +++++++++++++++++++
 6 files changed, 303 insertions(+), 1 deletion(-)
 create mode 100644 aurweb/routers/packages.py
 create mode 100644 templates/partials/packages/comments.html
 create mode 100644 templates/partials/packages/package_actions.html
 create mode 100644 templates/partials/packages/search.html
 create mode 100644 templates/pkgbase.html

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index cf878294..dc6b4355 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -18,7 +18,7 @@ from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models.accepted_term import AcceptedTerm
 from aurweb.models.term import Term
-from aurweb.routers import accounts, auth, errors, html, rss, sso, trusted_user
+from aurweb.routers import accounts, auth, errors, html, packages, rss, sso, trusted_user
 
 # Setup the FastAPI app.
 app = FastAPI(exception_handlers=errors.exceptions)
@@ -51,6 +51,7 @@ async def app_startup():
     app.include_router(accounts.router)
     app.include_router(trusted_user.router)
     app.include_router(rss.router)
+    app.include_router(packages.router)
 
     # Initialize the database engine and ORM.
     get_engine()
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
new file mode 100644
index 00000000..80a4221b
--- /dev/null
+++ b/aurweb/routers/packages.py
@@ -0,0 +1,37 @@
+from http import HTTPStatus
+
+from fastapi import APIRouter, HTTPException, Request
+from fastapi.responses import RedirectResponse
+
+import aurweb.models.package
+import aurweb.models.package_comment
+import aurweb.models.package_keyword
+
+from aurweb import db
+from aurweb.models.package_base import PackageBase
+from aurweb.templates import make_variable_context, render_template
+
+router = APIRouter()
+
+
+@router.get("/packages/{package}")
+async def package_base(request: Request, package: str):
+    package = db.query(PackageBase).filter(PackageBase.Name == package).first()
+    if not package:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+
+    context = await make_variable_context(request, package.Name)
+    context["git_clone_uri_anon"] = aurweb.config.get("options", "git_clone_uri_anon")
+    context["git_clone_uri_priv"] = aurweb.config.get("options", "git_clone_uri_priv")
+    context["pkgbase"] = package
+    context["packages"] = package.packages.all()
+    context["packages_count"] = package.packages.count()
+    context["keywords"] = package.keywords.all()
+    context["comments"] = package.comments.all()
+
+    return render_template(request, "pkgbase.html", context)
+
+
+@router.get("/pkgbase/{package}")
+async def package_base_redirect(request: Request, package: str):
+    return RedirectResponse(f"/packages/{package}")
diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
new file mode 100644
index 00000000..48bc88e6
--- /dev/null
+++ b/templates/partials/packages/comments.html
@@ -0,0 +1,73 @@
+<!--
+    This partial requires the following  to render properly
+    - pkgname
+    - pkgbase-id
+    - comments (list)
+-->
+
+<div id="generic-form" class="box">
+    <h2>Add Comment</h2>
+    <form action="/pkgbase/{{ pkgname }}/" method="post">
+        <fieldset>
+            <div>
+                <input type="hidden" name="action" value="do_AddComment"/>
+                <input type="hidden" name="ID" value="{{ pkgbase_id }}"/>
+            </div>
+            <p>
+                Git commit identifiers referencing commits in the AUR package
+                repository and URLs are converted to links automatically.
+                <a href="https://daringfireball.net/projects/markdown/syntax">
+                    Markdown syntax
+                </a>
+                is partially supported.
+            </p>
+            <p>
+                <textarea id="id_comment" name="comment" cols="80" rows="10"></textarea>
+            </p>
+            <p>
+                <input type="submit" value="Add Comment"/>
+            </p>
+        </fieldset>
+    </form>
+</div>
+
+<div class="comments package-comments">
+    <div class="comments-header">
+        <h3>
+            <span class="text">Latest Comments</span>
+            <span class="arrow"></span>
+        </h3>
+    </div>
+    {% for comment in comments %}
+    <h4 id="comment-{{ comment.ID }}" class="comment-header">
+        {% set commentTimestamp = comment.CommentTS | dt | as_timezone(timezone) %}
+        <a href="/account/{{ comment.User.Username }}" title="View account information for {{ comment.User.Username }}">{{ comment.User.Username }}</a>
+        commented on <a href="#comment-{{ comment.ID }}" class="date">{{ "%s" | tr | format(commentTimestamp.strftime("%Y-%m-%d %H:%M")) }}</a>
+        {% if request.user.is_authenticated() and pkgbase.Maintainer.Username == request.user.Username %}
+        <form class="delete-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
+            <fieldset style="display:inline;">
+                <input type="hidden" name="action" value="do_DeleteComment" />
+                <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
+                <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
+                <input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="Delete comment" title="Delete comment" name="submit" value="1" />
+            </fieldset>
+        </form>
+        <a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
+        {% endif %}
+        <form class="pin-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
+            <fieldset style="display:inline;">
+                <input type="hidden" name="action" value="do_PinComment"/>
+                <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
+                <input type="hidden" name="package_base" value="{{ pkgbase_id }}"/>
+                <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
+                <input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="Pin comment" title="Pin comment" name="submit" value="1"/>
+            </fieldset>
+        </form>
+    </h4>
+    <div id="comment-{{ comment.ID }}-content" class="article-content">
+        <div>
+            <p>{{ comment.Comments }}</p>
+        </div>
+    </div>
+    {% endfor %}
+</div>
diff --git a/templates/partials/packages/package_actions.html b/templates/partials/packages/package_actions.html
new file mode 100644
index 00000000..36844214
--- /dev/null
+++ b/templates/partials/packages/package_actions.html
@@ -0,0 +1,33 @@
+<!--
+    This partial requires pkgname to render
+-->
+<div id="detailslinks" class="listing">
+    <div id="actionlist">
+        <h4>Package Actions</h4>
+        <ul class="small">
+            <li>
+                <a href="/cgit/aur.git/tree/PKGBUILD?h={{ pkgname }}">View PKGBUILD</a> /
+                <a href="/cgit/aur.git/log/?h={{ pkgname }}">View Changes</a>
+            </li>
+            <li><a href="/cgit/aur.git/snapshot/{{ pkgname }}.tar.gz">Download snapshot</a>
+            <li><a href="https://wiki.archlinux.org/title/Special:Search?search={{ pkgname }}">Search wiki</a></li>
+            <li><span class="flagged"></span></li>
+            <li><a href="/pkgbase/{{ pkgname }}/flag/">Flag package out-of-date</a></li>
+            <li>
+                <form action="/pkgbase/{{ pkgname }}/vote/" method="post"><input type="submit" class="button text-button" name="do_Vote" value="Vote for this package"/></form>
+            </li>
+            <li>
+                <form action="/pkgbase/{{ pkgname }}/unnotify/" method="post"><input type="submit" class="button text-button" name="do_UnNotify" value="Disable notifications"/>
+                </form>
+            </li>
+            <li><a href="/pkgbase/{{ pkgname }}/comaintainers/">Manage Co-Maintainers</a></li>
+            <li><span class="flagged"></span></li>
+            <li><a href="/pkgbase/{{ pkgname }}/request/">Submit Request</a></li>
+            <li><a href="/pkgbase/{{ pkgname }}/delete/">Delete Package</a></li>
+            <li><a href="/pkgbase/{{ pkgname }}/merge/">Merge Package</a></li>
+            <li>
+                <form action="/pkgbase/{{ pkgname }}/disown/" method="post"><input type="submit" class="button text-button" name="do_Disown" value="Disown Package"/></form>
+            </li>
+        </ul>
+    </div>
+</div>
diff --git a/templates/partials/packages/search.html b/templates/partials/packages/search.html
new file mode 100644
index 00000000..b6b2da1b
--- /dev/null
+++ b/templates/partials/packages/search.html
@@ -0,0 +1,69 @@
+<div id="pkglist-search" class="box filter-criteria">
+    <h2>{% trans %}Search Criteria{% endtrans %}</h2>
+    <form action='/packages/' method='get'>
+        <p><input type='hidden' name='O' value='0'/></p>
+
+        <fieldset>
+            <legend>Enter search criteria</legend>
+            <div>
+                <label for="id_method">Search by</label>
+                <select name='SeB'>
+                    <option value="nd">Name, Description</option>
+                    <option value="n">Name Only</option>
+                    <option value="b">Package Base</option>
+                    <option value="N">Exact Name</option>
+                    <option value="B">Exact Package Base</option>
+                    <option value="k">Keywords</option>
+                    <option value="m">Maintainer</option>
+                    <option value="c">Co-maintainer</option>
+                    <option value="M">Maintainer, Co-maintainer</option>
+                    <option value="s">Submitter</option>
+                </select>
+            </div>
+            <div>
+                <label for="id_q">Keywords</label>
+                <input type='text' name='K' size='30' value="" maxlength='35'/>
+            </div>
+            <div>
+                <label for="id_out_of_date">Out of Date</label>
+                <select name='outdated'>
+                    <option value=''>All</option>
+                    <option value='on'>Flagged</option>
+                    <option value='off'>Not Flagged</option>
+                </select>
+            </div>
+            <div>
+                <label for="id_sort_by">Sort by</label>
+                <select name='SB'>
+                    <option value='n'>Name</option>
+                    <option value='v'>Votes</option>
+                    <option value='p'>Popularity</option>
+                    <option value='w'>Voted</option>
+                    <option value='o'>Notify</option>
+                    <option value='m'>Maintainer</option>
+                    <option value='l'>Last modified</option>
+                </select>
+            </div>
+            <div>
+                <label for="id_order_by">Sort order</label>
+                <select name='SO'>
+                    <option value='a'>Ascending</option>
+                    <option value='d'>Descending</option>
+                </select>
+            </div>
+            <div>
+                <label for="id_per_page">Per page</label>
+                <select name='PP'>
+                    <option value="50">50</option>
+                    <option value="100">100</option>
+                    <option value="250">250</option>
+                </select>
+            </div>
+            <div>
+                <label>&nbsp;</label>
+                <input type='submit' class='button' name='do_Search' value='Go'/>
+                <input type='submit' class='button' name='do_Orphans' value='Orphans'/>
+            </div>
+        </fieldset>
+    </form>
+</div>
diff --git a/templates/pkgbase.html b/templates/pkgbase.html
new file mode 100644
index 00000000..939aef10
--- /dev/null
+++ b/templates/pkgbase.html
@@ -0,0 +1,89 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    {% include "partials/packages/search.html" %}
+    <div id="pkgdetails" class="box">
+        <h2>Package Base Details: {{ pkgbase.Name }}</h2>
+
+        {% set result = pkgbase %}
+        {% set pkgname = "result.Name" %}
+        {% include "partials/packages/package_actions.html" %}
+
+        <table id="pkginfo">
+            <tr>
+                <th>Git Clone URL: </th>
+                <td>
+                    <a class="copy" href="{{ git_clone_uri_anon | format(pkgbase.Name) }}">{{ git_clone_uri_anon | format(pkgbase.Name) }}</a> (read-only, click to copy)
+                    {% if request.user.is_authenticated() and pkgbase.Maintainer.Username == request.user.Username %}
+                    <br /> <a class="copy" href="{{ git_clone_uri_priv | format(pkgbase.Name) }}">{{ git_clone_uri_priv | format(pkgbase.Name) }}</a> (click to copy)
+                    {% endif %}
+                </td>
+            </tr>
+            <tr>
+                <th>Keywords: </th>
+                {% if request.user.is_authenticated() and pkgbase.Maintainer.Username == request.user.Username %}
+                <td>
+                    <form method="post" action="/pkgbase/{{ pkgbase.Name }}/">
+                        <div>
+                            <input type="hidden" name="action" value="do_SetKeywords" />
+                            <input type="text" name="keywords" value="{{ pkgbase.keywords | join(' ', attribute='Keyword') }}"/>
+                            <input type="submit" value="Update"/>
+                        </div>
+                    </form>
+                </td>
+                {% else %}
+                <td>
+                    {% for item in pkgbase.keywords %}
+                    <a class="keyword" href="/packages/?K={{ item.Keyword }}&amp;SB=p">{{ item.Keyword }}</a>
+                    {% endfor %}
+                </td>
+                {% endif %}
+            </tr>
+            <tr>
+                <th>Submitter: </th>
+                <td>{{ pkgbase.Submitter.Username | default("None") }}</td>
+            </tr>
+            <tr>
+                <th>Maintainer: </th>
+                <td>{{ pkgbase.Maintainer.Username | default("None") }}</td>
+            </tr>
+            <tr>
+                <th>Last Packager: </th>
+                <td>{{ pkgbase.Packager.Username | default("None") }}</td>
+            </tr>
+            <tr>
+                <th>Votes: </th>
+                <td>{{ pkgbase.NumVotes }}</td>
+            </tr>
+            <tr>
+                <th>Popularity: </th>
+                <td>{{ '%0.2f' % pkgbase.Popularity | float }}</td>
+            </tr>
+            <tr>
+                {% set submitted = pkgbase.SubmittedTS | dt | as_timezone(timezone) %}
+                <th>First Submitted: </th>
+                <td>{{ "%s" | tr | format(submitted.strftime("%Y-%m-%d %H:%M")) }}</td>
+            </tr>
+            <tr>
+                <th>Last Updated: </th>
+                {% set updated = pkgbase.ModifiedTS | dt | as_timezone(timezone) %}
+                <td>{{ "%s" | tr | format(updated.strftime("%Y-%m-%d %H:%M")) }}</td>
+            </tr>
+        </table>
+
+        <div id="metadata">
+            <div id="pkgs" class="listing">
+                <h3>Packages ({{ packages_count }})</h3>
+                <ul>
+                    {% for result in packages %}
+                    <li><a href="/packages/{{ result.Name }}/" title="View packages details for {{ result.Name }}">{{ result.Name }}</a></li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
+    </div>
+    {% set pkgname = result.Name %}
+    {% set pkgbase_id = result.ID %}
+    {% set comments = comments %}
+    {% include "partials/packages/comments.html" %}
+{% endblock %}

From 2d3d03e01ec74d4a957087b0447acbb67adb5e3d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 14 Jul 2021 14:08:14 -0700
Subject: [PATCH 276/844] templates: Translate pkgbase.html and partials

+ Include the `is_maintainer` context key.
+ Use `is_maintainer` in more locations.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py                    |  2 +
 templates/partials/packages/comments.html     | 48 +++++++----
 .../partials/packages/package_actions.html    | 82 +++++++++++++++----
 templates/partials/packages/search.html       | 62 +++++++-------
 templates/pkgbase.html                        | 36 ++++----
 5 files changed, 155 insertions(+), 75 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 80a4221b..0bd19041 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -28,6 +28,8 @@ async def package_base(request: Request, package: str):
     context["packages_count"] = package.packages.count()
     context["keywords"] = package.keywords.all()
     context["comments"] = package.comments.all()
+    context["is_maintainer"] = request.user.is_authenticated() \
+        and request.user.Username == package.Maintainer.Username
 
     return render_template(request, "pkgbase.html", context)
 
diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
index 48bc88e6..39b0d2b4 100644
--- a/templates/partials/packages/comments.html
+++ b/templates/partials/packages/comments.html
@@ -14,18 +14,23 @@
                 <input type="hidden" name="ID" value="{{ pkgbase_id }}"/>
             </div>
             <p>
-                Git commit identifiers referencing commits in the AUR package
-                repository and URLs are converted to links automatically.
-                <a href="https://daringfireball.net/projects/markdown/syntax">
-                    Markdown syntax
-                </a>
-                is partially supported.
+                {{
+                "Git commit identifiers referencing commits in the AUR package"
+                " repository and URLs are converted to links automatically."
+                | tr
+                }}
+                {{
+                "%sMarkdown Syntax%s is partially supported."
+                | tr
+                | format('<a href="https://daringfireball.net/projects/markdown/syntax">', '</a>')
+                | safe
+                }}
             </p>
             <p>
                 <textarea id="id_comment" name="comment" cols="80" rows="10"></textarea>
             </p>
             <p>
-                <input type="submit" value="Add Comment"/>
+                <input type="submit" value="{{ 'Add Comment' | tr }}"/>
             </p>
         </fieldset>
     </form>
@@ -34,22 +39,35 @@
 <div class="comments package-comments">
     <div class="comments-header">
         <h3>
-            <span class="text">Latest Comments</span>
+            <span class="text">{{ "Latest Comments" | tr }}</span>
             <span class="arrow"></span>
         </h3>
     </div>
     {% for comment in comments %}
     <h4 id="comment-{{ comment.ID }}" class="comment-header">
-        {% set commentTimestamp = comment.CommentTS | dt | as_timezone(timezone) %}
-        <a href="/account/{{ comment.User.Username }}" title="View account information for {{ comment.User.Username }}">{{ comment.User.Username }}</a>
-        commented on <a href="#comment-{{ comment.ID }}" class="date">{{ "%s" | tr | format(commentTimestamp.strftime("%Y-%m-%d %H:%M")) }}</a>
-        {% if request.user.is_authenticated() and pkgbase.Maintainer.Username == request.user.Username %}
+        {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
+        {% set view_account_info = 'View account information for %s' | tr | format(comment.User.Username) %}
+        {{
+        "%s commented on %s" | tr | format(
+            '<a href="/account/%s" title="%s">%s</a>' | format(
+                comment.User.Username,
+                view_account_info,
+                comment.User.Username
+            ),
+            '<a href="#comment-%s" class="date">%s</a>' | format(
+                comment.ID,
+                commented_at.strftime("%Y-%m-%d %H:%M")
+            )
+        )
+        | safe
+        }}
+        {% if is_maintainer %}
         <form class="delete-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
             <fieldset style="display:inline;">
                 <input type="hidden" name="action" value="do_DeleteComment" />
                 <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
                 <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
-                <input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="Delete comment" title="Delete comment" name="submit" value="1" />
+                <input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="{{ 'Delete comment' | tr }}" title="{{ 'Delete comment' | tr }}" name="submit" value="1" />
             </fieldset>
         </form>
         <a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
@@ -60,13 +78,13 @@
                 <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
                 <input type="hidden" name="package_base" value="{{ pkgbase_id }}"/>
                 <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
-                <input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="Pin comment" title="Pin comment" name="submit" value="1"/>
+                <input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="{{ 'Pin comment' | tr }}" title="{{ 'Pin comment' | tr }}" name="submit" value="1"/>
             </fieldset>
         </form>
     </h4>
     <div id="comment-{{ comment.ID }}-content" class="article-content">
         <div>
-            <p>{{ comment.Comments }}</p>
+            <p>{{ comment.RenderedComment | safe }}</p>
         </div>
     </div>
     {% endfor %}
diff --git a/templates/partials/packages/package_actions.html b/templates/partials/packages/package_actions.html
index 36844214..4e7da882 100644
--- a/templates/partials/packages/package_actions.html
+++ b/templates/partials/packages/package_actions.html
@@ -3,31 +3,85 @@
 -->
 <div id="detailslinks" class="listing">
     <div id="actionlist">
-        <h4>Package Actions</h4>
+        <h4>{{ "Package Actions" | tr }}</h4>
         <ul class="small">
             <li>
-                <a href="/cgit/aur.git/tree/PKGBUILD?h={{ pkgname }}">View PKGBUILD</a> /
-                <a href="/cgit/aur.git/log/?h={{ pkgname }}">View Changes</a>
+                <a href="/cgit/aur.git/tree/PKGBUILD?h={{ pkgname }}">
+                    {{ "View PKGBUILD" | tr }}
+                </a>
+                /
+                <a href="/cgit/aur.git/log/?h={{ pkgname }}">
+                    {{ "View Changes" | tr }}
+                </a>
+            </li>
+            <li>
+                <a href="/cgit/aur.git/snapshot/{{ pkgname }}.tar.gz">
+                    {{ "Download snapshot" | tr }}
+                </a>
+            <li>
+                <a href="https://wiki.archlinux.org/title/Special:Search?search={{ pkgname }}">
+                    {{ "Search wiki" | tr }}
+                </a>
             </li>
-            <li><a href="/cgit/aur.git/snapshot/{{ pkgname }}.tar.gz">Download snapshot</a>
-            <li><a href="https://wiki.archlinux.org/title/Special:Search?search={{ pkgname }}">Search wiki</a></li>
             <li><span class="flagged"></span></li>
-            <li><a href="/pkgbase/{{ pkgname }}/flag/">Flag package out-of-date</a></li>
             <li>
-                <form action="/pkgbase/{{ pkgname }}/vote/" method="post"><input type="submit" class="button text-button" name="do_Vote" value="Vote for this package"/></form>
+                <a href="/pkgbase/{{ pkgname }}/flag/">
+                    {{ "Flag package out-of-date" | tr }}
+                </a>
             </li>
             <li>
-                <form action="/pkgbase/{{ pkgname }}/unnotify/" method="post"><input type="submit" class="button text-button" name="do_UnNotify" value="Disable notifications"/>
+                <form action="/pkgbase/{{ pkgname }}/vote/" method="post">
+                    <input type="submit"
+                           class="button text-button"
+                           name="do_Vote"
+                           value="{{ 'Vote for this package' | tr }}" />
                 </form>
             </li>
-            <li><a href="/pkgbase/{{ pkgname }}/comaintainers/">Manage Co-Maintainers</a></li>
-            <li><span class="flagged"></span></li>
-            <li><a href="/pkgbase/{{ pkgname }}/request/">Submit Request</a></li>
-            <li><a href="/pkgbase/{{ pkgname }}/delete/">Delete Package</a></li>
-            <li><a href="/pkgbase/{{ pkgname }}/merge/">Merge Package</a></li>
             <li>
-                <form action="/pkgbase/{{ pkgname }}/disown/" method="post"><input type="submit" class="button text-button" name="do_Disown" value="Disown Package"/></form>
+                <form action="/pkgbase/{{ pkgname }}/unnotify/" method="post">
+                    <input type="submit"
+                           class="button text-button"
+                           name="do_UnNotify"
+                           value="{{ 'Disable notifications' | tr }}"
+                    />
+                </form>
             </li>
+            {% if is_maintainer %}
+                <li>
+                    <a href="/pkgbase/{{ pkgname }}/comaintainers/">
+                        {{ "Manage Co-Maintainers" | tr }}
+                    </a>
+                </li>
+            {% endif %}
+            <li><span class="flagged"></span></li>
+            {% if request.user.is_authenticated() %}
+                <li>
+                    <a href="/pkgbase/{{ pkgname }}/request/">
+                        {{ "Submit Request" | tr }}
+                    </a>
+                </li>
+            {% endif %}
+            {% if is_maintainer %}
+                <li>
+                    <a href="/pkgbase/{{ pkgname }}/delete/">
+                        {{ "Delete Package" | tr }}
+                    </a>
+                </li>
+                <li>
+                    <a href="/pkgbase/{{ pkgname }}/merge/">
+                        {{ "Merge Package" | tr }}
+                    </a>
+                </li>
+                <li>
+                    <form action="/pkgbase/{{ pkgname }}/disown/" method="post">
+                        <input type="submit"
+                               class="button text-button"
+                               name="do_Disown"
+                               value="{{ 'Disown Package' | tr }}"
+                        />
+                    </form>
+                </li>
+            {% endif %}
         </ul>
     </div>
 </div>
diff --git a/templates/partials/packages/search.html b/templates/partials/packages/search.html
index b6b2da1b..c4488b95 100644
--- a/templates/partials/packages/search.html
+++ b/templates/partials/packages/search.html
@@ -4,55 +4,55 @@
         <p><input type='hidden' name='O' value='0'/></p>
 
         <fieldset>
-            <legend>Enter search criteria</legend>
+            <legend>{{ "Enter search criteria" | tr }}</legend>
             <div>
-                <label for="id_method">Search by</label>
+                <label for="id_method">{{ "Search by" | tr }}</label>
                 <select name='SeB'>
-                    <option value="nd">Name, Description</option>
-                    <option value="n">Name Only</option>
-                    <option value="b">Package Base</option>
-                    <option value="N">Exact Name</option>
-                    <option value="B">Exact Package Base</option>
-                    <option value="k">Keywords</option>
-                    <option value="m">Maintainer</option>
-                    <option value="c">Co-maintainer</option>
-                    <option value="M">Maintainer, Co-maintainer</option>
-                    <option value="s">Submitter</option>
+                    <option value="nd">{{ "Name, Description" | tr }}</option>
+                    <option value="n">{{ "Name Only" | tr }}</option>
+                    <option value="b">{{ "Package Base" | tr }}</option>
+                    <option value="N">{{ "Exact Name" | tr }}</option>
+                    <option value="B">{{ "Exact Package Base" | tr }}</option>
+                    <option value="k">{{ "Keywords" | tr }}</option>
+                    <option value="m">{{ "Maintainer" | tr }}</option>
+                    <option value="c">{{ "Co-maintainer" | tr }}</option>
+                    <option value="M">{{ "Maintainer, Co-maintainer" | tr }}</option>
+                    <option value="s">{{ "Submitter" | tr }}</option>
                 </select>
             </div>
             <div>
-                <label for="id_q">Keywords</label>
+                <label for="id_q">{{ "Keywords" | tr }}</label>
                 <input type='text' name='K' size='30' value="" maxlength='35'/>
             </div>
             <div>
-                <label for="id_out_of_date">Out of Date</label>
+                <label for="id_out_of_date">{{ "Out of Date" | tr }}</label>
                 <select name='outdated'>
-                    <option value=''>All</option>
-                    <option value='on'>Flagged</option>
-                    <option value='off'>Not Flagged</option>
+                    <option value=''>{{ "All" | tr }}</option>
+                    <option value='on'>{{ "Flagged" | tr }}</option>
+                    <option value='off'>{{ "Not Flagged" | tr }}</option>
                 </select>
             </div>
             <div>
-                <label for="id_sort_by">Sort by</label>
+                <label for="id_sort_by">{{ "Sort by" | tr }}</label>
                 <select name='SB'>
-                    <option value='n'>Name</option>
-                    <option value='v'>Votes</option>
-                    <option value='p'>Popularity</option>
-                    <option value='w'>Voted</option>
-                    <option value='o'>Notify</option>
-                    <option value='m'>Maintainer</option>
-                    <option value='l'>Last modified</option>
+                    <option value='n'>{{ "Name" | tr }}</option>
+                    <option value='v'>{{ "Votes" | tr }}</option>
+                    <option value='p'>{{ "Popularity" | tr }}</option>
+                    <option value='w'>{{ "Voted" | tr }}</option>
+                    <option value='o'>{{ "Notify" | tr }}</option>
+                    <option value='m'>{{ "Maintainer" | tr }}</option>
+                    <option value='l'>{{ "Last modified" | tr }}</option>
                 </select>
             </div>
             <div>
-                <label for="id_order_by">Sort order</label>
+                <label for="id_order_by">{{ "Sort order" | tr }}</label>
                 <select name='SO'>
-                    <option value='a'>Ascending</option>
-                    <option value='d'>Descending</option>
+                    <option value='a'>{{ "Ascending" | tr }}</option>
+                    <option value='d'>{{ "Descending" | tr }}</option>
                 </select>
             </div>
             <div>
-                <label for="id_per_page">Per page</label>
+                <label for="id_per_page">{{ "Per page" | tr }}</label>
                 <select name='PP'>
                     <option value="50">50</option>
                     <option value="100">100</option>
@@ -61,8 +61,8 @@
             </div>
             <div>
                 <label>&nbsp;</label>
-                <input type='submit' class='button' name='do_Search' value='Go'/>
-                <input type='submit' class='button' name='do_Orphans' value='Orphans'/>
+                <input type='submit' class='button' name='do_Search' value='{{ "Go" | tr }}'/>
+                <input type='submit' class='button' name='do_Orphans' value='{{ "Orphans" | tr }}'/>
             </div>
         </fieldset>
     </form>
diff --git a/templates/pkgbase.html b/templates/pkgbase.html
index 939aef10..d608fa2e 100644
--- a/templates/pkgbase.html
+++ b/templates/pkgbase.html
@@ -3,7 +3,7 @@
 {% block pageContent %}
     {% include "partials/packages/search.html" %}
     <div id="pkgdetails" class="box">
-        <h2>Package Base Details: {{ pkgbase.Name }}</h2>
+        <h2>Package Details: {{ pkgbase.Name }}</h2>
 
         {% set result = pkgbase %}
         {% set pkgname = "result.Name" %}
@@ -11,17 +11,17 @@
 
         <table id="pkginfo">
             <tr>
-                <th>Git Clone URL: </th>
+                <th>{{ "Git Clone URL" | tr }}:</th>
                 <td>
-                    <a class="copy" href="{{ git_clone_uri_anon | format(pkgbase.Name) }}">{{ git_clone_uri_anon | format(pkgbase.Name) }}</a> (read-only, click to copy)
-                    {% if request.user.is_authenticated() and pkgbase.Maintainer.Username == request.user.Username %}
-                    <br /> <a class="copy" href="{{ git_clone_uri_priv | format(pkgbase.Name) }}">{{ git_clone_uri_priv | format(pkgbase.Name) }}</a> (click to copy)
+                    <a class="copy" href="{{ git_clone_uri_anon | format(pkgbase.Name) }}">{{ git_clone_uri_anon | format(pkgbase.Name) }}</a> ({{ "read-only" | tr }}, {{ "click to copy" | tr }})
+                    {% if is_maintainer %}
+                        <br /> <a class="copy" href="{{ git_clone_uri_priv | format(pkgbase.Name) }}">{{ git_clone_uri_priv | format(pkgbase.Name) }}</a> ({{ "click to copy" | tr }})
                     {% endif %}
                 </td>
             </tr>
             <tr>
-                <th>Keywords: </th>
-                {% if request.user.is_authenticated() and pkgbase.Maintainer.Username == request.user.Username %}
+                <th>{{ "Keywords" | tr }}:</th>
+                {% if is_maintainer %}
                 <td>
                     <form method="post" action="/pkgbase/{{ pkgbase.Name }}/">
                         <div>
@@ -40,32 +40,32 @@
                 {% endif %}
             </tr>
             <tr>
-                <th>Submitter: </th>
+                <th>{{ "Submitter" | tr }}:</th>
                 <td>{{ pkgbase.Submitter.Username | default("None") }}</td>
             </tr>
             <tr>
-                <th>Maintainer: </th>
+                <th>{{ "Maintainer" | tr }}:</th>
                 <td>{{ pkgbase.Maintainer.Username | default("None") }}</td>
             </tr>
             <tr>
-                <th>Last Packager: </th>
+                <th>{{ "Last Packager" | tr }}:</th>
                 <td>{{ pkgbase.Packager.Username | default("None") }}</td>
             </tr>
             <tr>
-                <th>Votes: </th>
+                <th>{{ "Votes" | tr }}:</th>
                 <td>{{ pkgbase.NumVotes }}</td>
             </tr>
             <tr>
-                <th>Popularity: </th>
+                <th>{{ "Popularity" | tr }}:</th>
                 <td>{{ '%0.2f' % pkgbase.Popularity | float }}</td>
             </tr>
             <tr>
                 {% set submitted = pkgbase.SubmittedTS | dt | as_timezone(timezone) %}
-                <th>First Submitted: </th>
+                <th>{{ "First Submitted" | tr }}:</th>
                 <td>{{ "%s" | tr | format(submitted.strftime("%Y-%m-%d %H:%M")) }}</td>
             </tr>
             <tr>
-                <th>Last Updated: </th>
+                <th>{{ "Last Updated" | tr }}:</th>
                 {% set updated = pkgbase.ModifiedTS | dt | as_timezone(timezone) %}
                 <td>{{ "%s" | tr | format(updated.strftime("%Y-%m-%d %H:%M")) }}</td>
             </tr>
@@ -73,10 +73,16 @@
 
         <div id="metadata">
             <div id="pkgs" class="listing">
+                <!-- This needs to be replaced with the real implementation. -->
                 <h3>Packages ({{ packages_count }})</h3>
                 <ul>
                     {% for result in packages %}
-                    <li><a href="/packages/{{ result.Name }}/" title="View packages details for {{ result.Name }}">{{ result.Name }}</a></li>
+                        <li>
+                            <a href="/packages/{{ result.Name }}/"
+                               title="{{ 'View packages details for' | tr }} {{ result.Name }}">
+                                {{ result.Name }}
+                            </a>
+                        </li>
                     {% endfor %}
                 </ul>
             </div>

From ae3d302c47a0429a5cfd70445f62f54214f34606 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 15 Jul 2021 22:48:26 -0700
Subject: [PATCH 277/844] implement /packages/{name} as its own route

A few things added with this commit:

- aurweb.packages.util
    - A module providing package and pkgbase helpers.
- aurweb.template.register_filter
    - A decorator that can be used to register a filter:
      @register_filter("some_filter") def f(): pass

Additionally, template partials have been split off a bit
differently. Changes:

- /packages/{name} is defined in packages/show.html.
- partials/packages/package_actions.html is now
  partials/packages/actions.html.
- partials/packages/details.html has been added.
- partials/packages/comments.html has been added.
- partials/packages/comment.html has been added.
- models.dependency_type additions: name and id constants.
- models.relation_type additions: name and id constants.
- models.official_provider additions: base official url constant.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/dependency_type.py              |  16 +
 aurweb/models/official_provider.py            |   2 +
 aurweb/models/package_dependency.py           |   9 +
 aurweb/models/relation_type.py                |  13 +
 aurweb/packages/__init__.py                   |   0
 aurweb/packages/util.py                       | 117 ++++++++
 aurweb/routers/packages.py                    | 101 +++++--
 aurweb/templates.py                           |  27 ++
 aurweb/testing/html.py                        |  14 +
 templates/packages/show.html                  |  23 ++
 templates/partials/packages/actions.html      | 162 ++++++++++
 templates/partials/packages/comment.html      |  48 +++
 templates/partials/packages/comments.html     | 145 +++++----
 templates/partials/packages/details.html      | 145 +++++++++
 .../partials/packages/package_actions.html    |  87 ------
 .../partials/packages/package_metadata.html   |  54 ++++
 templates/pkgbase.html                        |  95 ------
 test/test_package_dependency.py               |   7 +
 test/test_packages_routes.py                  | 283 ++++++++++++++++++
 test/test_packages_util.py                    |  51 ++++
 test/test_templates.py                        |  15 +
 web/html/js/copy.js                           |   6 +
 22 files changed, 1166 insertions(+), 254 deletions(-)
 create mode 100644 aurweb/packages/__init__.py
 create mode 100644 aurweb/packages/util.py
 create mode 100644 aurweb/testing/html.py
 create mode 100644 templates/packages/show.html
 create mode 100644 templates/partials/packages/actions.html
 create mode 100644 templates/partials/packages/comment.html
 create mode 100644 templates/partials/packages/details.html
 delete mode 100644 templates/partials/packages/package_actions.html
 create mode 100644 templates/partials/packages/package_metadata.html
 delete mode 100644 templates/pkgbase.html
 create mode 100644 test/test_packages_routes.py
 create mode 100644 test/test_packages_util.py
 create mode 100644 test/test_templates.py
 create mode 100644 web/html/js/copy.js

diff --git a/aurweb/models/dependency_type.py b/aurweb/models/dependency_type.py
index 71acf368..3b5fafcc 100644
--- a/aurweb/models/dependency_type.py
+++ b/aurweb/models/dependency_type.py
@@ -1,7 +1,13 @@
 from sqlalchemy import Column, Integer
 
+from aurweb import db
 from aurweb.models.declarative import Base
 
+DEPENDS = "depends"
+MAKEDEPENDS = "makedepends"
+CHECKDEPENDS = "checkdepends"
+OPTDEPENDS = "optdepends"
+
 
 class DependencyType(Base):
     __tablename__ = "DependencyTypes"
@@ -12,3 +18,13 @@ class DependencyType(Base):
 
     def __init__(self, Name: str = None):
         self.Name = Name
+
+
+DEPENDS_ID = db.query(DependencyType).filter(
+    DependencyType.Name == DEPENDS).first().ID
+MAKEDEPENDS_ID = db.query(DependencyType).filter(
+    DependencyType.Name == MAKEDEPENDS).first().ID
+CHECKDEPENDS_ID = db.query(DependencyType).filter(
+    DependencyType.Name == CHECKDEPENDS).first().ID
+OPTDEPENDS_ID = db.query(DependencyType).filter(
+    DependencyType.Name == OPTDEPENDS).first().ID
diff --git a/aurweb/models/official_provider.py b/aurweb/models/official_provider.py
index 756be843..e53556b9 100644
--- a/aurweb/models/official_provider.py
+++ b/aurweb/models/official_provider.py
@@ -3,6 +3,8 @@ from sqlalchemy.exc import IntegrityError
 
 from aurweb.models.declarative import Base
 
+OFFICIAL_BASE = "https://aur.archlinux.org"
+
 
 class OfficialProvider(Base):
     __tablename__ = "OfficialProviders"
diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index b7bee246..0e5b028b 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -61,3 +61,12 @@ class PackageDependency(Base):
         self.DepDesc = DepDesc
         self.DepCondition = DepCondition
         self.DepArch = DepArch
+
+    def is_package(self) -> bool:
+        from aurweb import db
+        from aurweb.models.official_provider import OfficialProvider
+        from aurweb.models.package import Package
+        pkg = db.query(Package, Package.Name == self.DepName)
+        official = db.query(OfficialProvider,
+                            OfficialProvider.Name == self.DepName)
+        return pkg.count() > 0 or official.count() > 0
diff --git a/aurweb/models/relation_type.py b/aurweb/models/relation_type.py
index 319fb7f4..71b6adbb 100644
--- a/aurweb/models/relation_type.py
+++ b/aurweb/models/relation_type.py
@@ -1,7 +1,12 @@
 from sqlalchemy import Column, Integer
 
+from aurweb import db
 from aurweb.models.declarative import Base
 
+CONFLICTS = "conflicts"
+PROVIDES = "provides"
+REPLACES = "replaces"
+
 
 class RelationType(Base):
     __tablename__ = "RelationTypes"
@@ -12,3 +17,11 @@ class RelationType(Base):
 
     def __init__(self, Name: str = None):
         self.Name = Name
+
+
+CONFLICTS_ID = db.query(RelationType).filter(
+    RelationType.Name == CONFLICTS).first().ID
+PROVIDES_ID = db.query(RelationType).filter(
+    RelationType.Name == PROVIDES).first().ID
+REPLACES_ID = db.query(RelationType).filter(
+    RelationType.Name == REPLACES).first().ID
diff --git a/aurweb/packages/__init__.py b/aurweb/packages/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
new file mode 100644
index 00000000..6681d479
--- /dev/null
+++ b/aurweb/packages/util.py
@@ -0,0 +1,117 @@
+from http import HTTPStatus
+
+from fastapi import HTTPException
+from sqlalchemy import and_
+
+from aurweb import db
+from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_dependency import PackageDependency
+from aurweb.models.package_relation import PackageRelation
+from aurweb.models.relation_type import PROVIDES_ID, RelationType
+from aurweb.templates import register_filter
+
+
+def dep_depends_extra(dep: PackageDependency) -> str:
+    """ A function used to produce extra text for dependency display. """
+    return str()
+
+
+def dep_makedepends_extra(dep: PackageDependency) -> str:
+    """ A function used to produce extra text for dependency display. """
+    return "(make)"
+
+
+def dep_checkdepends_extra(dep: PackageDependency) -> str:
+    """ A function used to produce extra text for dependency display. """
+    return "(check)"
+
+
+def dep_optdepends_extra(dep: PackageDependency) -> str:
+    """ A function used to produce extra text for dependency display. """
+    return "(optional)"
+
+
+@register_filter("dep_extra")
+def dep_extra(dep: PackageDependency) -> str:
+    """ Some dependency types have extra text added to their
+    display. This function provides that output. However, it
+    **assumes** that the dep passed is bound to a valid one
+    of: depends, makedepends, checkdepends or optdepends. """
+    f = globals().get(f"dep_{dep.DependencyType.Name}_extra")
+    return f(dep)
+
+
+@register_filter("dep_extra_desc")
+def dep_extra_desc(dep: PackageDependency) -> str:
+    extra = dep_extra(dep)
+    return extra + f" – {dep.DepDesc}"
+
+
+@register_filter("pkgname_link")
+def pkgname_link(pkgname: str) -> str:
+    base = "/".join([OFFICIAL_BASE, "packages"])
+    pkg = db.query(Package).filter(Package.Name == pkgname)
+    official = db.query(OfficialProvider).filter(
+        OfficialProvider.Name == pkgname)
+    if not pkg.count() or official.count():
+        return f"{base}/?q={pkgname}"
+    return f"/packages/{pkgname}"
+
+
+@register_filter("package_link")
+def package_link(package: Package) -> str:
+    base = "/".join([OFFICIAL_BASE, "packages"])
+    official = db.query(OfficialProvider).filter(
+        OfficialProvider.Name == package.Name)
+    if official.count():
+        return f"{base}/?q={package.Name}"
+    return f"/packages/{package.Name}"
+
+
+@register_filter("provides_list")
+def provides_list(package: Package, depname: str) -> list:
+    providers = db.query(Package).join(
+        PackageRelation).join(RelationType).filter(
+        and_(
+            PackageRelation.RelName == depname,
+            RelationType.ID == PROVIDES_ID
+        )
+    )
+
+    string = str()
+    has_providers = providers.count() > 0
+
+    if has_providers:
+        string += "<em>("
+
+    string += ", ".join([
+        f'<a href="{package_link(pkg)}">{pkg.Name}</a>'
+        for pkg in providers
+    ])
+
+    if has_providers:
+        string += ")</em>"
+
+    return string
+
+
+def get_pkgbase(name: str) -> PackageBase:
+    """ Get a PackageBase instance by its name or raise a 404 if
+    it can't be foudn in the database.
+
+    :param name: PackageBase.Name
+    :raises HTTPException: With status code 404 if PackageBase doesn't exist
+    :return: PackageBase instance
+    """
+    pkgbase = db.query(PackageBase).filter(PackageBase.Name == name).first()
+    if not pkgbase:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+
+    provider = db.query(OfficialProvider).filter(
+        OfficialProvider.Name == name).first()
+    if provider:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+
+    return pkgbase
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 0bd19041..9650df85 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -1,39 +1,98 @@
 from http import HTTPStatus
+from typing import Any, Dict
 
-from fastapi import APIRouter, HTTPException, Request
+from fastapi import APIRouter, Request, Response
 from fastapi.responses import RedirectResponse
+from sqlalchemy import and_
 
-import aurweb.models.package
 import aurweb.models.package_comment
 import aurweb.models.package_keyword
+import aurweb.packages.util
 
 from aurweb import db
+from aurweb.models.license import License
+from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
+from aurweb.models.package_dependency import PackageDependency
+from aurweb.models.package_license import PackageLicense
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_relation import PackageRelation
+from aurweb.models.package_source import PackageSource
+from aurweb.models.package_vote import PackageVote
+from aurweb.models.relation_type import CONFLICTS_ID, RelationType
+from aurweb.packages.util import get_pkgbase
 from aurweb.templates import make_variable_context, render_template
 
 router = APIRouter()
 
 
-@router.get("/packages/{package}")
-async def package_base(request: Request, package: str):
-    package = db.query(PackageBase).filter(PackageBase.Name == package).first()
-    if not package:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+async def make_single_context(request: Request,
+                              pkgbase: PackageBase) -> Dict[str, Any]:
+    """ Make a basic context for package or pkgbase.
 
-    context = await make_variable_context(request, package.Name)
-    context["git_clone_uri_anon"] = aurweb.config.get("options", "git_clone_uri_anon")
-    context["git_clone_uri_priv"] = aurweb.config.get("options", "git_clone_uri_priv")
-    context["pkgbase"] = package
-    context["packages"] = package.packages.all()
-    context["packages_count"] = package.packages.count()
-    context["keywords"] = package.keywords.all()
-    context["comments"] = package.comments.all()
-    context["is_maintainer"] = request.user.is_authenticated() \
-        and request.user.Username == package.Maintainer.Username
+    :param request: FastAPI request
+    :param pkgbase: PackageBase instance
+    :return: A pkgbase context without specific differences
+    """
+    context = await make_variable_context(request, pkgbase.Name)
+    context["git_clone_uri_anon"] = aurweb.config.get("options",
+                                                      "git_clone_uri_anon")
+    context["git_clone_uri_priv"] = aurweb.config.get("options",
+                                                      "git_clone_uri_priv")
+    context["pkgbase"] = pkgbase
+    context["packages_count"] = pkgbase.packages.count()
+    context["keywords"] = pkgbase.keywords
+    context["comments"] = pkgbase.comments
+    context["is_maintainer"] = (request.user.is_authenticated()
+                                and request.user == pkgbase.Maintainer)
+    context["notified"] = db.query(
+        PackageNotification).join(PackageBase).filter(
+        and_(PackageBase.ID == pkgbase.ID,
+             PackageNotification.UserID == request.user.ID)).count() > 0
 
-    return render_template(request, "pkgbase.html", context)
+    context["out_of_date"] = bool(pkgbase.OutOfDateTS)
+
+    context["voted"] = pkgbase.package_votes.filter(
+        PackageVote.UsersID == request.user.ID).count() > 0
+
+    context["notifications_enabled"] = db.query(
+        PackageNotification).join(PackageBase).filter(
+        PackageBase.ID == pkgbase.ID).count() > 0
+
+    return context
 
 
-@router.get("/pkgbase/{package}")
-async def package_base_redirect(request: Request, package: str):
-    return RedirectResponse(f"/packages/{package}")
+@router.get("/packages/{name}")
+async def package(request: Request, name: str) -> Response:
+    # Get the PackageBase.
+    pkgbase = get_pkgbase(name)
+
+    # Add our base information.
+    context = await make_single_context(request, pkgbase)
+
+    # Package sources.
+    sources = db.query(PackageSource).join(Package).filter(
+        Package.PackageBaseID == pkgbase.ID)
+    context["sources"] = sources
+
+    # Package dependencies.
+    dependencies = db.query(PackageDependency).join(Package).filter(
+        Package.PackageBaseID == pkgbase.ID)
+    context["dependencies"] = dependencies
+
+    # Package requirements (other packages depend on this one).
+    required_by = db.query(PackageDependency).join(Package).filter(
+        PackageDependency.DepName == pkgbase.Name).order_by(
+        Package.Name.asc())
+    context["required_by"] = required_by
+
+    licenses = db.query(License).join(PackageLicense).join(Package).filter(
+        PackageLicense.PackageID == pkgbase.packages.first().ID)
+    context["licenses"] = licenses
+
+    conflicts = db.query(PackageRelation).join(RelationType).join(Package).join(PackageBase).filter(
+        and_(RelationType.ID == CONFLICTS_ID,
+             PackageBase.ID == pkgbase.ID))
+    context["conflicts"] = conflicts
+
+    return render_template(request, "packages/show.html", context)
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 8b507425..fa7aa039 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -1,9 +1,11 @@
 import copy
+import functools
 import os
 import zoneinfo
 
 from datetime import datetime
 from http import HTTPStatus
+from typing import Callable
 from urllib.parse import quote_plus
 
 import jinja2
@@ -40,6 +42,31 @@ env.filters["captcha_cmdline"] = captcha.captcha_cmdline_filter
 env.filters["account_url"] = util.account_url
 
 
+def register_filter(name: str) -> Callable:
+    """ A decorator that can be used to register a filter.
+
+    Example
+        @register_filter("some_filter")
+        def some_filter(some_value: str) -> str:
+            return some_value.replace("-", "_")
+
+    Jinja2
+        {{ 'blah-blah' | some_filter }}
+
+    :param name: Filter name
+    :return: Callable used for filter
+    """
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            return func(*args, **kwargs)
+        if name in env.filters:
+            raise KeyError(f"Jinja already has a filter named '{name}'")
+        env.filters[name] = wrapper
+        return wrapper
+    return decorator
+
+
 def make_context(request: Request, title: str, next: str = None):
     """ Create a context for a jinja2 TemplateResponse. """
 
diff --git a/aurweb/testing/html.py b/aurweb/testing/html.py
new file mode 100644
index 00000000..d5f0c256
--- /dev/null
+++ b/aurweb/testing/html.py
@@ -0,0 +1,14 @@
+from io import StringIO
+
+from lxml import etree
+
+parser = etree.HTMLParser()
+
+
+def parse_root(html: str) -> etree.Element:
+    """ Parse an lxml.etree.ElementTree root from html content.
+
+    :param html: HTML markup
+    :return: etree.Element
+    """
+    return etree.parse(StringIO(html), parser)
diff --git a/templates/packages/show.html b/templates/packages/show.html
new file mode 100644
index 00000000..7a5aae2d
--- /dev/null
+++ b/templates/packages/show.html
@@ -0,0 +1,23 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    {% include "partials/packages/search.html" %}
+    <div id="pkgdetails" class="box">
+        <h2>{{ 'Package Details' | tr }}: {{ pkgbase.Name }} {{ pkgbase.packages.first().Version }}</h2>
+
+        {% set result = pkgbase %}
+        {% include "partials/packages/actions.html" %}
+
+        {% set show_package_details = True %}
+        {% include "partials/packages/details.html" %}
+
+        <div id="metadata">
+            {% include "partials/packages/package_metadata.html" %}
+        </div>
+    </div>
+
+    {% set pkgname = result.Name %}
+    {% set pkgbase_id = result.ID %}
+    {% set comments = comments %}
+    {% include "partials/packages/comments.html" %}
+{% endblock %}
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
new file mode 100644
index 00000000..87db3a3f
--- /dev/null
+++ b/templates/partials/packages/actions.html
@@ -0,0 +1,162 @@
+<!--
+    This partial requires result.Name to render
+-->
+<div id="detailslinks" class="listing">
+    <div id="actionlist">
+        <h4>{{ "Package Actions" | tr }}</h4>
+        <ul class="small">
+            <li>
+                <a href="/cgit/aur.git/tree/PKGBUILD?h={{ result.Name }}">
+                    {{ "View PKGBUILD" | tr }}
+                </a>
+                /
+                <a href="/cgit/aur.git/log/?h={{ result.Name }}">
+                    {{ "View Changes" | tr }}
+                </a>
+            </li>
+            <li>
+                <a href="/cgit/aur.git/snapshot/{{ result.Name }}.tar.gz">
+                    {{ "Download snapshot" | tr }}
+                </a>
+            <li>
+                <a href="https://wiki.archlinux.org/title/Special:Search?search={{ result.Name }}">
+                    {{ "Search wiki" | tr }}
+                </a>
+            </li>
+            {% if not request.user.is_authenticated() %}
+                {% if not out_of_date %}
+                <li>
+                    <a href="/pkgbase/{{ result.Name }}/flag/">
+                        {{ "Flag package out-of-date" | tr }}
+                    </a>
+                </li>
+                {% else %}
+                    <li>
+                        <span class="flagged">
+                            {% set ood_ts = result.OutOfDateTS | dt | as_timezone(timezone) %}
+                            {{
+                            "Flagged out-of-date (%s)"
+                            | tr | format(ood_ts.strftime("%Y-%m-%d"))
+                            }}
+                        </span>
+                    </li>
+                {% endif %}
+                <li>
+                    <a href="/login?next={{ request.url.path | urlencode }}">
+                        {{ "Vote for this package" | tr }}
+                    </a>
+                </li>
+                <li>
+                    <a href="/login?next={{ request.url.path | urlencode }}">
+                        {{ "Enable notifications" | tr }}
+                    </a>
+                </li>
+            {% else %}
+                {% if not out_of_date %}
+                    <li>
+                        <a href="/pkgbase/{{ result.Name }}/flag/">
+                            {{ "Flag package out-of-date" | tr }}
+                        </a>
+                    </li>
+                {% else %}
+                    <li>
+                        <span class="flagged">
+                            {% set ood_ts = result.OutOfDateTS | dt | as_timezone(timezone) %}
+                            {{
+                            "Flagged out-of-date (%s)"
+                            | tr | format(ood_ts.strftime("%Y-%m-%d"))
+                            }}
+                        </span>
+                    </li>
+                    <li>
+                        <form action="/pkgbase/{{ result.Name }}/unflag" method="post">
+                            <input class="button text-button"
+                                   type="submit"
+                                   name="do_UnFlag"
+                                   value="{{ 'Unflag package' | tr }}"
+                            />
+                        </form>
+                    </li>
+                {% endif %}
+                    <li>
+                        {% if not voted %}
+                        <form action="/pkgbase/{{ result.Name }}/vote/" method="post">
+                            <input type="submit"
+                                   class="button text-button"
+                                   name="do_Vote"
+                                   value="{{ 'Vote for this package' | tr }}" />
+                        </form>
+                        {% else %}
+                        <form action="/pkgbase/{{ result.Name }}/unvote/" method="post">
+                            <input type="submit"
+                                   class="button text-button"
+                                   name="do_UnVote"
+                                   value="{{ 'Remove vote' | tr }}" />
+                        </form>
+                        {% endif %}
+                    </li>
+                    <li>
+                        {% if notified %}
+                            <form action="/pkgbase/{{ result.Name }}/unnotify/" method="post">
+                                <input type="submit"
+                                       class="button text-button"
+                                       name="do_UnNotify"
+                                       value="{{ 'Disable notifications' | tr }}"
+                                />
+                            </form>
+                        {% else %}
+                            <form action="/pkgbase/{{ result.Name }}/notify/" method="post">
+                                <input type="submit"
+                                       class="button text-button"
+                                       name="do_Notify"
+                                       value="{{ 'Enable notifications' | tr }}"
+                                />
+                            </form>
+                        {% endif %}
+                    </li>
+
+                {% endif %}
+            </form>
+            {% if is_maintainer %}
+                <li>
+                    <a href="/pkgbase/{{ result.Name }}/comaintainers/">
+                        {{ "Manage Co-Maintainers" | tr }}
+                    </a>
+                </li>
+            {% endif %}
+            <li><span class="flagged"></span></li>
+            <li>
+            {% if not request.user.is_authenticated() %}
+                <a href="/login?next={{ '/pkgbase/%s/request' | format(result.Name) | urlencode }}">
+                    {{ "Submit Request" | tr }}
+                </a>
+            {% else %}
+                <a href="/pkgbase/{{ result.Name }}/request/">
+                    {{ "Submit Request" | tr }}
+                </a>
+            {% endif %}
+            </li>
+            {% if is_maintainer %}
+                <li>
+                    <a href="/pkgbase/{{ result.Name }}/delete/">
+                        {{ "Delete Package" | tr }}
+                    </a>
+                </li>
+                <li>
+                    <a href="/pkgbase/{{ result.Name }}/merge/">
+                        {{ "Merge Package" | tr }}
+                    </a>
+                </li>
+                <li>
+                    <form action="/pkgbase/{{ result.Name }}/disown/" method="post">
+                        <input type="submit"
+                               class="button text-button"
+                               name="do_Disown"
+                               value="{{ 'Disown Package' | tr }}"
+                        />
+                    </form>
+                </li>
+            {% endif %}
+        </ul>
+    </div>
+</div>
diff --git a/templates/partials/packages/comment.html b/templates/partials/packages/comment.html
new file mode 100644
index 00000000..6cf5f319
--- /dev/null
+++ b/templates/partials/packages/comment.html
@@ -0,0 +1,48 @@
+<h4 id="comment-{{ comment.ID }}" class="comment-header">
+    {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
+    {% set view_account_info = 'View account information for %s' | tr | format(comment.User.Username) %}
+    {{
+    "%s commented on %s" | tr | format(
+        ('<a href="/account/%s" title="%s">%s</a>' | format(
+            comment.User.Username,
+            view_account_info,
+            comment.User.Username
+        )) if request.user.is_authenticated() else
+        (comment.User.Username),
+        '<a href="#comment-%s" class="date">%s</a>' | format(
+            comment.ID,
+            commented_at.strftime("%Y-%m-%d %H:%M")
+        )
+    )
+    | safe
+    }}
+    {% if is_maintainer %}
+    <form class="delete-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
+        <fieldset style="display:inline;">
+            <input type="hidden" name="action" value="do_DeleteComment" />
+            <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
+            <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
+            <input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="{{ 'Delete comment' | tr }}" title="{{ 'Delete comment' | tr }}" name="submit" value="1" />
+        </fieldset>
+    </form>
+    <a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
+    {% endif %}
+    <form class="pin-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
+        <fieldset style="display:inline;">
+            <input type="hidden" name="action" value="do_PinComment"/>
+            <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
+            <input type="hidden" name="package_base" value="{{ pkgbase_id }}"/>
+            <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
+            <input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="{{ 'Pin comment' | tr }}" title="{{ 'Pin comment' | tr }}" name="submit" value="1"/>
+        </fieldset>
+    </form>
+</h4>
+<div id="comment-{{ comment.ID }}-content" class="article-content">
+    <div>
+        {% if comment.RenderedComment %}
+            {{ comment.RenderedComment | safe }}
+        {% else %}
+            {{ comment.Comments }}
+        {% endif %}
+    </div>
+</div>
diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
index 39b0d2b4..f1bc020d 100644
--- a/templates/partials/packages/comments.html
+++ b/templates/partials/packages/comments.html
@@ -5,6 +5,7 @@
     - comments (list)
 -->
 
+{% if request.user.is_authenticated() %}
 <div id="generic-form" class="box">
     <h2>Add Comment</h2>
     <form action="/pkgbase/{{ pkgname }}/" method="post">
@@ -31,61 +32,103 @@
             </p>
             <p>
                 <input type="submit" value="{{ 'Add Comment' | tr }}"/>
+                {% if not notifications_enabled %}
+                    <span class="comment-enable-notifications">
+                        <input id="id_enable_notifications"
+                               type="checkbox"
+                               name="enable_notifications"
+                        />
+                        <label for="id_enable_notifications">
+                            {{ "Enable notifications" | tr }}
+                        </label>
+                    </span>
+                {% endif %}
             </p>
         </fieldset>
     </form>
 </div>
+{% endif %}
 
-<div class="comments package-comments">
-    <div class="comments-header">
-        <h3>
-            <span class="text">{{ "Latest Comments" | tr }}</span>
-            <span class="arrow"></span>
-        </h3>
-    </div>
-    {% for comment in comments %}
-    <h4 id="comment-{{ comment.ID }}" class="comment-header">
-        {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
-        {% set view_account_info = 'View account information for %s' | tr | format(comment.User.Username) %}
-        {{
-        "%s commented on %s" | tr | format(
-            '<a href="/account/%s" title="%s">%s</a>' | format(
-                comment.User.Username,
-                view_account_info,
-                comment.User.Username
-            ),
-            '<a href="#comment-%s" class="date">%s</a>' | format(
-                comment.ID,
-                commented_at.strftime("%Y-%m-%d %H:%M")
-            )
-        )
-        | safe
-        }}
-        {% if is_maintainer %}
-        <form class="delete-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
-            <fieldset style="display:inline;">
-                <input type="hidden" name="action" value="do_DeleteComment" />
-                <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
-                <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
-                <input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="{{ 'Delete comment' | tr }}" title="{{ 'Delete comment' | tr }}" name="submit" value="1" />
-            </fieldset>
-        </form>
-        <a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
-        {% endif %}
-        <form class="pin-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
-            <fieldset style="display:inline;">
-                <input type="hidden" name="action" value="do_PinComment"/>
-                <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
-                <input type="hidden" name="package_base" value="{{ pkgbase_id }}"/>
-                <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
-                <input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="{{ 'Pin comment' | tr }}" title="{{ 'Pin comment' | tr }}" name="submit" value="1"/>
-            </fieldset>
-        </form>
-    </h4>
-    <div id="comment-{{ comment.ID }}-content" class="article-content">
-        <div>
-            <p>{{ comment.RenderedComment | safe }}</p>
+{% if comments.count() %}
+    <div class="comments package-comments">
+        <div class="comments-header">
+            <h3>
+                <span class="text">{{ "Latest Comments" | tr }}</span>
+                <span class="arrow"></span>
+            </h3>
         </div>
+        {% for comment in comments.all() %}
+            {% include "partials/packages/comment.html" %}
+        {% endfor %}
     </div>
-    {% endfor %}
-</div>
+{% endif %}
+
+<script type="text/javascript" nonce="{{ request.user.nonce }}">
+function add_busy_indicator(sibling) {
+    const img = document.createElement('img');
+    img.src = "/images/ajax-loader.gif";
+    img.classList.add('ajax-loader');
+    img.style.height = 11;
+    img.style.width = 16;
+    img.alt = "Busy…";
+
+    sibling.insertAdjacentElement('afterend', img);
+}
+
+function remove_busy_indicator(sibling) {
+    const elem = sibling.nextElementSibling;
+    elem.parentNode.removeChild(elem);
+}
+
+function getParentsUntil(elem, className) {
+    // Limit to 10 depth
+    for ( ; elem && elem !== document; elem = elem.parentNode) {
+        if (elem.matches(className)) {
+            break;
+        }
+    }
+
+    return elem;
+}
+
+function handleEditCommentClick(event) {
+    event.preventDefault();
+    const parent_element = getParentsUntil(event.target, '.comment-header');
+    const parent_id = parent_element.id;
+    const comment_id = parent_id.substr(parent_id.indexOf('-') + 1);
+    // The div class="article-content" which contains the comment
+    const edit_form = parent_element.nextElementSibling;
+
+    const params = new URLSearchParams({
+        type: "get-comment-form",
+        arg: comment_id,
+        base_id: {{ pkgbase.ID }},
+        pkgbase_name: {{ pkgbase.Name }}
+    });
+
+    const url = '/rpc?' + params.toString();
+
+    add_busy_indicator(event.target);
+
+    fetch(url, {
+        method: 'GET'
+    })
+    .then(function(response) { return response.json(); })
+    .then(function(data) {
+        remove_busy_indicator(event.target);
+        if (data.success) {
+            edit_form.innerHTML = data.form;
+            edit_form.querySelector('textarea').focus();
+        } else {
+            alert(data.error);
+        }
+    });
+}
+
+document.addEventListener('DOMContentLoaded', function() {
+    const divs = document.querySelectorAll('.edit-comment');;
+    for (let div of divs) {
+        div.addEventListener('click', handleEditCommentClick);
+    }
+});
+</script>
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
new file mode 100644
index 00000000..a25e9c9e
--- /dev/null
+++ b/templates/partials/packages/details.html
@@ -0,0 +1,145 @@
+<table id="pkginfo">
+    <tr>
+        <th>{{ "Git Clone URL" | tr }}:</th>
+        <td>
+            <a class="copy" href="{{ git_clone_uri_anon | format(pkgbase.Name) }}">{{ git_clone_uri_anon | format(pkgbase.Name) }}</a> ({{ "read-only" | tr }}, {{ "click to copy" | tr }})
+            {% if is_maintainer %}
+                <br /> <a class="copy" href="{{ git_clone_uri_priv | format(pkgbase.Name) }}">{{ git_clone_uri_priv | format(pkgbase.Name) }}</a> ({{ "click to copy" | tr }})
+            {% endif %}
+        </td>
+    </tr>
+    {% if show_package_details | default(False) %}
+        <tr>
+            <th>{{ "Package Base" | tr }}:</th>
+            <td class="wrap">
+                <a href="/pkgbase/{{ pkgbase.Name }}">
+                    {{ pkgbase.Name }}
+                </a>
+            </td>
+        </tr>
+        <tr>
+            <th>{{ "Description" | tr }}:</th>
+            <td class="wrap">{{ pkgbase.packages.first().Description }}</td>
+        </tr>
+        <tr>
+            <th>{{ "Upstream URL" | tr }}:</th>
+            <td class="wrap">
+                {% set pkg = pkgbase.packages.first() %}
+                {% if pkg.URL %}
+                    <a href="{{ pkg.URL }}">{{ pkg.URL }}</a>
+                {% else %}
+                    {{ "None" | tr }}
+                {% endif %}
+            </td>
+        </tr>
+    {% endif %}
+    {% if pkgbase.keywords.count() %}
+        <tr>
+            <th>{{ "Keywords" | tr }}:</th>
+            {% if is_maintainer %}
+            <td>
+                <form method="update"
+                      action="/pkgbase/{{ pkgbase.Name }}/keywords/"
+                >
+                    <div>
+                        <input type="text"
+                               name="keywords"
+                               value="{{ pkgbase.keywords | join(' ', attribute='Keyword') }}"
+                        />
+                        <input type="submit" value="{{ 'Update' | tr }}"/>
+                    </div>
+                </form>
+            </td>
+            {% else %}
+            <td>
+                {% for keyword in pkgbase.keywords %}
+                    <a class="keyword"
+                       href="/packages/?K={{ keyword.Keyword }}&amp;SB=p"
+                    >
+                        {{ keyword.Keyword }}
+                    </a>
+                {% endfor %}
+            </td>
+            {% endif %}
+        </tr>
+    {% endif %}
+    {% if licenses and licenses.count() and show_package_details | default(False) %}
+        <tr>
+            <th>{{ "Licenses" | tr }}:</th>
+            <td>{{ licenses | join(', ', attribute='Name') | default('None' | tr) }} </td>
+        </tr>
+    {% endif %}
+    {% if show_package_details | default(False) %}
+        <tr>
+            <th>{{ "Conflicts" | tr }}:</th>
+            <td class="wrap">
+                {{ conflicts | join(', ', attribute='RelName') }}
+            </td>
+        </tr>
+    {% endif %}
+    <tr>
+        <th>{{ "Submitter" | tr }}:</th>
+        <td>
+            {% if request.user.is_authenticated() %}
+                <a href="/account/{{ pkgbase.Submitter.Username }}">
+                    {{ pkgbase.Submitter.Username | default("None" | tr) }}
+                </a>
+            {% else %}
+                {{ pkgbase.Submitter.Username | default("None" | tr) }}
+            {% endif %}
+        </td>
+    </tr>
+    <tr>
+        <th>{{ "Maintainer" | tr }}:</th>
+        <td>
+            {% if request.user.is_authenticated() %}
+                <a href="/account/{{ pkgbase.Maintainer.Username }}">
+                    {{ pkgbase.Maintainer.Username | default("None" | tr) }}
+                </a>
+            {% else %}
+                {{ pkgbase.Maintainer.Username | default("None" | tr) }}
+            {% endif %}
+        </td>
+    </tr>
+    <tr>
+        <th>{{ "Last Packager" | tr }}:</th>
+        <td>
+            {% if request.user.is_authenticated() %}
+                <a href="/account/{{ pkgbase.Packager.Username }}">
+                    {{ pkgbase.Packager.Username | default("None" | tr) }}
+                </a>
+            {% else %}
+                {{ pkgbase.Packager.Username | default("None" | tr) }}
+            {% endif %}
+        </td>
+    </tr>
+    <tr>
+        <th>{{ "Votes" | tr }}:</th>
+        {% if not is_maintainer %}
+            <td>{{ pkgbase.package_votes.count() }}</td>
+        {% else %}
+            <td>
+                <a href="/pkgbase/{{ pkgbase.Name }}/voters">
+                    {{ pkgbase.package_votes.count() }}
+                </a>
+            </td>
+        {% endif %}
+    </tr>
+    <tr>
+        <th>{{ "Popularity" | tr }}:</th>
+        <td>{{ pkgbase.Popularity | number_format(6 if pkgbase.Popularity <= 0.2 else 2) }}</td>
+    </tr>
+    <tr>
+        {% set submitted = pkgbase.SubmittedTS | dt | as_timezone(timezone) %}
+        <th>{{ "First Submitted" | tr }}:</th>
+        <td>{{ "%s" | format(submitted.strftime("%Y-%m-%d %H:%M")) }}</td>
+    </tr>
+    <tr>
+        <th>{{ "Last Updated" | tr }}:</th>
+        {% set updated = pkgbase.ModifiedTS | dt | as_timezone(timezone) %}
+        <td>{{ "%s" | format(updated.strftime("%Y-%m-%d %H:%M")) }}</td>
+    </tr>
+</table>
+
+<script type="text/javascript" src="/static/js/copy.js"></script>
+
diff --git a/templates/partials/packages/package_actions.html b/templates/partials/packages/package_actions.html
deleted file mode 100644
index 4e7da882..00000000
--- a/templates/partials/packages/package_actions.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-    This partial requires pkgname to render
--->
-<div id="detailslinks" class="listing">
-    <div id="actionlist">
-        <h4>{{ "Package Actions" | tr }}</h4>
-        <ul class="small">
-            <li>
-                <a href="/cgit/aur.git/tree/PKGBUILD?h={{ pkgname }}">
-                    {{ "View PKGBUILD" | tr }}
-                </a>
-                /
-                <a href="/cgit/aur.git/log/?h={{ pkgname }}">
-                    {{ "View Changes" | tr }}
-                </a>
-            </li>
-            <li>
-                <a href="/cgit/aur.git/snapshot/{{ pkgname }}.tar.gz">
-                    {{ "Download snapshot" | tr }}
-                </a>
-            <li>
-                <a href="https://wiki.archlinux.org/title/Special:Search?search={{ pkgname }}">
-                    {{ "Search wiki" | tr }}
-                </a>
-            </li>
-            <li><span class="flagged"></span></li>
-            <li>
-                <a href="/pkgbase/{{ pkgname }}/flag/">
-                    {{ "Flag package out-of-date" | tr }}
-                </a>
-            </li>
-            <li>
-                <form action="/pkgbase/{{ pkgname }}/vote/" method="post">
-                    <input type="submit"
-                           class="button text-button"
-                           name="do_Vote"
-                           value="{{ 'Vote for this package' | tr }}" />
-                </form>
-            </li>
-            <li>
-                <form action="/pkgbase/{{ pkgname }}/unnotify/" method="post">
-                    <input type="submit"
-                           class="button text-button"
-                           name="do_UnNotify"
-                           value="{{ 'Disable notifications' | tr }}"
-                    />
-                </form>
-            </li>
-            {% if is_maintainer %}
-                <li>
-                    <a href="/pkgbase/{{ pkgname }}/comaintainers/">
-                        {{ "Manage Co-Maintainers" | tr }}
-                    </a>
-                </li>
-            {% endif %}
-            <li><span class="flagged"></span></li>
-            {% if request.user.is_authenticated() %}
-                <li>
-                    <a href="/pkgbase/{{ pkgname }}/request/">
-                        {{ "Submit Request" | tr }}
-                    </a>
-                </li>
-            {% endif %}
-            {% if is_maintainer %}
-                <li>
-                    <a href="/pkgbase/{{ pkgname }}/delete/">
-                        {{ "Delete Package" | tr }}
-                    </a>
-                </li>
-                <li>
-                    <a href="/pkgbase/{{ pkgname }}/merge/">
-                        {{ "Merge Package" | tr }}
-                    </a>
-                </li>
-                <li>
-                    <form action="/pkgbase/{{ pkgname }}/disown/" method="post">
-                        <input type="submit"
-                               class="button text-button"
-                               name="do_Disown"
-                               value="{{ 'Disown Package' | tr }}"
-                        />
-                    </form>
-                </li>
-            {% endif %}
-        </ul>
-    </div>
-</div>
diff --git a/templates/partials/packages/package_metadata.html b/templates/partials/packages/package_metadata.html
new file mode 100644
index 00000000..767e25a9
--- /dev/null
+++ b/templates/partials/packages/package_metadata.html
@@ -0,0 +1,54 @@
+<div id="pkgdeps" class="listing">
+    <h3>Dependencies ({{ dependencies.count() }})</h3>
+    <ul id="pkgdepslist">
+        {% for dep in dependencies.all() %}
+            <li>
+                {% set broken = not dep.is_package() %}
+                {% if broken %}
+                    <span class="broken">
+                {% else %}
+                    <a href="{{ dep.DepName | pkgname_link }}">
+                {% endif %}
+                    {{ dep.DepName }}
+                {% if broken %}
+                    </span>
+                {% else %}
+                    </a>
+                {% endif %}
+                {{ dep.Package | provides_list(dep.DepName) | safe }}
+                {% set extra = dep | dep_extra %}
+                {% if extra %}
+                    <em>{{ dep | dep_extra_desc }}</em>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+</div>
+
+<div id="pkgreqs" class="listing">
+    <h3>Required by ({{ required_by.count() }})</h3>
+    <ul id="pkgreqslist">
+        {% for depender in required_by.all() %}
+            <li>
+                <a href="{{ depender.Package | package_link }}">
+                    {{ depender.Package.Name }}
+                </a>
+                <em>{{ depender | dep_extra }}</em>
+            </li>
+        {% endfor %}
+    </ul>
+</div>
+
+<div id="pkgfiles" class="listing">
+    <h3>Sources ({{ sources.count() }})</h3>
+</div>
+
+<div>
+    <ul id="pkgsrcslist">
+        {% for source in sources.all() %}
+            <li>
+                <a href="{{ source.Source }}">{{ source.Source }}</a>
+            </li>
+        {% endfor %}
+    </ul>
+</div>
diff --git a/templates/pkgbase.html b/templates/pkgbase.html
deleted file mode 100644
index d608fa2e..00000000
--- a/templates/pkgbase.html
+++ /dev/null
@@ -1,95 +0,0 @@
-{% extends "partials/layout.html" %}
-
-{% block pageContent %}
-    {% include "partials/packages/search.html" %}
-    <div id="pkgdetails" class="box">
-        <h2>Package Details: {{ pkgbase.Name }}</h2>
-
-        {% set result = pkgbase %}
-        {% set pkgname = "result.Name" %}
-        {% include "partials/packages/package_actions.html" %}
-
-        <table id="pkginfo">
-            <tr>
-                <th>{{ "Git Clone URL" | tr }}:</th>
-                <td>
-                    <a class="copy" href="{{ git_clone_uri_anon | format(pkgbase.Name) }}">{{ git_clone_uri_anon | format(pkgbase.Name) }}</a> ({{ "read-only" | tr }}, {{ "click to copy" | tr }})
-                    {% if is_maintainer %}
-                        <br /> <a class="copy" href="{{ git_clone_uri_priv | format(pkgbase.Name) }}">{{ git_clone_uri_priv | format(pkgbase.Name) }}</a> ({{ "click to copy" | tr }})
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <th>{{ "Keywords" | tr }}:</th>
-                {% if is_maintainer %}
-                <td>
-                    <form method="post" action="/pkgbase/{{ pkgbase.Name }}/">
-                        <div>
-                            <input type="hidden" name="action" value="do_SetKeywords" />
-                            <input type="text" name="keywords" value="{{ pkgbase.keywords | join(' ', attribute='Keyword') }}"/>
-                            <input type="submit" value="Update"/>
-                        </div>
-                    </form>
-                </td>
-                {% else %}
-                <td>
-                    {% for item in pkgbase.keywords %}
-                    <a class="keyword" href="/packages/?K={{ item.Keyword }}&amp;SB=p">{{ item.Keyword }}</a>
-                    {% endfor %}
-                </td>
-                {% endif %}
-            </tr>
-            <tr>
-                <th>{{ "Submitter" | tr }}:</th>
-                <td>{{ pkgbase.Submitter.Username | default("None") }}</td>
-            </tr>
-            <tr>
-                <th>{{ "Maintainer" | tr }}:</th>
-                <td>{{ pkgbase.Maintainer.Username | default("None") }}</td>
-            </tr>
-            <tr>
-                <th>{{ "Last Packager" | tr }}:</th>
-                <td>{{ pkgbase.Packager.Username | default("None") }}</td>
-            </tr>
-            <tr>
-                <th>{{ "Votes" | tr }}:</th>
-                <td>{{ pkgbase.NumVotes }}</td>
-            </tr>
-            <tr>
-                <th>{{ "Popularity" | tr }}:</th>
-                <td>{{ '%0.2f' % pkgbase.Popularity | float }}</td>
-            </tr>
-            <tr>
-                {% set submitted = pkgbase.SubmittedTS | dt | as_timezone(timezone) %}
-                <th>{{ "First Submitted" | tr }}:</th>
-                <td>{{ "%s" | tr | format(submitted.strftime("%Y-%m-%d %H:%M")) }}</td>
-            </tr>
-            <tr>
-                <th>{{ "Last Updated" | tr }}:</th>
-                {% set updated = pkgbase.ModifiedTS | dt | as_timezone(timezone) %}
-                <td>{{ "%s" | tr | format(updated.strftime("%Y-%m-%d %H:%M")) }}</td>
-            </tr>
-        </table>
-
-        <div id="metadata">
-            <div id="pkgs" class="listing">
-                <!-- This needs to be replaced with the real implementation. -->
-                <h3>Packages ({{ packages_count }})</h3>
-                <ul>
-                    {% for result in packages %}
-                        <li>
-                            <a href="/packages/{{ result.Name }}/"
-                               title="{{ 'View packages details for' | tr }} {{ result.Name }}">
-                                {{ result.Name }}
-                            </a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
-    </div>
-    {% set pkgname = result.Name %}
-    {% set pkgbase_id = result.ID %}
-    {% set comments = comments %}
-    {% include "partials/packages/comments.html" %}
-{% endblock %}
diff --git a/test/test_package_dependency.py b/test/test_package_dependency.py
index d39091aa..e28f1781 100644
--- a/test/test_package_dependency.py
+++ b/test/test_package_dependency.py
@@ -77,6 +77,13 @@ def test_package_dependencies():
     assert pkgdep in optdepends.package_dependencies
     assert pkgdep in package.package_dependencies
 
+    assert not pkgdep.is_package()
+
+    base = create(PackageBase, Name=pkgdep.DepName, Maintainer=user)
+    create(Package, PackageBase=base, Name=pkgdep.DepName)
+
+    assert pkgdep.is_package()
+
 
 def test_package_dependencies_null_package_raises_exception():
     from aurweb.db import session
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
new file mode 100644
index 00000000..f9592238
--- /dev/null
+++ b/test/test_packages_routes.py
@@ -0,0 +1,283 @@
+from datetime import datetime
+from http import HTTPStatus
+
+import pytest
+
+from fastapi.testclient import TestClient
+
+from aurweb import asgi, db
+from aurweb.models.account_type import USER_ID, AccountType
+from aurweb.models.dependency_type import DependencyType
+from aurweb.models.official_provider import OfficialProvider
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comment import PackageComment
+from aurweb.models.package_dependency import PackageDependency
+from aurweb.models.package_keyword import PackageKeyword
+from aurweb.models.package_relation import PackageRelation
+from aurweb.models.relation_type import PROVIDES_ID, RelationType
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+from aurweb.testing.html import parse_root
+from aurweb.testing.requests import Request
+
+
+def package_endpoint(package: Package) -> str:
+    return f"/packages/{package.Name}"
+
+
+def create_package(pkgname: str, maintainer: User,
+                   autocommit: bool = True) -> Package:
+    pkgbase = db.create(PackageBase,
+                        Name=pkgname,
+                        Maintainer=maintainer,
+                        autocommit=False)
+    return db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase,
+                     autocommit=autocommit)
+
+
+def create_package_dep(package: Package, depname: str,
+                       dep_type_name: str = "depends",
+                       autocommit: bool = True) -> PackageDependency:
+    dep_type = db.query(DependencyType,
+                        DependencyType.Name == dep_type_name).first()
+    return db.create(PackageDependency,
+                     DependencyType=dep_type,
+                     Package=package,
+                     DepName=depname,
+                     autocommit=autocommit)
+
+
+def create_package_rel(package: Package,
+                       relname: str,
+                       autocommit: bool = True) -> PackageRelation:
+    rel_type = db.query(RelationType,
+                        RelationType.ID == PROVIDES_ID).first()
+    return db.create(PackageRelation,
+                     RelationType=rel_type,
+                     Package=package,
+                     RelName=relname)
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db(
+        User.__tablename__,
+        Package.__tablename__,
+        PackageBase.__tablename__,
+        PackageDependency.__tablename__,
+        PackageRelation.__tablename__,
+        PackageKeyword.__tablename__,
+        OfficialProvider.__tablename__
+    )
+
+
+@pytest.fixture
+def client() -> TestClient:
+    """ Yield a FastAPI TestClient. """
+    yield TestClient(app=asgi.app)
+
+
+@pytest.fixture
+def user() -> User:
+    """ Yield a user. """
+    account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
+    yield db.create(User, Username="test",
+                    Email="test@example.org",
+                    Passwd="testPassword",
+                    AccountType=account_type)
+
+
+@pytest.fixture
+def maintainer() -> User:
+    """ Yield a specific User used to maintain packages. """
+    account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
+    yield db.create(User, Username="test_maintainer",
+                    Email="test_maintainer@example.org",
+                    Passwd="testPassword",
+                    AccountType=account_type)
+
+
+@pytest.fixture
+def package(maintainer: User) -> Package:
+    """ Yield a Package created by user. """
+    pkgbase = db.create(PackageBase,
+                        Name="test-package",
+                        Maintainer=maintainer)
+    yield db.create(Package,
+                    PackageBase=pkgbase,
+                    Name=pkgbase.Name)
+
+
+def test_package_not_found(client: TestClient):
+    with client as request:
+        resp = request.get("/packages/not_found")
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_package_official_not_found(client: TestClient, package: Package):
+    """ When a Package has a matching OfficialProvider record, it is not
+    hosted on AUR, but in the official repositories. Getting a package
+    with this kind of record should return a status code 404. """
+    db.create(OfficialProvider,
+              Name=package.Name,
+              Repo="core",
+              Provides=package.Name)
+
+    with client as request:
+        resp = request.get(package_endpoint(package))
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_package(client: TestClient, package: Package):
+    """ Test a single /packages/{name} route. """
+    with client as request:
+
+        resp = request.get(package_endpoint(package))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    h2 = root.find('.//div[@id="pkgdetails"]/h2')
+
+    sections = h2.text.split(":")
+    assert sections[0] == "Package Details"
+
+    name, version = sections[1].lstrip().split(" ")
+    assert name == package.Name
+    version == package.Version
+
+    rows = root.findall('.//table[@id="pkginfo"]//tr')
+    row = rows[1]  # Second row is our target.
+
+    pkgbase = row.find("./td/a")
+    assert pkgbase.text.strip() == package.PackageBase.Name
+
+
+def test_package_comments(client: TestClient, user: User, package: Package):
+    now = (datetime.utcnow().timestamp())
+    comment = db.create(PackageComment, PackageBase=package.PackageBase,
+                        User=user, Comments="Test comment", CommentTS=now)
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(package_endpoint(package), cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    expected = [
+        comment.Comments
+    ]
+    comments = root.xpath('.//div[contains(@class, "package-comments")]'
+                          '/div[@class="article-content"]/div/text()')
+    for i, row in enumerate(expected):
+        assert comments[i].strip() == row
+
+
+def test_package_authenticated(client: TestClient, user: User,
+                               package: Package):
+    """ We get the same here for either authenticated or not
+    authenticated. Form inputs are presented to maintainers.
+    This process also occurs when pkgbase.html is rendered. """
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(package_endpoint(package), cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    expected = [
+        "View PKGBUILD",
+        "View Changes",
+        "Download snapshot",
+        "Search wiki",
+        "Flag package out-of-date",
+        "Vote for this package",
+        "Enable notifications",
+        "Submit Request"
+    ]
+    for expected_text in expected:
+        assert expected_text in resp.text
+
+
+def test_package_authenticated_maintainer(client: TestClient,
+                                          maintainer: User,
+                                          package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(package_endpoint(package), cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    expected = [
+        "View PKGBUILD",
+        "View Changes",
+        "Download snapshot",
+        "Search wiki",
+        "Flag package out-of-date",
+        "Vote for this package",
+        "Enable notifications",
+        "Manage Co-Maintainers",
+        "Submit Request",
+        "Delete Package",
+        "Merge Package",
+        "Disown Package"
+    ]
+    for expected_text in expected:
+        assert expected_text in resp.text
+
+
+def test_package_dependencies(client: TestClient, maintainer: User,
+                              package: Package):
+    # Create a normal dependency of type depends.
+    dep_pkg = create_package("test-dep-1", maintainer, autocommit=False)
+    dep = create_package_dep(package, dep_pkg.Name, autocommit=False)
+
+    # Also, create a makedepends.
+    make_dep_pkg = create_package("test-dep-2", maintainer, autocommit=False)
+    make_dep = create_package_dep(package, make_dep_pkg.Name,
+                                  dep_type_name="makedepends",
+                                  autocommit=False)
+
+    # And... a checkdepends!
+    check_dep_pkg = create_package("test-dep-3", maintainer, autocommit=False)
+    check_dep = create_package_dep(package, check_dep_pkg.Name,
+                                   dep_type_name="checkdepends",
+                                   autocommit=False)
+
+    # Geez. Just stop. This is optdepends.
+    opt_dep_pkg = create_package("test-dep-4", maintainer, autocommit=False)
+    opt_dep = create_package_dep(package, opt_dep_pkg.Name,
+                                 dep_type_name="optdepends",
+                                 autocommit=False)
+
+    broken_dep = create_package_dep(package, "test-dep-5",
+                                    dep_type_name="depends",
+                                    autocommit=False)
+
+    # Create an official provider record.
+    db.create(OfficialProvider, Name="test-dep-99",
+              Repo="core", Provides="test-dep-99",
+              autocommit=False)
+    official_dep = create_package_dep(package, "test-dep-99",
+                                      autocommit=False)
+
+    # Also, create a provider who provides our test-dep-99.
+    provider = create_package("test-provider", maintainer, autocommit=False)
+    create_package_rel(provider, dep.DepName)
+
+    with client as request:
+        resp = request.get(package_endpoint(package))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+
+    expected = [
+        dep.DepName,
+        make_dep.DepName,
+        check_dep.DepName,
+        opt_dep.DepName,
+        official_dep.DepName
+    ]
+    pkgdeps = root.findall('.//ul[@id="pkgdepslist"]/li/a')
+    for i, expectation in enumerate(expected):
+        assert pkgdeps[i].text.strip() == expectation
+
+    broken_node = root.find('.//ul[@id="pkgdepslist"]/li/span')
+    assert broken_node.text.strip() == broken_dep.DepName
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
new file mode 100644
index 00000000..17978490
--- /dev/null
+++ b/test/test_packages_util.py
@@ -0,0 +1,51 @@
+import pytest
+
+from fastapi.testclient import TestClient
+
+from aurweb import asgi, db
+from aurweb.models.account_type import USER_ID, AccountType
+from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.user import User
+from aurweb.packages import util
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db(
+        User.__tablename__,
+        Package.__tablename__,
+        PackageBase.__tablename__,
+        OfficialProvider.__tablename__
+    )
+
+
+@pytest.fixture
+def maintainer() -> User:
+    account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
+    yield db.create(User, Username="test_maintainer",
+                    Email="test_maintainer@examepl.org",
+                    Passwd="testPassword",
+                    AccountType=account_type)
+
+
+@pytest.fixture
+def package(maintainer: User) -> Package:
+    pkgbase = db.create(PackageBase, Name="test-pkg", Maintainer=maintainer)
+    yield db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase)
+
+
+@pytest.fixture
+def client() -> TestClient:
+    yield TestClient(app=asgi.app)
+
+
+def test_package_link(client: TestClient, maintainer: User, package: Package):
+    db.create(OfficialProvider,
+              Name=package.Name,
+              Repo="core",
+              Provides=package.Name)
+    expected = f"{OFFICIAL_BASE}/packages/?q={package.Name}"
+    assert util.package_link(package) == expected
diff --git a/test/test_templates.py b/test/test_templates.py
new file mode 100644
index 00000000..8e3017b4
--- /dev/null
+++ b/test/test_templates.py
@@ -0,0 +1,15 @@
+import pytest
+
+from aurweb.templates import register_filter
+
+
+@register_filter("func")
+def func(): pass
+
+
+def test_register_filter_exists_key_error():
+    """ Most instances of register_filter are tested through module
+    imports or template renders, so we only test failures here. """
+    with pytest.raises(KeyError):
+        @register_filter("func")
+        def some_func(): pass
diff --git a/web/html/js/copy.js b/web/html/js/copy.js
new file mode 100644
index 00000000..f46299b3
--- /dev/null
+++ b/web/html/js/copy.js
@@ -0,0 +1,6 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.querySelector('.copy').addEventListener('click', function(e) {
+		e.preventDefault();
+		navigator.clipboard.writeText(event.target.text);
+	});
+});

From 88569b6d0987dd58e11198964e7bf597ed75d311 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 15 Jul 2021 22:54:41 -0700
Subject: [PATCH 278/844] add /pkgbase/{name} route

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py                    | 17 +++++++++
 .../partials/packages/pkgbase_metadata.html   | 13 +++++++
 templates/pkgbase.html                        | 21 +++++++++++
 test/test_packages_routes.py                  | 37 +++++++++++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 templates/partials/packages/pkgbase_metadata.html
 create mode 100644 templates/pkgbase.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 9650df85..cb7f4a18 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -96,3 +96,20 @@ async def package(request: Request, name: str) -> Response:
     context["conflicts"] = conflicts
 
     return render_template(request, "packages/show.html", context)
+
+
+@router.get("/pkgbase/{name}")
+async def package_base(request: Request, name: str) -> Response:
+    # Get the PackageBase.
+    pkgbase = get_pkgbase(name)
+
+    # If this is not a split package, redirect to /packages/{name}.
+    if pkgbase.packages.count() == 1:
+        return RedirectResponse(f"/packages/{name}",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+
+    # Add our base information.
+    context = await make_single_context(request, pkgbase)
+    context["packages"] = pkgbase.packages.all()  # Doesn't need to be here.
+
+    return render_template(request, "pkgbase.html", context)
diff --git a/templates/partials/packages/pkgbase_metadata.html b/templates/partials/packages/pkgbase_metadata.html
new file mode 100644
index 00000000..ba27fda5
--- /dev/null
+++ b/templates/partials/packages/pkgbase_metadata.html
@@ -0,0 +1,13 @@
+<div id="pkgs" class="listing">
+    <h3>Packages ({{ packages_count }})</h3>
+    <ul>
+        {% for result in packages %}
+            <li>
+                <a href="/packages/{{ result.Name }}/"
+                   title="{{ 'View packages details for' | tr }} {{ result.Name }}">
+                    {{ result.Name }}
+                </a>
+            </li>
+        {% endfor %}
+    </ul>
+</div>
diff --git a/templates/pkgbase.html b/templates/pkgbase.html
new file mode 100644
index 00000000..315cdf67
--- /dev/null
+++ b/templates/pkgbase.html
@@ -0,0 +1,21 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    {% include "partials/packages/search.html" %}
+    <div id="pkgdetails" class="box">
+        <h2>{{ 'Package Base Details' | tr }}: {{ pkgbase.Name }}</h2>
+
+        {% set result = pkgbase %}
+        {% include "partials/packages/actions.html" %}
+        {% include "partials/packages/details.html" %}
+
+        <div id="metadata">
+            {% include "partials/packages/pkgbase_metadata.html" %}
+        </div>
+    </div>
+
+    {% set pkgname = result.Name %}
+    {% set pkgbase_id = result.ID %}
+    {% set comments = comments %}
+    {% include "partials/packages/comments.html" %}
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index f9592238..44ef7fcd 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -281,3 +281,40 @@ def test_package_dependencies(client: TestClient, maintainer: User,
 
     broken_node = root.find('.//ul[@id="pkgdepslist"]/li/span')
     assert broken_node.text.strip() == broken_dep.DepName
+
+
+def test_pkgbase_not_found(client: TestClient):
+    with client as request:
+        resp = request.get("/pkgbase/not_found")
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_redirect(client: TestClient, package: Package):
+    with client as request:
+        resp = request.get(f"/pkgbase/{package.Name}",
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/packages/{package.Name}"
+
+
+def test_pkgbase(client: TestClient, package: Package):
+    second = db.create(Package, Name="second-pkg",
+                       PackageBase=package.PackageBase)
+
+    expected = [package.Name, second.Name]
+    with client as request:
+        resp = request.get(f"/pkgbase/{package.Name}",
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+
+    # Check the details box title.
+    title = root.find('.//div[@id="pkgdetails"]/h2')
+    title, pkgname = title.text.split(": ")
+    assert title == "Package Base Details"
+    assert pkgname == package.Name
+
+    pkgs = root.findall('.//div[@id="pkgs"]/ul/li/a')
+    for i, name in enumerate(expected):
+        assert pkgs[i].text.strip() == name

From 04d1c81d3dc3af59749ca3555a9fd45f4a9fcb78 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 27 Jul 2021 22:03:38 -0700
Subject: [PATCH 279/844] bugfix: fix extra dependency annotations

These were being displayed regardless of the dep type
and state of DepDesc. This is fixed with this commit.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py                           |  2 ++
 templates/partials/packages/package_metadata.html |  6 ++++--
 test/test_packages_routes.py                      | 11 ++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 6681d479..698ae1af 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -46,6 +46,8 @@ def dep_extra(dep: PackageDependency) -> str:
 @register_filter("dep_extra_desc")
 def dep_extra_desc(dep: PackageDependency) -> str:
     extra = dep_extra(dep)
+    if not dep.DepDesc:
+        return extra
     return extra + f" – {dep.DepDesc}"
 
 
diff --git a/templates/partials/packages/package_metadata.html b/templates/partials/packages/package_metadata.html
index 767e25a9..7ec95699 100644
--- a/templates/partials/packages/package_metadata.html
+++ b/templates/partials/packages/package_metadata.html
@@ -16,9 +16,11 @@
                     </a>
                 {% endif %}
                 {{ dep.Package | provides_list(dep.DepName) | safe }}
-                {% set extra = dep | dep_extra %}
-                {% if extra %}
+                <!-- If this dependency type is an optdepends (id: 4). -->
+                {% if dep.DepTypeID == 4 %}
                     <em>{{ dep | dep_extra_desc }}</em>
+                {% else %}
+                    <em>{{ dep | dep_extra }}</em>
                 {% endif %}
             </li>
         {% endfor %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 44ef7fcd..82fbba40 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -247,7 +247,15 @@ def test_package_dependencies(client: TestClient, maintainer: User,
                                  dep_type_name="optdepends",
                                  autocommit=False)
 
-    broken_dep = create_package_dep(package, "test-dep-5",
+    # Heh. Another optdepends to test one with a description.
+    opt_desc_dep_pkg = create_package("test-dep-5", maintainer,
+                                      autocommit=False)
+    opt_desc_dep = create_package_dep(package, opt_desc_dep_pkg.Name,
+                                      dep_type_name="optdepends",
+                                      autocommit=False)
+    opt_desc_dep.DepDesc = "Test description."
+
+    broken_dep = create_package_dep(package, "test-dep-6",
                                     dep_type_name="depends",
                                     autocommit=False)
 
@@ -273,6 +281,7 @@ def test_package_dependencies(client: TestClient, maintainer: User,
         make_dep.DepName,
         check_dep.DepName,
         opt_dep.DepName,
+        opt_desc_dep.DepName,
         official_dep.DepName
     ]
     pkgdeps = root.findall('.//ul[@id="pkgdepslist"]/li/a')

From bace345da4c6ff4f89e6cda0f916d8789ea5dba8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 8 Aug 2021 18:32:35 -0700
Subject: [PATCH 280/844] Docker: support both '%' and 'localhost' in mariadb

This is needed to be able to reach the mysql service from
other hosts or through localhost. Handling both cases here
means that we can support both localhost access and host access.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/mariadb-entrypoint.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docker/mariadb-entrypoint.sh b/docker/mariadb-entrypoint.sh
index e38900c8..945a4b82 100755
--- a/docker/mariadb-entrypoint.sh
+++ b/docker/mariadb-entrypoint.sh
@@ -18,15 +18,19 @@ DATABASE="aurweb" # Persistent database for fastapi/php-fpm.
 TEST_DB="aurweb_test" # Test database (ephemereal).
 
 echo "Taking care of primary database '${DATABASE}'..."
-mysql -u root -e "CREATE USER IF NOT EXISTS 'aur'@'$DB_HOST' IDENTIFIED BY 'aur';"
+mysql -u root -e "CREATE USER IF NOT EXISTS 'aur'@'localhost' IDENTIFIED BY 'aur';"
+mysql -u root -e "CREATE USER IF NOT EXISTS 'aur'@'%' IDENTIFIED BY 'aur';"
 mysql -u root -e "CREATE DATABASE IF NOT EXISTS $DATABASE;"
-mysql -u root -e "GRANT ALL ON ${DATABASE}.* TO 'aur'@'$DB_HOST';"
+mysql -u root -e "GRANT ALL ON ${DATABASE}.* TO 'aur'@'localhost';"
+mysql -u root -e "GRANT ALL ON ${DATABASE}.* TO 'aur'@'%';"
 
 # Drop and create our test database.
 echo "Dropping test database '$TEST_DB'..."
 mysql -u root -e "DROP DATABASE IF EXISTS $TEST_DB;"
 mysql -u root -e "CREATE DATABASE $TEST_DB;"
-mysql -u root -e "GRANT ALL ON ${TEST_DB}.* TO 'aur'@'$DB_HOST';"
+mysql -u root -e "GRANT ALL ON ${TEST_DB}.* TO 'aur'@'localhost';"
+mysql -u root -e "GRANT ALL ON ${TEST_DB}.* TO 'aur'@'%';"
+
 echo "Created new '$TEST_DB'!"
 
 mysqladmin -uroot shutdown

From 4ade8b053992663242df361477ca26282cadfc20 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 6 Aug 2021 00:59:38 -0700
Subject: [PATCH 281/844] routers.packages: Simplify some existence checks

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py                            | 15 ++++++++
 aurweb/models/package_dependency.py       |  2 +-
 aurweb/packages/util.py                   | 18 ++++------
 aurweb/routers/packages.py                | 44 +++++++++++------------
 templates/partials/packages/comments.html |  2 +-
 templates/partials/packages/details.html  | 10 +++---
 6 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 316e7293..26e4073d 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -19,6 +19,17 @@ from aurweb.models.user import User
 from aurweb.templates import make_variable_context, render_template
 
 
+class StubQuery:
+    """ Acts as a stubbed version of an orm.Query. Typically used
+    to masquerade fake records for an AnonymousUser. """
+
+    def filter(self, *args):
+        return StubQuery()
+
+    def scalar(self):
+        return 0
+
+
 class AnonymousUser:
     # Stub attributes used to mimic a real user.
     ID = 0
@@ -28,6 +39,10 @@ class AnonymousUser:
     # A stub ssh_pub_key relationship.
     ssh_pub_key = None
 
+    # Add stubbed relationship backrefs.
+    package_notifications = StubQuery()
+    package_votes = StubQuery()
+
     # A nonce attribute, needed for all browser sessions; set in __init__.
     nonce = None
 
diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index 0e5b028b..9ce0b019 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -69,4 +69,4 @@ class PackageDependency(Base):
         pkg = db.query(Package, Package.Name == self.DepName)
         official = db.query(OfficialProvider,
                             OfficialProvider.Name == self.DepName)
-        return pkg.count() > 0 or official.count() > 0
+        return pkg.scalar() or official.scalar()
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 698ae1af..60db2962 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -54,10 +54,9 @@ def dep_extra_desc(dep: PackageDependency) -> str:
 @register_filter("pkgname_link")
 def pkgname_link(pkgname: str) -> str:
     base = "/".join([OFFICIAL_BASE, "packages"])
-    pkg = db.query(Package).filter(Package.Name == pkgname)
     official = db.query(OfficialProvider).filter(
         OfficialProvider.Name == pkgname)
-    if not pkg.count() or official.count():
+    if official.scalar():
         return f"{base}/?q={pkgname}"
     return f"/packages/{pkgname}"
 
@@ -67,7 +66,7 @@ def package_link(package: Package) -> str:
     base = "/".join([OFFICIAL_BASE, "packages"])
     official = db.query(OfficialProvider).filter(
         OfficialProvider.Name == package.Name)
-    if official.count():
+    if official.scalar():
         return f"{base}/?q={package.Name}"
     return f"/packages/{package.Name}"
 
@@ -82,19 +81,14 @@ def provides_list(package: Package, depname: str) -> list:
         )
     )
 
-    string = str()
-    has_providers = providers.count() > 0
-
-    if has_providers:
-        string += "<em>("
-
-    string += ", ".join([
+    string = ", ".join([
         f'<a href="{package_link(pkg)}">{pkg.Name}</a>'
         for pkg in providers
     ])
 
-    if has_providers:
-        string += ")</em>"
+    if string:
+        # If we actually constructed a string, wrap it.
+        string = f"<em>({string})</em>"
 
     return string
 
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index cb7f4a18..0ffcbfb9 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -19,9 +19,9 @@ from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
-from aurweb.models.relation_type import CONFLICTS_ID, RelationType
+from aurweb.models.relation_type import CONFLICTS_ID
 from aurweb.packages.util import get_pkgbase
-from aurweb.templates import make_variable_context, render_template
+from aurweb.templates import make_context, render_template
 
 router = APIRouter()
 
@@ -34,7 +34,7 @@ async def make_single_context(request: Request,
     :param pkgbase: PackageBase instance
     :return: A pkgbase context without specific differences
     """
-    context = await make_variable_context(request, pkgbase.Name)
+    context = make_context(request, pkgbase.Name)
     context["git_clone_uri_anon"] = aurweb.config.get("options",
                                                       "git_clone_uri_anon")
     context["git_clone_uri_priv"] = aurweb.config.get("options",
@@ -44,20 +44,15 @@ async def make_single_context(request: Request,
     context["keywords"] = pkgbase.keywords
     context["comments"] = pkgbase.comments
     context["is_maintainer"] = (request.user.is_authenticated()
-                                and request.user == pkgbase.Maintainer)
-    context["notified"] = db.query(
-        PackageNotification).join(PackageBase).filter(
-        and_(PackageBase.ID == pkgbase.ID,
-             PackageNotification.UserID == request.user.ID)).count() > 0
+                                and request.user.ID == pkgbase.MaintainerUID)
+    context["notified"] = request.user.package_notifications.filter(
+        PackageNotification.PackageBaseID == pkgbase.ID
+    ).scalar()
 
     context["out_of_date"] = bool(pkgbase.OutOfDateTS)
 
-    context["voted"] = pkgbase.package_votes.filter(
-        PackageVote.UsersID == request.user.ID).count() > 0
-
-    context["notifications_enabled"] = db.query(
-        PackageNotification).join(PackageBase).filter(
-        PackageBase.ID == pkgbase.ID).count() > 0
+    context["voted"] = request.user.package_votes.filter(
+        PackageVote.PackageBaseID == pkgbase.ID).scalar()
 
     return context
 
@@ -71,13 +66,12 @@ async def package(request: Request, name: str) -> Response:
     context = await make_single_context(request, pkgbase)
 
     # Package sources.
-    sources = db.query(PackageSource).join(Package).filter(
-        Package.PackageBaseID == pkgbase.ID)
-    context["sources"] = sources
+    context["sources"] = db.query(PackageSource).join(Package).join(
+        PackageBase).filter(PackageBase.ID == pkgbase.ID)
 
     # Package dependencies.
-    dependencies = db.query(PackageDependency).join(Package).filter(
-        Package.PackageBaseID == pkgbase.ID)
+    dependencies = db.query(PackageDependency).join(Package).join(
+        PackageBase).filter(PackageBase.ID == pkgbase.ID)
     context["dependencies"] = dependencies
 
     # Package requirements (other packages depend on this one).
@@ -86,13 +80,15 @@ async def package(request: Request, name: str) -> Response:
         Package.Name.asc())
     context["required_by"] = required_by
 
-    licenses = db.query(License).join(PackageLicense).join(Package).filter(
-        PackageLicense.PackageID == pkgbase.packages.first().ID)
+    licenses = db.query(License).join(PackageLicense).join(Package).join(
+        PackageBase).filter(PackageBase.ID == pkgbase.ID)
     context["licenses"] = licenses
 
-    conflicts = db.query(PackageRelation).join(RelationType).join(Package).join(PackageBase).filter(
-        and_(RelationType.ID == CONFLICTS_ID,
-             PackageBase.ID == pkgbase.ID))
+    conflicts = db.query(PackageRelation).join(Package).join(
+        PackageBase).filter(
+        and_(PackageRelation.RelTypeID == CONFLICTS_ID,
+             PackageBase.ID == pkgbase.ID)
+    )
     context["conflicts"] = conflicts
 
     return render_template(request, "packages/show.html", context)
diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
index f1bc020d..051849b0 100644
--- a/templates/partials/packages/comments.html
+++ b/templates/partials/packages/comments.html
@@ -49,7 +49,7 @@
 </div>
 {% endif %}
 
-{% if comments.count() %}
+{% if comments.scalar() %}
     <div class="comments package-comments">
         <div class="comments-header">
             <h3>
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index a25e9c9e..83c6d53b 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -1,3 +1,4 @@
+{% set pkg = pkgbase.packages.first() %}
 <table id="pkginfo">
     <tr>
         <th>{{ "Git Clone URL" | tr }}:</th>
@@ -19,12 +20,11 @@
         </tr>
         <tr>
             <th>{{ "Description" | tr }}:</th>
-            <td class="wrap">{{ pkgbase.packages.first().Description }}</td>
+            <td class="wrap">{{ pkg.Description }}</td>
         </tr>
         <tr>
             <th>{{ "Upstream URL" | tr }}:</th>
             <td class="wrap">
-                {% set pkg = pkgbase.packages.first() %}
                 {% if pkg.URL %}
                     <a href="{{ pkg.URL }}">{{ pkg.URL }}</a>
                 {% else %}
@@ -33,7 +33,7 @@
             </td>
         </tr>
     {% endif %}
-    {% if pkgbase.keywords.count() %}
+    {% if pkgbase.keywords.scalar() %}
         <tr>
             <th>{{ "Keywords" | tr }}:</th>
             {% if is_maintainer %}
@@ -63,13 +63,13 @@
             {% endif %}
         </tr>
     {% endif %}
-    {% if licenses and licenses.count() and show_package_details | default(False) %}
+    {% if licenses and licenses.scalar() and show_package_details %}
         <tr>
             <th>{{ "Licenses" | tr }}:</th>
             <td>{{ licenses | join(', ', attribute='Name') | default('None' | tr) }} </td>
         </tr>
     {% endif %}
-    {% if show_package_details | default(False) %}
+    {% if show_package_details %}
         <tr>
             <th>{{ "Conflicts" | tr }}:</th>
             <td class="wrap">

From ae0f69a5e463b5cdb502aa3777eb5da011112eba Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 16 Aug 2021 17:18:29 -0700
Subject: [PATCH 282/844] Docker: remove intervals and timeouts

These weren't needed at all and provided false negatives in
general. Removed them to let Docker deal with them.

Additionally. 'exit 0' -> 'echo' for ca's command; 'exit 0'
happens to depend on the shell running Docker (it seems).
echo is quite a bit more agnostic.

Moreso, added mariadb deps to php-fpm and fastapi.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ab8d7c41..3500b8e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     image: aurweb:latest
     init: true
     entrypoint: /docker/ca-entrypoint.sh
-    command: exit 0
+    command: echo
     volumes:
       - ./cache:/cache
 
@@ -45,8 +45,6 @@ services:
       - mariadb_data:/var/lib/mysql
     healthcheck:
       test: "bash /docker/health/mariadb.sh"
-      interval: 2s
-      timeout: 60s
 
   git:
     image: aurweb:latest
@@ -59,8 +57,6 @@ services:
       - "2222:2222"
     healthcheck:
       test: "bash /docker/health/sshd.sh"
-      interval: 2s
-      timeout: 30s
     depends_on:
       mariadb:
         condition: service_healthy
@@ -79,8 +75,6 @@ services:
     command: /docker/scripts/run-smartgit.sh
     healthcheck:
       test: "bash /docker/health/smartgit.sh"
-      interval: 2s
-      timeout: 30s
     depends_on:
       mariadb:
         condition: service_healthy
@@ -100,11 +94,11 @@ services:
     command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8443/cgit"
     healthcheck:
       test: "bash /docker/health/cgit.sh 3000"
-      interval: 2s
-      timeout: 30s
     depends_on:
       git:
         condition: service_healthy
+      php-fpm:
+        condition: service_healthy
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -117,11 +111,11 @@ services:
     command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8444/cgit"
     healthcheck:
       test: "bash /docker/health/cgit.sh 3000"
-      interval: 2s
-      timeout: 30s
     depends_on:
       git:
         condition: service_healthy
+      fastapi:
+        condition: service_healthy
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -135,8 +129,6 @@ services:
     command: /docker/scripts/run-php.sh
     healthcheck:
       test: "bash /docker/health/php.sh"
-      interval: 2s
-      timeout: 30s
     depends_on:
       ca:
         condition: service_started
@@ -166,8 +158,6 @@ services:
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:
       test: "bash /docker/health/fastapi.sh ${FASTAPI_BACKEND}"
-      interval: 2s
-      timeout: 30s
     depends_on:
       ca:
         condition: service_started
@@ -199,8 +189,6 @@ services:
       - "8444:8444" # FastAPI
     healthcheck:
       test: "bash /docker/health/nginx.sh"
-      interval: 2s
-      timeout: 30s
     depends_on:
       cgit-php:
         condition: service_healthy

From 35851d553348383903c17d98cd049ac1f07bfaab Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 8 Aug 2021 18:35:49 -0700
Subject: [PATCH 283/844] Docker: add service 'memcached'

Additionally, setup memcached for php-fpm.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.dev                 | 4 ++++
 docker-compose.yml              | 9 +++++++++
 docker/health/memcached.sh      | 2 ++
 docker/php-entrypoint.sh        | 6 ++++++
 docker/scripts/install-deps.sh  | 2 +-
 docker/scripts/run-memcached.sh | 2 ++
 6 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100755 docker/health/memcached.sh
 create mode 100755 docker/scripts/run-memcached.sh

diff --git a/conf/config.dev b/conf/config.dev
index fc3bde91..566b655e 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -28,6 +28,10 @@ enable-maintenance = 0
 localedir = YOUR_AUR_ROOT/web/locale
 ; In production, salt_rounds should be higher; suggested: 12.
 salt_rounds = 4
+cache = none
+; In docker, the memcached host is available. On a user's system,
+; this should be set to localhost (most likely).
+memcache_servers = memcached:11211
 
 [notifications]
 ; For development/testing, use /usr/bin/sendmail
diff --git a/docker-compose.yml b/docker-compose.yml
index 3500b8e9..56eff570 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,13 @@ services:
     volumes:
       - ./cache:/cache
 
+  memcached:
+    image: aurweb:latest
+    init: true
+    command: /docker/scripts/run-memcached.sh
+    healthcheck:
+      test: "bash /docker/health/memcached.sh"
+
   mariadb:
     image: aurweb:latest
     init: true
@@ -136,6 +143,8 @@ services:
         condition: service_healthy
       mariadb:
         condition: service_healthy
+      memcached:
+        condition: service_healthy
     volumes:
       - mariadb_run:/var/run/mysqld # Bind socket in this volume.
       - mariadb_data:/var/lib/mysql
diff --git a/docker/health/memcached.sh b/docker/health/memcached.sh
new file mode 100755
index 00000000..00f8cd98
--- /dev/null
+++ b/docker/health/memcached.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec pgrep memcached
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index b4f6c631..1f3ed82b 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -7,6 +7,9 @@ bash $dir/test-mysql-entrypoint.sh
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8443;" conf/config
 sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
 
+# Enable memcached.
+sed -ri 's/^(cache) = .+$/\1 = memcache/' conf/config
+
 sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8443/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
 
@@ -21,6 +24,9 @@ sed -ri 's|^;?(access\.log) = .*$|\1 = /proc/self/fd/2|g' \
 sed -ri 's/^;?(extension=pdo_mysql)/\1/' /etc/php/php.ini
 sed -ri 's/^;?(open_basedir).*$/\1 = \//' /etc/php/php.ini
 
+# Use the sqlite3 extension line for memcached.
+sed -ri 's/^;(extension)=sqlite3$/\1=memcached/' /etc/php/php.ini
+
 python -m aurweb.initdb 2>/dev/null || /bin/true
 
 exec "$@"
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index 8d4525de..6edbff5a 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -14,6 +14,6 @@ pacman -Syu --noconfirm --noprogressbar \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
     python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
-    python-asgiref uvicorn python-feedgen
+    python-asgiref uvicorn python-feedgen memcached php-memcached
 
 exec "$@"
diff --git a/docker/scripts/run-memcached.sh b/docker/scripts/run-memcached.sh
new file mode 100755
index 00000000..90784b0f
--- /dev/null
+++ b/docker/scripts/run-memcached.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/bin/memcached -u memcached -m 64 -c 1024 -l 0.0.0.0

From 96d1af936381a959090d5362ee2ee49b4c91eced Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 28 Jun 2021 08:30:12 -0700
Subject: [PATCH 284/844] docker-compose: add redis service

Now, the fastapi docker-compose service uses the new redis
service for a cache option.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL                        |  5 +++++
 docker-compose.yml             | 12 ++++++++++++
 docker/fastapi-entrypoint.sh   |  4 ++++
 docker/health/redis.sh         |  2 ++
 docker/redis-entrypoint.sh     |  6 ++++++
 docker/scripts/install-deps.sh |  3 ++-
 docker/scripts/run-redis.sh    |  2 ++
 7 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100755 docker/health/redis.sh
 create mode 100755 docker/redis-entrypoint.sh
 create mode 100755 docker/scripts/run-redis.sh

diff --git a/INSTALL b/INSTALL
index f192f9f5..c41a5c8e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -55,6 +55,11 @@ read the instructions below.
                 python-lxml python-feedgen
     # python3 setup.py install
 
+(FastAPI-Specific)
+
+    # pacman -S redis python-redis
+    # systemctl enable --now redis
+
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
 
     $ python -m aurweb.initdb
diff --git a/docker-compose.yml b/docker-compose.yml
index 56eff570..0e91d6eb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,6 +36,16 @@ services:
     healthcheck:
       test: "bash /docker/health/memcached.sh"
 
+  redis:
+    image: aurweb:latest
+    init: true
+    entrypoint: /docker/redis-entrypoint.sh
+    command: /docker/scripts/run-redis.sh
+    healthcheck:
+      test: "bash /docker/health/redis.sh"
+    ports:
+      - "16379:6379"
+
   mariadb:
     image: aurweb:latest
     init: true
@@ -172,6 +182,8 @@ services:
         condition: service_started
       git:
         condition: service_healthy
+      redis:
+        condition: service_healthy
       mariadb:
         condition: service_healthy
     volumes:
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index c46a33eb..41a88206 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -7,6 +7,10 @@ bash $dir/test-mysql-entrypoint.sh
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8444;" conf/config
 sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
 
+# Setup Redis for FastAPI.
+sed -ri 's/^(cache) = .+/\1 = redis/' conf/config
+sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config
+
 sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8444/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
 
diff --git a/docker/health/redis.sh b/docker/health/redis.sh
new file mode 100755
index 00000000..b5b442e8
--- /dev/null
+++ b/docker/health/redis.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec pgrep redis-server
diff --git a/docker/redis-entrypoint.sh b/docker/redis-entrypoint.sh
new file mode 100755
index 00000000..e92be6c5
--- /dev/null
+++ b/docker/redis-entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eou pipefail
+
+sed -ri 's/^bind .*$/bind 0.0.0.0 -::1/g' /etc/redis/redis.conf
+
+exec "$@"
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index 6edbff5a..6b0ec48b 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -14,6 +14,7 @@ pacman -Syu --noconfirm --noprogressbar \
     python-pytest-asyncio python-coverage hypercorn python-bcrypt \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
     python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
-    python-asgiref uvicorn python-feedgen memcached php-memcached
+    python-asgiref uvicorn python-feedgen memcached php-memcached \
+    python-redis redis
 
 exec "$@"
diff --git a/docker/scripts/run-redis.sh b/docker/scripts/run-redis.sh
new file mode 100755
index 00000000..8dc98b10
--- /dev/null
+++ b/docker/scripts/run-redis.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/bin/redis-server /etc/redis/redis.conf

From 91e769f6033867daaa951334ff51380275de5c84 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 28 Jun 2021 08:49:02 -0700
Subject: [PATCH 285/844] FastAPI: add redis integration

This includes the addition of the python-fakeredis package,
used for stubbing python-redis when a user does not have a
configured cache.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL                        |  2 +-
 aurweb/redis.py                | 57 ++++++++++++++++++++++++++++++++++
 conf/config.defaults           |  4 ++-
 conf/config.dev                |  3 ++
 docker/scripts/install-deps.sh |  2 +-
 test/test_asgi.py              | 18 +++++++++++
 test/test_redis.py             | 40 ++++++++++++++++++++++++
 7 files changed, 123 insertions(+), 3 deletions(-)
 create mode 100644 aurweb/redis.py
 create mode 100644 test/test_redis.py

diff --git a/INSTALL b/INSTALL
index c41a5c8e..fdeb64ca 100644
--- a/INSTALL
+++ b/INSTALL
@@ -57,7 +57,7 @@ read the instructions below.
 
 (FastAPI-Specific)
 
-    # pacman -S redis python-redis
+    # pacman -S redis python-redis python-fakeredis
     # systemctl enable --now redis
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
diff --git a/aurweb/redis.py b/aurweb/redis.py
new file mode 100644
index 00000000..6b8dede4
--- /dev/null
+++ b/aurweb/redis.py
@@ -0,0 +1,57 @@
+import logging
+
+import fakeredis
+
+from redis import ConnectionPool, Redis
+
+import aurweb.config
+
+logger = logging.getLogger(__name__)
+pool = None
+
+
+class FakeConnectionPool:
+    """ A fake ConnectionPool class which holds an internal reference
+    to a fakeredis handle.
+
+    We normally deal with Redis by keeping its ConnectionPool globally
+    referenced so we can persist connection state through different calls
+    to redis_connection(), and since FakeRedis does not offer a ConnectionPool,
+    we craft one up here to hang onto the same handle instance as long as the
+    same instance is alive; this allows us to use a similar flow from the
+    redis_connection() user's perspective.
+    """
+
+    def __init__(self):
+        self.handle = fakeredis.FakeStrictRedis()
+
+    def disconnect(self):
+        pass
+
+
+def redis_connection():  # pragma: no cover
+    global pool
+
+    disabled = aurweb.config.get("options", "cache") != "redis"
+
+    # If we haven't initialized redis yet, construct a pool.
+    if disabled:
+        logger.debug("Initializing fake Redis instance.")
+        if pool is None:
+            pool = FakeConnectionPool()
+        return pool.handle
+    else:
+        logger.debug("Initializing real Redis instance.")
+        if pool is None:
+            redis_addr = aurweb.config.get("options", "redis_address")
+            pool = ConnectionPool.from_url(redis_addr)
+
+    # Create a connection to the pool.
+    return Redis(connection_pool=pool)
+
+
+def kill_redis():
+    global pool
+    if pool:
+        pool.disconnect()
+        pool = None
diff --git a/conf/config.defaults b/conf/config.defaults
index ebc21e51..1b4c3a74 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -36,11 +36,13 @@ enable-maintenance = 1
 maintenance-exceptions = 127.0.0.1
 render-comment-cmd = /usr/local/bin/aurweb-rendercomment
 localedir = /srv/http/aurweb/aur.git/web/locale/
-# memcache or apc
+; memcache, apc, or redis
+; memcache/apc are supported in PHP, redis is supported in Python.
 cache = none
 cache_pkginfo_ttl = 86400
 memcache_servers = 127.0.0.1:11211
 salt_rounds = 12
+redis_address = redis://localhost
 
 [ratelimit]
 request_limit = 4000
diff --git a/conf/config.dev b/conf/config.dev
index 566b655e..94a9630b 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -28,10 +28,13 @@ enable-maintenance = 0
 localedir = YOUR_AUR_ROOT/web/locale
 ; In production, salt_rounds should be higher; suggested: 12.
 salt_rounds = 4
+; See config.defaults comment about cache.
 cache = none
 ; In docker, the memcached host is available. On a user's system,
 ; this should be set to localhost (most likely).
 memcache_servers = memcached:11211
+; If cache = 'redis' this address is used to connect to Redis.
+redis_address = redis://127.0.0.1
 
 [notifications]
 ; For development/testing, use /usr/bin/sendmail
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index 6b0ec48b..0405f29b 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -15,6 +15,6 @@ pacman -Syu --noconfirm --noprogressbar \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
     python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
     python-asgiref uvicorn python-feedgen memcached php-memcached \
-    python-redis redis
+    python-redis redis python-fakeredis
 
 exec "$@"
diff --git a/test/test_asgi.py b/test/test_asgi.py
index 79b34daf..b8856741 100644
--- a/test/test_asgi.py
+++ b/test/test_asgi.py
@@ -9,6 +9,24 @@ from fastapi import HTTPException
 
 import aurweb.asgi
 import aurweb.config
+import aurweb.redis
+
+
+@pytest.mark.asyncio
+async def test_asgi_startup_session_secret_exception(monkeypatch):
+    """ Test that we get an IOError on app_startup when we cannot
+    connect to options.redis_address. """
+
+    redis_addr = aurweb.config.get("options", "redis_address")
+
+    def mock_get(section: str, key: str):
+        if section == "fastapi" and key == "session_secret":
+            return None
+        return redis_addr
+
+    with mock.patch("aurweb.config.get", side_effect=mock_get):
+        with pytest.raises(Exception):
+            await aurweb.asgi.app_startup()
 
 
 @pytest.mark.asyncio
diff --git a/test/test_redis.py b/test/test_redis.py
new file mode 100644
index 00000000..82aebb57
--- /dev/null
+++ b/test/test_redis.py
@@ -0,0 +1,40 @@
+from unittest import mock
+
+import pytest
+
+import aurweb.config
+
+from aurweb.redis import redis_connection
+
+
+@pytest.fixture
+def rediss():
+    """ Create a RedisStub. """
+    def mock_get(section, key):
+        return "none"
+
+    with mock.patch("aurweb.config.get", side_effect=mock_get):
+        aurweb.config.rehash()
+        redis = redis_connection()
+    aurweb.config.rehash()
+
+    yield redis
+
+
+def test_redis_stub(rediss):
+    # We don't yet have a test key set.
+    assert rediss.get("test") is None
+
+    # Set the test key to abc.
+    rediss.set("test", "abc")
+    assert rediss.get("test").decode() == "abc"
+
+    # Test expire.
+    rediss.expire("test", 0)
+    assert rediss.get("test") is None
+
+    # Now, set the test key again and use delete() on it.
+    rediss.set("test", "abc")
+    assert rediss.get("test").decode() == "abc"
+    rediss.delete("test")
+    assert rediss.get("test") is None

From 968ed736c16f92de6ebca1a77fe1e7b2d78ec4e5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 8 Aug 2021 20:42:00 -0700
Subject: [PATCH 286/844] add python-orjson dependency

python-orjson speeds up a lot of JSON serialization steps,
so we choose to use it over the standard library json module.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL                        | 2 +-
 docker/scripts/install-deps.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index fdeb64ca..4df59bd2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -57,7 +57,7 @@ read the instructions below.
 
 (FastAPI-Specific)
 
-    # pacman -S redis python-redis python-fakeredis
+    # pacman -S redis python-redis python-fakeredis python-orjson
     # systemctl enable --now redis
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index 0405f29b..a532a6b2 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -15,6 +15,6 @@ pacman -Syu --noconfirm --noprogressbar \
     python-email-validator openssh python-lxml mariadb mariadb-libs \
     python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
     python-asgiref uvicorn python-feedgen memcached php-memcached \
-    python-redis redis python-fakeredis
+    python-redis redis python-fakeredis python-orjson
 
 exec "$@"

From 9e73936c4e52a862f392947005d6ed29668969de Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 6 Aug 2021 22:44:19 -0700
Subject: [PATCH 287/844] add aurweb.cache, a redis caching utility module

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/cache.py    | 20 +++++++++++++
 test/test_cache.py | 74 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 aurweb/cache.py
 create mode 100644 test/test_cache.py

diff --git a/aurweb/cache.py b/aurweb/cache.py
new file mode 100644
index 00000000..697473b8
--- /dev/null
+++ b/aurweb/cache.py
@@ -0,0 +1,20 @@
+from redis import Redis
+from sqlalchemy import orm
+
+
+async def db_count_cache(redis: Redis, key: str, query: orm.Query,
+                         expire: int = None) -> int:
+    """ Store and retrieve a query.count() via redis cache.
+
+    :param redis: Redis handle
+    :param key: Redis key
+    :param query: SQLAlchemy ORM query
+    :param expire: Optional expiration in seconds
+    :return: query.count()
+    """
+    result = redis.get(key)
+    if result is None:
+        redis.set(key, (result := int(query.count())))
+        if expire:
+            redis.expire(key, expire)
+    return int(result)
diff --git a/test/test_cache.py b/test/test_cache.py
new file mode 100644
index 00000000..35346e52
--- /dev/null
+++ b/test/test_cache.py
@@ -0,0 +1,74 @@
+import pytest
+
+from aurweb import cache, db
+from aurweb.models.account_type import USER_ID
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db(
+        User.__tablename__
+    )
+
+
+class StubRedis:
+    """ A class which acts as a RedisConnection without using Redis. """
+
+    cache = dict()
+    expires = dict()
+
+    def get(self, key, *args):
+        if "key" not in self.cache:
+            self.cache[key] = None
+        return self.cache[key]
+
+    def set(self, key, *args):
+        self.cache[key] = list(args)[0]
+
+    def expire(self, key, *args):
+        self.expires[key] = list(args)[0]
+
+    async def execute(self, command, key, *args):
+        f = getattr(self, command)
+        return f(key, *args)
+
+
+@pytest.fixture
+def redis():
+    yield StubRedis()
+
+
+@pytest.mark.asyncio
+async def test_db_count_cache(redis):
+    db.create(User, Username="user1",
+              Email="user1@example.org",
+              Passwd="testPassword",
+              AccountTypeID=USER_ID)
+
+    query = db.query(User)
+
+    # Now, perform several checks that db_count_cache matches query.count().
+
+    # We have no cached value yet.
+    assert await cache.db_count_cache(redis, "key1", query) == query.count()
+
+    # It's cached now.
+    assert await cache.db_count_cache(redis, "key1", query) == query.count()
+
+
+@pytest.mark.asyncio
+async def test_db_count_cache_expires(redis):
+    db.create(User, Username="user1",
+              Email="user1@example.org",
+              Passwd="testPassword",
+              AccountTypeID=USER_ID)
+
+    query = db.query(User)
+
+    # Cache a query with an expire.
+    value = await cache.db_count_cache(redis, "key1", query, 100)
+    assert value == query.count()
+
+    assert redis.expires["key1"] == 100

From d9cdd5faeff608f4191872cc808be5c3ce0ce4b4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 28 Jul 2021 13:28:17 -0700
Subject: [PATCH 288/844] [FastAPI] Modularize homepage and add side panel

This puts one more toward completion of the homepage
overall; we'll need to still implement the authenticated
user dashboard after this.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py                       |  55 ++++++++-
 aurweb/routers/html.py                        |  74 ++++++++++-
 templates/home.html                           | 101 +++++++++++++++
 templates/index.html                          | 107 ++--------------
 .../partials/packages/widgets/search.html     |  14 +++
 .../partials/packages/widgets/statistics.html |  55 +++++++++
 .../partials/packages/widgets/updates.html    |  35 ++++++
 templates/partials/widgets/statistics.html    |  27 ++++
 test/test_homepage.py                         | 115 ++++++++++++++++++
 test/test_packages_util.py                    |  19 ++-
 10 files changed, 500 insertions(+), 102 deletions(-)
 create mode 100644 templates/home.html
 create mode 100644 templates/partials/packages/widgets/search.html
 create mode 100644 templates/partials/packages/widgets/statistics.html
 create mode 100644 templates/partials/packages/widgets/updates.html
 create mode 100644 templates/partials/widgets/statistics.html

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 60db2962..036e3441 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -1,7 +1,10 @@
 from http import HTTPStatus
+from typing import List
+
+import orjson
 
 from fastapi import HTTPException
-from sqlalchemy import and_
+from sqlalchemy import and_, orm
 
 from aurweb import db
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
@@ -10,6 +13,7 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_relation import PackageRelation
 from aurweb.models.relation_type import PROVIDES_ID, RelationType
+from aurweb.redis import redis_connection
 from aurweb.templates import register_filter
 
 
@@ -111,3 +115,52 @@ def get_pkgbase(name: str) -> PackageBase:
         raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
 
     return pkgbase
+
+
+@register_filter("out_of_date")
+def out_of_date(packages: orm.Query) -> orm.Query:
+    return packages.filter(PackageBase.OutOfDateTS.isnot(None))
+
+
+def updated_packages(limit: int = 0, cache_ttl: int = 600) -> List[Package]:
+    """ Return a list of valid Package objects ordered by their
+    ModifiedTS column in descending order from cache, after setting
+    the cache when no key yet exists.
+
+    :param limit: Optional record limit
+    :param cache_ttl: Cache expiration time (in seconds)
+    :return: A list of Packages
+    """
+    redis = redis_connection()
+    packages = redis.get("package_updates")
+    if packages:
+        # If we already have a cache, deserialize it and return.
+        return orjson.loads(packages)
+
+    query = db.query(Package).join(PackageBase).filter(
+        PackageBase.PackagerUID.isnot(None)
+    ).order_by(
+        PackageBase.ModifiedTS.desc()
+    )
+
+    if limit:
+        query = query.limit(limit)
+
+    packages = []
+    for pkg in query:
+        # For each Package returned by the query, append a dict
+        # containing Package columns we're interested in.
+        packages.append({
+            "Name": pkg.Name,
+            "Version": pkg.Version,
+            "PackageBase": {
+                "ModifiedTS": pkg.PackageBase.ModifiedTS
+            }
+        })
+
+    # Store the JSON serialization of the package_updates key into Redis.
+    redis.set("package_updates", orjson.dumps(packages))
+    redis.expire("package_updates", cache_ttl)
+
+    # Return the deserialized list of packages.
+    return packages
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index f6f1a54e..ae012901 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -1,14 +1,21 @@
 """ AURWeb's primary routing module. Define all routes via @app.app.{get,post}
 decorators in some way; more complex routes should be defined in their
 own modules and imported here. """
+from datetime import datetime
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
+from sqlalchemy import and_, or_
 
 import aurweb.config
 
-from aurweb import util
+from aurweb import db, util
+from aurweb.cache import db_count_cache
+from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
+from aurweb.models.package_base import PackageBase
+from aurweb.models.user import User
+from aurweb.packages.util import updated_packages
 from aurweb.templates import make_context, render_template
 
 router = APIRouter()
@@ -60,6 +67,71 @@ async def index(request: Request):
     context = make_context(request, "Home")
     context['ssh_fingerprints'] = util.get_ssh_fingerprints()
 
+    bases = db.query(PackageBase)
+
+    redis = aurweb.redis.redis_connection()
+    stats_expire = 300  # Five minutes.
+    updates_expire = 600  # Ten minutes.
+
+    # Package statistics.
+    query = bases.filter(PackageBase.PackagerUID.isnot(None))
+    context["package_count"] = await db_count_cache(
+        redis, "package_count", query, expire=stats_expire)
+
+    query = bases.filter(
+        and_(PackageBase.MaintainerUID.is_(None),
+             PackageBase.PackagerUID.isnot(None))
+    )
+    context["orphan_count"] = await db_count_cache(
+        redis, "orphan_count", query, expire=stats_expire)
+
+    query = db.query(User)
+    context["user_count"] = await db_count_cache(
+        redis, "user_count", query, expire=stats_expire)
+
+    query = query.filter(
+        or_(User.AccountTypeID == TRUSTED_USER_ID,
+            User.AccountTypeID == TRUSTED_USER_AND_DEV_ID))
+    context["trusted_user_count"] = await db_count_cache(
+        redis, "trusted_user_count", query, expire=stats_expire)
+
+    # Current timestamp.
+    now = int(datetime.utcnow().timestamp())
+
+    seven_days = 86400 * 7  # Seven days worth of seconds.
+    seven_days_ago = now - seven_days
+
+    one_hour = 3600
+    updated = bases.filter(
+        and_(PackageBase.ModifiedTS - PackageBase.SubmittedTS >= one_hour,
+             PackageBase.PackagerUID.isnot(None))
+    )
+
+    query = bases.filter(
+        and_(PackageBase.SubmittedTS >= seven_days_ago,
+             PackageBase.PackagerUID.isnot(None))
+    )
+    context["seven_days_old_added"] = await db_count_cache(
+        redis, "seven_days_old_added", query, expire=stats_expire)
+
+    query = updated.filter(PackageBase.ModifiedTS >= seven_days_ago)
+    context["seven_days_old_updated"] = await db_count_cache(
+        redis, "seven_days_old_updated", query, expire=stats_expire)
+
+    year = seven_days * 52  # Fifty two weeks worth: one year.
+    year_ago = now - year
+    query = updated.filter(PackageBase.ModifiedTS >= year_ago)
+    context["year_old_updated"] = await db_count_cache(
+        redis, "year_old_updated", query, expire=stats_expire)
+
+    query = bases.filter(
+        PackageBase.ModifiedTS - PackageBase.SubmittedTS < 3600)
+    context["never_updated"] = await db_count_cache(
+        redis, "never_updated", query, expire=stats_expire)
+
+    # Get the 15 most recently updated packages.
+    context["package_updates"] = updated_packages(15, updates_expire)
+
     return render_template(request, "index.html", context)
 
 
diff --git a/templates/home.html b/templates/home.html
new file mode 100644
index 00000000..a8cae5b8
--- /dev/null
+++ b/templates/home.html
@@ -0,0 +1,101 @@
+<div id="intro" class="box">
+    <h2>AUR  {% trans %}Home{% endtrans %}</h2>
+    <p>
+        {{ "Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information."
+            | tr
+            | format('<a href="https://wiki.archlinux.org/title/AUR_User_Guidelines">', "</a>",
+                     '<a href="https://wiki.archlinux.org/title/AUR_Trusted_User_Guidelines">', "</a>")
+            | safe 
+        }}
+        {{ "Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!"
+            | tr
+	    | format("<strong>", "</strong>",
+		     '<a href="https://wiki.archlinux.org/title/Arch_Packaging_Standards">',
+		     "</a>")
+            | safe
+        }}
+        {% trans %}Remember to vote for your favourite packages!{% endtrans %}
+        {% trans %}Some packages may be provided as binaries in [community].{% endtrans %}
+    </p>
+    <p class="important">
+        {% trans %}DISCLAIMER{% endtrans %}:
+        {% trans %}AUR packages are user produced content. Any use of the provided files is at your own risk.{% endtrans %}
+    </p>
+    <p class="readmore"><a href="https://wiki.archlinux.org/title/AUR">{% trans %}Learn more...{% endtrans %}</a></p>
+</div>
+<div id="news">
+    <h3><a>{% trans %}Support{% endtrans %}</a><span class="arrow"></span></h3>
+    <h4>{% trans %}Package Requests{% endtrans %}</h4>
+    <div class="article-content">
+        <p>
+        {{ "There are three types of requests that can be filed in the %sPackage Actions%s box on the package details page:"
+           | tr
+           | format("<var>", "</var>")
+           | safe
+        }}
+        </p>
+        <ul>
+            <li><em>{% trans %}Orphan Request{% endtrans %}</em>: {% trans %}Request a package to be disowned, e.g. when the maintainer is inactive and the package has been flagged out-of-date for a long time.{% endtrans %}</li>
+            <li><em>{% trans %}Deletion Request{% endtrans %}</em>: {%trans %}Request a package to be removed from the Arch User Repository. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.{% endtrans %}</li>
+            <li><em>{% trans %}Merge Request{% endtrans %}</em>: {% trans %}Request a package to be merged into another one. Can be used when a package needs to be renamed or replaced by a split package.{% endtrans %}</li>
+	</ul>
+        <p>
+	{{ "If you want to discuss a request, you can use the %saur-requests%s mailing list. However, please do not use that list to file requests."
+           | tr
+           | format('<a href="https://mailman.archlinux.org/mailman/listinfo/aur-requests">', "</a>")
+           | safe
+        }}
+        </p>
+    </div>
+    <h4>{% trans %}Submitting Packages{% endtrans %}</h4>
+    <div class="article-content">
+    <p>
+        {{ "Git over SSH is now used to submit packages to the AUR. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details."
+           | tr
+           | format('<a href="https://wiki.archlinux.org/title/Arch_User_Repository#Submitting_packages">', "</a>")
+           | safe
+        }}
+    </p>
+    {% if ssh_fingerprints %}
+        <p>
+            {% trans %}The following SSH fingerprints are used for the AUR:{% endtrans %}
+        <p>
+        <ul>
+        {% for keytype in ssh_fingerprints %} 
+            <li><code>{{ keytype }}</code>: <code>{{ ssh_fingerprints[keytype] }}</code>
+        {% endfor %}
+    </ul>
+    {% endif %}
+    </div>
+    <h4>{% trans %}Discussion{% endtrans %}</h4>
+    <div class="article-content">
+        <p>
+        {{ "General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list."
+           | tr
+           | format('<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', "</a>",
+                    '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', "</a>")
+           | safe
+        }}
+        <p>
+    </div>
+    <h4>{% trans %}Bug Reporting{% endtrans %}</h4>
+    <div class="article-content">
+        <p>
+        {{ "If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page."
+           | tr
+           | format('<a href="https://bugs.archlinux.org/index.php?project=2">', "</a>",
+                    "<strong>", "</strong>")
+           | safe 
+        }}
+        </p>
+    </div>
+</div>
+
+<!-- Bootstrap typeahead for the homepage. -->
+<script type="text/javascript" src="/static/js/typeahead-home.js"></script>
+
+<!-- Stub inline javascript with a nonce. Used for testing purposes. -->
+<script type="text/javascript" nonce={{ request.user.nonce }}>
+function NONEXISTENT() {}
+NONEXISTENT();
+</script>
diff --git a/templates/index.html b/templates/index.html
index f8745f33..e50a99cd 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,106 +1,15 @@
 {% extends 'partials/layout.html' %}
 
 {% block pageContent %}
-<div id="intro" class="box">
-    <h2>AUR  {% trans %}Home{% endtrans %}</h2>
-    <p>
-        {{ "Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information."
-            | tr
-            | format('<a href="https://wiki.archlinux.org/title/AUR_User_Guidelines">', "</a>",
-                     '<a href="https://wiki.archlinux.org/title/AUR_Trusted_User_Guidelines">', "</a>")
-            | safe 
-        }}
-        {{ "Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!"
-            | tr
-	    | format("<strong>", "</strong>",
-		     '<a href="https://wiki.archlinux.org/title/Arch_Packaging_Standards">',
-		     "</a>")
-            | safe
-        }}
-        {% trans %}Remember to vote for your favourite packages!{% endtrans %}
-        {% trans %}Some packages may be provided as binaries in [community].{% endtrans %}
-        <p class="important">
-            {% trans %}DISCLAIMER{% endtrans %}:
-            {% trans %}AUR packages are user produced content. Any use of the provided files is at your own risk.{% endtrans %}
-        </p>
-        <p class="readmore"><a href="https://wiki.archlinux.org/title/AUR">{% trans %}Learn more...{% endtrans %}</a></p>
-    </p>
-</div>
-<div id="news">
-    <h3><a>{% trans %}Support{% endtrans %}</a><span class="arrow"></span></h3>
-    <h4>{% trans %}Package Requests{% endtrans %}</h4>
-    <div class="article-content">
-        <p>
-        {{ "There are three types of requests that can be filed in the %sPackage Actions%s box on the package details page:"
-           | tr
-           | format("<var>", "</var>")
-           | safe
-        }}
-        </p>
-        <ul>
-            <li><em>{% trans %}Orphan Request{% endtrans %}</em>: {% trans %}Request a package to be disowned, e.g. when the maintainer is inactive and the package has been flagged out-of-date for a long time.{% endtrans %}</li>
-            <li><em>{% trans %}Deletion Request{% endtrans %}</em>: {%trans %}Request a package to be removed from the Arch User Repository. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.{% endtrans %}</li>
-            <li><em>{% trans %}Merge Request{% endtrans %}</em>: {% trans %}Request a package to be merged into another one. Can be used when a package needs to be renamed or replaced by a split package.{% endtrans %}</li>
-	</ul>
-        <p>
-	{{ "If you want to discuss a request, you can use the %saur-requests%s mailing list. However, please do not use that list to file requests."
-           | tr
-           | format('<a href="https://mailman.archlinux.org/mailman/listinfo/aur-requests">', "</a>")
-           | safe
-        }}
-        </p>
+    <div id="content-left-wrapper">
+        <div id="content-left">
+            {% include 'home.html' %}
+        </div>
     </div>
-    <h4>{% trans %}Submitting Packages{% endtrans %}</h4>
-    <div class="article-content">
-    <p>
-        {{ "Git over SSH is now used to submit packages to the AUR. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details."
-           | tr
-           | format('<a href="https://wiki.archlinux.org/title/Arch_User_Repository#Submitting_packages">', "</a>")
-           | safe
-        }}
-    </p>
-    {% if ssh_fingerprints %}
-        <p>
-            {% trans %}The following SSH fingerprints are used for the AUR:{% endtrans %}
-        <p>
-        <ul>
-        {% for keytype in ssh_fingerprints %} 
-            <li><code>{{ keytype }}</code>: <code>{{ ssh_fingerprints[keytype] }}</code>
-        {% endfor %}
-    </ul>
-    {% endif %}
+    <div id="content-right">
+        {% include 'partials/packages/widgets/search.html' %}
+        {% include 'partials/packages/widgets/updates.html' %}
+        {% include 'partials/packages/widgets/statistics.html' %}
     </div>
-    <h4>{% trans %}Discussion{% endtrans %}</h4>
-    <div class="article-content">
-        <p>
-        {{ "General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list."
-           | tr
-           | format('<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', "</a>",
-                    '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', "</a>")
-           | safe
-        }}
-        <p>
-    </div>
-    <h4>{% trans %}Bug Reporting{% endtrans %}</h4>
-    <div class="article-content">
-        <p>
-        {{ "If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page."
-           | tr
-           | format('<a href="https://bugs.archlinux.org/index.php?project=2">', "</a>",
-                    "<strong>", "</strong>")
-           | safe 
-        }}
-        </p>
-    </div>
-</div>
-
-<!-- Bootstrap typeahead for the homepage. -->
-<script type="text/javascript" src="/static/js/typeahead-home.js"></script>
-
-<!-- Stub inline javascript with a nonce. Used for testing purposes. -->
-<script type="text/javascript" nonce={{ request.user.nonce }}>
-function NONEXISTENT() {}
-NONEXISTENT();
-</script>
 
 {% endblock %}
diff --git a/templates/partials/packages/widgets/search.html b/templates/partials/packages/widgets/search.html
new file mode 100644
index 00000000..106b93ea
--- /dev/null
+++ b/templates/partials/packages/widgets/search.html
@@ -0,0 +1,14 @@
+<div id="pkgsearch" class="widget">
+    <form id="pkgsearch-form" method="get" action="/packages/">
+        <fieldset>
+            <label for="pkgsearch-field">{{ "Package Search" | tr }}:</label>
+            <input type="hidden" name="O" value="0" />
+            <input id="pkgsearch-field"
+                   type="text"
+                   name="K"
+                   size="30"
+                   maxlength="35"
+                   autocomplete="off" />
+        </fieldset>
+    </form>
+</div>
diff --git a/templates/partials/packages/widgets/statistics.html b/templates/partials/packages/widgets/statistics.html
new file mode 100644
index 00000000..f841ae0e
--- /dev/null
+++ b/templates/partials/packages/widgets/statistics.html
@@ -0,0 +1,55 @@
+<div id="pkg-stats" class="widget box">
+    <h3>{{ "Statistics" | tr }}</h3>
+
+    <table>
+        <tr>
+            <td class="stat-desc">{{ "Packages" | tr }}</td>
+            <td>{{ package_count }}</td>
+        </tr>
+        <tr>
+            <td class="stat-desc">{{ "Orphan Packages" | tr }}</td>
+            <td>{{ orphan_count }}</td>
+        </tr>
+        <tr>
+            <td class="stat-desc">
+                {{ "Packages added in the past 7 days" | tr }}
+            </td>
+            <td>{{ seven_days_old_added }}</td>
+        </tr>
+        <tr>
+            <td class="stat-desc">
+                {{ "Packages updated in the past 7 days" | tr }}
+            </td>
+            <td>{{ seven_days_old_updated }}</td>
+        </tr>
+        <tr>
+            <td class="stat-desc">
+                {{ "Packages updated in the past year" | tr }}
+            </td>
+            <td>{{ year_old_updated }}</td>
+        </tr>
+        <tr>
+            <td class="stat-desc">
+                {{ "Packages never updated" | tr }}
+            </td>
+            <td>{{ never_updated }}</td>
+        </tr>
+        <tr>
+            <td class="stat-desc">
+                {{ "Registered Users" | tr }}
+            </td>
+            <td>{{ user_count }}</td>
+        </tr>
+        <tr>
+            <td class="stat-desc">
+                {{ "Trusted Users" | tr }}
+            </td>
+            <td>{{ trusted_user_count }}</td>
+        </tr>
+    </table>
+</div>
+
+{% if request.user.is_authenticated() %}
+    <!-- Include "My Statistics" -->
+    {% include 'partials/widgets/statistics.html' %}
+{% endif %}
diff --git a/templates/partials/packages/widgets/updates.html b/templates/partials/packages/widgets/updates.html
new file mode 100644
index 00000000..3ee1b98e
--- /dev/null
+++ b/templates/partials/packages/widgets/updates.html
@@ -0,0 +1,35 @@
+<div id="pkg-updates" class="widget box">
+    <h3>
+        {{ "Recent Updates" | tr }}
+        <span class="more">
+            (<a href="/packages/?SB=l&SO=d">{{ "more" | tr }}</a>)
+        </span>
+    </h3>
+    <a class="rss-icon latest" href="/rss/"
+       title="AUR Latest Packages RSS Feed">
+        <img src="/static/images/rss.svg" alt="RSS Feed" />
+    </a>
+    <a class="rss-icon" href="/rss/modified"
+       title="AUR Modified Packages RSS Feed">
+        <img src="/static/images/rss.svg" alt="RSS Feed" />
+    </a>
+
+    <table>
+        <tbody>
+            {% for pkg in package_updates %}
+                <tr>
+                    <td class="pkg-name">
+                        <a href="/packages/{{ pkg.Name }}">
+                            {{ pkg.Name }} {{ pkg.Version }}
+                        </a>
+                    </td>
+                    <td class="pkg-date">
+                        {% set modified = pkg.PackageBase.ModifiedTS | dt | as_timezone(timezone) %}
+                        {{ modified.strftime("%Y-%m-%d %H:%M") }}
+                    </td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+</div>
diff --git a/templates/partials/widgets/statistics.html b/templates/partials/widgets/statistics.html
new file mode 100644
index 00000000..0bf844b6
--- /dev/null
+++ b/templates/partials/widgets/statistics.html
@@ -0,0 +1,27 @@
+<div id="my-stats" class="widget box">
+    <h3>{{ "My Statistics" | tr }}</h3>
+
+    {% set bases = request.user.maintained_bases %}
+    <table>
+        <tbody>
+            <tr>
+                <td>
+                    <a href="/packages/?SeB=m&K={{ request.user.Username }}">
+                        {{ "Packages" | tr }}
+                    </a>
+                </td>
+                <td>{{ bases.count() }}</td>
+            </tr>
+            {% set out_of_date_packages = bases | out_of_date %}
+            <tr>
+                <td>
+                    <a href="/packages/?SeB=m&outdated=on&K={{ request.user.Username }}">
+                        {{ "Out of Date" | tr }}
+                    </a>
+                </td>
+                <td>{{ out_of_date_packages.count() }}</td>
+            </tr>
+        </tbody>
+    </table>
+
+</div>
diff --git a/test/test_homepage.py b/test/test_homepage.py
index 23d7185f..a629b98c 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -1,13 +1,82 @@
+import re
+
+from datetime import datetime
 from http import HTTPStatus
 from unittest.mock import patch
 
+import pytest
+
 from fastapi.testclient import TestClient
 
+from aurweb import db
 from aurweb.asgi import app
+from aurweb.models.account_type import USER_ID
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.user import User
+from aurweb.redis import redis_connection
+from aurweb.testing import setup_test_db
+from aurweb.testing.html import parse_root
 
 client = TestClient(app)
 
 
+@pytest.fixture(autouse=True)
+def setup():
+    yield setup_test_db(
+        User.__tablename__,
+        Package.__tablename__,
+        PackageBase.__tablename__
+    )
+
+
+@pytest.fixture
+def user():
+    yield db.create(User, Username="test", Email="test@example.org",
+                    Passwd="testPassword", AccountTypeID=USER_ID)
+
+
+@pytest.fixture
+def redis():
+    redis = redis_connection()
+
+    def delete_keys():
+        # Cleanup keys if they exist.
+        for key in ("package_count", "orphan_count", "user_count",
+                    "trusted_user_count", "seven_days_old_added",
+                    "seven_days_old_updated", "year_old_updated",
+                    "never_updated", "package_updates"):
+            if redis.get(key) is not None:
+                redis.delete(key)
+
+    delete_keys()
+    yield redis
+    delete_keys()
+
+
+@pytest.fixture
+def packages(user):
+    """ Yield a list of num_packages Package objects maintained by user. """
+    num_packages = 50  # Tunable
+
+    # For i..num_packages, create a package named pkg_{i}.
+    pkgs = []
+    now = int(datetime.utcnow().timestamp())
+    for i in range(num_packages):
+        pkgbase = db.create(PackageBase, Name=f"pkg_{i}",
+                            Maintainer=user, Packager=user,
+                            autocommit=False, SubmittedTS=now,
+                            ModifiedTS=now)
+        pkg = db.create(Package, PackageBase=pkgbase,
+                        Name=pkgbase.Name, autocommit=False)
+        pkgs.append(pkg)
+        now += 1
+
+    db.commit()
+
+    yield pkgs
+
+
 def test_homepage():
     with client as request:
         response = request.get("/")
@@ -34,3 +103,49 @@ def test_homepage_no_ssh_fingerprints(get_ssh_fingerprints_mock):
         response = request.get("/")
 
     assert 'The following SSH fingerprints are used for the AUR' not in response.content.decode()
+
+
+def test_homepage_stats(redis, packages):
+    with client as request:
+        response = request.get("/")
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+
+    expectations = [
+        ("Packages", r'\d+'),
+        ("Orphan Packages", r'\d+'),
+        ("Packages added in the past 7 days", r'\d+'),
+        ("Packages updated in the past 7 days", r'\d+'),
+        ("Packages updated in the past year", r'\d+'),
+        ("Packages never updated", r'\d+'),
+        ("Registered Users", r'\d+'),
+        ("Trusted Users", r'\d+')
+    ]
+
+    stats = root.xpath('//div[@id="pkg-stats"]//tr')
+    for i, expected in enumerate(expectations):
+        expected_key, expected_regex = expected
+        key, value = stats[i].xpath('./td')
+        assert key.text.strip() == expected_key
+        assert re.match(expected_regex, value.text.strip())
+
+
+def test_homepage_updates(redis, packages):
+    with client as request:
+        response = request.get("/")
+        assert response.status_code == int(HTTPStatus.OK)
+        # Run the request a second time to exercise the Redis path.
+        response = request.get("/")
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+
+    # We expect to see the latest 15 packages, which happens to be
+    # pkg_49 .. pkg_34. So, create a list of expectations using a range
+    # starting at 49, stepping down to 49 - 15, -1 step at a time.
+    expectations = [f"pkg_{i}" for i in range(50 - 1, 50 - 1 - 15, -1)]
+    updates = root.xpath('//div[@id="pkg-updates"]/table/tbody/tr')
+    for i, expected in enumerate(expectations):
+        pkgname = updates[i].xpath('./td/a').pop(0)
+        assert pkgname.text.strip() == expected
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index 17978490..bc6a941c 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -9,6 +9,7 @@ from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
 from aurweb.packages import util
+from aurweb.redis import kill_redis
 from aurweb.testing import setup_test_db
 
 
@@ -33,7 +34,8 @@ def maintainer() -> User:
 
 @pytest.fixture
 def package(maintainer: User) -> Package:
-    pkgbase = db.create(PackageBase, Name="test-pkg", Maintainer=maintainer)
+    pkgbase = db.create(PackageBase, Name="test-pkg",
+                        Packager=maintainer, Maintainer=maintainer)
     yield db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase)
 
 
@@ -49,3 +51,18 @@ def test_package_link(client: TestClient, maintainer: User, package: Package):
               Provides=package.Name)
     expected = f"{OFFICIAL_BASE}/packages/?q={package.Name}"
     assert util.package_link(package) == expected
+
+
+def test_updated_packages(maintainer: User, package: Package):
+    expected = {
+        "Name": package.Name,
+        "Version": package.Version,
+        "PackageBase": {
+            "ModifiedTS": package.PackageBase.ModifiedTS
+        }
+    }
+
+    kill_redis()  # Kill it here to ensure we're on a fake instance.
+    assert util.updated_packages(1, 0) == [expected]
+    assert util.updated_packages(1, 600) == [expected]
+    kill_redis()  # Kill it again, in case other tests use a real instance.

From 469c141f6b541ea4b6d6aadbbd32fdb9822f6975 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 17 Aug 2021 20:58:41 -0700
Subject: [PATCH 289/844] [FastAPI] bugfix: remove use of scalar() in plural
 context

Anything where we can have more than one of something, scalar()
cannot be used.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
index 051849b0..39cfb363 100644
--- a/templates/partials/packages/comments.html
+++ b/templates/partials/packages/comments.html
@@ -49,7 +49,7 @@
 </div>
 {% endif %}
 
-{% if comments.scalar() %}
+{% if comments %}
     <div class="comments package-comments">
         <div class="comments-header">
             <h3>

From eb8ea53a4483d3a9d42b9b5cb0bfcfcc87d2cb4e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 7 Aug 2021 14:57:24 -0700
Subject: [PATCH 290/844] PackageRequest: add status_display()

A helper function which provides a textual string conversion
of a particular Status column.

In a PackageRequest, Status is split up into four different types:
- PENDING  : "Pending", PENDING_ID: 0
- CLOSED   : "Closed", CLOSED_ID: 1
- ACCEPTED : "Accepted", ACCEPTED_ID: 2
- REJECTED : "Rejected", REJECTED_ID: 3

This commit adds constants for the textual strings and the
IDs. It also adds a PackageRequest.status_display() function which
grabs the proper display string for a particular Status ID.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_request.py | 22 +++++++++++++++++++++
 test/test_package_request.py     | 34 ++++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/package_request.py b/aurweb/models/package_request.py
index 00f46ce2..a5125cee 100644
--- a/aurweb/models/package_request.py
+++ b/aurweb/models/package_request.py
@@ -8,6 +8,17 @@ import aurweb.models.user
 
 from aurweb.models.declarative import Base
 
+PENDING = "Pending"
+CLOSED = "Closed"
+ACCEPTED = "Accepted"
+REJECTED = "Rejected"
+
+# Integer values used for the Status column of PackageRequest.
+PENDING_ID = 0
+CLOSED_ID = 1
+ACCEPTED_ID = 2
+REJECTED_ID = 3
+
 
 class PackageRequest(Base):
     __tablename__ = "PackageRequests"
@@ -40,6 +51,13 @@ class PackageRequest(Base):
 
     __mapper_args__ = {"primary_key": [ID]}
 
+    STATUS_DISPLAY = {
+        PENDING_ID: PENDING,
+        CLOSED_ID: CLOSED,
+        ACCEPTED_ID: ACCEPTED,
+        REJECTED_ID: REJECTED
+    }
+
     def __init__(self,
                  RequestType: aurweb.models.request_type.RequestType = None,
                  PackageBase: aurweb.models.package_base.PackageBase = None,
@@ -91,3 +109,7 @@ class PackageRequest(Base):
                 statement="Column ClosureComment cannot be null.",
                 orig="PackageRequests.ClosureComment",
                 params=("NULL"))
+
+    def status_display(self) -> str:
+        """ Return a display string for the Status column. """
+        return self.STATUS_DISPLAY[self.Status]
diff --git a/test/test_package_request.py b/test/test_package_request.py
index fc839836..c28af6bd 100644
--- a/test/test_package_request.py
+++ b/test/test_package_request.py
@@ -4,9 +4,10 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query, rollback
+from aurweb.db import commit, create, query, rollback
 from aurweb.models.package_base import PackageBase
-from aurweb.models.package_request import PackageRequest
+from aurweb.models.package_request import (ACCEPTED, ACCEPTED_ID, CLOSED, CLOSED_ID, PENDING, PENDING_ID, REJECTED,
+                                           REJECTED_ID, PackageRequest)
 from aurweb.models.request_type import RequestType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
@@ -117,3 +118,32 @@ def test_package_request_null_closure_comment_raises_exception():
                User=user, PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
                Comments=str())
     rollback()
+
+
+def test_package_request_status_display():
+    """ Test status_display() based on the Status column value. """
+    request_type = query(RequestType, RequestType.Name == "merge").first()
+
+    pkgreq = create(PackageRequest, RequestType=request_type,
+                    User=user, PackageBase=pkgbase,
+                    PackageBaseName=pkgbase.Name,
+                    Comments=str(), ClosureComment=str(),
+                    Status=PENDING_ID)
+    assert pkgreq.status_display() == PENDING
+
+    pkgreq.Status = CLOSED_ID
+    commit()
+    assert pkgreq.status_display() == CLOSED
+
+    pkgreq.Status = ACCEPTED_ID
+    commit()
+    assert pkgreq.status_display() == ACCEPTED
+
+    pkgreq.Status = REJECTED_ID
+    commit()
+    assert pkgreq.status_display() == REJECTED
+
+    pkgreq.Status = 124
+    commit()
+    with pytest.raises(KeyError):
+        pkgreq.status_display()

From 5bd3a7bbabd06bf846991a9dd4c74d61c9a8d0a0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 7 Aug 2021 15:43:44 -0700
Subject: [PATCH 291/844] RequestType: add name_display() and record constants

Just like some of the other tables, we have some constant
records that we use to denote types of things. This commit
adds constants which correlate with these record constants.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/request_type.py | 15 +++++++++++++++
 test/test_request_type.py     | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/request_type.py b/aurweb/models/request_type.py
index 2c8276e8..a26dcf9a 100644
--- a/aurweb/models/request_type.py
+++ b/aurweb/models/request_type.py
@@ -1,7 +1,12 @@
 from sqlalchemy import Column, Integer
 
+from aurweb import db
 from aurweb.models.declarative import Base
 
+DELETION = "deletion"
+ORPHAN = "orphan"
+MERGE = "merge"
+
 
 class RequestType(Base):
     __tablename__ = "RequestTypes"
@@ -9,3 +14,13 @@ class RequestType(Base):
     ID = Column(Integer, primary_key=True)
 
     __mapper_args__ = {"primary_key": [ID]}
+
+    def name_display(self) -> str:
+        """ Return the Name column with its first char capitalized. """
+        name = self.Name
+        return name[0].upper() + name[1:]
+
+
+DELETION_ID = db.query(RequestType, RequestType.Name == DELETION).first().ID
+ORPHAN_ID = db.query(RequestType, RequestType.Name == ORPHAN).first().ID
+MERGE_ID = db.query(RequestType, RequestType.Name == MERGE).first().ID
diff --git a/test/test_request_type.py b/test/test_request_type.py
index a470a60b..a3b3ccb8 100644
--- a/test/test_request_type.py
+++ b/test/test_request_type.py
@@ -1,7 +1,7 @@
 import pytest
 
-from aurweb.db import create, delete
-from aurweb.models.request_type import RequestType
+from aurweb.db import create, delete, query
+from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID, RequestType
 from aurweb.testing import setup_test_db
 
 
@@ -22,3 +22,14 @@ def test_request_type_null_name_returns_empty_string():
     assert bool(request_type.ID)
     assert request_type.Name == str()
     delete(RequestType, RequestType.ID == request_type.ID)
+
+
+def test_request_type_name_display():
+    deletion = query(RequestType, RequestType.ID == DELETION_ID).first()
+    assert deletion.name_display() == "Deletion"
+
+    orphan = query(RequestType, RequestType.ID == ORPHAN_ID).first()
+    assert orphan.name_display() == "Orphan"
+
+    merge = query(RequestType, RequestType.ID == MERGE_ID).first()
+    assert merge.name_display() == "Merge"

From af51b5c4604636408d78d015b49bfbc0e8d7de27 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 7 Aug 2021 19:35:50 -0700
Subject: [PATCH 292/844] User: add several utility methods

Added:
- User.voted_for(package)
    - Has a user voted for a particular package?
- User.notified(package)
    - Is a user being notified about a particular package?
- User.packages()
    - Entire collection of Package objects related to User.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py | 36 +++++++++++++++++++++++++++++++++++-
 test/test_user.py     | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 4705c050..0ccf7329 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -5,13 +5,14 @@ from datetime import datetime
 import bcrypt
 
 from fastapi import Request
-from sqlalchemy import Column, ForeignKey, Integer, String, text
+from sqlalchemy import Column, ForeignKey, Integer, String, or_, text
 from sqlalchemy.orm import backref, relationship
 
 import aurweb.config
 import aurweb.models.account_type
 import aurweb.schema
 
+from aurweb import db
 from aurweb.models.ban import is_banned
 from aurweb.models.declarative import Base
 
@@ -177,6 +178,39 @@ class User(Base):
         """
         return self == user or self.is_trusted_user() or self.is_developer()
 
+    def voted_for(self, package) -> bool:
+        """ Has this User voted for package? """
+        from aurweb.models.package_vote import PackageVote
+        return bool(package.PackageBase.package_votes.filter(
+            PackageVote.UsersID == self.ID
+        ).scalar())
+
+    def notified(self, package) -> bool:
+        """ Is this User being notified about package? """
+        from aurweb.models.package_notification import PackageNotification
+        return bool(package.PackageBase.package_notifications.filter(
+            PackageNotification.UserID == self.ID
+        ).scalar())
+
+    def packages(self):
+        """ Returns an ORM query to Package objects owned by this user.
+
+        This should really be replaced with an internal ORM join
+        configured for the User model. This has not been done yet
+        due to issues I've been encountering in the process, so
+        sticking with this function until we can properly implement it.
+
+        :return: ORM query of User-packaged or maintained Package objects
+        """
+        from aurweb.models.package import Package
+        from aurweb.models.package_base import PackageBase
+        return db.query(Package).join(PackageBase).filter(
+            or_(
+                PackageBase.PackagerUID == self.ID,
+                PackageBase.MaintainerUID == self.ID
+            )
+        )
+
     def __repr__(self):
         return "<User(ID='%s', AccountType='%s', Username='%s')>" % (
             self.ID, str(self.AccountType), self.Username)
diff --git a/test/test_user.py b/test/test_user.py
index 9ab40801..7756cff3 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -12,6 +12,10 @@ import aurweb.config
 from aurweb.db import commit, create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_vote import PackageVote
 from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey
 from aurweb.models.user import User
@@ -25,7 +29,16 @@ account_type = user = None
 def setup():
     global account_type, user
 
-    setup_test_db("Users", "Sessions", "Bans", "SSHPubKeys")
+    setup_test_db(
+        User.__tablename__,
+        Session.__tablename__,
+        Ban.__tablename__,
+        SSHPubKey.__tablename__,
+        Package.__tablename__,
+        PackageBase.__tablename__,
+        PackageVote.__tablename__,
+        PackageNotification.__tablename__
+    )
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
@@ -249,3 +262,24 @@ def test_user_is_developer():
     user.AccountType = dev_type
     commit()
     assert user.is_developer() is True
+
+
+def test_user_voted_for():
+    now = int(datetime.utcnow().timestamp())
+    pkgbase = create(PackageBase, Name="pkg1", Maintainer=user)
+    pkg = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    create(PackageVote, PackageBase=pkgbase, User=user, VoteTS=now)
+    assert user.voted_for(pkg)
+
+
+def test_user_notified():
+    pkgbase = create(PackageBase, Name="pkg1", Maintainer=user)
+    pkg = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    create(PackageNotification, PackageBase=pkgbase, User=user)
+    assert user.notified(pkg)
+
+
+def test_user_packages():
+    pkgbase = create(PackageBase, Name="pkg1", Maintainer=user)
+    pkg = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    assert pkg in user.packages()

From 5a175bd92a791b45ad1d224cca133645abfcaa0d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 9 Aug 2021 23:43:48 -0700
Subject: [PATCH 293/844] routers.html: add authenticated dashboard to homepage

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/html.py                    | 39 +++++++++++
 templates/dashboard.html                  | 54 ++++++++++++++++
 templates/index.html                      |  6 +-
 templates/partials/packages/requests.html | 38 +++++++++++
 templates/partials/packages/results.html  | 55 ++++++++++++++++
 test/test_homepage.py                     | 79 ++++++++++++++++++++++-
 6 files changed, 269 insertions(+), 2 deletions(-)
 create mode 100644 templates/dashboard.html
 create mode 100644 templates/partials/packages/requests.html
 create mode 100644 templates/partials/packages/results.html

diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index ae012901..c2375f69 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -9,11 +9,15 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 from sqlalchemy import and_, or_
 
 import aurweb.config
+import aurweb.models.package_request
 
 from aurweb import db, util
 from aurweb.cache import db_count_cache
 from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
+from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comaintainer import PackageComaintainer
+from aurweb.models.package_request import PackageRequest
 from aurweb.models.user import User
 from aurweb.packages.util import updated_packages
 from aurweb.templates import make_context, render_template
@@ -132,6 +136,41 @@ async def index(request: Request):
     # Get the 15 most recently updated packages.
     context["package_updates"] = updated_packages(15, updates_expire)
 
+    if request.user.is_authenticated():
+        # Authenticated users get a few extra pieces of data for
+        # the dashboard display.
+        packages = db.query(Package).join(PackageBase)
+
+        maintained = packages.join(
+            User, PackageBase.MaintainerUID == User.ID
+        ).filter(
+            PackageBase.MaintainerUID == request.user.ID
+        )
+
+        context["flagged_packages"] = maintained.filter(
+            PackageBase.OutOfDateTS.isnot(None)
+        ).order_by(
+            PackageBase.ModifiedTS.desc(), Package.Name.asc()
+        ).limit(50).all()
+
+        archive_time = aurweb.config.getint('options', 'request_archive_time')
+        start = now - archive_time
+        context["package_requests"] = request.user.package_requests.filter(
+            PackageRequest.RequestTS >= start
+        ).limit(50).all()
+
+        # Packages that the request user maintains or comaintains.
+        context["packages"] = maintained.order_by(
+            PackageBase.ModifiedTS.desc(), Package.Name.desc()
+        ).limit(50).all()
+
+        # Any packages that the request user comaintains.
+        context["comaintained"] = packages.join(
+            PackageComaintainer).filter(
+            PackageComaintainer.UsersID == request.user.ID).order_by(
+            PackageBase.ModifiedTS.desc(), Package.Name.desc()
+        ).limit(50).all()
+
     return render_template(request, "index.html", context)
 
 
diff --git a/templates/dashboard.html b/templates/dashboard.html
new file mode 100644
index 00000000..5ad89992
--- /dev/null
+++ b/templates/dashboard.html
@@ -0,0 +1,54 @@
+<div id="intro" class="box">
+    <h2>{{ "Dashboard" | tr }}</h2>
+
+    <h3>{{ "My Flagged Packages" | tr }}</h3>
+    {% if not flagged_packages %}
+        <p>{{ "No packages matched your search criteria." | tr }}</p>
+    {% else %}
+        {% with table_id = "flagged-packages", packages = flagged_packages %}
+            {% include 'partials/packages/results.html' %}
+        {% endwith %}
+    {% endif %}
+
+    <h3>{{ "My Requests" | tr }}</h3>
+    {% if not package_requests %}
+        <p>{{ "No requests matched your search criteria." | tr }}</p>
+    {% else %}
+        {% with requests = package_requests %}
+            {% include 'partials/packages/requests.html' %}
+        {% endwith %}
+    {% endif %}
+</div>
+
+<div id="intro" class="box">
+    <h2>{{ "My Packages" | tr }}</h2>
+    <p>
+        <a href="/packages/?SeB=m&K={{ request.user.Username }}">
+            {{ "Search for packages I maintain" | tr }}
+        </a>
+    </p>
+    {% if not packages %}
+        <p>{{ "No packages matched your search criteria." | tr }}</p>
+    {% else %}
+        {% with table_id = "my-packages" %}
+            {% include 'partials/packages/results.html' %}
+        {% endwith %}
+    {% endif %}
+</div>
+
+<div id="intro" class="box">
+    <h2>{{ "Co-Maintained Packages" | tr }}</h2>
+    <p>
+        <a href="/packages/?SeB=c&K={{ request.user.Username }}">
+            {{ "Search for packages I co-maintain" | tr }}
+        </a>
+    </p>
+    {% if not comaintained %}
+        <p>{{ "No packages matched your search criteria." | tr }}</p>
+    {% else %}
+        {% with table_id = "comaintained-packages", packages = comaintained %}
+            {% include 'partials/packages/results.html' %}
+        {% endwith %}
+    {% endif %}
+</div>
+
diff --git a/templates/index.html b/templates/index.html
index e50a99cd..0b6eda50 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,7 +3,11 @@
 {% block pageContent %}
     <div id="content-left-wrapper">
         <div id="content-left">
-            {% include 'home.html' %}
+            {% if request.user.is_authenticated() %}
+                {% include 'dashboard.html' %}
+            {% else %}
+                {% include 'home.html' %}
+            {% endif %}
         </div>
     </div>
     <div id="content-right">
diff --git a/templates/partials/packages/requests.html b/templates/partials/packages/requests.html
new file mode 100644
index 00000000..5239ca72
--- /dev/null
+++ b/templates/partials/packages/requests.html
@@ -0,0 +1,38 @@
+<table id="pkgreq-results" class="results">
+    <thead>
+        <tr>
+            <th>{{ "Package" | tr }}</th>
+            <th>{{ "Type" | tr }}</th>
+            <th>{{ "Comments" | tr }}</th>
+            <th>{{ "Filed by" | tr }}</th>
+            <th>{{ "Date" | tr }}</th>
+            <th>{{ "Status" | tr }}</th>
+        </tr>
+    </thead>
+
+    <tbody>
+
+        {% for request in requests %}
+            {% set requested = request.RequestTS | dt | as_timezone(timezone) %}
+            <tr>
+                <td>
+                    <a href="/pkgbase/{{ request.PackageBase.Name }}">
+                        {{ request.PackageBase.Name }}
+                    </a>
+                </td>
+                <td>{{ request.RequestType.name_display() | tr }}</td>
+                <td class="wrap">{{ request.Comments }}</td>
+                <td>
+                    <a href="/account/{{ request.User.Username }}"
+                       title="{{ 'View account information for %s' | tr | format(request.User.Username) }}">
+                        {{ request.User.Username }}
+                    </a>
+                </td>
+                <td>{{ requested.strftime("%Y-%m-%d %H:%M") }}</td>
+                <td>{{ request.status_display() | tr }}</td>
+            </tr>
+        {% endfor %}
+
+    </tbody>
+
+</table>
diff --git a/templates/partials/packages/results.html b/templates/partials/packages/results.html
new file mode 100644
index 00000000..005bd5a9
--- /dev/null
+++ b/templates/partials/packages/results.html
@@ -0,0 +1,55 @@
+
+<table {% if table_id %}id="{{ table_id }}"{% endif %} class="results">
+    <thead>
+        <tr>
+            <th>{{ "Name" | tr }}</th>
+            <th>{{ "Version" | tr }}</th>
+            <th>{{ "Votes" | tr }}</th>
+            <th>{{ "Popularity" | tr }}</th>
+            <th>{{ "Voted" | tr }}</th>
+            <th>{{ "Notify" | tr }}</th>
+            <th>{{ "Description" | tr }}</th>
+            <th>{{ "Maintainer" | tr }}</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for pkg in packages %}
+            {% set flagged = pkg.PackageBase.OutOfDateTS %}
+            <tr>
+                <td>
+                    <a href="/packages/{{ pkg.Name }}">
+                        {{ pkg.Name }}
+                    </a>
+                </td>
+                {% if flagged %}
+                    <td class="flagged">{{ pkg.Version }}</td>
+                {% else %}
+                    <td>{{ pkg.Version }}</td>
+                {% endif %}
+                <td>{{ pkg.PackageBase.NumVotes }}</td>
+                <td>
+                    {{ pkg.PackageBase.Popularity | number_format(2) }}
+                </td>
+                <td>
+                    <!-- If I voted, display "Yes". -->
+                    {% if request.user.voted_for(pkg) %}
+                        {{ "Yes" | tr }}
+                    {% endif %}
+                </td>
+                <td>
+                    <!-- If I'm being notified, display "Yes". -->
+                    {% if request.user.notified(pkg) %}
+                        {{ "Yes" | tr }}
+                    {% endif %}
+                </td>
+                <td class="wrap">{{ pkg.Description or '' }}</td>
+                <td>
+                    {% set maintainer = pkg.PackageBase.Maintainer %}
+                    <a href="/account/{{ maintainer.Username }}">
+                        {{ maintainer.Username }}
+                    </a>
+                </td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
diff --git a/test/test_homepage.py b/test/test_homepage.py
index a629b98c..2cd6682f 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -13,10 +13,14 @@ from aurweb.asgi import app
 from aurweb.models.account_type import USER_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comaintainer import PackageComaintainer
+from aurweb.models.package_request import PackageRequest
+from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
 from aurweb.redis import redis_connection
 from aurweb.testing import setup_test_db
 from aurweb.testing.html import parse_root
+from aurweb.testing.requests import Request
 
 client = TestClient(app)
 
@@ -26,7 +30,9 @@ def setup():
     yield setup_test_db(
         User.__tablename__,
         Package.__tablename__,
-        PackageBase.__tablename__
+        PackageBase.__tablename__,
+        PackageComaintainer.__tablename__,
+        PackageRequest.__tablename__
     )
 
 
@@ -149,3 +155,74 @@ def test_homepage_updates(redis, packages):
     for i, expected in enumerate(expectations):
         pkgname = updates[i].xpath('./td/a').pop(0)
         assert pkgname.text.strip() == expected
+
+
+def test_homepage_dashboard(redis, packages, user):
+    # Create Comaintainer records for all of the packages.
+    for pkg in packages:
+        db.create(PackageComaintainer, PackageBase=pkg.PackageBase,
+                  User=user, Priority=1, autocommit=False)
+    db.commit()
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+
+    # Assert some expectations that we end up getting all fifty
+    # packages in the "My Packages" table.
+    expectations = [f"pkg_{i}" for i in range(50 - 1, 0, -1)]
+    my_packages = root.xpath('//table[@id="my-packages"]/tbody/tr')
+    for i, expected in enumerate(expectations):
+        name, version, votes, pop, voted, notify, desc, maint \
+            = my_packages[i].xpath('./td')
+        assert name.xpath('./a').pop(0).text.strip() == expected
+
+    # Do the same for the Comaintained Packages table.
+    my_packages = root.xpath('//table[@id="comaintained-packages"]/tbody/tr')
+    for i, expected in enumerate(expectations):
+        name, version, votes, pop, voted, notify, desc, maint \
+            = my_packages[i].xpath('./td')
+        assert name.xpath('./a').pop(0).text.strip() == expected
+
+
+def test_homepage_dashboard_requests(redis, packages, user):
+    now = int(datetime.utcnow().timestamp())
+
+    pkg = packages[0]
+    reqtype = db.query(RequestType, RequestType.ID == DELETION_ID).first()
+    pkgreq = db.create(PackageRequest, PackageBase=pkg.PackageBase,
+                       PackageBaseName=pkg.PackageBase.Name,
+                       User=user, Comments=str(),
+                       ClosureComment=str(), RequestTS=now,
+                       RequestType=reqtype)
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    request = root.xpath('//table[@id="pkgreq-results"]/tbody/tr').pop(0)
+    pkgname = request.xpath('./td/a').pop(0)
+    assert pkgname.text.strip() == pkgreq.PackageBaseName
+
+
+def test_homepage_dashboard_flagged_packages(redis, packages, user):
+    # Set the first Package flagged by setting its OutOfDateTS column.
+    pkg = packages[0]
+    pkg.PackageBase.OutOfDateTS = int(datetime.utcnow().timestamp())
+    db.commit()
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/", cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Check to see that the package showed up in the Flagged Packages table.
+    root = parse_root(response.text)
+    flagged_pkg = root.xpath('//table[@id="flagged-packages"]/tbody/tr').pop(0)
+    flagged_name = flagged_pkg.xpath('./td/a').pop(0)
+    assert flagged_name.text.strip() == pkg.Name

From f086457741574867f30109dc58ae656684968e2e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 17 Aug 2021 21:52:59 -0700
Subject: [PATCH 294/844] aurweb.redis: Reduce logging

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/redis.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/redis.py b/aurweb/redis.py
index 6b8dede4..6d3cff38 100644
--- a/aurweb/redis.py
+++ b/aurweb/redis.py
@@ -36,13 +36,13 @@ def redis_connection():  # pragma: no cover
 
     # If we haven't initialized redis yet, construct a pool.
     if disabled:
-        logger.debug("Initializing fake Redis instance.")
         if pool is None:
+            logger.debug("Initializing fake Redis instance.")
             pool = FakeConnectionPool()
         return pool.handle
     else:
-        logger.debug("Initializing real Redis instance.")
         if pool is None:
+            logger.debug("Initializing real Redis instance.")
             redis_addr = aurweb.config.get("options", "redis_address")
             pool = ConnectionPool.from_url(redis_addr)
 

From 6eafb457ec18cefd9341e27d84b7be76abbcca29 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 20 Aug 2021 16:36:10 -0700
Subject: [PATCH 295/844] aurweb.util: fix code style violation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index d4a0b221..860bdd12 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -20,8 +20,8 @@ import aurweb.config
 
 
 def make_random_string(length):
-    return ''.join(random.choices(string.ascii_lowercase +
-                                  string.digits, k=length))
+    return ''.join(random.choices(string.ascii_lowercase
+                                  + string.digits, k=length))
 
 
 def make_nonce(length: int = 8):

From a72ab61902961562048f487c2e102249b4a33964 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 25 Aug 2021 16:34:37 -0700
Subject: [PATCH 296/844] [FastAPI] fix dashboard template

Some columns should only be shown when a user is authenticated.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/results.html | 52 ++++++++++++------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/templates/partials/packages/results.html b/templates/partials/packages/results.html
index 005bd5a9..80029d10 100644
--- a/templates/partials/packages/results.html
+++ b/templates/partials/packages/results.html
@@ -6,8 +6,10 @@
             <th>{{ "Version" | tr }}</th>
             <th>{{ "Votes" | tr }}</th>
             <th>{{ "Popularity" | tr }}</th>
-            <th>{{ "Voted" | tr }}</th>
-            <th>{{ "Notify" | tr }}</th>
+            {% if request.user.is_authenticated() %}
+                <th>{{ "Voted" | tr }}</th>
+                <th>{{ "Notify" | tr }}</th>
+            {% endif %}
             <th>{{ "Description" | tr }}</th>
             <th>{{ "Maintainer" | tr }}</th>
         </tr>
@@ -21,33 +23,33 @@
                         {{ pkg.Name }}
                     </a>
                 </td>
-                {% if flagged %}
-                    <td class="flagged">{{ pkg.Version }}</td>
-                {% else %}
-                    <td>{{ pkg.Version }}</td>
-                {% endif %}
+                <td{% if flagged %} class="flagged"{% endif %}>{{ pkg.Version }}</td>
                 <td>{{ pkg.PackageBase.NumVotes }}</td>
-                <td>
-                    {{ pkg.PackageBase.Popularity | number_format(2) }}
-                </td>
-                <td>
-                    <!-- If I voted, display "Yes". -->
-                    {% if request.user.voted_for(pkg) %}
-                        {{ "Yes" | tr }}
-                    {% endif %}
-                </td>
-                <td>
-                    <!-- If I'm being notified, display "Yes". -->
-                    {% if request.user.notified(pkg) %}
-                        {{ "Yes" | tr }}
-                    {% endif %}
-                </td>
+                <td>{{ pkg.PackageBase.Popularity | number_format(2) }}</td>
+                {% if request.user.is_authenticated() %}
+                    <td>
+                        <!-- If I voted, display "Yes". -->
+                        {% if request.user.voted_for(pkg) %}
+                            {{ "Yes" | tr }}
+                        {% endif %}
+                    </td>
+                    <td>
+                        <!-- If I'm being notified, display "Yes". -->
+                        {% if request.user.notified(pkg) %}
+                            {{ "Yes" | tr }}
+                        {% endif %}
+                    </td>
+                {% endif %}
                 <td class="wrap">{{ pkg.Description or '' }}</td>
                 <td>
                     {% set maintainer = pkg.PackageBase.Maintainer %}
-                    <a href="/account/{{ maintainer.Username }}">
-                        {{ maintainer.Username }}
-                    </a>
+                    {% if maintainer %}
+                        <a href="/account/{{ maintainer.Username }}">
+                            {{ maintainer.Username }}
+                        </a>
+                    {% else %}
+                        <span class="error">{{ "orphan" | tr }}</span>
+                    {% endif %}
                 </td>
             </tr>
         {% endfor %}

From f147ef34767a91c0171b6d69ca2a2749ea0f4994 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 18 Aug 2021 22:14:35 -0700
Subject: [PATCH 297/844] models.account_type: remove duplicated constants

Clearly made in mistake, removing to keep things organized.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/account_type.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/aurweb/models/account_type.py b/aurweb/models/account_type.py
index 0db37ced..2e3dde06 100644
--- a/aurweb/models/account_type.py
+++ b/aurweb/models/account_type.py
@@ -28,12 +28,6 @@ class AccountType(Base):
             self.ID, str(self))
 
 
-# Define some AccountType.AccountType constants.
-USER = "User"
-TRUSTED_USER = "Trusted User"
-DEVELOPER = "Developer"
-TRUSTED_USER_AND_DEV = "Trusted User & Developer"
-
 # Fetch account type IDs from the database for constants.
 _account_types = db.query(AccountType)
 USER_ID = _account_types.filter(

From fb908189b61cce6241d8b4afdb4010ea279dfeea Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sat, 28 Aug 2021 17:18:32 -0500
Subject: [PATCH 298/844] Began port of dependencies to pip

Adds Python dependencies to requirements list to allow installation via
pip
---
 requirements.txt | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..1c760057
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,40 @@
+# Arch Linux
+pyalpm==0.10.6
+srcinfo==0.0.8
+
+# Generic
+authlib==0.15.2
+aiofiles==0.7.0
+asgiref==3.4.1
+bcrypt==3.2.0
+bleach==3.3.1
+coverage==5.5
+email-validator==1.1.3
+fakeredis==1.6.0
+fastapi==0.66.0
+feedgen==0.9.0
+flake8==3.9.2
+httpx==0.18.2
+hypercorn==0.11.2
+isort==5.9.3
+itsdangerous==2.0.1
+jinja2==3.0.1
+lxml==4.6.3
+markdown==3.3.4
+orjson==3.6.3
+protobuf==3.17.3
+pygit2==1.6.1
+pytest==6.2.4
+pytest-asyncio==0.15.1
+pytest-cov==2.12.1
+pytest-tap==3.2
+python-multipart==0.0.5
+redis==3.5.3
+requests==2.26.0
+uvicorn==0.15.0
+werkzeug==2.0.1
+
+# SQL
+alembic==1.6.5
+sqlalchemy==1.3.23
+mysqlclient==2.0.3

From b88fa8386ae9359fbf0d7cabf6efd008bd4d760b Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sat, 28 Aug 2021 19:25:51 -0500
Subject: [PATCH 299/844] Removed pyalpm and srcinfo from pip requirements;
 Changed section title

Changed 'Generic' to 'General'
---
 requirements.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1c760057..37a12f61 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,4 @@
-# Arch Linux
-pyalpm==0.10.6
-srcinfo==0.0.8
-
-# Generic
+# General
 authlib==0.15.2
 aiofiles==0.7.0
 asgiref==3.4.1

From 0075ba3c33c18831e277ddfceac53d8653a9dcc6 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sat, 28 Aug 2021 19:27:36 -0500
Subject: [PATCH 300/844] Added .python-version from Pyenv

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4fdfa790..885d9c2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,6 @@ doc/rpc.html
 
 # Ignore any user-configured .envrc files at the root.
 /.envrc
+
+# Ignore .python-version file from Pyenv
+.python-version

From e69004bc4a135551fc89581147947fb8c8f0e68c Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sat, 28 Aug 2021 19:29:44 -0500
Subject: [PATCH 301/844] Alphabetized .gitignore file so it looks prettier

---
 .gitignore | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 885d9c2f..f7ec5a95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,5 @@
-dummy-data.sql*
-po/*.mo
-po/*.po~
-po/POTFILES
-web/locale/*/
-aur.git/
 __pycache__/
 *.py[cod]
-test/test-results/
-test/trash directory*
-schema/aur-schema-sqlite.sql
-data.sql
-aurweb.sqlite3
-conf/config
-conf/config.sqlite
-conf/config.sqlite.defaults
-conf/docker
-conf/docker.defaults
-htmlcov/
-fastapi_aw/
 .vim/
 .pylintrc
 .coverage
@@ -28,6 +10,24 @@ fastapi_aw/
 /dist/
 /aurweb.egg-info/
 /pyrightconfig.json
+aur.git/
+aurweb.sqlite3
+conf/config
+conf/config.sqlite
+conf/config.sqlite.defaults
+conf/docker
+conf/docker.defaults
+data.sql
+dummy-data.sql*
+fastapi_aw/
+htmlcov/
+po/*.mo
+po/*.po~
+po/POTFILES
+schema/aur-schema-sqlite.sql
+test/test-results/
+test/trash directory*
+web/locale/*/
 
 # Do not stage compiled asciidoc: make -C doc
 doc/rpc.html

From e61050adcf41141d43a2018265b1c38b0c4031e4 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sat, 28 Aug 2021 19:31:11 -0500
Subject: [PATCH 302/844] Added env/ to .gitignore

Folder will be used under virtualenv for pip dependencies
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f7ec5a95..581d5c17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ conf/docker
 conf/docker.defaults
 data.sql
 dummy-data.sql*
+env/
 fastapi_aw/
 htmlcov/
 po/*.mo

From 85b1a05d0138888e2f06c8fc5b474314abd090e9 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sat, 28 Aug 2021 19:51:05 -0500
Subject: [PATCH 303/844] Removed pip dependencies from
 docker/scripts/install-deps.sh

---
 docker/scripts/install-deps.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index a532a6b2..d22fd460 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -5,16 +5,12 @@
 set -eou pipefail
 
 pacman -Syu --noconfirm --noprogressbar \
-    --cachedir .pkg-cache git gpgme protobuf pyalpm \
-    python-mysqlclient python-pygit2 python-srcinfo python-bleach \
-    python-markdown python-sqlalchemy python-alembic python-pytest \
-    python-werkzeug python-pytest-tap python-fastapi nginx python-authlib \
-    python-itsdangerous python-httpx python-jinja python-pytest-cov \
-    python-requests python-aiofiles python-python-multipart \
-    python-pytest-asyncio python-coverage hypercorn python-bcrypt \
-    python-email-validator openssh python-lxml mariadb mariadb-libs \
-    python-isort flake8 cgit uwsgi uwsgi-plugin-cgi php php-fpm \
-    python-asgiref uvicorn python-feedgen memcached php-memcached \
-    python-redis redis python-fakeredis python-orjson
+    --cachedir .pkg-cache git gpgme \
+      nginx redis openssh \
+      mariadb mariadb-libs \
+      cgit uwsgi uwsgi-plugin-cgi \
+      php php-fpm \
+      memcached php-memcached \
+      pyalpm python-srcinfo
 
 exec "$@"

From eff7d478ab29d541c7a486cccd27c23d0e803e5d Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sat, 28 Aug 2021 20:12:35 -0500
Subject: [PATCH 304/844] Updated CI tests for pip dependencies; Changed
 styling in install-deps.sh

---
 .gitlab-ci.yml                 |  1 +
 Dockerfile                     | 26 +++++++++++++-------------
 docker/scripts/install-deps.sh |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b8da2ae..d360d483 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ variables:
 
 before_script:
   - ./docker/scripts/install-deps.sh
+  - pip install -r requirements.txt
   - useradd -U -d /aurweb -c 'AUR User' aur
   - ./docker/mariadb-entrypoint.sh
   - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
diff --git a/Dockerfile b/Dockerfile
index 2843fa1b..b610b8c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,19 @@ FROM archlinux:base-devel
 ENV PYTHONPATH=/aurweb
 ENV AUR_CONFIG=conf/config
 
-# Copy our single bootstrap script.
-COPY docker/scripts/install-deps.sh /install-deps.sh
-RUN /install-deps.sh
+# Copy Docker scripts
+COPY ./docker /docker
+COPY ./docker/scripts/*.sh /usr/local/bin/
+
+# Copy over all aurweb files.
+COPY . /aurweb
+
+# Working directory is aurweb root @ /aurweb.
+WORKDIR /aurweb
+
+# Install dependencies
+RUN docker/scripts/install-deps.sh
+RUN pip install -r requirements.txt
 
 # Add our aur user.
 RUN useradd -U -d /aurweb -c 'AUR User' aur
@@ -13,16 +23,6 @@ RUN useradd -U -d /aurweb -c 'AUR User' aur
 # Setup some default system stuff.
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 
-# Copy the rest of docker.
-COPY ./docker /docker
-COPY ./docker/scripts/*.sh /usr/local/bin/
-
-# Copy from host to container.
-COPY . /aurweb
-
-# Working directory is aurweb root @ /aurweb.
-WORKDIR /aurweb
-
 # Install translations.
 RUN make -C po all install
 
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index d22fd460..4985fe85 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -11,6 +11,6 @@ pacman -Syu --noconfirm --noprogressbar \
       cgit uwsgi uwsgi-plugin-cgi \
       php php-fpm \
       memcached php-memcached \
-      pyalpm python-srcinfo
+      python-pip pyalpm python-srcinfo
 
 exec "$@"

From a0be0185475e38adcb628b776f440efc5685c23d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 28 Aug 2021 21:30:36 -0700
Subject: [PATCH 305/844] Docker: Reorder dependency installation for cache
 purposes

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b610b8c1..6539bd94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,14 +7,16 @@ ENV AUR_CONFIG=conf/config
 COPY ./docker /docker
 COPY ./docker/scripts/*.sh /usr/local/bin/
 
+# Install system-wide dependencies.
+RUN /docker/scripts/install-deps.sh
+
 # Copy over all aurweb files.
 COPY . /aurweb
 
 # Working directory is aurweb root @ /aurweb.
 WORKDIR /aurweb
 
-# Install dependencies
-RUN docker/scripts/install-deps.sh
+# Install pip directories now that we have access to /aurweb.
 RUN pip install -r requirements.txt
 
 # Add our aur user.

From 1c26ce52a5e83abe99d5bea055aac8231b97428f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 30 Aug 2021 18:17:14 -0700
Subject: [PATCH 306/844] [FastAPI] include DepArch in dependency list

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/package_metadata.html | 3 +++
 test/test_packages_routes.py                      | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/templates/partials/packages/package_metadata.html b/templates/partials/packages/package_metadata.html
index 7ec95699..e7b1aefb 100644
--- a/templates/partials/packages/package_metadata.html
+++ b/templates/partials/packages/package_metadata.html
@@ -16,6 +16,9 @@
                     </a>
                 {% endif %}
                 {{ dep.Package | provides_list(dep.DepName) | safe }}
+                {% if dep.DepArch %}
+                    <em>({{ dep.DepArch }})</em>
+                {% endif %}
                 <!-- If this dependency type is an optdepends (id: 4). -->
                 {% if dep.DepTypeID == 4 %}
                     <em>{{ dep | dep_extra_desc }}</em>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 82fbba40..0c9d80e8 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -228,6 +228,7 @@ def test_package_dependencies(client: TestClient, maintainer: User,
     # Create a normal dependency of type depends.
     dep_pkg = create_package("test-dep-1", maintainer, autocommit=False)
     dep = create_package_dep(package, dep_pkg.Name, autocommit=False)
+    dep.DepArch = "x86_64"
 
     # Also, create a makedepends.
     make_dep_pkg = create_package("test-dep-2", maintainer, autocommit=False)
@@ -288,6 +289,11 @@ def test_package_dependencies(client: TestClient, maintainer: User,
     for i, expectation in enumerate(expected):
         assert pkgdeps[i].text.strip() == expectation
 
+    # Let's make sure the DepArch was displayed for our first dep.
+    arch = root.findall('.//ul[@id="pkgdepslist"]/li')[0]
+    arch = arch.xpath('./em')[1]
+    assert arch.text.strip() == "(x86_64)"
+
     broken_node = root.find('.//ul[@id="pkgdepslist"]/li/span')
     assert broken_node.text.strip() == broken_dep.DepName
 

From 45fbf214b46fd5e3f90157ee2aaf94cdf62e62f4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 20 Aug 2021 16:29:04 -0700
Subject: [PATCH 307/844] jinja2: add 'tn' filter, a numerical translation

The possibly plural version of `tr`, `tn` provides a way to translate
strings into singular or plural form based on a given integer
being 1 or not 1.

Example use:

```
{{ 1 | tn("%d package found.", "%d packages found.") | format(1) }}
```

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/l10n.py      | 18 ++++++++++++++++++
 aurweb/templates.py |  3 ++-
 test/test_l10n.py   | 12 ++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index 9270f3ce..c4938d64 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -93,3 +93,21 @@ def tr(context: typing.Any, value: str):
     """ A translation filter; example: {{ "Hello" | tr("de") }}. """
     _ = get_translator_for_request(context.get("request"))
     return _(value)
+
+
+@pass_context
+def tn(context: typing.Dict[str, typing.Any], count: int,
+       singular: str, plural: str) -> str:
+    """ A singular and plural translation filter.
+
+    Example:
+        {{ some_integer | tn("singular %d", "plural %d") }}
+
+    :param context: Response context
+    :param count: The number used to decide singular or plural state
+    :param singular: The singular translation
+    :param plural: The plural translation
+    :return: Translated string
+    """
+    gettext = get_raw_translator_for_request(context.get("request"))
+    return gettext.ngettext(singular, plural, count)
diff --git a/aurweb/templates.py b/aurweb/templates.py
index fa7aa039..7530472f 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -23,8 +23,9 @@ loader = jinja2.FileSystemLoader(os.path.join(
 env = jinja2.Environment(loader=loader, autoescape=True,
                          extensions=["jinja2.ext.i18n"])
 
-# Add tr translation filter.
+# Add t{r,n} translation filters.
 env.filters["tr"] = l10n.tr
+env.filters["tn"] = l10n.tn
 
 # Utility filters.
 env.filters["dt"] = util.timestamp_to_datetime
diff --git a/test/test_l10n.py b/test/test_l10n.py
index e833cd44..1c2ae95a 100644
--- a/test/test_l10n.py
+++ b/test/test_l10n.py
@@ -36,3 +36,15 @@ def test_get_translator_for_request():
 
     translate = l10n.get_translator_for_request(request)
     assert translate("Home") == "Startseite"
+
+
+def test_tn_filter():
+    request = Request()
+    request.cookies["AURLANG"] = "en"
+    context = {"language": "en", "request": request}
+
+    translated = l10n.tn(context, 1, "%d package found.", "%d packages found.")
+    assert translated == "%d package found."
+
+    translated = l10n.tn(context, 2, "%d package found.", "%d packages found.")
+    assert translated == "%d packages found."

From 55c29c4519c200f32ad2463a63f5a46f7a850f2c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 30 Aug 2021 18:27:17 -0700
Subject: [PATCH 308/844] partials/packages/details.html: Add package request
 count

This was missed during the original implementation merge.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               |  5 +++
 templates/partials/packages/actions.html |  8 ++++-
 test/test_packages_routes.py             | 45 ++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 0ffcbfb9..0873bd9f 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -17,6 +17,7 @@ from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_license import PackageLicense
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
+from aurweb.models.package_request import PackageRequest
 from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID
@@ -54,6 +55,10 @@ async def make_single_context(request: Request,
     context["voted"] = request.user.package_votes.filter(
         PackageVote.PackageBaseID == pkgbase.ID).scalar()
 
+    context["requests"] = pkgbase.requests.filter(
+        PackageRequest.ClosedTS.is_(None)
+    ).count()
+
     return context
 
 
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 87db3a3f..346537be 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -124,7 +124,13 @@
                     </a>
                 </li>
             {% endif %}
-            <li><span class="flagged"></span></li>
+            {% if requests %}
+                <li>
+                    <span class="flagged">
+                        {{ requests | tn("%d pending request", "%d pending requests") | format(requests) }}
+                    </span>
+                </li>
+            {% endif %}
             <li>
             {% if not request.user.is_authenticated() %}
                 <a href="/login?next={{ '/pkgbase/%s/request' | format(result.Name) | urlencode }}">
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 0c9d80e8..ad07ec17 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -15,7 +15,9 @@ from aurweb.models.package_comment import PackageComment
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_keyword import PackageKeyword
 from aurweb.models.package_relation import PackageRelation
+from aurweb.models.package_request import PackageRequest
 from aurweb.models.relation_type import PROVIDES_ID, RelationType
+from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
 from aurweb.testing.html import parse_root
@@ -173,6 +175,43 @@ def test_package_comments(client: TestClient, user: User, package: Package):
         assert comments[i].strip() == row
 
 
+def test_package_requests_display(client: TestClient, user: User,
+                                  package: Package):
+    type_ = db.query(RequestType, RequestType.ID == DELETION_ID).first()
+    db.create(PackageRequest, PackageBase=package.PackageBase,
+              PackageBaseName=package.PackageBase.Name,
+              User=user, RequestType=type_,
+              Comments="Test comment.",
+              ClosureComment=str())
+
+    # Test that a single request displays "1 pending request".
+    with client as request:
+        resp = request.get(package_endpoint(package))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    selector = '//div[@id="actionlist"]/ul/li/span[@class="flagged"]'
+    target = root.xpath(selector)[0]
+    assert target.text.strip() == "1 pending request"
+
+    type_ = db.query(RequestType, RequestType.ID == DELETION_ID).first()
+    db.create(PackageRequest, PackageBase=package.PackageBase,
+              PackageBaseName=package.PackageBase.Name,
+              User=user, RequestType=type_,
+              Comments="Test comment2.",
+              ClosureComment=str())
+
+    # Test that a two requests display "2 pending requests".
+    with client as request:
+        resp = request.get(package_endpoint(package))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    selector = '//div[@id="actionlist"]/ul/li/span[@class="flagged"]'
+    target = root.xpath(selector)[0]
+    assert target.text.strip() == "2 pending requests"
+
+
 def test_package_authenticated(client: TestClient, user: User,
                                package: Package):
     """ We get the same here for either authenticated or not
@@ -196,6 +235,12 @@ def test_package_authenticated(client: TestClient, user: User,
     for expected_text in expected:
         assert expected_text in resp.text
 
+    # When no requests are up, make sure we don't see the display for them.
+    root = parse_root(resp.text)
+    selector = '//div[@id="actionlist"]/ul/li/span[@class="flagged"]'
+    target = root.xpath(selector)
+    assert len(target) == 0
+
 
 def test_package_authenticated_maintainer(client: TestClient,
                                           maintainer: User,

From 718ae1acba880d6ecf7488e88c3ac90bd357d493 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 30 Aug 2021 22:14:31 -0700
Subject: [PATCH 309/844] aurweb.templates: loader -> _loader, env -> _env

These are module local globals and we don't want to expose
global functionality to users, so privatize them with a
leading `_` prefix.

These things should **really** not be accessible by users.
---
 aurweb/templates.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 7530472f..48391b4a 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -18,29 +18,29 @@ import aurweb.config
 from aurweb import captcha, l10n, time, util
 
 # Prepare jinja2 objects.
-loader = jinja2.FileSystemLoader(os.path.join(
+_loader = jinja2.FileSystemLoader(os.path.join(
     aurweb.config.get("options", "aurwebdir"), "templates"))
-env = jinja2.Environment(loader=loader, autoescape=True,
-                         extensions=["jinja2.ext.i18n"])
+_env = jinja2.Environment(loader=_loader, autoescape=True,
+                          extensions=["jinja2.ext.i18n"])
 
 # Add t{r,n} translation filters.
-env.filters["tr"] = l10n.tr
-env.filters["tn"] = l10n.tn
+_env.filters["tr"] = l10n.tr
+_env.filters["tn"] = l10n.tn
 
 # Utility filters.
-env.filters["dt"] = util.timestamp_to_datetime
-env.filters["as_timezone"] = util.as_timezone
-env.filters["dedupe_qs"] = util.dedupe_qs
-env.filters["urlencode"] = quote_plus
-env.filters["get_vote"] = util.get_vote
-env.filters["number_format"] = util.number_format
+_env.filters["dt"] = util.timestamp_to_datetime
+_env.filters["as_timezone"] = util.as_timezone
+_env.filters["dedupe_qs"] = util.dedupe_qs
+_env.filters["urlencode"] = quote_plus
+_env.filters["get_vote"] = util.get_vote
+_env.filters["number_format"] = util.number_format
 
 # Add captcha filters.
-env.filters["captcha_salt"] = captcha.captcha_salt_filter
-env.filters["captcha_cmdline"] = captcha.captcha_cmdline_filter
+_env.filters["captcha_salt"] = captcha.captcha_salt_filter
+_env.filters["captcha_cmdline"] = captcha.captcha_cmdline_filter
 
 # Add account utility filters.
-env.filters["account_url"] = util.account_url
+_env.filters["account_url"] = util.account_url
 
 
 def register_filter(name: str) -> Callable:
@@ -61,9 +61,9 @@ def register_filter(name: str) -> Callable:
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
             return func(*args, **kwargs)
-        if name in env.filters:
+        if name in _env.filters:
             raise KeyError(f"Jinja already has a filter named '{name}'")
-        env.filters[name] = wrapper
+        _env.filters[name] = wrapper
         return wrapper
     return decorator
 
@@ -105,12 +105,12 @@ def render_template(request: Request,
                     status_code: HTTPStatus = HTTPStatus.OK):
     """ Render a Jinja2 multi-lingual template with some context. """
 
-    # Create a deep copy of our jinja2 environment. The environment in
+    # Create a deep copy of our jinja2 _environment. The _environment in
     # total by itself is 48 bytes large (according to sys.getsizeof).
     # This is done so we can install gettext translations on the template
-    # environment being rendered without installing them into a global
+    # _environment being rendered without installing them into a global
     # which is reused in this function.
-    templates = copy.copy(env)
+    templates = copy.copy(_env)
 
     translator = l10n.get_raw_translator_for_request(context.get("request"))
     templates.install_gettext_translations(translator)

From e15a18e9fb05afac2ddc1fdc12965b80eafa5435 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 30 Aug 2021 23:04:55 -0700
Subject: [PATCH 310/844] remove unneeded comment

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 0873bd9f..a20c97b1 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -111,6 +111,6 @@ async def package_base(request: Request, name: str) -> Response:
 
     # Add our base information.
     context = await make_single_context(request, pkgbase)
-    context["packages"] = pkgbase.packages.all()  # Doesn't need to be here.
+    context["packages"] = pkgbase.packages.all()
 
     return render_template(request, "pkgbase.html", context)

From 49cc12f99dbe2bc69edd09db39692ad2135473af Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 20 Aug 2021 14:44:36 -0700
Subject: [PATCH 311/844] jinja2: rename filter 'urlencode' to 'quote_plus'

urlencode does more than just a quote_plus. Using urlencode
was not sensible, so this commit addresses that.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py                        | 2 +-
 aurweb/util.py                             | 3 +++
 templates/partials/packages/actions.html   | 6 +++---
 templates/partials/tu/proposal/voters.html | 2 +-
 templates/partials/tu/proposals.html       | 6 +++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 48391b4a..a648d5a1 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -31,7 +31,7 @@ _env.filters["tn"] = l10n.tn
 _env.filters["dt"] = util.timestamp_to_datetime
 _env.filters["as_timezone"] = util.as_timezone
 _env.filters["dedupe_qs"] = util.dedupe_qs
-_env.filters["urlencode"] = quote_plus
+_env.filters["quote_plus"] = quote_plus
 _env.filters["get_vote"] = util.get_vote
 _env.filters["number_format"] = util.number_format
 
diff --git a/aurweb/util.py b/aurweb/util.py
index 860bdd12..494a988d 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -1,4 +1,5 @@
 import base64
+import logging
 import math
 import random
 import re
@@ -18,6 +19,8 @@ from jinja2 import pass_context
 
 import aurweb.config
 
+logger = logging.getLogger(__name__)
+
 
 def make_random_string(length):
     return ''.join(random.choices(string.ascii_lowercase
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 346537be..d552f2dd 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -42,12 +42,12 @@
                     </li>
                 {% endif %}
                 <li>
-                    <a href="/login?next={{ request.url.path | urlencode }}">
+                    <a href="/login?next={{ request.url.path | quote_plus }}">
                         {{ "Vote for this package" | tr }}
                     </a>
                 </li>
                 <li>
-                    <a href="/login?next={{ request.url.path | urlencode }}">
+                    <a href="/login?next={{ request.url.path | quote_plus }}">
                         {{ "Enable notifications" | tr }}
                     </a>
                 </li>
@@ -133,7 +133,7 @@
             {% endif %}
             <li>
             {% if not request.user.is_authenticated() %}
-                <a href="/login?next={{ '/pkgbase/%s/request' | format(result.Name) | urlencode }}">
+                <a href="/login?next={{ '/pkgbase/%s/request' | format(result.Name) | quote_plus }}">
                     {{ "Submit Request" | tr }}
                 </a>
             {% else %}
diff --git a/templates/partials/tu/proposal/voters.html b/templates/partials/tu/proposal/voters.html
index 2fd42bdf..6069f97d 100644
--- a/templates/partials/tu/proposal/voters.html
+++ b/templates/partials/tu/proposal/voters.html
@@ -2,7 +2,7 @@
 <ul id="voters">
     {% for voter in voters %}
         <li>
-            <a href="/account/{{ voter.Username | urlencode }}">
+            <a href="/account/{{ voter.Username | quote_plus }}">
                 {{ voter.Username | e }}
             </a>
         </li>
diff --git a/templates/partials/tu/proposals.html b/templates/partials/tu/proposals.html
index 13e705fc..ab90444e 100644
--- a/templates/partials/tu/proposals.html
+++ b/templates/partials/tu/proposals.html
@@ -23,7 +23,7 @@
                     <th>{{ "Proposal" | tr }}</th>
                     <th>
                         {% set off_qs = "%s=%d" | format(off_param, off) %}
-                        {% set by_qs = "%s=%s" | format(by_param, by_next | urlencode) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by_next | quote_plus) %}
                         <a href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
                             {{ "Start" | tr }}
                         </a>
@@ -95,7 +95,7 @@
 
                     {% if off > 0 %}
                         {% set off_qs = "%s=%d" | format(off_param, off - 10) %}
-                        {% set by_qs = "%s=%s" | format(by_param, by | urlencode) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by | quote_plus) %}
                         <a class="page"
                            href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
                             ‹ Back
@@ -104,7 +104,7 @@
 
                     {% if off < total_votes - pp %}
                         {% set off_qs = "%s=%d" | format(off_param, off + 10) %}
-                        {% set by_qs = "%s=%s" | format(by_param, by | urlencode) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by | quote_plus) %}
                         <a class="page"
                            href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
                             Next ›

From a114bd3e16e5df00cc2542e37cedb82bf99e9a84 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 28 Aug 2021 16:33:33 -0700
Subject: [PATCH 312/844] aurweb.util: add extend_query and to_qs helpers

The first addition, extend_query, can be used to take an existing
query parameter dictionary and inject an *additions as replacement
key/value pairs.

The second, to_qs, converts a query parameter dictionary to
a query string in the form "a=b&c=d".

These two functions simplify and make dedupe_qs and quote_plus more
efficient in terms of constructing custom query string overrides.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py    | 14 +++++++++++++-
 test/test_util.py | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index 494a988d..e993c440 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -8,7 +8,8 @@ import string
 
 from collections import OrderedDict
 from datetime import datetime
-from urllib.parse import quote_plus, urlparse
+from typing import Any, Dict
+from urllib.parse import quote_plus, urlencode, urlparse
 from zoneinfo import ZoneInfo
 
 import fastapi
@@ -148,6 +149,17 @@ def dedupe_qs(query_string: str, *additions):
     return '&'.join([f"{k}={quote_plus(v)}" for k, v in reversed(qs.items())])
 
 
+def extend_query(query: Dict[str, Any], *additions) -> Dict[str, Any]:
+    """ Add additionally key value pairs to query. """
+    for k, v in list(additions):
+        query[k] = v
+    return query
+
+
+def to_qs(query: Dict[str, Any]) -> str:
+    return urlencode(query, doseq=True)
+
+
 def get_vote(voteinfo, request: fastapi.Request):
     from aurweb.models.tu_vote import TUVote
     return voteinfo.tu_votes.filter(TUVote.User == request.user).first()
diff --git a/test/test_util.py b/test/test_util.py
index f54a98a0..06fc08d3 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -35,3 +35,18 @@ def test_dedupe_qs():
 def test_number_format():
     assert util.number_format(0.222, 2) == "0.22"
     assert util.number_format(0.226, 2) == "0.23"
+
+
+def test_extend_query():
+    """ Test extension of a query via extend_query. """
+    query = {"a": "b"}
+    extended = util.extend_query(query, ("a", "c"), ("b", "d"))
+    assert extended.get("a") == "c"
+    assert extended.get("b") == "d"
+
+
+def test_to_qs():
+    """ Test conversion from a query dictionary to a query string. """
+    query = {"a": "b", "c": [1, 2, 3]}
+    qs = util.to_qs(query)
+    assert qs == "a=b&c=1&c=2&c=3"

From c9374732c013ba336cd1b3d6b3991fece9b2c934 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 31 Aug 2021 14:25:58 -0700
Subject: [PATCH 313/844] add filters for extend_query, to_qs

New jinja2 filters:

* `extend_query` -> `aurweb.util.extend_query`
* `urlencode` -> `aurweb.util.to_qs`

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index a648d5a1..4a9927fb 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -31,6 +31,8 @@ _env.filters["tn"] = l10n.tn
 _env.filters["dt"] = util.timestamp_to_datetime
 _env.filters["as_timezone"] = util.as_timezone
 _env.filters["dedupe_qs"] = util.dedupe_qs
+_env.filters["extend_query"] = util.extend_query
+_env.filters["urlencode"] = util.to_qs
 _env.filters["quote_plus"] = quote_plus
 _env.filters["get_vote"] = util.get_vote
 _env.filters["number_format"] = util.number_format

From 210e459ba90e274e585a6928585aa2362d168944 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 31 Aug 2021 14:27:16 -0700
Subject: [PATCH 314/844] Eradicate the `dedupe_qs` filter

The new `extend_query` and `urlencode` filters are way cleaner ways
to achieve what we did with `dedupe_qs`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/trusted_user.py       | 13 ++++++-------
 aurweb/templates.py                  |  1 -
 aurweb/util.py                       | 28 ++--------------------------
 templates/partials/tu/proposals.html |  6 +++---
 test/test_util.py                    | 16 ----------------
 5 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index fd5ebb04..61cfec6c 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -5,7 +5,6 @@ import typing
 
 from datetime import datetime
 from http import HTTPStatus
-from urllib.parse import quote_plus
 
 from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import RedirectResponse, Response
@@ -106,12 +105,12 @@ async def trusted_user(request: Request,
     context["current_by_next"] = "asc" if current_by == "desc" else "desc"
     context["past_by_next"] = "asc" if past_by == "desc" else "desc"
 
-    context["q"] = '&'.join([
-        f"coff={current_off}",
-        f"cby={quote_plus(current_by)}",
-        f"poff={past_off}",
-        f"pby={quote_plus(past_by)}"
-    ])
+    context["q"] = {
+        "coff": current_off,
+        "cby": current_by,
+        "poff": past_off,
+        "pby": past_by
+    }
 
     return render_template(request, "tu/index.html", context)
 
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 4a9927fb..6a1b6a1c 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -30,7 +30,6 @@ _env.filters["tn"] = l10n.tn
 # Utility filters.
 _env.filters["dt"] = util.timestamp_to_datetime
 _env.filters["as_timezone"] = util.as_timezone
-_env.filters["dedupe_qs"] = util.dedupe_qs
 _env.filters["extend_query"] = util.extend_query
 _env.filters["urlencode"] = util.to_qs
 _env.filters["quote_plus"] = quote_plus
diff --git a/aurweb/util.py b/aurweb/util.py
index e993c440..f9181811 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -6,10 +6,9 @@ import re
 import secrets
 import string
 
-from collections import OrderedDict
 from datetime import datetime
 from typing import Any, Dict
-from urllib.parse import quote_plus, urlencode, urlparse
+from urllib.parse import urlencode, urlparse
 from zoneinfo import ZoneInfo
 
 import fastapi
@@ -126,31 +125,8 @@ def as_timezone(dt: datetime, timezone: str):
     return dt.astimezone(tz=ZoneInfo(timezone))
 
 
-def dedupe_qs(query_string: str, *additions):
-    """ Dedupe keys found in a query string by rewriting it without
-    duplicates found while iterating from the end to the beginning,
-    using an ordered memo to track keys found and persist locations.
-
-    That is, query string 'a=1&b=1&a=2' will be deduped and converted
-    to 'b=1&a=2'.
-
-    :param query_string: An HTTP URL query string.
-    :param *additions: Optional additional fields to add to the query string.
-    :return: Deduped query string, including *additions at the tail.
-    """
-    for addition in list(additions):
-        query_string += f"&{addition}"
-
-    qs = OrderedDict()
-    for item in reversed(query_string.split('&')):
-        key, value = item.split('=')
-        if key not in qs:
-            qs[key] = value
-    return '&'.join([f"{k}={quote_plus(v)}" for k, v in reversed(qs.items())])
-
-
 def extend_query(query: Dict[str, Any], *additions) -> Dict[str, Any]:
-    """ Add additionally key value pairs to query. """
+    """ Add additional key value pairs to query. """
     for k, v in list(additions):
         query[k] = v
     return query
diff --git a/templates/partials/tu/proposals.html b/templates/partials/tu/proposals.html
index ab90444e..40eba22b 100644
--- a/templates/partials/tu/proposals.html
+++ b/templates/partials/tu/proposals.html
@@ -24,7 +24,7 @@
                     <th>
                         {% set off_qs = "%s=%d" | format(off_param, off) %}
                         {% set by_qs = "%s=%s" | format(by_param, by_next | quote_plus) %}
-                        <a href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
+                        <a href="?{{ q | extend_query([off_param, off], [by_param, by_next]) | urlencode }}">
                             {{ "Start" | tr }}
                         </a>
                     </th>
@@ -97,7 +97,7 @@
                         {% set off_qs = "%s=%d" | format(off_param, off - 10) %}
                         {% set by_qs = "%s=%s" | format(by_param, by | quote_plus) %}
                         <a class="page"
-                           href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
+                           href="?{{ q | extend_query([off_param, ([off - 10, 0] | max)], [by_param, by]) | urlencode }}">
                             ‹ Back
                         </a>
                     {% endif %}
@@ -106,7 +106,7 @@
                         {% set off_qs = "%s=%d" | format(off_param, off + 10) %}
                         {% set by_qs = "%s=%s" | format(by_param, by | quote_plus) %}
                         <a class="page"
-                           href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
+                           href="?{{ q | extend_query([off_param, off + pp], [by_param, by]) | urlencode }}">
                             Next ›
                         </a>
                     {% endif %}
diff --git a/test/test_util.py b/test/test_util.py
index 06fc08d3..0cc45409 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
@@ -17,21 +16,6 @@ def test_as_timezone():
     assert util.as_timezone(dt, "UTC") == dt.astimezone(tz=ZoneInfo("UTC"))
 
 
-def test_dedupe_qs():
-    items = OrderedDict()
-    items["key1"] = "test"
-    items["key2"] = "blah"
-    items["key3"] = 1
-
-    # Construct and test our query string.
-    query_string = '&'.join([f"{k}={v}" for k, v in items.items()])
-    assert query_string == "key1=test&key2=blah&key3=1"
-
-    # Add key1=changed and key2=changed to the query and dedupe it.
-    deduped = util.dedupe_qs(query_string, "key1=changed", "key3=changed")
-    assert deduped == "key2=blah&key1=changed&key3=changed"
-
-
 def test_number_format():
     assert util.number_format(0.222, 2) == "0.22"
     assert util.number_format(0.226, 2) == "0.23"

From b52059d43758e56729e475e01039b4ed19a64fab Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 31 Aug 2021 17:13:10 -0700
Subject: [PATCH 315/844] RPC: add deprecation warning for v1-v4 usage

With FastAPI starting to come closer to a close, we've got to advertise
this deprecation so that users have some time to adjust before making
the changes. We have not specified a specific time here, but we'd like
this message to reach users of the RPC API for at least a month before
any modifications are made to the interface.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 web/lib/aurjson.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php
index 86eae22b..e7bc7f97 100644
--- a/web/lib/aurjson.class.php
+++ b/web/lib/aurjson.class.php
@@ -272,6 +272,15 @@ class AurJSON {
 			'results' => $data
 		);
 
+        if ($this->version != 5) {
+            $json_array['warning'] = 'The use of versions lower than 5 is '
+                . 'now deprecated and will soon be unsupported. To ensure '
+                . 'your API client supports the change without issue, it '
+                . 'should use version 5 and adjust for any changes in the '
+                . 'API interface. See https://aur.archlinux.org/rpc for '
+                . 'documentation related to v5.';
+        }
+
 		if ($error) {
 			$json_array['error'] = $error;
 		}

From cfa95ef80ad758f1804896f582c73a8f907d9686 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 31 Aug 2021 17:13:10 -0700
Subject: [PATCH 316/844] RPC: add deprecation warning for v1-v4 usage

With FastAPI starting to come closer to a close, we've got to advertise
this deprecation so that users have some time to adjust before making
the changes. We have not specified a specific time here, but we'd like
this message to reach users of the RPC API for at least a month before
any modifications are made to the interface.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 web/lib/aurjson.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php
index 86eae22b..e7bc7f97 100644
--- a/web/lib/aurjson.class.php
+++ b/web/lib/aurjson.class.php
@@ -272,6 +272,15 @@ class AurJSON {
 			'results' => $data
 		);
 
+        if ($this->version != 5) {
+            $json_array['warning'] = 'The use of versions lower than 5 is '
+                . 'now deprecated and will soon be unsupported. To ensure '
+                . 'your API client supports the change without issue, it '
+                . 'should use version 5 and adjust for any changes in the '
+                . 'API interface. See https://aur.archlinux.org/rpc for '
+                . 'documentation related to v5.';
+        }
+
 		if ($error) {
 			$json_array['error'] = $error;
 		}

From a5943bf2add0231925d7836e2e0b587a4f5c7f05 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 2 Sep 2021 16:26:48 -0700
Subject: [PATCH 317/844] [FastAPI] Refactor db modifications

For SQLAlchemy to automatically understand updates from the
external world, it must use an `autocommit=True` in its session.

This change breaks how we were using commit previously, as
`autocommit=True` causes SQLAlchemy to commit when a
SessionTransaction context hits __exit__.

So, a refactoring was required of our tests: All usage of
any `db.{create,delete}` must be called **within** a
SessionTransaction context, created via new `db.begin()`.

From this point forward, we're going to require:

```
with db.begin():
    db.create(...)
    db.delete(...)
    db.session.delete(object)
```

With this, we now get external DB modifications automatically
without reloading or restarting the FastAPI server, which we
absolutely need for production.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py                     |  44 +++++---
 aurweb/models/user.py            |  42 ++++----
 aurweb/routers/accounts.py       | 145 +++++++++++++--------------
 aurweb/routers/html.py           |   6 +-
 aurweb/routers/trusted_user.py   |  20 ++--
 test/test_account_type.py        |  18 ++--
 test/test_accounts_routes.py     | 166 ++++++++++++++++---------------
 test/test_api_rate_limit.py      |  19 ++--
 test/test_auth.py                |  22 ++--
 test/test_auth_routes.py         |   9 +-
 test/test_ban.py                 |  10 +-
 test/test_db.py                  |  22 ++--
 test/test_dependency_type.py     |  14 ++-
 test/test_group.py               |  11 +-
 test/test_homepage.py            |  49 ++++-----
 test/test_license.py             |  11 +-
 test/test_official_provider.py   |  59 +++++------
 test/test_package.py             |  68 ++++++-------
 test/test_package_base.py        |  61 ++++++------
 test/test_package_blacklist.py   |  16 +--
 test/test_package_comment.py     |  47 +++++----
 test/test_package_dependency.py  |  84 ++++++++--------
 test/test_package_relation.py    |  75 +++++++-------
 test/test_package_request.py     |  99 ++++++++++--------
 test/test_package_source.py      |  23 +++--
 test/test_packages_routes.py     | 160 +++++++++++++++--------------
 test/test_packages_util.py       |  27 +++--
 test/test_relation_type.py       |  15 +--
 test/test_request_type.py        |  24 +++--
 test/test_routes.py              |  14 +--
 test/test_rss.py                 |  15 ++-
 test/test_session.py             |  34 ++++---
 test/test_ssh_pub_key.py         |  32 +++---
 test/test_term.py                |  19 ++--
 test/test_trusted_user_routes.py | 166 ++++++++++++++++---------------
 test/test_tu_voteinfo.py         | 130 +++++++++++++-----------
 test/test_user.py                | 124 ++++++++++++-----------
 37 files changed, 998 insertions(+), 902 deletions(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index c0147720..ea6b6918 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -59,20 +59,15 @@ def query(model, *args, **kwargs):
     return session.query(model).filter(*args, **kwargs)
 
 
-def create(model, autocommit: bool = True, *args, **kwargs):
+def create(model, *args, **kwargs):
     instance = model(*args, **kwargs)
-    add(instance)
-    if autocommit is True:
-        commit()
-    return instance
+    return add(instance)
 
 
-def delete(model, *args, autocommit: bool = True, **kwargs):
+def delete(model, *args, **kwargs):
     instance = session.query(model).filter(*args, **kwargs)
     for record in instance:
         session.delete(record)
-    if autocommit is True:
-        commit()
 
 
 def rollback():
@@ -84,8 +79,25 @@ def add(model):
     return model
 
 
-def commit():
-    session.commit()
+def begin():
+    """ Begin an SQLAlchemy SessionTransaction.
+
+    This context is **required** to perform an modifications to the
+    database.
+
+    Example:
+
+        with db.begin():
+            object = db.create(...)
+        # On __exit__, db.commit() is run.
+
+        with db.begin():
+            object = db.delete(...)
+        # On __exit__, db.commit() is run.
+
+    :return: A new SessionTransaction based on session
+    """
+    return session.begin()
 
 
 def get_sqlalchemy_url():
@@ -155,23 +167,23 @@ def get_engine(echo: bool = False):
                                connect_args=connect_args,
                                echo=echo)
 
+        Session = sessionmaker(autocommit=True, autoflush=False, bind=engine)
+        session = Session()
+
         if db_backend == "sqlite":
             # For SQLite, we need to add some custom functions as
             # they are used in the reference graph method.
             def regexp(regex, item):
                 return bool(re.search(regex, str(item)))
 
-            @event.listens_for(engine, "begin")
-            def do_begin(conn):
+            @event.listens_for(engine, "connect")
+            def do_begin(conn, record):
                 create_deterministic_function = functools.partial(
-                    conn.connection.create_function,
+                    conn.create_function,
                     deterministic=True
                 )
                 create_deterministic_function("REGEXP", 2, regexp)
 
-        Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-        session = Session()
-
     return engine
 
 
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 0ccf7329..70d15f88 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -102,7 +102,7 @@ class User(Base):
     def login(self, request: Request, password: str, session_time=0):
         """ Login and authenticate a request. """
 
-        from aurweb.db import session
+        from aurweb import db
         from aurweb.models.session import Session, generate_unique_sid
 
         if not self._login_approved(request):
@@ -112,10 +112,7 @@ class User(Base):
         if not self.authenticated:
             return None
 
-        self.LastLogin = now_ts = datetime.utcnow().timestamp()
-        self.LastLoginIPAddress = request.client.host
-        session.commit()
-
+        now_ts = datetime.utcnow().timestamp()
         session_ts = now_ts + (
             session_time if session_time
             else aurweb.config.getint("options", "login_timeout")
@@ -123,22 +120,23 @@ class User(Base):
 
         sid = None
 
-        if not self.session:
-            sid = generate_unique_sid()
-            self.session = Session(UsersID=self.ID, SessionID=sid,
-                                   LastUpdateTS=session_ts)
-            session.add(self.session)
-        else:
-            last_updated = self.session.LastUpdateTS
-            if last_updated and last_updated < now_ts:
-                self.session.SessionID = sid = generate_unique_sid()
+        with db.begin():
+            self.LastLogin = now_ts
+            self.LastLoginIPAddress = request.client.host
+            if not self.session:
+                sid = generate_unique_sid()
+                self.session = Session(UsersID=self.ID, SessionID=sid,
+                                       LastUpdateTS=session_ts)
+                db.add(self.session)
             else:
-                # Session is still valid; retrieve the current SID.
-                sid = self.session.SessionID
+                last_updated = self.session.LastUpdateTS
+                if last_updated and last_updated < now_ts:
+                    self.session.SessionID = sid = generate_unique_sid()
+                else:
+                    # Session is still valid; retrieve the current SID.
+                    sid = self.session.SessionID
 
-            self.session.LastUpdateTS = session_ts
-
-        session.commit()
+                self.session.LastUpdateTS = session_ts
 
         request.cookies["AURSID"] = self.session.SessionID
         return self.session.SessionID
@@ -149,13 +147,11 @@ class User(Base):
         return aurweb.auth.has_credential(self, cred, approved)
 
     def logout(self, request):
-        from aurweb.db import session
-
         del request.cookies["AURSID"]
         self.authenticated = False
         if self.session:
-            session.delete(self.session)
-            session.commit()
+            with db.begin():
+                db.session.delete(self.session)
 
     def is_trusted_user(self):
         return self.AccountType.ID in {
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 466d129d..ef4b99af 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -43,8 +43,6 @@ async def passreset_post(request: Request,
                          resetkey: str = Form(default=None),
                          password: str = Form(default=None),
                          confirm: str = Form(default=None)):
-    from aurweb.db import session
-
     context = await make_variable_context(request, "Password Reset")
 
     # The user parameter being required, we can match against
@@ -86,12 +84,11 @@ async def passreset_post(request: Request,
 
         # We got to this point; everything matched up. Update the password
         # and remove the ResetKey.
-        user.ResetKey = str()
-        user.update_password(password)
-
-        if user.session:
-            session.delete(user.session)
-            session.commit()
+        with db.begin():
+            user.ResetKey = str()
+            if user.session:
+                db.session.delete(user.session)
+            user.update_password(password)
 
         # Render ?step=complete.
         return RedirectResponse(url="/passreset?step=complete",
@@ -99,8 +96,8 @@ async def passreset_post(request: Request,
 
     # If we got here, we continue with issuing a resetkey for the user.
     resetkey = db.make_random_value(User, User.ResetKey)
-    user.ResetKey = resetkey
-    session.commit()
+    with db.begin():
+        user.ResetKey = resetkey
 
     executor = db.ConnectionExecutor(db.get_engine().raw_connection())
     ResetKeyNotification(executor, user.ID).send()
@@ -364,8 +361,6 @@ async def account_register_post(request: Request,
                                 ON: bool = Form(default=False),
                                 captcha: str = Form(default=None),
                                 captcha_salt: str = Form(...)):
-    from aurweb.db import session
-
     context = await make_variable_context(request, "Register")
 
     args = dict(await request.form())
@@ -394,11 +389,13 @@ async def account_register_post(request: Request,
                             AccountType.AccountType == "User").first()
 
     # Create a user given all parameters available.
-    user = db.create(User, Username=U, Email=E, HideEmail=H, BackupEmail=BE,
-                     RealName=R, Homepage=HP, IRCNick=I, PGPKey=K,
-                     LangPreference=L, Timezone=TZ, CommentNotify=CN,
-                     UpdateNotify=UN, OwnershipNotify=ON, ResetKey=resetkey,
-                     AccountType=account_type)
+    with db.begin():
+        user = db.create(User, Username=U,
+                         Email=E, HideEmail=H, BackupEmail=BE,
+                         RealName=R, Homepage=HP, IRCNick=I, PGPKey=K,
+                         LangPreference=L, Timezone=TZ, CommentNotify=CN,
+                         UpdateNotify=UN, OwnershipNotify=ON,
+                         ResetKey=resetkey, AccountType=account_type)
 
     # If a PK was given and either one does not exist or the given
     # PK mismatches the existing user's SSHPubKey.PubKey.
@@ -410,10 +407,10 @@ async def account_register_post(request: Request,
             # Remove the host part.
             pubkey = parts[0] + " " + parts[1]
         fingerprint = get_fingerprint(pubkey)
-        user.ssh_pub_key = SSHPubKey(UserID=user.ID,
-                                     PubKey=pubkey,
-                                     Fingerprint=fingerprint)
-        session.commit()
+        with db.begin():
+            user.ssh_pub_key = SSHPubKey(UserID=user.ID,
+                                         PubKey=pubkey,
+                                         Fingerprint=fingerprint)
 
     # Send a reset key notification to the new user.
     executor = db.ConnectionExecutor(db.get_engine().raw_connection())
@@ -499,63 +496,67 @@ async def account_edit_post(request: Request,
                                status_code=int(HTTPStatus.BAD_REQUEST))
 
     # Set all updated fields as needed.
-    user.Username = U or user.Username
-    user.Email = E or user.Email
-    user.HideEmail = bool(H)
-    user.BackupEmail = BE or user.BackupEmail
-    user.RealName = R or user.RealName
-    user.Homepage = HP or user.Homepage
-    user.IRCNick = I or user.IRCNick
-    user.PGPKey = K or user.PGPKey
-    user.InactivityTS = datetime.utcnow().timestamp() if J else 0
+    with db.begin():
+        user.Username = U or user.Username
+        user.Email = E or user.Email
+        user.HideEmail = bool(H)
+        user.BackupEmail = BE or user.BackupEmail
+        user.RealName = R or user.RealName
+        user.Homepage = HP or user.Homepage
+        user.IRCNick = I or user.IRCNick
+        user.PGPKey = K or user.PGPKey
+        user.InactivityTS = datetime.utcnow().timestamp() if J else 0
 
     # If we update the language, update the cookie as well.
     if L and L != user.LangPreference:
         request.cookies["AURLANG"] = L
-        user.LangPreference = L
+        with db.begin():
+            user.LangPreference = L
         context["language"] = L
 
     # If we update the timezone, also update the cookie.
     if TZ and TZ != user.Timezone:
-        user.Timezone = TZ
+        with db.begin():
+            user.Timezone = TZ
         request.cookies["AURTZ"] = TZ
         context["timezone"] = TZ
 
-    user.CommentNotify = bool(CN)
-    user.UpdateNotify = bool(UN)
-    user.OwnershipNotify = bool(ON)
+    with db.begin():
+        user.CommentNotify = bool(CN)
+        user.UpdateNotify = bool(UN)
+        user.OwnershipNotify = bool(ON)
 
     # If a PK is given, compare it against the target user's PK.
-    if PK:
-        # Get the second token in the public key, which is the actual key.
-        pubkey = PK.strip().rstrip()
-        parts = pubkey.split(" ")
-        if len(parts) == 3:
-            # Remove the host part.
-            pubkey = parts[0] + " " + parts[1]
-        fingerprint = get_fingerprint(pubkey)
-        if not user.ssh_pub_key:
-            # No public key exists, create one.
-            user.ssh_pub_key = SSHPubKey(UserID=user.ID,
-                                         PubKey=pubkey,
-                                         Fingerprint=fingerprint)
-        elif user.ssh_pub_key.PubKey != pubkey:
-            # A public key already exists, update it.
-            user.ssh_pub_key.PubKey = pubkey
-            user.ssh_pub_key.Fingerprint = fingerprint
-    elif user.ssh_pub_key:
-        # Else, if the user has a public key already, delete it.
-        session.delete(user.ssh_pub_key)
-
-    # Commit changes, if any.
-    session.commit()
+    with db.begin():
+        if PK:
+            # Get the second token in the public key, which is the actual key.
+            pubkey = PK.strip().rstrip()
+            parts = pubkey.split(" ")
+            if len(parts) == 3:
+                # Remove the host part.
+                pubkey = parts[0] + " " + parts[1]
+            fingerprint = get_fingerprint(pubkey)
+            if not user.ssh_pub_key:
+                # No public key exists, create one.
+                user.ssh_pub_key = SSHPubKey(UserID=user.ID,
+                                             PubKey=pubkey,
+                                             Fingerprint=fingerprint)
+            elif user.ssh_pub_key.PubKey != pubkey:
+                # A public key already exists, update it.
+                user.ssh_pub_key.PubKey = pubkey
+                user.ssh_pub_key.Fingerprint = fingerprint
+        elif user.ssh_pub_key:
+            # Else, if the user has a public key already, delete it.
+            session.delete(user.ssh_pub_key)
 
     if P and not user.valid_password(P):
         # Remove the fields we consumed for passwords.
         context["P"] = context["C"] = str()
 
         # If a password was given and it doesn't match the user's, update it.
-        user.update_password(P)
+        with db.begin():
+            user.update_password(P)
+
         if user == request.user:
             # If the target user is the request user, login with
             # the updated password and update AURSID.
@@ -731,21 +732,17 @@ async def terms_of_service_post(request: Request,
         accept_needed = sorted(unaccepted + diffs)
         return render_terms_of_service(request, context, accept_needed)
 
-    # For each term we found, query for the matching accepted term
-    # and update its Revision to the term's current Revision.
-    for term in diffs:
-        accepted_term = request.user.accepted_terms.filter(
-            AcceptedTerm.TermsID == term.ID).first()
-        accepted_term.Revision = term.Revision
+    with db.begin():
+        # For each term we found, query for the matching accepted term
+        # and update its Revision to the term's current Revision.
+        for term in diffs:
+            accepted_term = request.user.accepted_terms.filter(
+                AcceptedTerm.TermsID == term.ID).first()
+            accepted_term.Revision = term.Revision
 
-    # For each term that was never accepted, accept it!
-    for term in unaccepted:
-        db.create(AcceptedTerm, User=request.user,
-                  Term=term, Revision=term.Revision,
-                  autocommit=False)
-
-    if diffs or unaccepted:
-        # If we had any terms to update, commit the changes.
-        db.commit()
+        # For each term that was never accepted, accept it!
+        for term in unaccepted:
+            db.create(AcceptedTerm, User=request.user,
+                      Term=term, Revision=term.Revision)
 
     return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index c2375f69..c3fd3db1 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -44,8 +44,6 @@ async def language(request: Request,
     setting the language on any page, we want to preserve query
     parameters across the redirect.
     """
-    from aurweb.db import session
-
     if next[0] != '/':
         return HTMLResponse(b"Invalid 'next' parameter.", status_code=400)
 
@@ -53,8 +51,8 @@ async def language(request: Request,
 
     # If the user is authenticated, update the user's LangPreference.
     if request.user.is_authenticated():
-        request.user.LangPreference = set_lang
-        session.commit()
+        with db.begin():
+            request.user.LangPreference = set_lang
 
     # In any case, set the response's AURLANG cookie that never expires.
     response = RedirectResponse(url=f"{next}{query_string}",
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index 61cfec6c..a977b31a 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -214,10 +214,9 @@ async def trusted_user_proposal_post(request: Request,
         return Response("Invalid 'decision' value.",
                         status_code=int(HTTPStatus.BAD_REQUEST))
 
-    vote = db.create(TUVote, User=request.user, VoteInfo=voteinfo,
-                     autocommit=False)
-    voteinfo.ActiveTUs += 1
-    db.commit()
+    with db.begin():
+        vote = db.create(TUVote, User=request.user, VoteInfo=voteinfo)
+        voteinfo.ActiveTUs += 1
 
     context["error"] = "You've already voted for this proposal."
     return render_proposal(request, context, proposal, voteinfo, voters, vote)
@@ -294,12 +293,13 @@ async def trusted_user_addvote_post(request: Request,
     agenda = re.sub(r'<[/]?style.*>', '', agenda)
 
     # Create a new TUVoteInfo (proposal)!
-    voteinfo = db.create(TUVoteInfo,
-                         User=user,
-                         Agenda=agenda,
-                         Submitted=timestamp, End=timestamp + duration,
-                         Quorum=quorum,
-                         Submitter=request.user)
+    with db.begin():
+        voteinfo = db.create(TUVoteInfo,
+                             User=user,
+                             Agenda=agenda,
+                             Submitted=timestamp, End=timestamp + duration,
+                             Quorum=quorum,
+                             Submitter=request.user)
 
     # Redirect to the new proposal.
     return RedirectResponse(f"/tu/{voteinfo.ID}",
diff --git a/test/test_account_type.py b/test/test_account_type.py
index fa4bc5ad..86e68253 100644
--- a/test/test_account_type.py
+++ b/test/test_account_type.py
@@ -1,6 +1,6 @@
 import pytest
 
-from aurweb.db import create, delete, query
+from aurweb.db import begin, create, delete, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
@@ -14,11 +14,13 @@ def setup():
 
     global account_type
 
-    account_type = create(AccountType, AccountType="TestUser")
+    with begin():
+        account_type = create(AccountType, AccountType="TestUser")
 
     yield account_type
 
-    delete(AccountType, AccountType.ID == account_type.ID)
+    with begin():
+        delete(AccountType, AccountType.ID == account_type.ID)
 
 
 def test_account_type():
@@ -38,12 +40,14 @@ def test_account_type():
 
 
 def test_user_account_type_relationship():
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+    with begin():
+        user = create(User, Username="test", Email="test@example.org",
+                      RealName="Test User", Passwd="testPassword",
+                      AccountType=account_type)
 
     assert user.AccountType == account_type
 
     # This must be deleted here to avoid foreign key issues when
     # deleting the temporary AccountType in the fixture.
-    delete(User, User.ID == user.ID)
+    with begin():
+        delete(User, User.ID == user.ID)
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 567b3426..9120f23f 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -11,9 +11,9 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import captcha
+from aurweb import captcha, db
 from aurweb.asgi import app
-from aurweb.db import commit, create, query
+from aurweb.db import create, query
 from aurweb.models.accepted_term import AcceptedTerm
 from aurweb.models.account_type import DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID, AccountType
 from aurweb.models.ban import Ban
@@ -57,9 +57,11 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
-                  RealName="Test UserZ", Passwd="testPassword",
-                  IRCNick="testZ", AccountType=account_type)
+
+    with db.begin():
+        user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
+                      RealName="Test UserZ", Passwd="testPassword",
+                      IRCNick="testZ", AccountType=account_type)
 
     yield user
 
@@ -70,9 +72,10 @@ def setup():
 
 @pytest.fixture
 def tu_user():
-    user.AccountType = query(AccountType,
-                             AccountType.ID == TRUSTED_USER_AND_DEV_ID).first()
-    commit()
+    with db.begin():
+        user.AccountType = query(AccountType).filter(
+            AccountType.ID == TRUSTED_USER_AND_DEV_ID
+        ).first()
     yield user
 
 
@@ -149,11 +152,9 @@ def test_post_passreset_user():
 
 
 def test_post_passreset_resetkey():
-    from aurweb.db import session
-
-    user.session = Session(UsersID=user.ID, SessionID="blah",
-                           LastUpdateTS=datetime.utcnow().timestamp())
-    session.commit()
+    with db.begin():
+        user.session = Session(UsersID=user.ID, SessionID="blah",
+                               LastUpdateTS=datetime.utcnow().timestamp())
 
     # Prepare a password reset.
     with client as request:
@@ -357,7 +358,8 @@ def test_post_register_error_invalid_captcha():
 
 def test_post_register_error_ip_banned():
     # 'testclient' is used as request.client.host via FastAPI TestClient.
-    create(Ban, IPAddress="testclient", BanTS=datetime.utcnow())
+    with db.begin():
+        create(Ban, IPAddress="testclient", BanTS=datetime.utcnow())
 
     with client as request:
         response = post_register(request)
@@ -576,7 +578,8 @@ def test_post_register_error_ssh_pubkey_taken():
 
     # Take the sha256 fingerprint of the ssh public key, create it.
     fp = get_fingerprint(pk)
-    create(SSHPubKey, UserID=user.ID, PubKey=pk, Fingerprint=fp)
+    with db.begin():
+        create(SSHPubKey, UserID=user.ID, PubKey=pk, Fingerprint=fp)
 
     with client as request:
         response = post_register(request, PK=pk)
@@ -660,13 +663,11 @@ def test_post_account_edit():
 
 
 def test_post_account_edit_dev():
-    from aurweb.db import session
-
     # Modify our user to be a "Trusted User & Developer"
     name = "Trusted User & Developer"
     tu_or_dev = query(AccountType, AccountType.AccountType == name).first()
-    user.AccountType = tu_or_dev
-    session.commit()
+    with db.begin():
+        user.AccountType = tu_or_dev
 
     request = Request()
     sid = user.login(request, "testPassword")
@@ -1001,21 +1002,19 @@ def get_rows(html):
 
 def test_post_accounts(tu_user):
     # Set a PGPKey.
-    user.PGPKey = "5F18B20346188419750745D7335F2CB41F253D30"
+    with db.begin():
+        user.PGPKey = "5F18B20346188419750745D7335F2CB41F253D30"
 
     # Create a few more users.
     users = [user]
-    for i in range(10):
-        _user = create(User, Username=f"test_{i}",
-                       Email=f"test_{i}@example.org",
-                       RealName=f"Test #{i}",
-                       Passwd="testPassword",
-                       IRCNick=f"test_#{i}",
-                       autocommit=False)
-        users.append(_user)
-
-    # Commit everything to the database.
-    commit()
+    with db.begin():
+        for i in range(10):
+            _user = create(User, Username=f"test_{i}",
+                           Email=f"test_{i}@example.org",
+                           RealName=f"Test #{i}",
+                           Passwd="testPassword",
+                           IRCNick=f"test_#{i}")
+            users.append(_user)
 
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1085,11 +1084,12 @@ def test_post_accounts_account_type(tu_user):
     # test the `u` parameter.
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    create(User, Username="test_2",
-           Email="test_2@example.org",
-           RealName="Test User 2",
-           Passwd="testPassword",
-           AccountType=account_type)
+    with db.begin():
+        create(User, Username="test_2",
+               Email="test_2@example.org",
+               RealName="Test User 2",
+               Passwd="testPassword",
+               AccountType=account_type)
 
     # Expect no entries; we marked our only user as a User type.
     with client as request:
@@ -1113,9 +1113,10 @@ def test_post_accounts_account_type(tu_user):
     assert type.text.strip() == "User"
 
     # Set our only user to a Trusted User.
-    user.AccountType = query(AccountType,
-                             AccountType.ID == TRUSTED_USER_ID).first()
-    commit()
+    with db.begin():
+        user.AccountType = query(AccountType).filter(
+            AccountType.ID == TRUSTED_USER_ID
+        ).first()
 
     with client as request:
         response = request.post("/accounts/", cookies=cookies,
@@ -1130,9 +1131,10 @@ def test_post_accounts_account_type(tu_user):
 
     assert type.text.strip() == "Trusted User"
 
-    user.AccountType = query(AccountType,
-                             AccountType.ID == DEVELOPER_ID).first()
-    commit()
+    with db.begin():
+        user.AccountType = query(AccountType).filter(
+            AccountType.ID == DEVELOPER_ID
+        ).first()
 
     with client as request:
         response = request.post("/accounts/", cookies=cookies,
@@ -1147,10 +1149,10 @@ def test_post_accounts_account_type(tu_user):
 
     assert type.text.strip() == "Developer"
 
-    user.AccountType = query(AccountType,
-                             AccountType.ID == TRUSTED_USER_AND_DEV_ID
-                             ).first()
-    commit()
+    with db.begin():
+        user.AccountType = query(AccountType).filter(
+            AccountType.ID == TRUSTED_USER_AND_DEV_ID
+        ).first()
 
     with client as request:
         response = request.post("/accounts/", cookies=cookies,
@@ -1182,8 +1184,8 @@ def test_post_accounts_status(tu_user):
     username, type, status, realname, irc, pgp_key, edit = row
     assert status.text.strip() == "Active"
 
-    user.Suspended = True
-    commit()
+    with db.begin():
+        user.Suspended = True
 
     with client as request:
         response = request.post("/accounts/", cookies=cookies,
@@ -1244,12 +1246,13 @@ def test_post_accounts_sortby(tu_user):
     # Create a second user so we can compare sorts.
     account_type = query(AccountType,
                          AccountType.ID == DEVELOPER_ID).first()
-    create(User, Username="test2",
-           Email="test2@example.org",
-           RealName="Test User 2",
-           Passwd="testPassword",
-           IRCNick="test2",
-           AccountType=account_type)
+    with db.begin():
+        create(User, Username="test2",
+               Email="test2@example.org",
+               RealName="Test User 2",
+               Passwd="testPassword",
+               IRCNick="test2",
+               AccountType=account_type)
 
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1297,9 +1300,10 @@ def test_post_accounts_sortby(tu_user):
     # Test the rows are reversed when ordering by RealName.
     assert compare_text_values(4, first_rows, reversed(rows)) is True
 
-    user.AccountType = query(AccountType,
-                             AccountType.ID == TRUSTED_USER_AND_DEV_ID).first()
-    commit()
+    with db.begin():
+        user.AccountType = query(AccountType).filter(
+            AccountType.ID == TRUSTED_USER_AND_DEV_ID
+        ).first()
 
     # Fetch first_rows again with our new AccountType ordering.
     with client as request:
@@ -1322,8 +1326,8 @@ def test_post_accounts_sortby(tu_user):
 
 
 def test_post_accounts_pgp_key(tu_user):
-    user.PGPKey = "5F18B20346188419750745D7335F2CB41F253D30"
-    commit()
+    with db.begin():
+        user.PGPKey = "5F18B20346188419750745D7335F2CB41F253D30"
 
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1343,15 +1347,14 @@ def test_post_accounts_paged(tu_user):
     users = [user]
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    for i in range(150):
-        _user = create(User, Username=f"test_#{i}",
-                       Email=f"test_#{i}@example.org",
-                       RealName=f"Test User #{i}",
-                       Passwd="testPassword",
-                       AccountType=account_type,
-                       autocommit=False)
-        users.append(_user)
-    commit()
+    with db.begin():
+        for i in range(150):
+            _user = create(User, Username=f"test_#{i}",
+                           Email=f"test_#{i}@example.org",
+                           RealName=f"Test User #{i}",
+                           Passwd="testPassword",
+                           AccountType=account_type)
+            users.append(_user)
 
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1414,8 +1417,9 @@ def test_post_accounts_paged(tu_user):
 
 
 def test_get_terms_of_service():
-    term = create(Term, Description="Test term.",
-                  URL="http://localhost", Revision=1)
+    with db.begin():
+        term = create(Term, Description="Test term.",
+                      URL="http://localhost", Revision=1)
 
     with client as request:
         response = request.get("/tos", allow_redirects=False)
@@ -1436,8 +1440,9 @@ def test_get_terms_of_service():
         response = request.get("/tos", cookies=cookies, allow_redirects=False)
     assert response.status_code == int(HTTPStatus.OK)
 
-    accepted_term = create(AcceptedTerm, User=user,
-                           Term=term, Revision=term.Revision)
+    with db.begin():
+        accepted_term = create(AcceptedTerm, User=user,
+                               Term=term, Revision=term.Revision)
 
     with client as request:
         response = request.get("/tos", cookies=cookies, allow_redirects=False)
@@ -1445,8 +1450,8 @@ def test_get_terms_of_service():
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
     # Bump the term's revision.
-    term.Revision = 2
-    commit()
+    with db.begin():
+        term.Revision = 2
 
     with client as request:
         response = request.get("/tos", cookies=cookies, allow_redirects=False)
@@ -1454,8 +1459,8 @@ def test_get_terms_of_service():
     # yet been agreed to via AcceptedTerm update.
     assert response.status_code == int(HTTPStatus.OK)
 
-    accepted_term.Revision = term.Revision
-    commit()
+    with db.begin():
+        accepted_term.Revision = term.Revision
 
     with client as request:
         response = request.get("/tos", cookies=cookies, allow_redirects=False)
@@ -1471,8 +1476,9 @@ def test_post_terms_of_service():
     cookies = {"AURSID": sid}  # Auth cookie.
 
     # Create a fresh Term.
-    term = create(Term, Description="Test term.",
-                  URL="http://localhost", Revision=1)
+    with db.begin():
+        term = create(Term, Description="Test term.",
+                      URL="http://localhost", Revision=1)
 
     # Test that the term we just created is listed.
     with client as request:
@@ -1497,8 +1503,8 @@ def test_post_terms_of_service():
     assert accepted_term.Term == term
 
     # Update the term to revision 2.
-    term.Revision = 2
-    commit()
+    with db.begin():
+        term.Revision = 2
 
     # A GET request gives us the new revision to accept.
     with client as request:
diff --git a/test/test_api_rate_limit.py b/test/test_api_rate_limit.py
index 536e3841..25cb3e0f 100644
--- a/test/test_api_rate_limit.py
+++ b/test/test_api_rate_limit.py
@@ -2,6 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
+from aurweb import db
 from aurweb.db import create
 from aurweb.models.api_rate_limit import ApiRateLimit
 from aurweb.testing import setup_test_db
@@ -13,26 +14,28 @@ def setup():
 
 
 def test_api_rate_key_creation():
-    rate = create(ApiRateLimit, IP="127.0.0.1", Requests=10, WindowStart=1)
+    with db.begin():
+        rate = create(ApiRateLimit, IP="127.0.0.1", Requests=10, WindowStart=1)
     assert rate.IP == "127.0.0.1"
     assert rate.Requests == 10
     assert rate.WindowStart == 1
 
 
 def test_api_rate_key_ip_default():
-    api_rate_limit = create(ApiRateLimit, Requests=10, WindowStart=1)
+    with db.begin():
+        api_rate_limit = create(ApiRateLimit, Requests=10, WindowStart=1)
     assert api_rate_limit.IP == str()
 
 
 def test_api_rate_key_null_requests_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(ApiRateLimit, IP="127.0.0.1", WindowStart=1)
-    session.rollback()
+        with db.begin():
+            create(ApiRateLimit, IP="127.0.0.1", WindowStart=1)
+    db.rollback()
 
 
 def test_api_rate_key_null_window_start_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(ApiRateLimit, IP="127.0.0.1", Requests=1)
-    session.rollback()
+        with db.begin():
+            create(ApiRateLimit, IP="127.0.0.1", Requests=1)
+    db.rollback()
diff --git a/test/test_auth.py b/test/test_auth.py
index b386bea1..caa39468 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -4,6 +4,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
+from aurweb import db
 from aurweb.auth import BasicAuthBackend, account_type_required, has_credential
 from aurweb.db import create, query
 from aurweb.models.account_type import USER, USER_ID, AccountType
@@ -23,9 +24,10 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.com",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+    with db.begin():
+        user = create(User, Username="test", Email="test@example.com",
+                      RealName="Test User", Passwd="testPassword",
+                      AccountType=account_type)
 
     backend = BasicAuthBackend()
     request = Request()
@@ -51,14 +53,13 @@ async def test_auth_backend_invalid_sid():
 
 @pytest.mark.asyncio
 async def test_auth_backend_invalid_user_id():
-    from aurweb.db import session
-
     # Create a new session with a fake user id.
     now_ts = datetime.utcnow().timestamp()
     with pytest.raises(IntegrityError):
-        create(Session, UsersID=666, SessionID="realSession",
-               LastUpdateTS=now_ts + 5)
-    session.rollback()
+        with db.begin():
+            create(Session, UsersID=666, SessionID="realSession",
+                   LastUpdateTS=now_ts + 5)
+    db.rollback()
 
 
 @pytest.mark.asyncio
@@ -66,8 +67,9 @@ async def test_basic_auth_backend():
     # This time, everything matches up. We expect the user to
     # equal the real_user.
     now_ts = datetime.utcnow().timestamp()
-    create(Session, UsersID=user.ID, SessionID="realSession",
-           LastUpdateTS=now_ts + 5)
+    with db.begin():
+        create(Session, UsersID=user.ID, SessionID="realSession",
+               LastUpdateTS=now_ts + 5)
     request.cookies["AURSID"] = "realSession"
     _, result = await backend.authenticate(request)
     assert result == user
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index b0dd5648..1d8f9cbe 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -9,7 +9,7 @@ from fastapi.testclient import TestClient
 import aurweb.config
 
 from aurweb.asgi import app
-from aurweb.db import create, query
+from aurweb.db import begin, create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.session import Session
 from aurweb.models.user import User
@@ -32,9 +32,10 @@ def setup():
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
 
-    user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+    with begin():
+        user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
+                      RealName="Test User", Passwd="testPassword",
+                      AccountType=account_type)
 
     client = TestClient(app)
 
diff --git a/test/test_ban.py b/test/test_ban.py
index b728644b..f96e9d14 100644
--- a/test/test_ban.py
+++ b/test/test_ban.py
@@ -6,6 +6,7 @@ import pytest
 
 from sqlalchemy import exc as sa_exc
 
+from aurweb import db
 from aurweb.db import create
 from aurweb.models.ban import Ban, is_banned
 from aurweb.testing import setup_test_db
@@ -21,7 +22,8 @@ def setup():
     setup_test_db("Bans")
 
     ts = datetime.utcnow() + timedelta(seconds=30)
-    ban = create(Ban, IPAddress="127.0.0.1", BanTS=ts)
+    with db.begin():
+        ban = create(Ban, IPAddress="127.0.0.1", BanTS=ts)
     request = Request()
 
 
@@ -35,17 +37,17 @@ def test_invalid_ban():
 
     with pytest.raises(sa_exc.IntegrityError):
         bad_ban = Ban(BanTS=datetime.utcnow())
-        session.add(bad_ban)
 
         # We're adding a ban with no primary key; this causes an
         # SQLAlchemy warnings when committing to the DB.
         # Ignore them.
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", sa_exc.SAWarning)
-            session.commit()
+            with db.begin():
+                session.add(bad_ban)
 
     # Since we got a transaction failure, we need to rollback.
-    session.rollback()
+    db.rollback()
 
 
 def test_banned():
diff --git a/test/test_db.py b/test/test_db.py
index 9ece25ea..7798d2f6 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -278,18 +278,15 @@ def test_connection_execute_paramstyle_unsupported():
 
 
 def test_create_delete():
-    db.create(AccountType, AccountType="test")
+    with db.begin():
+        db.create(AccountType, AccountType="test")
+
     record = db.query(AccountType, AccountType.AccountType == "test").first()
     assert record is not None
-    db.delete(AccountType, AccountType.AccountType == "test")
-    record = db.query(AccountType, AccountType.AccountType == "test").first()
-    assert record is None
 
-    # Create and delete a record with autocommit=False.
-    db.create(AccountType, AccountType="test", autocommit=False)
-    db.commit()
-    db.delete(AccountType, AccountType.AccountType == "test", autocommit=False)
-    db.commit()
+    with db.begin():
+        db.delete(AccountType, AccountType.AccountType == "test")
+
     record = db.query(AccountType, AccountType.AccountType == "test").first()
     assert record is None
 
@@ -297,8 +294,8 @@ def test_create_delete():
 def test_add_commit():
     # Use db.add and db.commit to add a temporary record.
     account_type = AccountType(AccountType="test")
-    db.add(account_type)
-    db.commit()
+    with db.begin():
+        db.add(account_type)
 
     # Assert it got created in the DB.
     assert bool(account_type.ID)
@@ -308,7 +305,8 @@ def test_add_commit():
     assert record == account_type
 
     # Remove the record.
-    db.delete(AccountType, AccountType.ID == account_type.ID)
+    with db.begin():
+        db.delete(AccountType, AccountType.ID == account_type.ID)
 
 
 def test_connection_executor_mysql_paramstyle():
diff --git a/test/test_dependency_type.py b/test/test_dependency_type.py
index 6c37cc58..4d555123 100644
--- a/test/test_dependency_type.py
+++ b/test/test_dependency_type.py
@@ -1,6 +1,6 @@
 import pytest
 
-from aurweb.db import create, delete, query
+from aurweb.db import begin, create, delete, query
 from aurweb.models.dependency_type import DependencyType
 from aurweb.testing import setup_test_db
 
@@ -19,13 +19,17 @@ def test_dependency_types():
 
 
 def test_dependency_type_creation():
-    dependency_type = create(DependencyType, Name="Test Type")
+    with begin():
+        dependency_type = create(DependencyType, Name="Test Type")
     assert bool(dependency_type.ID)
     assert dependency_type.Name == "Test Type"
-    delete(DependencyType, DependencyType.ID == dependency_type.ID)
+    with begin():
+        delete(DependencyType, DependencyType.ID == dependency_type.ID)
 
 
 def test_dependency_type_null_name_uses_default():
-    dependency_type = create(DependencyType)
+    with begin():
+        dependency_type = create(DependencyType)
     assert dependency_type.Name == str()
-    delete(DependencyType, DependencyType.ID == dependency_type.ID)
+    with begin():
+        delete(DependencyType, DependencyType.ID == dependency_type.ID)
diff --git a/test/test_group.py b/test/test_group.py
index da017a96..cea69b68 100644
--- a/test/test_group.py
+++ b/test/test_group.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create
+from aurweb import db
 from aurweb.models.group import Group
 from aurweb.testing import setup_test_db
 
@@ -13,13 +13,14 @@ def setup():
 
 
 def test_group_creation():
-    group = create(Group, Name="Test Group")
+    with db.begin():
+        group = db.create(Group, Name="Test Group")
     assert bool(group.ID)
     assert group.Name == "Test Group"
 
 
 def test_group_null_name_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(Group)
-    session.rollback()
+        with db.begin():
+            db.create(Group)
+    db.rollback()
diff --git a/test/test_homepage.py b/test/test_homepage.py
index 2cd6682f..fef3532d 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -38,8 +38,10 @@ def setup():
 
 @pytest.fixture
 def user():
-    yield db.create(User, Username="test", Email="test@example.org",
-                    Passwd="testPassword", AccountTypeID=USER_ID)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         Passwd="testPassword", AccountTypeID=USER_ID)
+    yield user
 
 
 @pytest.fixture
@@ -68,17 +70,14 @@ def packages(user):
     # For i..num_packages, create a package named pkg_{i}.
     pkgs = []
     now = int(datetime.utcnow().timestamp())
-    for i in range(num_packages):
-        pkgbase = db.create(PackageBase, Name=f"pkg_{i}",
-                            Maintainer=user, Packager=user,
-                            autocommit=False, SubmittedTS=now,
-                            ModifiedTS=now)
-        pkg = db.create(Package, PackageBase=pkgbase,
-                        Name=pkgbase.Name, autocommit=False)
-        pkgs.append(pkg)
-        now += 1
-
-    db.commit()
+    with db.begin():
+        for i in range(num_packages):
+            pkgbase = db.create(PackageBase, Name=f"pkg_{i}",
+                                Maintainer=user, Packager=user,
+                                SubmittedTS=now, ModifiedTS=now)
+            pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+            pkgs.append(pkg)
+            now += 1
 
     yield pkgs
 
@@ -159,10 +158,11 @@ def test_homepage_updates(redis, packages):
 
 def test_homepage_dashboard(redis, packages, user):
     # Create Comaintainer records for all of the packages.
-    for pkg in packages:
-        db.create(PackageComaintainer, PackageBase=pkg.PackageBase,
-                  User=user, Priority=1, autocommit=False)
-    db.commit()
+    with db.begin():
+        for pkg in packages:
+            db.create(PackageComaintainer,
+                      PackageBase=pkg.PackageBase,
+                      User=user, Priority=1)
 
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
@@ -193,11 +193,12 @@ def test_homepage_dashboard_requests(redis, packages, user):
 
     pkg = packages[0]
     reqtype = db.query(RequestType, RequestType.ID == DELETION_ID).first()
-    pkgreq = db.create(PackageRequest, PackageBase=pkg.PackageBase,
-                       PackageBaseName=pkg.PackageBase.Name,
-                       User=user, Comments=str(),
-                       ClosureComment=str(), RequestTS=now,
-                       RequestType=reqtype)
+    with db.begin():
+        pkgreq = db.create(PackageRequest, PackageBase=pkg.PackageBase,
+                           PackageBaseName=pkg.PackageBase.Name,
+                           User=user, Comments=str(),
+                           ClosureComment=str(), RequestTS=now,
+                           RequestType=reqtype)
 
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
@@ -213,8 +214,8 @@ def test_homepage_dashboard_requests(redis, packages, user):
 def test_homepage_dashboard_flagged_packages(redis, packages, user):
     # Set the first Package flagged by setting its OutOfDateTS column.
     pkg = packages[0]
-    pkg.PackageBase.OutOfDateTS = int(datetime.utcnow().timestamp())
-    db.commit()
+    with db.begin():
+        pkg.PackageBase.OutOfDateTS = int(datetime.utcnow().timestamp())
 
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
diff --git a/test/test_license.py b/test/test_license.py
index feb7a396..2c52f058 100644
--- a/test/test_license.py
+++ b/test/test_license.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create
+from aurweb import db
 from aurweb.models.license import License
 from aurweb.testing import setup_test_db
 
@@ -13,13 +13,14 @@ def setup():
 
 
 def test_license_creation():
-    license = create(License, Name="Test License")
+    with db.begin():
+        license = db.create(License, Name="Test License")
     assert bool(license.ID)
     assert license.Name == "Test License"
 
 
 def test_license_null_name_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(License)
-    session.rollback()
+        with db.begin():
+            db.create(License)
+    db.rollback()
diff --git a/test/test_official_provider.py b/test/test_official_provider.py
index a1d3d54a..0aa4f1d1 100644
--- a/test/test_official_provider.py
+++ b/test/test_official_provider.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create
+from aurweb import db
 from aurweb.models.official_provider import OfficialProvider
 from aurweb.testing import setup_test_db
 
@@ -13,10 +13,11 @@ def setup():
 
 
 def test_official_provider_creation():
-    oprovider = create(OfficialProvider,
-                       Name="some-name",
-                       Repo="some-repo",
-                       Provides="some-provides")
+    with db.begin():
+        oprovider = db.create(OfficialProvider,
+                              Name="some-name",
+                              Repo="some-repo",
+                              Provides="some-provides")
     assert bool(oprovider.ID)
     assert oprovider.Name == "some-name"
     assert oprovider.Repo == "some-repo"
@@ -25,16 +26,18 @@ def test_official_provider_creation():
 
 def test_official_provider_cs():
     """ Test case sensitivity of the database table. """
-    oprovider = create(OfficialProvider,
-                       Name="some-name",
-                       Repo="some-repo",
-                       Provides="some-provides")
+    with db.begin():
+        oprovider = db.create(OfficialProvider,
+                              Name="some-name",
+                              Repo="some-repo",
+                              Provides="some-provides")
     assert bool(oprovider.ID)
 
-    oprovider_cs = create(OfficialProvider,
-                          Name="SOME-NAME",
-                          Repo="SOME-REPO",
-                          Provides="SOME-PROVIDES")
+    with db.begin():
+        oprovider_cs = db.create(OfficialProvider,
+                                 Name="SOME-NAME",
+                                 Repo="SOME-REPO",
+                                 Provides="SOME-PROVIDES")
     assert bool(oprovider_cs.ID)
 
     assert oprovider.ID != oprovider_cs.ID
@@ -49,27 +52,27 @@ def test_official_provider_cs():
 
 
 def test_official_provider_null_name_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(OfficialProvider,
-               Repo="some-repo",
-               Provides="some-provides")
-    session.rollback()
+        with db.begin():
+            db.create(OfficialProvider,
+                      Repo="some-repo",
+                      Provides="some-provides")
+    db.rollback()
 
 
 def test_official_provider_null_repo_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(OfficialProvider,
-               Name="some-name",
-               Provides="some-provides")
-    session.rollback()
+        with db.begin():
+            db.create(OfficialProvider,
+                      Name="some-name",
+                      Provides="some-provides")
+    db.rollback()
 
 
 def test_official_provider_null_provides_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(OfficialProvider,
-               Name="some-name",
-               Repo="some-repo")
-    session.rollback()
+        with db.begin():
+            db.create(OfficialProvider,
+                      Name="some-name",
+                      Repo="some-repo")
+    db.rollback()
diff --git a/test/test_package.py b/test/test_package.py
index 1e940164..112ca9b4 100644
--- a/test/test_package.py
+++ b/test/test_package.py
@@ -3,7 +3,7 @@ import pytest
 from sqlalchemy import and_
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query
+from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -19,25 +19,25 @@ def setup():
 
     setup_test_db("Packages", "PackageBases", "Users")
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+    account_type = db.query(AccountType,
+                            AccountType.AccountType == "User").first()
 
-    pkgbase = create(PackageBase,
-                     Name="beautiful-package",
-                     Maintainer=user)
-    package = create(Package,
-                     PackageBase=pkgbase,
-                     Name=pkgbase.Name,
-                     Description="Test description.",
-                     URL="https://test.package")
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountType=account_type)
+
+        pkgbase = db.create(PackageBase,
+                            Name="beautiful-package",
+                            Maintainer=user)
+        package = db.create(Package,
+                            PackageBase=pkgbase,
+                            Name=pkgbase.Name,
+                            Description="Test description.",
+                            URL="https://test.package")
 
 
 def test_package():
-    from aurweb.db import session
-
     assert pkgbase == package.PackageBase
     assert package.Name == "beautiful-package"
     assert package.Description == "Test description."
@@ -45,33 +45,31 @@ def test_package():
     assert package.URL == "https://test.package"
 
     # Update package Version.
-    package.Version = "1.2.3"
-    session.commit()
+    with db.begin():
+        package.Version = "1.2.3"
 
     # Make sure it got updated in the database.
-    record = query(Package,
-                   and_(Package.ID == package.ID,
-                        Package.Version == "1.2.3")).first()
+    record = db.query(Package,
+                      and_(Package.ID == package.ID,
+                           Package.Version == "1.2.3")).first()
     assert record is not None
 
 
 def test_package_null_pkgbase_raises_exception():
-    from aurweb.db import session
-
     with pytest.raises(IntegrityError):
-        create(Package,
-               Name="some-package",
-               Description="Some description.",
-               URL="https://some.package")
-    session.rollback()
+        with db.begin():
+            db.create(Package,
+                      Name="some-package",
+                      Description="Some description.",
+                      URL="https://some.package")
+    db.rollback()
 
 
 def test_package_null_name_raises_exception():
-    from aurweb.db import session
-
     with pytest.raises(IntegrityError):
-        create(Package,
-               PackageBase=pkgbase,
-               Description="Some description.",
-               URL="https://some.package")
-    session.rollback()
+        with db.begin():
+            db.create(Package,
+                      PackageBase=pkgbase,
+                      Description="Some description.",
+                      URL="https://some.package")
+    db.rollback()
diff --git a/test/test_package_base.py b/test/test_package_base.py
index 0c0d0526..2bc6278f 100644
--- a/test/test_package_base.py
+++ b/test/test_package_base.py
@@ -4,7 +4,7 @@ from sqlalchemy.exc import IntegrityError
 
 import aurweb.config
 
-from aurweb.db import create, query
+from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
@@ -19,17 +19,19 @@ def setup():
 
     setup_test_db("Users", "PackageBases")
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+    account_type = db.query(AccountType,
+                            AccountType.AccountType == "User").first()
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountType=account_type)
 
 
 def test_package_base():
-    pkgbase = create(PackageBase,
-                     Name="beautiful-package",
-                     Maintainer=user)
+    with db.begin():
+        pkgbase = db.create(PackageBase,
+                            Name="beautiful-package",
+                            Maintainer=user)
     assert pkgbase in user.maintained_bases
 
     assert not pkgbase.OutOfDateTS
@@ -38,7 +40,8 @@ def test_package_base():
 
     # Set Popularity to a string, then get it by attribute to
     # exercise the string -> float conversion path.
-    pkgbase.Popularity = "0.0"
+    with db.begin():
+        pkgbase.Popularity = "0.0"
     assert pkgbase.Popularity == 0.0
 
 
@@ -47,27 +50,28 @@ def test_package_base_ci():
     if aurweb.config.get("database", "backend") == "sqlite":
         return None  # SQLite doesn't seem handle this.
 
-    from aurweb.db import session
-
-    pkgbase = create(PackageBase,
-                     Name="beautiful-package",
-                     Maintainer=user)
+    with db.begin():
+        pkgbase = db.create(PackageBase,
+                            Name="beautiful-package",
+                            Maintainer=user)
     assert bool(pkgbase.ID)
 
     with pytest.raises(IntegrityError):
-        create(PackageBase,
-               Name="Beautiful-Package",
-               Maintainer=user)
-    session.rollback()
+        with db.begin():
+            db.create(PackageBase,
+                      Name="Beautiful-Package",
+                      Maintainer=user)
+    db.rollback()
 
 
 def test_package_base_relationships():
-    pkgbase = create(PackageBase,
-                     Name="beautiful-package",
-                     Flagger=user,
-                     Maintainer=user,
-                     Submitter=user,
-                     Packager=user)
+    with db.begin():
+        pkgbase = db.create(PackageBase,
+                            Name="beautiful-package",
+                            Flagger=user,
+                            Maintainer=user,
+                            Submitter=user,
+                            Packager=user)
     assert pkgbase in user.flagged_bases
     assert pkgbase in user.maintained_bases
     assert pkgbase in user.submitted_bases
@@ -75,8 +79,7 @@ def test_package_base_relationships():
 
 
 def test_package_base_null_name_raises_exception():
-    from aurweb.db import session
-
     with pytest.raises(IntegrityError):
-        create(PackageBase)
-    session.rollback()
+        with db.begin():
+            db.create(PackageBase)
+    db.rollback()
diff --git a/test/test_package_blacklist.py b/test/test_package_blacklist.py
index 3c64cc21..93f15de7 100644
--- a/test/test_package_blacklist.py
+++ b/test/test_package_blacklist.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, rollback
+from aurweb import db
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_blacklist import PackageBlacklist
 from aurweb.models.user import User
@@ -17,18 +17,20 @@ def setup():
 
     setup_test_db("PackageBlacklist", "PackageBases", "Users")
 
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword")
-    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    user = db.create(User, Username="test", Email="test@example.org",
+                     RealName="Test User", Passwd="testPassword")
+    pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_blacklist_creation():
-    package_blacklist = create(PackageBlacklist, Name="evil-package")
+    with db.begin():
+        package_blacklist = db.create(PackageBlacklist, Name="evil-package")
     assert bool(package_blacklist.ID)
     assert package_blacklist.Name == "evil-package"
 
 
 def test_package_blacklist_null_name_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageBlacklist)
-    rollback()
+        with db.begin():
+            db.create(PackageBlacklist)
+    db.rollback()
diff --git a/test/test_package_comment.py b/test/test_package_comment.py
index ca77b511..60f0333d 100644
--- a/test/test_package_comment.py
+++ b/test/test_package_comment.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query, rollback
+from aurweb.db import begin, create, query, rollback
 from aurweb.models.account_type import AccountType
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_comment import PackageComment
@@ -20,45 +20,52 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
-    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    with begin():
+        user = create(User, Username="test", Email="test@example.org",
+                      RealName="Test User", Passwd="testPassword",
+                      AccountType=account_type)
+        pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_comment_creation():
-    package_comment = create(PackageComment,
-                             PackageBase=pkgbase,
-                             User=user,
-                             Comments="Test comment.",
-                             RenderedComment="Test rendered comment.")
+    with begin():
+        package_comment = create(PackageComment,
+                                 PackageBase=pkgbase,
+                                 User=user,
+                                 Comments="Test comment.",
+                                 RenderedComment="Test rendered comment.")
     assert bool(package_comment.ID)
 
 
 def test_package_comment_null_package_base_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageComment, User=user, Comments="Test comment.",
-               RenderedComment="Test rendered comment.")
+        with begin():
+            create(PackageComment, User=user, Comments="Test comment.",
+                   RenderedComment="Test rendered comment.")
     rollback()
 
 
 def test_package_comment_null_user_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageComment, PackageBase=pkgbase, Comments="Test comment.",
-               RenderedComment="Test rendered comment.")
+        with begin():
+            create(PackageComment, PackageBase=pkgbase,
+                   Comments="Test comment.",
+                   RenderedComment="Test rendered comment.")
     rollback()
 
 
 def test_package_comment_null_comments_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageComment, PackageBase=pkgbase, User=user,
-               RenderedComment="Test rendered comment.")
+        with begin():
+            create(PackageComment, PackageBase=pkgbase, User=user,
+                   RenderedComment="Test rendered comment.")
     rollback()
 
 
 def test_package_comment_null_renderedcomment_defaults():
-    record = create(PackageComment,
-                    PackageBase=pkgbase,
-                    User=user,
-                    Comments="Test comment.")
+    with begin():
+        record = create(PackageComment,
+                        PackageBase=pkgbase,
+                        User=user,
+                        Comments="Test comment.")
     assert record.RenderedComment == str()
diff --git a/test/test_package_dependency.py b/test/test_package_dependency.py
index e28f1781..2ddef68e 100644
--- a/test/test_package_dependency.py
+++ b/test/test_package_dependency.py
@@ -2,7 +2,8 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import commit, create, query
+from aurweb import db
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.dependency_type import DependencyType
 from aurweb.models.package import Package
@@ -22,25 +23,28 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
 
-    pkgbase = create(PackageBase,
-                     Name="test-package",
-                     Maintainer=user)
-    package = create(Package,
-                     PackageBase=pkgbase,
-                     Name=pkgbase.Name,
-                     Description="Test description.",
-                     URL="https://test.package")
+    with db.begin():
+        user = create(User, Username="test", Email="test@example.org",
+                      RealName="Test User", Passwd="testPassword",
+                      AccountType=account_type)
+        pkgbase = create(PackageBase,
+                         Name="test-package",
+                         Maintainer=user)
+        package = create(Package,
+                         PackageBase=pkgbase,
+                         Name=pkgbase.Name,
+                         Description="Test description.",
+                         URL="https://test.package")
 
 
 def test_package_dependencies():
     depends = query(DependencyType, DependencyType.Name == "depends").first()
-    pkgdep = create(PackageDependency, Package=package,
-                    DependencyType=depends,
-                    DepName="test-dep")
+
+    with db.begin():
+        pkgdep = create(PackageDependency, Package=package,
+                        DependencyType=depends,
+                        DepName="test-dep")
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
     assert pkgdep.DependencyType == depends
@@ -49,8 +53,8 @@ def test_package_dependencies():
 
     makedepends = query(DependencyType,
                         DependencyType.Name == "makedepends").first()
-    pkgdep.DependencyType = makedepends
-    commit()
+    with db.begin():
+        pkgdep.DependencyType = makedepends
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
     assert pkgdep.DependencyType == makedepends
@@ -59,8 +63,8 @@ def test_package_dependencies():
 
     checkdepends = query(DependencyType,
                          DependencyType.Name == "checkdepends").first()
-    pkgdep.DependencyType = checkdepends
-    commit()
+    with db.begin():
+        pkgdep.DependencyType = checkdepends
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
     assert pkgdep.DependencyType == checkdepends
@@ -69,8 +73,8 @@ def test_package_dependencies():
 
     optdepends = query(DependencyType,
                        DependencyType.Name == "optdepends").first()
-    pkgdep.DependencyType = optdepends
-    commit()
+    with db.begin():
+        pkgdep.DependencyType = optdepends
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
     assert pkgdep.DependencyType == optdepends
@@ -79,39 +83,37 @@ def test_package_dependencies():
 
     assert not pkgdep.is_package()
 
-    base = create(PackageBase, Name=pkgdep.DepName, Maintainer=user)
-    create(Package, PackageBase=base, Name=pkgdep.DepName)
+    with db.begin():
+        base = create(PackageBase, Name=pkgdep.DepName, Maintainer=user)
+        create(Package, PackageBase=base, Name=pkgdep.DepName)
 
     assert pkgdep.is_package()
 
 
 def test_package_dependencies_null_package_raises_exception():
-    from aurweb.db import session
-
     depends = query(DependencyType, DependencyType.Name == "depends").first()
     with pytest.raises(IntegrityError):
-        create(PackageDependency,
-               DependencyType=depends,
-               DepName="test-dep")
-    session.rollback()
+        with db.begin():
+            create(PackageDependency,
+                   DependencyType=depends,
+                   DepName="test-dep")
+    db.rollback()
 
 
 def test_package_dependencies_null_dependency_type_raises_exception():
-    from aurweb.db import session
-
     with pytest.raises(IntegrityError):
-        create(PackageDependency,
-               Package=package,
-               DepName="test-dep")
-    session.rollback()
+        with db.begin():
+            create(PackageDependency,
+                   Package=package,
+                   DepName="test-dep")
+    db.rollback()
 
 
 def test_package_dependencies_null_depname_raises_exception():
-    from aurweb.db import session
-
     depends = query(DependencyType, DependencyType.Name == "depends").first()
     with pytest.raises(IntegrityError):
-        create(PackageDependency,
-               Package=package,
-               DependencyType=depends)
-    session.rollback()
+        with db.begin():
+            create(PackageDependency,
+                   Package=package,
+                   DependencyType=depends)
+    db.rollback()
diff --git a/test/test_package_relation.py b/test/test_package_relation.py
index 766d0017..edb67078 100644
--- a/test/test_package_relation.py
+++ b/test/test_package_relation.py
@@ -2,7 +2,8 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError, OperationalError
 
-from aurweb.db import commit, create, query
+from aurweb import db
+from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -22,25 +23,28 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
 
-    pkgbase = create(PackageBase,
-                     Name="test-package",
-                     Maintainer=user)
-    package = create(Package,
-                     PackageBase=pkgbase,
-                     Name=pkgbase.Name,
-                     Description="Test description.",
-                     URL="https://test.package")
+    with db.begin():
+        user = create(User, Username="test", Email="test@example.org",
+                      RealName="Test User", Passwd="testPassword",
+                      AccountType=account_type)
+        pkgbase = create(PackageBase,
+                         Name="test-package",
+                         Maintainer=user)
+        package = create(Package,
+                         PackageBase=pkgbase,
+                         Name=pkgbase.Name,
+                         Description="Test description.",
+                         URL="https://test.package")
 
 
 def test_package_relation():
     conflicts = query(RelationType, RelationType.Name == "conflicts").first()
-    pkgrel = create(PackageRelation, Package=package,
-                    RelationType=conflicts,
-                    RelName="test-relation")
+
+    with db.begin():
+        pkgrel = create(PackageRelation, Package=package,
+                        RelationType=conflicts,
+                        RelName="test-relation")
     assert pkgrel.RelName == "test-relation"
     assert pkgrel.Package == package
     assert pkgrel.RelationType == conflicts
@@ -48,8 +52,8 @@ def test_package_relation():
     assert pkgrel in package.package_relations
 
     provides = query(RelationType, RelationType.Name == "provides").first()
-    pkgrel.RelationType = provides
-    commit()
+    with db.begin():
+        pkgrel.RelationType = provides
     assert pkgrel.RelName == "test-relation"
     assert pkgrel.Package == package
     assert pkgrel.RelationType == provides
@@ -57,8 +61,8 @@ def test_package_relation():
     assert pkgrel in package.package_relations
 
     replaces = query(RelationType, RelationType.Name == "replaces").first()
-    pkgrel.RelationType = replaces
-    commit()
+    with db.begin():
+        pkgrel.RelationType = replaces
     assert pkgrel.RelName == "test-relation"
     assert pkgrel.Package == package
     assert pkgrel.RelationType == replaces
@@ -67,36 +71,33 @@ def test_package_relation():
 
 
 def test_package_relation_null_package_raises_exception():
-    from aurweb.db import session
-
     conflicts = query(RelationType, RelationType.Name == "conflicts").first()
     assert conflicts is not None
 
     with pytest.raises(IntegrityError):
-        create(PackageRelation,
-               RelationType=conflicts,
-               RelName="test-relation")
-    session.rollback()
+        with db.begin():
+            create(PackageRelation,
+                   RelationType=conflicts,
+                   RelName="test-relation")
+    db.rollback()
 
 
 def test_package_relation_null_relation_type_raises_exception():
-    from aurweb.db import session
-
     with pytest.raises(IntegrityError):
-        create(PackageRelation,
-               Package=package,
-               RelName="test-relation")
-    session.rollback()
+        with db.begin():
+            create(PackageRelation,
+                   Package=package,
+                   RelName="test-relation")
+    db.rollback()
 
 
 def test_package_relation_null_relname_raises_exception():
-    from aurweb.db import session
-
     depends = query(RelationType, RelationType.Name == "conflicts").first()
     assert depends is not None
 
     with pytest.raises((OperationalError, IntegrityError)):
-        create(PackageRelation,
-               Package=package,
-               RelationType=depends)
-    session.rollback()
+        with db.begin():
+            create(PackageRelation,
+                   Package=package,
+                   RelationType=depends)
+    db.rollback()
diff --git a/test/test_package_request.py b/test/test_package_request.py
index c28af6bd..1589ffc2 100644
--- a/test/test_package_request.py
+++ b/test/test_package_request.py
@@ -4,7 +4,8 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import commit, create, query, rollback
+from aurweb import db
+from aurweb.db import create, query, rollback
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_request import (ACCEPTED, ACCEPTED_ID, CLOSED, CLOSED_ID, PENDING, PENDING_ID, REJECTED,
                                            REJECTED_ID, PackageRequest)
@@ -21,19 +22,21 @@ def setup():
 
     setup_test_db("PackageRequests", "PackageBases", "Users")
 
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword")
-    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    with db.begin():
+        user = create(User, Username="test", Email="test@example.org",
+                      RealName="Test User", Passwd="testPassword")
+        pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_request_creation():
     request_type = query(RequestType, RequestType.Name == "merge").first()
     assert request_type.Name == "merge"
 
-    package_request = create(PackageRequest, RequestType=request_type,
-                             User=user, PackageBase=pkgbase,
-                             PackageBaseName=pkgbase.Name,
-                             Comments=str(), ClosureComment=str())
+    with db.begin():
+        package_request = create(PackageRequest, RequestType=request_type,
+                                 User=user, PackageBase=pkgbase,
+                                 PackageBaseName=pkgbase.Name,
+                                 Comments=str(), ClosureComment=str())
 
     assert bool(package_request.ID)
     assert package_request.RequestType == request_type
@@ -54,11 +57,12 @@ def test_package_request_closed():
     assert request_type.Name == "merge"
 
     ts = int(datetime.utcnow().timestamp())
-    package_request = create(PackageRequest, RequestType=request_type,
-                             User=user, PackageBase=pkgbase,
-                             PackageBaseName=pkgbase.Name,
-                             Closer=user, ClosedTS=ts,
-                             Comments=str(), ClosureComment=str())
+    with db.begin():
+        package_request = create(PackageRequest, RequestType=request_type,
+                                 User=user, PackageBase=pkgbase,
+                                 PackageBaseName=pkgbase.Name,
+                                 Closer=user, ClosedTS=ts,
+                                 Comments=str(), ClosureComment=str())
 
     assert package_request.Closer == user
     assert package_request.ClosedTS == ts
@@ -69,54 +73,60 @@ def test_package_request_closed():
 
 def test_package_request_null_request_type_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageRequest, User=user, PackageBase=pkgbase,
-               PackageBaseName=pkgbase.Name,
-               Comments=str(), ClosureComment=str())
+        with db.begin():
+            create(PackageRequest, User=user, PackageBase=pkgbase,
+                   PackageBaseName=pkgbase.Name,
+                   Comments=str(), ClosureComment=str())
     rollback()
 
 
 def test_package_request_null_user_raises_exception():
     request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        create(PackageRequest, RequestType=request_type, PackageBase=pkgbase,
-               PackageBaseName=pkgbase.Name,
-               Comments=str(), ClosureComment=str())
+        with db.begin():
+            create(PackageRequest, RequestType=request_type,
+                   PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+                   Comments=str(), ClosureComment=str())
     rollback()
 
 
 def test_package_request_null_package_base_raises_exception():
     request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        create(PackageRequest, RequestType=request_type,
-               User=user, PackageBaseName=pkgbase.Name,
-               Comments=str(), ClosureComment=str())
+        with db.begin():
+            create(PackageRequest, RequestType=request_type,
+                   User=user, PackageBaseName=pkgbase.Name,
+                   Comments=str(), ClosureComment=str())
     rollback()
 
 
 def test_package_request_null_package_base_name_raises_exception():
     request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        create(PackageRequest, RequestType=request_type,
-               User=user, PackageBase=pkgbase,
-               Comments=str(), ClosureComment=str())
+        with db.begin():
+            create(PackageRequest, RequestType=request_type,
+                   User=user, PackageBase=pkgbase,
+                   Comments=str(), ClosureComment=str())
     rollback()
 
 
 def test_package_request_null_comments_raises_exception():
     request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        create(PackageRequest, RequestType=request_type,
-               User=user, PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
-               ClosureComment=str())
+        with db.begin():
+            create(PackageRequest, RequestType=request_type, User=user,
+                   PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+                   ClosureComment=str())
     rollback()
 
 
 def test_package_request_null_closure_comment_raises_exception():
     request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        create(PackageRequest, RequestType=request_type,
-               User=user, PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
-               Comments=str())
+        with db.begin():
+            create(PackageRequest, RequestType=request_type, User=user,
+                   PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+                   Comments=str())
     rollback()
 
 
@@ -124,26 +134,27 @@ def test_package_request_status_display():
     """ Test status_display() based on the Status column value. """
     request_type = query(RequestType, RequestType.Name == "merge").first()
 
-    pkgreq = create(PackageRequest, RequestType=request_type,
-                    User=user, PackageBase=pkgbase,
-                    PackageBaseName=pkgbase.Name,
-                    Comments=str(), ClosureComment=str(),
-                    Status=PENDING_ID)
+    with db.begin():
+        pkgreq = create(PackageRequest, RequestType=request_type,
+                        User=user, PackageBase=pkgbase,
+                        PackageBaseName=pkgbase.Name,
+                        Comments=str(), ClosureComment=str(),
+                        Status=PENDING_ID)
     assert pkgreq.status_display() == PENDING
 
-    pkgreq.Status = CLOSED_ID
-    commit()
+    with db.begin():
+        pkgreq.Status = CLOSED_ID
     assert pkgreq.status_display() == CLOSED
 
-    pkgreq.Status = ACCEPTED_ID
-    commit()
+    with db.begin():
+        pkgreq.Status = ACCEPTED_ID
     assert pkgreq.status_display() == ACCEPTED
 
-    pkgreq.Status = REJECTED_ID
-    commit()
+    with db.begin():
+        pkgreq.Status = REJECTED_ID
     assert pkgreq.status_display() == REJECTED
 
-    pkgreq.Status = 124
-    commit()
+    with db.begin():
+        pkgreq.Status = 124
     with pytest.raises(KeyError):
         pkgreq.status_display()
diff --git a/test/test_package_source.py b/test/test_package_source.py
index 7453f756..d1adcf9c 100644
--- a/test/test_package_source.py
+++ b/test/test_package_source.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query, rollback
+from aurweb.db import begin, create, query, rollback
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -21,17 +21,19 @@ def setup():
 
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
-    pkgbase = create(PackageBase,
-                     Name="test-package",
-                     Maintainer=user)
-    package = create(Package, PackageBase=pkgbase, Name="test-package")
+    with begin():
+        user = create(User, Username="test", Email="test@example.org",
+                      RealName="Test User", Passwd="testPassword",
+                      AccountType=account_type)
+        pkgbase = create(PackageBase,
+                         Name="test-package",
+                         Maintainer=user)
+        package = create(Package, PackageBase=pkgbase, Name="test-package")
 
 
 def test_package_source():
-    pkgsource = create(PackageSource, Package=package)
+    with begin():
+        pkgsource = create(PackageSource, Package=package)
     assert pkgsource.Package == package
     # By default, PackageSources.Source assigns the string '/dev/null'.
     assert pkgsource.Source == "/dev/null"
@@ -40,5 +42,6 @@ def test_package_source():
 
 def test_package_source_null_package_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageSource)
+        with begin():
+            create(PackageSource)
     rollback()
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index ad07ec17..8a468c15 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -28,31 +28,25 @@ def package_endpoint(package: Package) -> str:
     return f"/packages/{package.Name}"
 
 
-def create_package(pkgname: str, maintainer: User,
-                   autocommit: bool = True) -> Package:
+def create_package(pkgname: str, maintainer: User) -> Package:
     pkgbase = db.create(PackageBase,
                         Name=pkgname,
-                        Maintainer=maintainer,
-                        autocommit=False)
-    return db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase,
-                     autocommit=autocommit)
+                        Maintainer=maintainer)
+    return db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase)
 
 
 def create_package_dep(package: Package, depname: str,
-                       dep_type_name: str = "depends",
-                       autocommit: bool = True) -> PackageDependency:
+                       dep_type_name: str = "depends") -> PackageDependency:
     dep_type = db.query(DependencyType,
                         DependencyType.Name == dep_type_name).first()
     return db.create(PackageDependency,
                      DependencyType=dep_type,
                      Package=package,
-                     DepName=depname,
-                     autocommit=autocommit)
+                     DepName=depname)
 
 
 def create_package_rel(package: Package,
-                       relname: str,
-                       autocommit: bool = True) -> PackageRelation:
+                       relname: str) -> PackageRelation:
     rel_type = db.query(RelationType,
                         RelationType.ID == PROVIDES_ID).first()
     return db.create(PackageRelation,
@@ -84,31 +78,37 @@ def client() -> TestClient:
 def user() -> User:
     """ Yield a user. """
     account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
-    yield db.create(User, Username="test",
-                    Email="test@example.org",
-                    Passwd="testPassword",
-                    AccountType=account_type)
+    with db.begin():
+        user = db.create(User, Username="test",
+                         Email="test@example.org",
+                         Passwd="testPassword",
+                         AccountType=account_type)
+    yield user
 
 
 @pytest.fixture
 def maintainer() -> User:
     """ Yield a specific User used to maintain packages. """
     account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
-    yield db.create(User, Username="test_maintainer",
-                    Email="test_maintainer@example.org",
-                    Passwd="testPassword",
-                    AccountType=account_type)
+    with db.begin():
+        maintainer = db.create(User, Username="test_maintainer",
+                               Email="test_maintainer@example.org",
+                               Passwd="testPassword",
+                               AccountType=account_type)
+    yield maintainer
 
 
 @pytest.fixture
 def package(maintainer: User) -> Package:
     """ Yield a Package created by user. """
-    pkgbase = db.create(PackageBase,
-                        Name="test-package",
-                        Maintainer=maintainer)
-    yield db.create(Package,
-                    PackageBase=pkgbase,
-                    Name=pkgbase.Name)
+    with db.begin():
+        pkgbase = db.create(PackageBase,
+                            Name="test-package",
+                            Maintainer=maintainer)
+        package = db.create(Package,
+                            PackageBase=pkgbase,
+                            Name=pkgbase.Name)
+    yield package
 
 
 def test_package_not_found(client: TestClient):
@@ -121,10 +121,11 @@ def test_package_official_not_found(client: TestClient, package: Package):
     """ When a Package has a matching OfficialProvider record, it is not
     hosted on AUR, but in the official repositories. Getting a package
     with this kind of record should return a status code 404. """
-    db.create(OfficialProvider,
-              Name=package.Name,
-              Repo="core",
-              Provides=package.Name)
+    with db.begin():
+        db.create(OfficialProvider,
+                  Name=package.Name,
+                  Repo="core",
+                  Provides=package.Name)
 
     with client as request:
         resp = request.get(package_endpoint(package))
@@ -157,8 +158,9 @@ def test_package(client: TestClient, package: Package):
 
 def test_package_comments(client: TestClient, user: User, package: Package):
     now = (datetime.utcnow().timestamp())
-    comment = db.create(PackageComment, PackageBase=package.PackageBase,
-                        User=user, Comments="Test comment", CommentTS=now)
+    with db.begin():
+        comment = db.create(PackageComment, PackageBase=package.PackageBase,
+                            User=user, Comments="Test comment", CommentTS=now)
 
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
@@ -178,11 +180,12 @@ def test_package_comments(client: TestClient, user: User, package: Package):
 def test_package_requests_display(client: TestClient, user: User,
                                   package: Package):
     type_ = db.query(RequestType, RequestType.ID == DELETION_ID).first()
-    db.create(PackageRequest, PackageBase=package.PackageBase,
-              PackageBaseName=package.PackageBase.Name,
-              User=user, RequestType=type_,
-              Comments="Test comment.",
-              ClosureComment=str())
+    with db.begin():
+        db.create(PackageRequest, PackageBase=package.PackageBase,
+                  PackageBaseName=package.PackageBase.Name,
+                  User=user, RequestType=type_,
+                  Comments="Test comment.",
+                  ClosureComment=str())
 
     # Test that a single request displays "1 pending request".
     with client as request:
@@ -195,11 +198,12 @@ def test_package_requests_display(client: TestClient, user: User,
     assert target.text.strip() == "1 pending request"
 
     type_ = db.query(RequestType, RequestType.ID == DELETION_ID).first()
-    db.create(PackageRequest, PackageBase=package.PackageBase,
-              PackageBaseName=package.PackageBase.Name,
-              User=user, RequestType=type_,
-              Comments="Test comment2.",
-              ClosureComment=str())
+    with db.begin():
+        db.create(PackageRequest, PackageBase=package.PackageBase,
+                  PackageBaseName=package.PackageBase.Name,
+                  User=user, RequestType=type_,
+                  Comments="Test comment2.",
+                  ClosureComment=str())
 
     # Test that a two requests display "2 pending requests".
     with client as request:
@@ -271,50 +275,43 @@ def test_package_authenticated_maintainer(client: TestClient,
 def test_package_dependencies(client: TestClient, maintainer: User,
                               package: Package):
     # Create a normal dependency of type depends.
-    dep_pkg = create_package("test-dep-1", maintainer, autocommit=False)
-    dep = create_package_dep(package, dep_pkg.Name, autocommit=False)
-    dep.DepArch = "x86_64"
+    with db.begin():
+        dep_pkg = create_package("test-dep-1", maintainer)
+        dep = create_package_dep(package, dep_pkg.Name)
+        dep.DepArch = "x86_64"
 
-    # Also, create a makedepends.
-    make_dep_pkg = create_package("test-dep-2", maintainer, autocommit=False)
-    make_dep = create_package_dep(package, make_dep_pkg.Name,
-                                  dep_type_name="makedepends",
-                                  autocommit=False)
+        # Also, create a makedepends.
+        make_dep_pkg = create_package("test-dep-2", maintainer)
+        make_dep = create_package_dep(package, make_dep_pkg.Name,
+                                      dep_type_name="makedepends")
 
-    # And... a checkdepends!
-    check_dep_pkg = create_package("test-dep-3", maintainer, autocommit=False)
-    check_dep = create_package_dep(package, check_dep_pkg.Name,
-                                   dep_type_name="checkdepends",
-                                   autocommit=False)
+        # And... a checkdepends!
+        check_dep_pkg = create_package("test-dep-3", maintainer)
+        check_dep = create_package_dep(package, check_dep_pkg.Name,
+                                       dep_type_name="checkdepends")
 
-    # Geez. Just stop. This is optdepends.
-    opt_dep_pkg = create_package("test-dep-4", maintainer, autocommit=False)
-    opt_dep = create_package_dep(package, opt_dep_pkg.Name,
-                                 dep_type_name="optdepends",
-                                 autocommit=False)
+        # Geez. Just stop. This is optdepends.
+        opt_dep_pkg = create_package("test-dep-4", maintainer)
+        opt_dep = create_package_dep(package, opt_dep_pkg.Name,
+                                     dep_type_name="optdepends")
 
-    # Heh. Another optdepends to test one with a description.
-    opt_desc_dep_pkg = create_package("test-dep-5", maintainer,
-                                      autocommit=False)
-    opt_desc_dep = create_package_dep(package, opt_desc_dep_pkg.Name,
-                                      dep_type_name="optdepends",
-                                      autocommit=False)
-    opt_desc_dep.DepDesc = "Test description."
+        # Heh. Another optdepends to test one with a description.
+        opt_desc_dep_pkg = create_package("test-dep-5", maintainer)
+        opt_desc_dep = create_package_dep(package, opt_desc_dep_pkg.Name,
+                                          dep_type_name="optdepends")
+        opt_desc_dep.DepDesc = "Test description."
 
-    broken_dep = create_package_dep(package, "test-dep-6",
-                                    dep_type_name="depends",
-                                    autocommit=False)
+        broken_dep = create_package_dep(package, "test-dep-6",
+                                        dep_type_name="depends")
 
-    # Create an official provider record.
-    db.create(OfficialProvider, Name="test-dep-99",
-              Repo="core", Provides="test-dep-99",
-              autocommit=False)
-    official_dep = create_package_dep(package, "test-dep-99",
-                                      autocommit=False)
+        # Create an official provider record.
+        db.create(OfficialProvider, Name="test-dep-99",
+                  Repo="core", Provides="test-dep-99")
+        official_dep = create_package_dep(package, "test-dep-99")
 
-    # Also, create a provider who provides our test-dep-99.
-    provider = create_package("test-provider", maintainer, autocommit=False)
-    create_package_rel(provider, dep.DepName)
+        # Also, create a provider who provides our test-dep-99.
+        provider = create_package("test-provider", maintainer)
+        create_package_rel(provider, dep.DepName)
 
     with client as request:
         resp = request.get(package_endpoint(package))
@@ -358,8 +355,9 @@ def test_pkgbase_redirect(client: TestClient, package: Package):
 
 
 def test_pkgbase(client: TestClient, package: Package):
-    second = db.create(Package, Name="second-pkg",
-                       PackageBase=package.PackageBase)
+    with db.begin():
+        second = db.create(Package, Name="second-pkg",
+                           PackageBase=package.PackageBase)
 
     expected = [package.Name, second.Name]
     with client as request:
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index bc6a941c..754e3b8d 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -26,17 +26,21 @@ def setup():
 @pytest.fixture
 def maintainer() -> User:
     account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
-    yield db.create(User, Username="test_maintainer",
-                    Email="test_maintainer@examepl.org",
-                    Passwd="testPassword",
-                    AccountType=account_type)
+    with db.begin():
+        maintainer = db.create(User, Username="test_maintainer",
+                               Email="test_maintainer@examepl.org",
+                               Passwd="testPassword",
+                               AccountType=account_type)
+    yield maintainer
 
 
 @pytest.fixture
 def package(maintainer: User) -> Package:
-    pkgbase = db.create(PackageBase, Name="test-pkg",
-                        Packager=maintainer, Maintainer=maintainer)
-    yield db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase)
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="test-pkg",
+                            Packager=maintainer, Maintainer=maintainer)
+        package = db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase)
+    yield package
 
 
 @pytest.fixture
@@ -45,10 +49,11 @@ def client() -> TestClient:
 
 
 def test_package_link(client: TestClient, maintainer: User, package: Package):
-    db.create(OfficialProvider,
-              Name=package.Name,
-              Repo="core",
-              Provides=package.Name)
+    with db.begin():
+        db.create(OfficialProvider,
+                  Name=package.Name,
+                  Repo="core",
+                  Provides=package.Name)
     expected = f"{OFFICIAL_BASE}/packages/?q={package.Name}"
     assert util.package_link(package) == expected
 
diff --git a/test/test_relation_type.py b/test/test_relation_type.py
index bf23505c..fbc22c71 100644
--- a/test/test_relation_type.py
+++ b/test/test_relation_type.py
@@ -1,6 +1,6 @@
 import pytest
 
-from aurweb.db import create, delete, query
+from aurweb import db
 from aurweb.models.relation_type import RelationType
 from aurweb.testing import setup_test_db
 
@@ -11,22 +11,25 @@ def setup():
 
 
 def test_relation_type_creation():
-    relation_type = create(RelationType, Name="test-relation")
+    with db.begin():
+        relation_type = db.create(RelationType, Name="test-relation")
+
     assert bool(relation_type.ID)
     assert relation_type.Name == "test-relation"
 
-    delete(RelationType, RelationType.ID == relation_type.ID)
+    with db.begin():
+        db.delete(RelationType, RelationType.ID == relation_type.ID)
 
 
 def test_relation_types():
-    conflicts = query(RelationType, RelationType.Name == "conflicts").first()
+    conflicts = db.query(RelationType, RelationType.Name == "conflicts").first()
     assert conflicts is not None
     assert conflicts.Name == "conflicts"
 
-    provides = query(RelationType, RelationType.Name == "provides").first()
+    provides = db.query(RelationType, RelationType.Name == "provides").first()
     assert provides is not None
     assert provides.Name == "provides"
 
-    replaces = query(RelationType, RelationType.Name == "replaces").first()
+    replaces = db.query(RelationType, RelationType.Name == "replaces").first()
     assert replaces is not None
     assert replaces.Name == "replaces"
diff --git a/test/test_request_type.py b/test/test_request_type.py
index a3b3ccb8..8d21c2d9 100644
--- a/test/test_request_type.py
+++ b/test/test_request_type.py
@@ -1,6 +1,6 @@
 import pytest
 
-from aurweb.db import create, delete, query
+from aurweb import db
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID, RequestType
 from aurweb.testing import setup_test_db
 
@@ -11,25 +11,33 @@ def setup():
 
 
 def test_request_type_creation():
-    request_type = create(RequestType, Name="Test Request")
+    with db.begin():
+        request_type = db.create(RequestType, Name="Test Request")
+
     assert bool(request_type.ID)
     assert request_type.Name == "Test Request"
-    delete(RequestType, RequestType.ID == request_type.ID)
+
+    with db.begin():
+        db.delete(RequestType, RequestType.ID == request_type.ID)
 
 
 def test_request_type_null_name_returns_empty_string():
-    request_type = create(RequestType)
+    with db.begin():
+        request_type = db.create(RequestType)
+
     assert bool(request_type.ID)
     assert request_type.Name == str()
-    delete(RequestType, RequestType.ID == request_type.ID)
+
+    with db.begin():
+        db.delete(RequestType, RequestType.ID == request_type.ID)
 
 
 def test_request_type_name_display():
-    deletion = query(RequestType, RequestType.ID == DELETION_ID).first()
+    deletion = db.query(RequestType, RequestType.ID == DELETION_ID).first()
     assert deletion.name_display() == "Deletion"
 
-    orphan = query(RequestType, RequestType.ID == ORPHAN_ID).first()
+    orphan = db.query(RequestType, RequestType.ID == ORPHAN_ID).first()
     assert orphan.name_display() == "Orphan"
 
-    merge = query(RequestType, RequestType.ID == MERGE_ID).first()
+    merge = db.query(RequestType, RequestType.ID == MERGE_ID).first()
     assert merge.name_display() == "Merge"
diff --git a/test/test_routes.py b/test/test_routes.py
index a2d1786e..e3f69d7a 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -8,8 +8,8 @@ import pytest
 
 from fastapi.testclient import TestClient
 
+from aurweb import db
 from aurweb.asgi import app
-from aurweb.db import create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
@@ -24,11 +24,13 @@ def setup():
 
     setup_test_db("Users", "Sessions")
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+    account_type = db.query(AccountType,
+                            AccountType.AccountType == "User").first()
+
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountType=account_type)
 
     client = TestClient(app)
 
diff --git a/test/test_rss.py b/test/test_rss.py
index 7dd5bb47..ce3bc71f 100644
--- a/test/test_rss.py
+++ b/test/test_rss.py
@@ -49,14 +49,13 @@ def packages(user):
     now = int(datetime.utcnow().timestamp())
 
     # Create 101 packages; we limit 100 on RSS feeds.
-    for i in range(101):
-        pkgbase = db.create(
-            PackageBase, Maintainer=user, Name=f"test-package-{i}",
-            SubmittedTS=(now + i), ModifiedTS=(now + i), autocommit=False)
-        pkg = db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase,
-                        autocommit=False)
-        pkgs.append(pkg)
-    db.commit()
+    with db.begin():
+        for i in range(101):
+            pkgbase = db.create(
+                PackageBase, Maintainer=user, Name=f"test-package-{i}",
+                SubmittedTS=(now + i), ModifiedTS=(now + i))
+            pkg = db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase)
+            pkgs.append(pkg)
     yield pkgs
 
 
diff --git a/test/test_session.py b/test/test_session.py
index 1ba11556..4e6f4db4 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -4,7 +4,7 @@ from unittest import mock
 
 import pytest
 
-from aurweb.db import create, query
+from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.session import Session, generate_unique_sid
 from aurweb.models.user import User
@@ -19,13 +19,16 @@ def setup():
 
     setup_test_db("Users", "Sessions")
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  ResetKey="testReset", Passwd="testPassword",
-                  AccountType=account_type)
-    session = create(Session, UsersID=user.ID, SessionID="testSession",
-                     LastUpdateTS=datetime.utcnow().timestamp())
+    account_type = db.query(AccountType,
+                            AccountType.AccountType == "User").first()
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         ResetKey="testReset", Passwd="testPassword",
+                         AccountType=account_type)
+
+    with db.begin():
+        session = db.create(Session, UsersID=user.ID, SessionID="testSession",
+                            LastUpdateTS=datetime.utcnow().timestamp())
 
 
 def test_session():
@@ -35,12 +38,15 @@ def test_session():
 
 def test_session_cs():
     """ Test case sensitivity of the database table. """
-    user2 = create(User, Username="test2", Email="test2@example.org",
-                   ResetKey="testReset2", Passwd="testPassword",
-                   AccountType=account_type)
-    session_cs = create(Session, UsersID=user2.ID,
-                        SessionID="TESTSESSION",
-                        LastUpdateTS=datetime.utcnow().timestamp())
+    with db.begin():
+        user2 = db.create(User, Username="test2", Email="test2@example.org",
+                          ResetKey="testReset2", Passwd="testPassword",
+                          AccountType=account_type)
+
+    with db.begin():
+        session_cs = db.create(Session, UsersID=user2.ID,
+                               SessionID="TESTSESSION",
+                               LastUpdateTS=datetime.utcnow().timestamp())
     assert session_cs.SessionID == "TESTSESSION"
     assert session.SessionID == "testSession"
 
diff --git a/test/test_ssh_pub_key.py b/test/test_ssh_pub_key.py
index 0793199a..12a3e1ce 100644
--- a/test/test_ssh_pub_key.py
+++ b/test/test_ssh_pub_key.py
@@ -1,6 +1,6 @@
 import pytest
 
-from aurweb.db import create, query
+from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.user import User
@@ -19,19 +19,18 @@ def setup():
 
     setup_test_db("Users", "SSHPubKeys")
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+    account_type = db.query(AccountType,
+                            AccountType.AccountType == "User").first()
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountType=account_type)
 
-    assert account_type == user.AccountType
-    assert account_type.ID == user.AccountTypeID
-
-    ssh_pub_key = create(SSHPubKey,
-                         UserID=user.ID,
-                         Fingerprint="testFingerprint",
-                         PubKey="testPubKey")
+    with db.begin():
+        ssh_pub_key = db.create(SSHPubKey,
+                                UserID=user.ID,
+                                Fingerprint="testFingerprint",
+                                PubKey="testPubKey")
 
 
 def test_ssh_pub_key():
@@ -43,9 +42,10 @@ def test_ssh_pub_key():
 
 def test_ssh_pub_key_cs():
     """ Test case sensitivity of the database table. """
-    ssh_pub_key_cs = create(SSHPubKey, UserID=user.ID,
-                            Fingerprint="TESTFINGERPRINT",
-                            PubKey="TESTPUBKEY")
+    with db.begin():
+        ssh_pub_key_cs = db.create(SSHPubKey, UserID=user.ID,
+                                   Fingerprint="TESTFINGERPRINT",
+                                   PubKey="TESTPUBKEY")
 
     assert ssh_pub_key_cs.Fingerprint == "TESTFINGERPRINT"
     assert ssh_pub_key_cs.PubKey == "TESTPUBKEY"
diff --git a/test/test_term.py b/test/test_term.py
index 25108419..3f28311f 100644
--- a/test/test_term.py
+++ b/test/test_term.py
@@ -2,7 +2,7 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create
+from aurweb import db
 from aurweb.models.term import Term
 from aurweb.testing import setup_test_db
 
@@ -18,8 +18,9 @@ def setup():
 
 
 def test_term_creation():
-    term = create(Term, Description="Term description",
-                  URL="https://fake_url.io")
+    with db.begin():
+        term = db.create(Term, Description="Term description",
+                         URL="https://fake_url.io")
     assert bool(term.ID)
     assert term.Description == "Term description"
     assert term.URL == "https://fake_url.io"
@@ -27,14 +28,14 @@ def test_term_creation():
 
 
 def test_term_null_description_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(Term, URL="https://fake_url.io")
-    session.rollback()
+        with db.begin():
+            db.create(Term, URL="https://fake_url.io")
+    db.rollback()
 
 
 def test_term_null_url_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(Term, Description="Term description")
-    session.rollback()
+        with db.begin():
+            db.create(Term, Description="Term description")
+    db.rollback()
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index 0c33f958..67181db3 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -90,37 +90,37 @@ def client():
 def tu_user():
     tu_type = db.query(AccountType,
                        AccountType.AccountType == "Trusted User").first()
-    yield db.create(User, Username="test_tu", Email="test_tu@example.org",
-                    RealName="Test TU", Passwd="testPassword",
-                    AccountType=tu_type)
+    with db.begin():
+        tu_user = db.create(User, Username="test_tu",
+                            Email="test_tu@example.org",
+                            RealName="Test TU", Passwd="testPassword",
+                            AccountType=tu_type)
+    yield tu_user
 
 
 @pytest.fixture
 def user():
     user_type = db.query(AccountType,
                          AccountType.AccountType == "User").first()
-    yield db.create(User, Username="test", Email="test@example.org",
-                    RealName="Test User", Passwd="testPassword",
-                    AccountType=user_type)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountType=user_type)
+    yield user
 
 
 @pytest.fixture
-def proposal(tu_user):
+def proposal(user, tu_user):
     ts = int(datetime.utcnow().timestamp())
     agenda = "Test proposal."
     start = ts - 5
     end = ts + 1000
 
-    user_type = db.query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = db.create(User, Username="test", Email="test@example.org",
-                     RealName="Test User", Passwd="testPassword",
-                     AccountType=user_type)
-
-    voteinfo = db.create(TUVoteInfo,
-                         Agenda=agenda, Quorum=0.0,
-                         User=user.Username, Submitter=tu_user,
-                         Submitted=start, End=end)
+    with db.begin():
+        voteinfo = db.create(TUVoteInfo,
+                             Agenda=agenda, Quorum=0.0,
+                             User=user.Username, Submitter=tu_user,
+                             Submitted=start, End=end)
     yield (tu_user, user, voteinfo)
 
 
@@ -170,20 +170,22 @@ def test_tu_index(client, tu_user):
         ("Test agenda 2", ts - 1000, ts - 5)  # Not running anymore.
     ]
     vote_records = []
-    for vote in votes:
-        agenda, start, end = vote
-        vote_records.append(
-            db.create(TUVoteInfo, Agenda=agenda,
-                      User=tu_user.Username,
-                      Submitted=start, End=end,
-                      Quorum=0.0,
-                      Submitter=tu_user))
+    with db.begin():
+        for vote in votes:
+            agenda, start, end = vote
+            vote_records.append(
+                db.create(TUVoteInfo, Agenda=agenda,
+                          User=tu_user.Username,
+                          Submitted=start, End=end,
+                          Quorum=0.0,
+                          Submitter=tu_user))
 
-    # Vote on an ended proposal.
-    vote_record = vote_records[1]
-    vote_record.Yes += 1
-    vote_record.ActiveTUs += 1
-    db.create(TUVote, VoteInfo=vote_record, User=tu_user)
+    with db.begin():
+        # Vote on an ended proposal.
+        vote_record = vote_records[1]
+        vote_record.Yes += 1
+        vote_record.ActiveTUs += 1
+        db.create(TUVote, VoteInfo=vote_record, User=tu_user)
 
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:
@@ -255,22 +257,22 @@ def test_tu_index(client, tu_user):
 def test_tu_index_table_paging(client, tu_user):
     ts = int(datetime.utcnow().timestamp())
 
-    for i in range(25):
-        # Create 25 current votes.
-        db.create(TUVoteInfo, Agenda=f"Agenda #{i}",
-                  User=tu_user.Username,
-                  Submitted=(ts - 5), End=(ts + 1000),
-                  Quorum=0.0,
-                  Submitter=tu_user, autocommit=False)
+    with db.begin():
+        for i in range(25):
+            # Create 25 current votes.
+            db.create(TUVoteInfo, Agenda=f"Agenda #{i}",
+                      User=tu_user.Username,
+                      Submitted=(ts - 5), End=(ts + 1000),
+                      Quorum=0.0,
+                      Submitter=tu_user)
 
-    for i in range(25):
-        # Create 25 past votes.
-        db.create(TUVoteInfo, Agenda=f"Agenda #{25 + i}",
-                  User=tu_user.Username,
-                  Submitted=(ts - 1000), End=(ts - 5),
-                  Quorum=0.0,
-                  Submitter=tu_user, autocommit=False)
-    db.commit()
+        for i in range(25):
+            # Create 25 past votes.
+            db.create(TUVoteInfo, Agenda=f"Agenda #{25 + i}",
+                      User=tu_user.Username,
+                      Submitted=(ts - 1000), End=(ts - 5),
+                      Quorum=0.0,
+                      Submitter=tu_user)
 
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:
@@ -363,18 +365,19 @@ def test_tu_index_table_paging(client, tu_user):
 def test_tu_index_sorting(client, tu_user):
     ts = int(datetime.utcnow().timestamp())
 
-    for i in range(2):
-        # Create 'Agenda #1' and 'Agenda #2'.
-        db.create(TUVoteInfo, Agenda=f"Agenda #{i + 1}",
-                  User=tu_user.Username,
-                  Submitted=(ts + 5), End=(ts + 1000),
-                  Quorum=0.0,
-                  Submitter=tu_user, autocommit=False)
+    with db.begin():
+        for i in range(2):
+            # Create 'Agenda #1' and 'Agenda #2'.
+            db.create(TUVoteInfo, Agenda=f"Agenda #{i + 1}",
+                      User=tu_user.Username,
+                      Submitted=(ts + 5), End=(ts + 1000),
+                      Quorum=0.0,
+                      Submitter=tu_user)
 
-        # Let's order each vote one day after the other.
-        # This will allow us to test the sorting nature
-        # of the tables.
-        ts += 86405
+            # Let's order each vote one day after the other.
+            # This will allow us to test the sorting nature
+            # of the tables.
+            ts += 86405
 
     # Make a default request to /tu.
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
@@ -432,18 +435,19 @@ def test_tu_index_sorting(client, tu_user):
 def test_tu_index_last_votes(client, tu_user, user):
     ts = int(datetime.utcnow().timestamp())
 
-    # Create a proposal which has ended.
-    voteinfo = db.create(TUVoteInfo, Agenda="Test agenda",
-                         User=user.Username,
-                         Submitted=(ts - 1000),
-                         End=(ts - 5),
-                         Yes=1,
-                         ActiveTUs=1,
-                         Quorum=0.0,
-                         Submitter=tu_user)
+    with db.begin():
+        # Create a proposal which has ended.
+        voteinfo = db.create(TUVoteInfo, Agenda="Test agenda",
+                             User=user.Username,
+                             Submitted=(ts - 1000),
+                             End=(ts - 5),
+                             Yes=1,
+                             ActiveTUs=1,
+                             Quorum=0.0,
+                             Submitter=tu_user)
 
-    # Create a vote on it from tu_user.
-    db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
+        # Create a vote on it from tu_user.
+        db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
 
     # Now, check that tu_user got populated in the .last-votes table.
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
@@ -529,10 +533,10 @@ def test_tu_running_proposal(client, proposal):
     assert abstain.attrib["value"] == "Abstain"
 
     # Create a vote.
-    db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
-    voteinfo.ActiveTUs += 1
-    voteinfo.Yes += 1
-    db.commit()
+    with db.begin():
+        db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
+        voteinfo.ActiveTUs += 1
+        voteinfo.Yes += 1
 
     # Make another request now that we've voted.
     with client as request:
@@ -556,8 +560,8 @@ def test_tu_ended_proposal(client, proposal):
     tu_user, user, voteinfo = proposal
 
     ts = int(datetime.utcnow().timestamp())
-    voteinfo.End = ts - 5  # 5 seconds ago.
-    db.commit()
+    with db.begin():
+        voteinfo.End = ts - 5  # 5 seconds ago.
 
     # Initiate an authenticated GET request to /tu/{proposal_id}.
     proposal_id = voteinfo.ID
@@ -635,8 +639,8 @@ def test_tu_proposal_vote_unauthorized(client, proposal):
 
     dev_type = db.query(AccountType,
                         AccountType.AccountType == "Developer").first()
-    tu_user.AccountType = dev_type
-    db.commit()
+    with db.begin():
+        tu_user.AccountType = dev_type
 
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:
@@ -664,8 +668,8 @@ def test_tu_proposal_vote_cant_self_vote(client, proposal):
     tu_user, user, voteinfo = proposal
 
     # Update voteinfo.User.
-    voteinfo.User = tu_user.Username
-    db.commit()
+    with db.begin():
+        voteinfo.User = tu_user.Username
 
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:
@@ -692,10 +696,10 @@ def test_tu_proposal_vote_cant_self_vote(client, proposal):
 def test_tu_proposal_vote_already_voted(client, proposal):
     tu_user, user, voteinfo = proposal
 
-    db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
-    voteinfo.Yes += 1
-    voteinfo.ActiveTUs += 1
-    db.commit()
+    with db.begin():
+        db.create(TUVote, VoteInfo=voteinfo, User=tu_user)
+        voteinfo.Yes += 1
+        voteinfo.ActiveTUs += 1
 
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:
diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index 494300c5..b60e2e6a 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -4,7 +4,8 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import commit, create, query, rollback
+from aurweb import db
+from aurweb.db import create, query, rollback
 from aurweb.models.account_type import AccountType
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
@@ -21,19 +22,21 @@ def setup():
 
     tu_type = query(AccountType,
                     AccountType.AccountType == "Trusted User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=tu_type)
+    with db.begin():
+        user = create(User, Username="test", Email="test@example.org",
+                      RealName="Test User", Passwd="testPassword",
+                      AccountType=tu_type)
 
 
 def test_tu_voteinfo_creation():
     ts = int(datetime.utcnow().timestamp())
-    tu_voteinfo = create(TUVoteInfo,
-                         Agenda="Blah blah.",
-                         User=user.Username,
-                         Submitted=ts, End=ts + 5,
-                         Quorum=0.5,
-                         Submitter=user)
+    with db.begin():
+        tu_voteinfo = create(TUVoteInfo,
+                             Agenda="Blah blah.",
+                             User=user.Username,
+                             Submitted=ts, End=ts + 5,
+                             Quorum=0.5,
+                             Submitter=user)
     assert bool(tu_voteinfo.ID)
     assert tu_voteinfo.Agenda == "Blah blah."
     assert tu_voteinfo.User == user.Username
@@ -51,32 +54,33 @@ def test_tu_voteinfo_creation():
 
 def test_tu_voteinfo_is_running():
     ts = int(datetime.utcnow().timestamp())
-    tu_voteinfo = create(TUVoteInfo,
-                         Agenda="Blah blah.",
-                         User=user.Username,
-                         Submitted=ts, End=ts + 1000,
-                         Quorum=0.5,
-                         Submitter=user)
+    with db.begin():
+        tu_voteinfo = create(TUVoteInfo,
+                             Agenda="Blah blah.",
+                             User=user.Username,
+                             Submitted=ts, End=ts + 1000,
+                             Quorum=0.5,
+                             Submitter=user)
     assert tu_voteinfo.is_running() is True
 
-    tu_voteinfo.End = ts - 5
-    commit()
+    with db.begin():
+        tu_voteinfo.End = ts - 5
     assert tu_voteinfo.is_running() is False
 
 
 def test_tu_voteinfo_total_votes():
     ts = int(datetime.utcnow().timestamp())
-    tu_voteinfo = create(TUVoteInfo,
-                         Agenda="Blah blah.",
-                         User=user.Username,
-                         Submitted=ts, End=ts + 1000,
-                         Quorum=0.5,
-                         Submitter=user)
+    with db.begin():
+        tu_voteinfo = create(TUVoteInfo,
+                             Agenda="Blah blah.",
+                             User=user.Username,
+                             Submitted=ts, End=ts + 1000,
+                             Quorum=0.5,
+                             Submitter=user)
 
-    tu_voteinfo.Yes = 1
-    tu_voteinfo.No = 3
-    tu_voteinfo.Abstain = 5
-    commit()
+        tu_voteinfo.Yes = 1
+        tu_voteinfo.No = 3
+        tu_voteinfo.Abstain = 5
 
     # total_votes() should be the sum of Yes, No and Abstain: 1 + 3 + 5 = 9.
     assert tu_voteinfo.total_votes() == 9
@@ -84,61 +88,67 @@ def test_tu_voteinfo_total_votes():
 
 def test_tu_voteinfo_null_submitter_raises_exception():
     with pytest.raises(IntegrityError):
-        create(TUVoteInfo,
-               Agenda="Blah blah.",
-               User=user.Username,
-               Submitted=0, End=0,
-               Quorum=0.50)
+        with db.begin():
+            create(TUVoteInfo,
+                   Agenda="Blah blah.",
+                   User=user.Username,
+                   Submitted=0, End=0,
+                   Quorum=0.50)
     rollback()
 
 
 def test_tu_voteinfo_null_agenda_raises_exception():
     with pytest.raises(IntegrityError):
-        create(TUVoteInfo,
-               User=user.Username,
-               Submitted=0, End=0,
-               Quorum=0.50,
-               Submitter=user)
+        with db.begin():
+            create(TUVoteInfo,
+                   User=user.Username,
+                   Submitted=0, End=0,
+                   Quorum=0.50,
+                   Submitter=user)
     rollback()
 
 
 def test_tu_voteinfo_null_user_raises_exception():
     with pytest.raises(IntegrityError):
-        create(TUVoteInfo,
-               Agenda="Blah blah.",
-               Submitted=0, End=0,
-               Quorum=0.50,
-               Submitter=user)
+        with db.begin():
+            create(TUVoteInfo,
+                   Agenda="Blah blah.",
+                   Submitted=0, End=0,
+                   Quorum=0.50,
+                   Submitter=user)
     rollback()
 
 
 def test_tu_voteinfo_null_submitted_raises_exception():
     with pytest.raises(IntegrityError):
-        create(TUVoteInfo,
-               Agenda="Blah blah.",
-               User=user.Username,
-               End=0,
-               Quorum=0.50,
-               Submitter=user)
+        with db.begin():
+            create(TUVoteInfo,
+                   Agenda="Blah blah.",
+                   User=user.Username,
+                   End=0,
+                   Quorum=0.50,
+                   Submitter=user)
     rollback()
 
 
 def test_tu_voteinfo_null_end_raises_exception():
     with pytest.raises(IntegrityError):
-        create(TUVoteInfo,
-               Agenda="Blah blah.",
-               User=user.Username,
-               Submitted=0,
-               Quorum=0.50,
-               Submitter=user)
+        with db.begin():
+            create(TUVoteInfo,
+                   Agenda="Blah blah.",
+                   User=user.Username,
+                   Submitted=0,
+                   Quorum=0.50,
+                   Submitter=user)
     rollback()
 
 
 def test_tu_voteinfo_null_quorum_raises_exception():
     with pytest.raises(IntegrityError):
-        create(TUVoteInfo,
-               Agenda="Blah blah.",
-               User=user.Username,
-               Submitted=0, End=0,
-               Submitter=user)
+        with db.begin():
+            create(TUVoteInfo,
+                   Agenda="Blah blah.",
+                   User=user.Username,
+                   Submitted=0, End=0,
+                   Submitter=user)
     rollback()
diff --git a/test/test_user.py b/test/test_user.py
index 7756cff3..70eac079 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -9,7 +9,7 @@ import pytest
 import aurweb.auth
 import aurweb.config
 
-from aurweb.db import commit, create, query
+from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.package import Package
@@ -40,12 +40,13 @@ def setup():
         PackageNotification.__tablename__
     )
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
+    account_type = db.query(AccountType,
+                            AccountType.AccountType == "User").first()
 
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountType=account_type)
 
 
 def test_user_login_logout():
@@ -70,14 +71,14 @@ def test_user_login_logout():
     assert "AURSID" in request.cookies
 
     # Expect that User session relationships work right.
-    user_session = query(Session,
-                         Session.UsersID == user.ID).first()
+    user_session = db.query(Session,
+                            Session.UsersID == user.ID).first()
     assert user_session == user.session
     assert user.session.SessionID == sid
     assert user.session.User == user
 
     # Search for the user via query API.
-    result = query(User, User.ID == user.ID).first()
+    result = db.query(User, User.ID == user.ID).first()
 
     # Compare the result and our original user.
     assert result == user
@@ -114,7 +115,8 @@ def test_user_login_twice():
 def test_user_login_banned():
     # Add ban for the next 30 seconds.
     banned_timestamp = datetime.utcnow() + timedelta(seconds=30)
-    create(Ban, IPAddress="127.0.0.1", BanTS=banned_timestamp)
+    with db.begin():
+        db.create(Ban, IPAddress="127.0.0.1", BanTS=banned_timestamp)
 
     request = Request()
     request.client.host = "127.0.0.1"
@@ -122,18 +124,17 @@ def test_user_login_banned():
 
 
 def test_user_login_suspended():
-    from aurweb.db import session
-    user.Suspended = True
-    session.commit()
+    with db.begin():
+        user.Suspended = True
     assert not user.login(Request(), "testPassword")
 
 
 def test_legacy_user_authentication():
-    from aurweb.db import session
-
-    user.Salt = bcrypt.gensalt().decode()
-    user.Passwd = hashlib.md5(f"{user.Salt}testPassword".encode()).hexdigest()
-    session.commit()
+    with db.begin():
+        user.Salt = bcrypt.gensalt().decode()
+        user.Passwd = hashlib.md5(
+            f"{user.Salt}testPassword".encode()
+        ).hexdigest()
 
     assert not user.valid_password("badPassword")
     assert user.valid_password("testPassword")
@@ -145,8 +146,9 @@ def test_legacy_user_authentication():
 def test_user_login_with_outdated_sid():
     # Make a session with a LastUpdateTS 5 seconds ago, causing
     # user.login to update it with a new sid.
-    create(Session, UsersID=user.ID, SessionID="stub",
-           LastUpdateTS=datetime.utcnow().timestamp() - 5)
+    with db.begin():
+        db.create(Session, UsersID=user.ID, SessionID="stub",
+                  LastUpdateTS=datetime.utcnow().timestamp() - 5)
     sid = user.login(Request(), "testPassword")
     assert sid and user.is_authenticated()
     assert sid != "stub"
@@ -171,43 +173,42 @@ def test_user_has_credential():
 def test_user_ssh_pub_key():
     assert user.ssh_pub_key is None
 
-    ssh_pub_key = create(SSHPubKey, UserID=user.ID,
-                         Fingerprint="testFingerprint",
-                         PubKey="testPubKey")
+    with db.begin():
+        ssh_pub_key = db.create(SSHPubKey, UserID=user.ID,
+                                Fingerprint="testFingerprint",
+                                PubKey="testPubKey")
 
     assert user.ssh_pub_key == ssh_pub_key
 
 
 def test_user_credential_types():
-    from aurweb.db import session
-
     assert aurweb.auth.user_developer_or_trusted_user(user)
     assert not aurweb.auth.trusted_user(user)
     assert not aurweb.auth.developer(user)
     assert not aurweb.auth.trusted_user_or_dev(user)
 
-    trusted_user_type = query(AccountType,
-                              AccountType.AccountType == "Trusted User")\
-        .first()
-    user.AccountType = trusted_user_type
-    session.commit()
+    trusted_user_type = db.query(AccountType).filter(
+        AccountType.AccountType == "Trusted User"
+    ).first()
+    with db.begin():
+        user.AccountType = trusted_user_type
 
     assert aurweb.auth.trusted_user(user)
     assert aurweb.auth.trusted_user_or_dev(user)
 
-    developer_type = query(AccountType,
-                           AccountType.AccountType == "Developer").first()
-    user.AccountType = developer_type
-    session.commit()
+    developer_type = db.query(AccountType,
+                              AccountType.AccountType == "Developer").first()
+    with db.begin():
+        user.AccountType = developer_type
 
     assert aurweb.auth.developer(user)
     assert aurweb.auth.trusted_user_or_dev(user)
 
     type_str = "Trusted User & Developer"
-    elevated_type = query(AccountType,
-                          AccountType.AccountType == type_str).first()
-    user.AccountType = elevated_type
-    session.commit()
+    elevated_type = db.query(AccountType,
+                             AccountType.AccountType == type_str).first()
+    with db.begin():
+        user.AccountType = elevated_type
 
     assert aurweb.auth.trusted_user(user)
     assert aurweb.auth.developer(user)
@@ -233,53 +234,56 @@ def test_user_as_dict():
 
 
 def test_user_is_trusted_user():
-    tu_type = query(AccountType,
-                    AccountType.AccountType == "Trusted User").first()
-    user.AccountType = tu_type
-    commit()
+    tu_type = db.query(AccountType,
+                       AccountType.AccountType == "Trusted User").first()
+    with db.begin():
+        user.AccountType = tu_type
     assert user.is_trusted_user() is True
 
     # Do it again with the combined role.
-    tu_type = query(
+    tu_type = db.query(
         AccountType,
         AccountType.AccountType == "Trusted User & Developer").first()
-    user.AccountType = tu_type
-    commit()
+    with db.begin():
+        user.AccountType = tu_type
     assert user.is_trusted_user() is True
 
 
 def test_user_is_developer():
-    dev_type = query(AccountType,
-                     AccountType.AccountType == "Developer").first()
-    user.AccountType = dev_type
-    commit()
+    dev_type = db.query(AccountType,
+                        AccountType.AccountType == "Developer").first()
+    with db.begin():
+        user.AccountType = dev_type
     assert user.is_developer() is True
 
     # Do it again with the combined role.
-    dev_type = query(
+    dev_type = db.query(
         AccountType,
         AccountType.AccountType == "Trusted User & Developer").first()
-    user.AccountType = dev_type
-    commit()
+    with db.begin():
+        user.AccountType = dev_type
     assert user.is_developer() is True
 
 
 def test_user_voted_for():
     now = int(datetime.utcnow().timestamp())
-    pkgbase = create(PackageBase, Name="pkg1", Maintainer=user)
-    pkg = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
-    create(PackageVote, PackageBase=pkgbase, User=user, VoteTS=now)
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="pkg1", Maintainer=user)
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+        db.create(PackageVote, PackageBase=pkgbase, User=user, VoteTS=now)
     assert user.voted_for(pkg)
 
 
 def test_user_notified():
-    pkgbase = create(PackageBase, Name="pkg1", Maintainer=user)
-    pkg = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
-    create(PackageNotification, PackageBase=pkgbase, User=user)
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="pkg1", Maintainer=user)
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+        db.create(PackageNotification, PackageBase=pkgbase, User=user)
     assert user.notified(pkg)
 
 
 def test_user_packages():
-    pkgbase = create(PackageBase, Name="pkg1", Maintainer=user)
-    pkg = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="pkg1", Maintainer=user)
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
     assert pkg in user.packages()

From 1b452d126471df269605ed4e39edcdd38f9e59d8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 3 Sep 2021 21:02:35 -0700
Subject: [PATCH 318/844] Add GPL 2.0 LICENSE file

This was missing from the project and really needs to be here.

Closes #107

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 LICENSE | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 339 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..d511905c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

From 5c7e76ef891af78dbe4e3cacb42675b86d9f3a35 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 3 Sep 2021 21:02:35 -0700
Subject: [PATCH 319/844] Add GPL 2.0 LICENSE file

This was missing from the project and really needs to be here.

Closes #107

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 LICENSE | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 339 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..d511905c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

From 5e6f0cb8d71266d8ba29ea24db267914b1e33973 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Sep 2021 10:02:40 -0700
Subject: [PATCH 320/844] Revert "Add GPL 2.0 LICENSE file"

This was already in the repository in ./COPYING

This reverts commit 1b452d126471df269605ed4e39edcdd38f9e59d8.
---
 LICENSE | 339 --------------------------------------------------------
 1 file changed, 339 deletions(-)
 delete mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d511905c..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

From 4e5b67f0a6164a237bbab17f56db9c037cc365f0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Sep 2021 10:02:40 -0700
Subject: [PATCH 321/844] Revert "Add GPL 2.0 LICENSE file"

This was already in the repository in ./COPYING

This reverts commit 1b452d126471df269605ed4e39edcdd38f9e59d8.
---
 LICENSE | 339 --------------------------------------------------------
 1 file changed, 339 deletions(-)
 delete mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d511905c..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

From 2f9994807becf152cc6617e5e0e6d6ba24b2c363 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Sep 2021 10:02:13 -0700
Subject: [PATCH 322/844] use Poetry to deal with deps and package install

As the new-age Python package manager, Poetry brings a lot
of good additions to the table. It allows us to more easily
deal with virtualenvs for the project and resolve dependencies.

As of this commit, `requirements.txt` is replaced by Poetry,
configured at `pyproject.toml`.

In Docker and GitLab, we currently use Poetry in a root fashion.
We should work toward purely using virtualenvs in Docker, but,
for now we'd like to move forward with other things. The project
can still be installed to a virtualenv and used on a user's system
through Poetry; it is just not yet doing so in Docker.

Modifications:

* docker/scripts/install-deps.sh
    * Remove python dependencies.
* conf/config.defaults
    * Script paths have been updated to use '/usr/bin'.
* docker/git-entrypoint.sh
    * Use '/usr/bin/aurweb-git-auth' instead of
      '/usr/local/bin/aurweb-git-auth'.

Additions:

* docker/scripts/install-python-deps.sh
    * A script used purely to install Python dependencies with Poetry.
      This has to be used within the aurweb project directory and
      requires system-wide dependencies are installed beforehand.
    * Also upgrades system-wide pip.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml                        |    4 +-
 Dockerfile                            |   15 +-
 INSTALL                               |   54 +-
 conf/config.defaults                  |   10 +-
 docker/git-entrypoint.sh              |    2 +-
 docker/scripts/install-deps.sh        |   14 +-
 docker/scripts/install-python-deps.sh |   14 +
 poetry.lock                           | 1577 +++++++++++++++++++++++++
 pyproject.toml                        |  100 ++
 requirements.txt                      |   36 -
 setup.py                              |   36 -
 11 files changed, 1756 insertions(+), 106 deletions(-)
 create mode 100755 docker/scripts/install-python-deps.sh
 create mode 100644 poetry.lock
 create mode 100644 pyproject.toml
 delete mode 100644 requirements.txt
 delete mode 100644 setup.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d360d483..ffea5308 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,8 +11,9 @@ variables:
   DB_HOST: localhost
 
 before_script:
+  - export PATH="$HOME/.poetry/bin:${PATH}"
   - ./docker/scripts/install-deps.sh
-  - pip install -r requirements.txt
+  - ./docker/scripts/install-python-deps.sh
   - useradd -U -d /aurweb -c 'AUR User' aur
   - ./docker/mariadb-entrypoint.sh
   - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
@@ -20,7 +21,6 @@ before_script:
   - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
   - ./docker/test-sqlite-entrypoint.sh # Create sqlite AUR_CONFIG.
   - make -C po all install
-  - python setup.py install --install-scripts=/usr/local/bin
   - python -m aurweb.initdb # Initialize MySQL tables.
   - AUR_CONFIG=conf/config.sqlite python -m aurweb.initdb
   - make -C test clean
diff --git a/Dockerfile b/Dockerfile
index 6539bd94..76da62f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,25 @@
 FROM archlinux:base-devel
 
+ENV PATH="$HOME/.poetry/bin:${PATH}"
 ENV PYTHONPATH=/aurweb
 ENV AUR_CONFIG=conf/config
 
+# Install system-wide dependencies.
+COPY ./docker/scripts/install-deps.sh /install-deps.sh
+RUN /install-deps.sh
+
 # Copy Docker scripts
 COPY ./docker /docker
 COPY ./docker/scripts/*.sh /usr/local/bin/
 
-# Install system-wide dependencies.
-RUN /docker/scripts/install-deps.sh
-
 # Copy over all aurweb files.
 COPY . /aurweb
 
 # Working directory is aurweb root @ /aurweb.
 WORKDIR /aurweb
 
-# Install pip directories now that we have access to /aurweb.
-RUN pip install -r requirements.txt
+# Install Python dependencies.
+RUN /docker/scripts/install-python-deps.sh
 
 # Add our aur user.
 RUN useradd -U -d /aurweb -c 'AUR User' aur
@@ -27,6 +29,3 @@ RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 
 # Install translations.
 RUN make -C po all install
-
-# Install package and scripts.
-RUN python setup.py install --install-scripts=/usr/local/bin
diff --git a/INSTALL b/INSTALL
index 4df59bd2..e14b9f31 100644
--- a/INSTALL
+++ b/INSTALL
@@ -45,22 +45,54 @@ read the instructions below.
    if the defaults file does not exist) and adjust the configuration (pay
    attention to disable_http_login, enable_maintenance and aur_location).
 
-4) Install Python modules and dependencies:
+4) Install dependencies.
 
-    # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy \
-                python-bleach python-markdown python-alembic hypercorn \
-                python-itsdangerous python-authlib python-httpx \
-                python-jinja python-aiofiles python-python-multipart \
-                python-requests hypercorn python-bcrypt python-email-validator \
-                python-lxml python-feedgen
-    # python3 setup.py install
+4a) Install system-wide dependencies:
 
-(FastAPI-Specific)
+    # pacman -S git gpgme cgit pyalpm python-srcinfo curl openssh \
+                uwsgi uwsgi-plugin-cgi php php-fpm
 
-    # pacman -S redis python-redis python-fakeredis python-orjson
+4b) Install Python dependencies via poetry (required):
+
+**NOTE** Users do not need to install pip or poetry dependencies system-wide.
+You may take advantage of Poetry's virtualenv integration to manage
+dependencies. This is merely a demonstration to show users how to without
+a virtualenv. In Docker and CI, we don't yet use a virtualenv.
+
+    ## Install Poetry dependencies system-wide, if not using a virtualenv.
+    # pacman -S python-pip
+
+    ## Ensure pip is upgraded. Poetry depends on it being up to date.
+    # pip install --upgrade pip
+
+    ## Install Poetry.
+    # curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
+    # export PATH="$HOME/.poetry/bin:${PATH}"
+
+    ## Use Poetry to install dependencies and the aurweb package.
+    # poetry lock     # Resolve dependencies
+    # poetry update   # Install/update dependencies
+    # poetry build    # Build the aurweb package
+    # poetry install  # Install the aurweb package and scripts
+
+When installing in a virtualenv, config.defaults must contain the correct
+absolute paths to aurweb scripts, which requires modification.
+
+4c) Setup FastAPI Redis cache (optional).
+
+First, install Redis and start its service.
+
+    # pacman -S redis
     # systemctl enable --now redis
 
-5) Create a new MySQL database and a user and import the aurweb SQL schema:
+Now that Redis is running, ensure that you configure aurweb to use
+the Redis cache by setting `cache = redis` in your AUR config.
+
+In `conf/config.defaults`, the `redis_address` configuration is set
+to `redis://localhost`. This can be set to point to any Redis server
+and will be used as long as `cache = redis`.
+
+5) Create a new database and a user and import the aurweb SQL schema:
 
     $ python -m aurweb.initdb
 
diff --git a/conf/config.defaults b/conf/config.defaults
index 1b4c3a74..1c96a55d 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -34,8 +34,8 @@ commit_uri = /cgit/aur.git/commit/?h=%s&id=%s
 snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz
 enable-maintenance = 1
 maintenance-exceptions = 127.0.0.1
-render-comment-cmd = /usr/local/bin/aurweb-rendercomment
-localedir = /srv/http/aurweb/aur.git/web/locale/
+render-comment-cmd = /usr/bin/aurweb-rendercomment
+localedir = /srv/http/aurweb/web/locale/
 ; memcache, apc, or redis
 ; memcache/apc are supported in PHP, redis is supported in Python.
 cache = none
@@ -49,7 +49,7 @@ request_limit = 4000
 window_length = 86400
 
 [notifications]
-notify-cmd = /usr/local/bin/aurweb-notify
+notify-cmd = /usr/bin/aurweb-notify
 sendmail =
 smtp-server = localhost
 smtp-port = 25
@@ -68,7 +68,7 @@ RSA = SHA256:Ju+yWiMb/2O+gKQ9RJCDqvRg7l+Q95KFAeqM5sr6l2s
 [auth]
 valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 sk-ssh-ecdsa@openssh.com sk-ssh-ed25519@openssh.com
 username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$
-git-serve-cmd = /usr/local/bin/aurweb-git-serve
+git-serve-cmd = /usr/bin/aurweb-git-serve
 ssh-options = restrict
 
 [sso]
@@ -83,7 +83,7 @@ session_secret =
 repo-path = /srv/http/aurweb/aur.git/
 repo-regex = [a-z0-9][a-z0-9.+_-]*$
 git-shell-cmd = /usr/bin/git-shell
-git-update-cmd = /usr/local/bin/aurweb-git-update
+git-update-cmd = /usr/bin/aurweb-git-update
 ssh-cmdline = ssh aur@aur.archlinux.org
 
 [update]
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index 57752ac5..cfd159c9 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -25,7 +25,7 @@ chmod 755 /app
 cat >> $AUTH_SCRIPT << EOF
 #!/usr/bin/env bash
 export AUR_CONFIG="$AUR_CONFIG"
-exec /usr/local/bin/aurweb-git-auth "\$@"
+exec /usr/bin/aurweb-git-auth "\$@"
 EOF
 chmod 755 $AUTH_SCRIPT
 
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index 4985fe85..f8881d05 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -5,12 +5,12 @@
 set -eou pipefail
 
 pacman -Syu --noconfirm --noprogressbar \
-    --cachedir .pkg-cache git gpgme \
-      nginx redis openssh \
-      mariadb mariadb-libs \
-      cgit uwsgi uwsgi-plugin-cgi \
-      php php-fpm \
-      memcached php-memcached \
-      python-pip pyalpm python-srcinfo
+    --cachedir .pkg-cache git gpgme nginx redis openssh \
+      mariadb mariadb-libs cgit uwsgi uwsgi-plugin-cgi \
+      php php-fpm memcached php-memcached python-pip pyalpm \
+      python-srcinfo curl
+
+# https://python-poetry.org/docs/ Installation section.
+curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
 
 exec "$@"
diff --git a/docker/scripts/install-python-deps.sh b/docker/scripts/install-python-deps.sh
new file mode 100755
index 00000000..df9b5997
--- /dev/null
+++ b/docker/scripts/install-python-deps.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -eou pipefail
+
+# Upgrade PIP; Arch Linux's version of pip is outdated for Poetry.
+pip install --upgrade pip
+
+# Install the aurweb package and deps system-wide via poetry.
+poetry config virtualenvs.create false
+poetry lock
+poetry update
+poetry build
+poetry install --no-interaction --no-ansi
+
+exec "$@"
diff --git a/poetry.lock b/poetry.lock
new file mode 100644
index 00000000..3cc84361
--- /dev/null
+++ b/poetry.lock
@@ -0,0 +1,1577 @@
+[[package]]
+name = "aiofiles"
+version = "0.7.0"
+description = "File support for asyncio."
+category = "main"
+optional = false
+python-versions = ">=3.6,<4.0"
+
+[[package]]
+name = "alembic"
+version = "1.6.5"
+description = "A database migration tool for SQLAlchemy."
+category = "main"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
+
+[package.dependencies]
+Mako = "*"
+python-dateutil = "*"
+python-editor = ">=0.3"
+SQLAlchemy = ">=1.3.0"
+
+[[package]]
+name = "anyio"
+version = "3.3.0"
+description = "High level compatibility layer for multiple asynchronous event loop implementations"
+category = "main"
+optional = false
+python-versions = ">=3.6.2"
+
+[package.dependencies]
+idna = ">=2.8"
+sniffio = ">=1.1"
+
+[package.extras]
+doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"]
+test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"]
+trio = ["trio (>=0.16)"]
+
+[[package]]
+name = "asgiref"
+version = "3.4.1"
+description = "ASGI specs, helper code, and adapters"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"]
+
+[[package]]
+name = "atomicwrites"
+version = "1.4.0"
+description = "Atomic file writes."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "attrs"
+version = "21.2.0"
+description = "Classes Without Boilerplate"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.extras]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"]
+docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"]
+
+[[package]]
+name = "authlib"
+version = "0.15.2"
+description = "The ultimate Python library in building OAuth and OpenID Connect servers."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+cryptography = "*"
+
+[package.extras]
+client = ["requests"]
+
+[[package]]
+name = "bcrypt"
+version = "3.2.0"
+description = "Modern password hashing for your software and your servers"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+cffi = ">=1.1"
+six = ">=1.4.1"
+
+[package.extras]
+tests = ["pytest (>=3.2.1,!=3.3.0)"]
+typecheck = ["mypy"]
+
+[[package]]
+name = "bleach"
+version = "3.3.1"
+description = "An easy safelist-based HTML-sanitizing tool."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.dependencies]
+packaging = "*"
+six = ">=1.9.0"
+webencodings = "*"
+
+[[package]]
+name = "certifi"
+version = "2021.5.30"
+description = "Python package for providing Mozilla's CA Bundle."
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "cffi"
+version = "1.14.6"
+description = "Foreign Function Interface for Python calling C code."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+pycparser = "*"
+
+[[package]]
+name = "charset-normalizer"
+version = "2.0.4"
+description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
+category = "main"
+optional = false
+python-versions = ">=3.5.0"
+
+[package.extras]
+unicode_backport = ["unicodedata2"]
+
+[[package]]
+name = "click"
+version = "8.0.1"
+description = "Composable command line interface toolkit"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[[package]]
+name = "colorama"
+version = "0.4.4"
+description = "Cross-platform colored terminal text."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[[package]]
+name = "coverage"
+version = "5.5"
+description = "Code coverage measurement for Python"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+
+[package.extras]
+toml = ["toml"]
+
+[[package]]
+name = "cryptography"
+version = "3.4.8"
+description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+cffi = ">=1.12"
+
+[package.extras]
+docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
+docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
+pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
+sdist = ["setuptools-rust (>=0.11.4)"]
+ssh = ["bcrypt (>=3.1.5)"]
+test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
+
+[[package]]
+name = "dnspython"
+version = "2.1.0"
+description = "DNS toolkit"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+dnssec = ["cryptography (>=2.6)"]
+doh = ["requests", "requests-toolbelt"]
+idna = ["idna (>=2.1)"]
+curio = ["curio (>=1.2)", "sniffio (>=1.1)"]
+trio = ["trio (>=0.14.0)", "sniffio (>=1.1)"]
+
+[[package]]
+name = "dunamai"
+version = "1.6.0"
+description = "Dynamic version generation"
+category = "main"
+optional = false
+python-versions = ">=3.5,<4.0"
+
+[[package]]
+name = "email-validator"
+version = "1.1.3"
+description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."
+category = "main"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+
+[package.dependencies]
+dnspython = ">=1.15.0"
+idna = ">=2.0.0"
+
+[[package]]
+name = "fakeredis"
+version = "1.6.0"
+description = "Fake implementation of redis API for testing purposes."
+category = "main"
+optional = false
+python-versions = ">=3.5"
+
+[package.dependencies]
+redis = "<3.6.0"
+six = ">=1.12"
+sortedcontainers = "*"
+
+[package.extras]
+aioredis = ["aioredis"]
+lua = ["lupa"]
+
+[[package]]
+name = "fastapi"
+version = "0.66.0"
+description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0"
+starlette = "0.14.2"
+
+[package.extras]
+all = ["requests (>=2.24.0,<3.0.0)", "aiofiles (>=0.5.0,<0.6.0)", "jinja2 (>=2.11.2,<3.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<2.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "graphene (>=2.1.8,<3.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)"]
+dev = ["python-jose[cryptography] (>=3.1.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "graphene (>=2.1.8,<3.0.0)"]
+doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "markdown-include (>=0.6.0,<0.7.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"]
+test = ["pytest (==5.4.3)", "pytest-cov (==2.10.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (==0.812)", "flake8 (>=3.8.3,<4.0.0)", "black (==20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.4.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"]
+
+[[package]]
+name = "feedgen"
+version = "0.9.0"
+description = "Feed Generator (ATOM, RSS, Podcasts)"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+lxml = "*"
+python-dateutil = "*"
+
+[[package]]
+name = "flake8"
+version = "3.9.2"
+description = "the modular source code checker: pep8 pyflakes and co"
+category = "dev"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+
+[package.dependencies]
+mccabe = ">=0.6.0,<0.7.0"
+pycodestyle = ">=2.7.0,<2.8.0"
+pyflakes = ">=2.3.0,<2.4.0"
+
+[[package]]
+name = "h11"
+version = "0.12.0"
+description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[[package]]
+name = "h2"
+version = "4.0.0"
+description = "HTTP/2 State-Machine based protocol implementation"
+category = "main"
+optional = false
+python-versions = ">=3.6.1"
+
+[package.dependencies]
+hpack = ">=4.0,<5"
+hyperframe = ">=6.0,<7"
+
+[[package]]
+name = "hpack"
+version = "4.0.0"
+description = "Pure-Python HPACK header compression"
+category = "main"
+optional = false
+python-versions = ">=3.6.1"
+
+[[package]]
+name = "httpcore"
+version = "0.13.6"
+description = "A minimal low-level HTTP client."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+anyio = ">=3.0.0,<4.0.0"
+h11 = ">=0.11,<0.13"
+sniffio = ">=1.0.0,<2.0.0"
+
+[package.extras]
+http2 = ["h2 (>=3,<5)"]
+
+[[package]]
+name = "httpx"
+version = "0.18.2"
+description = "The next generation HTTP client."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+certifi = "*"
+httpcore = ">=0.13.3,<0.14.0"
+rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]}
+sniffio = "*"
+
+[package.extras]
+brotli = ["brotlicffi (>=1.0.0,<2.0.0)"]
+http2 = ["h2 (>=3.0.0,<4.0.0)"]
+
+[[package]]
+name = "hypercorn"
+version = "0.11.2"
+description = "A ASGI Server based on Hyper libraries and inspired by Gunicorn."
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.dependencies]
+h11 = "*"
+h2 = ">=3.1.0"
+priority = "*"
+toml = "*"
+wsproto = ">=0.14.0"
+
+[package.extras]
+h3 = ["aioquic (>=0.9.0,<1.0)"]
+tests = ["hypothesis", "mock", "pytest", "pytest-asyncio", "pytest-cov", "pytest-trio", "trio"]
+trio = ["trio (>=0.11.0)"]
+uvloop = ["uvloop"]
+
+[[package]]
+name = "hyperframe"
+version = "6.0.1"
+description = "HTTP/2 framing layer for Python"
+category = "main"
+optional = false
+python-versions = ">=3.6.1"
+
+[[package]]
+name = "idna"
+version = "3.2"
+description = "Internationalized Domain Names in Applications (IDNA)"
+category = "main"
+optional = false
+python-versions = ">=3.5"
+
+[[package]]
+name = "iniconfig"
+version = "1.1.1"
+description = "iniconfig: brain-dead simple config-ini parsing"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "isort"
+version = "5.9.3"
+description = "A Python utility / library to sort Python imports."
+category = "dev"
+optional = false
+python-versions = ">=3.6.1,<4.0"
+
+[package.extras]
+pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
+requirements_deprecated_finder = ["pipreqs", "pip-api"]
+colors = ["colorama (>=0.4.3,<0.5.0)"]
+plugins = ["setuptools"]
+
+[[package]]
+name = "itsdangerous"
+version = "2.0.1"
+description = "Safely pass data to untrusted environments and back."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[[package]]
+name = "jinja2"
+version = "3.0.1"
+description = "A very fast and expressive template engine."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+MarkupSafe = ">=2.0"
+
+[package.extras]
+i18n = ["Babel (>=2.7)"]
+
+[[package]]
+name = "lxml"
+version = "4.6.3"
+description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*"
+
+[package.extras]
+cssselect = ["cssselect (>=0.7)"]
+html5 = ["html5lib"]
+htmlsoup = ["beautifulsoup4"]
+source = ["Cython (>=0.29.7)"]
+
+[[package]]
+name = "mako"
+version = "1.1.5"
+description = "A super-fast templating language that borrows the  best ideas from the existing templating languages."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[package.dependencies]
+MarkupSafe = ">=0.9.2"
+
+[package.extras]
+babel = ["babel"]
+lingua = ["lingua"]
+
+[[package]]
+name = "markdown"
+version = "3.3.4"
+description = "Python implementation of Markdown."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+testing = ["coverage", "pyyaml"]
+
+[[package]]
+name = "markupsafe"
+version = "2.0.1"
+description = "Safely add untrusted strings to HTML/XML markup."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[[package]]
+name = "mccabe"
+version = "0.6.1"
+description = "McCabe checker, plugin for flake8"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "mysqlclient"
+version = "2.0.3"
+description = "Python interface to MySQL"
+category = "main"
+optional = false
+python-versions = ">=3.5"
+
+[[package]]
+name = "orjson"
+version = "3.6.3"
+description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[[package]]
+name = "packaging"
+version = "21.0"
+description = "Core utilities for Python packages"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+pyparsing = ">=2.0.2"
+
+[[package]]
+name = "pluggy"
+version = "0.13.1"
+description = "plugin and hook calling mechanisms for python"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[package.extras]
+dev = ["pre-commit", "tox"]
+
+[[package]]
+name = "poetry-dynamic-versioning"
+version = "0.13.1"
+description = "Plugin for Poetry to enable dynamic versioning based on VCS tags"
+category = "main"
+optional = false
+python-versions = ">=3.5,<4.0"
+
+[package.dependencies]
+dunamai = ">=1.5,<2.0"
+jinja2 = {version = ">=2.11.1,<4", markers = "python_version >= \"3.6\" and python_version < \"4.0\""}
+tomlkit = ">=0.4"
+
+[[package]]
+name = "priority"
+version = "2.0.0"
+description = "A pure-Python implementation of the HTTP/2 priority tree"
+category = "main"
+optional = false
+python-versions = ">=3.6.1"
+
+[[package]]
+name = "protobuf"
+version = "3.17.3"
+description = "Protocol Buffers"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+six = ">=1.9"
+
+[[package]]
+name = "py"
+version = "1.10.0"
+description = "library with cross-python path, ini-parsing, io, code, log facilities"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "pycodestyle"
+version = "2.7.0"
+description = "Python style guide checker"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "pycparser"
+version = "2.20"
+description = "C parser in Python"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "pydantic"
+version = "1.8.2"
+description = "Data validation and settings management using python 3.6 type hinting"
+category = "main"
+optional = false
+python-versions = ">=3.6.1"
+
+[package.dependencies]
+typing-extensions = ">=3.7.4.3"
+
+[package.extras]
+dotenv = ["python-dotenv (>=0.10.4)"]
+email = ["email-validator (>=1.0.3)"]
+
+[[package]]
+name = "pyflakes"
+version = "2.3.1"
+description = "passive checker of Python programs"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "pygit2"
+version = "1.6.1"
+description = "Python bindings for libgit2."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+cffi = ">=1.4.0"
+
+[[package]]
+name = "pyparsing"
+version = "2.4.7"
+description = "Python parsing module"
+category = "main"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+
+[[package]]
+name = "pytest"
+version = "6.2.4"
+description = "pytest: simple powerful testing with Python"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
+attrs = ">=19.2.0"
+colorama = {version = "*", markers = "sys_platform == \"win32\""}
+iniconfig = "*"
+packaging = "*"
+pluggy = ">=0.12,<1.0.0a1"
+py = ">=1.8.2"
+toml = "*"
+
+[package.extras]
+testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
+
+[[package]]
+name = "pytest-asyncio"
+version = "0.15.1"
+description = "Pytest support for asyncio."
+category = "dev"
+optional = false
+python-versions = ">= 3.6"
+
+[package.dependencies]
+pytest = ">=5.4.0"
+
+[package.extras]
+testing = ["coverage", "hypothesis (>=5.7.1)"]
+
+[[package]]
+name = "pytest-cov"
+version = "2.12.1"
+description = "Pytest plugin for measuring coverage."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.dependencies]
+coverage = ">=5.2.1"
+pytest = ">=4.6"
+toml = "*"
+
+[package.extras]
+testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
+
+[[package]]
+name = "pytest-tap"
+version = "3.2"
+description = "Test Anything Protocol (TAP) reporting plugin for pytest"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+pytest = ">=3.0"
+"tap.py" = ">=3.0,<4.0"
+
+[[package]]
+name = "python-dateutil"
+version = "2.8.2"
+description = "Extensions to the standard Python datetime module"
+category = "main"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+
+[package.dependencies]
+six = ">=1.5"
+
+[[package]]
+name = "python-editor"
+version = "1.0.4"
+description = "Programmatically open an editor, capture the result."
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "python-multipart"
+version = "0.0.5"
+description = "A streaming multipart parser for Python"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+six = ">=1.4.0"
+
+[[package]]
+name = "redis"
+version = "3.5.3"
+description = "Python client for Redis key-value store"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.extras]
+hiredis = ["hiredis (>=0.1.3)"]
+
+[[package]]
+name = "requests"
+version = "2.26.0"
+description = "Python HTTP for Humans."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+
+[package.dependencies]
+certifi = ">=2017.4.17"
+charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""}
+idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""}
+urllib3 = ">=1.21.1,<1.27"
+
+[package.extras]
+socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
+use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"]
+
+[[package]]
+name = "rfc3986"
+version = "1.5.0"
+description = "Validating URI References per RFC 3986"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+idna = {version = "*", optional = true, markers = "extra == \"idna2008\""}
+
+[package.extras]
+idna2008 = ["idna"]
+
+[[package]]
+name = "six"
+version = "1.16.0"
+description = "Python 2 and 3 compatibility utilities"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+
+[[package]]
+name = "sniffio"
+version = "1.2.0"
+description = "Sniff out which async library your code is running under"
+category = "main"
+optional = false
+python-versions = ">=3.5"
+
+[[package]]
+name = "sortedcontainers"
+version = "2.4.0"
+description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "sqlalchemy"
+version = "1.3.23"
+description = "Database Abstraction Library"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[package.extras]
+mssql = ["pyodbc"]
+mssql_pymssql = ["pymssql"]
+mssql_pyodbc = ["pyodbc"]
+mysql = ["mysqlclient"]
+oracle = ["cx-oracle"]
+postgresql = ["psycopg2"]
+postgresql_pg8000 = ["pg8000 (<1.16.6)"]
+postgresql_psycopg2binary = ["psycopg2-binary"]
+postgresql_psycopg2cffi = ["psycopg2cffi"]
+pymysql = ["pymysql (<1)", "pymysql"]
+
+[[package]]
+name = "starlette"
+version = "0.14.2"
+description = "The little ASGI library that shines."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"]
+
+[[package]]
+name = "tap.py"
+version = "3.0"
+description = "Test Anything Protocol (TAP) tools"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.extras]
+yaml = ["more-itertools", "PyYAML (>=5.1)"]
+
+[[package]]
+name = "toml"
+version = "0.10.2"
+description = "Python Library for Tom's Obvious, Minimal Language"
+category = "main"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+
+[[package]]
+name = "tomlkit"
+version = "0.7.2"
+description = "Style preserving TOML library"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.dependencies]
+typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\""}
+
+[[package]]
+name = "typing"
+version = "3.7.4.3"
+description = "Type Hints for Python"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "typing-extensions"
+version = "3.10.0.2"
+description = "Backported and Experimental Type Hints for Python 3.5+"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "urllib3"
+version = "1.26.6"
+description = "HTTP library with thread-safe connection pooling, file post, and more."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+
+[package.extras]
+brotli = ["brotlipy (>=0.6.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
+socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
+
+[[package]]
+name = "uvicorn"
+version = "0.15.0"
+description = "The lightning-fast ASGI server."
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+asgiref = ">=3.4.0"
+click = ">=7.0"
+h11 = ">=0.8"
+
+[package.extras]
+standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"]
+
+[[package]]
+name = "webencodings"
+version = "0.5.1"
+description = "Character encoding aliases for legacy web content"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "werkzeug"
+version = "2.0.1"
+description = "The comprehensive WSGI web application library."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+watchdog = ["watchdog"]
+
+[[package]]
+name = "wsproto"
+version = "1.0.0"
+description = "WebSockets state-machine based protocol implementation"
+category = "main"
+optional = false
+python-versions = ">=3.6.1"
+
+[package.dependencies]
+h11 = ">=0.9.0,<1"
+
+[metadata]
+lock-version = "1.1"
+python-versions = "*"
+content-hash = "96112731ca21a6ff5d0657c6c40979642bb992ae660ba8d6135421718737c6b0"
+
+[metadata.files]
+aiofiles = [
+    {file = "aiofiles-0.7.0-py3-none-any.whl", hash = "sha256:c67a6823b5f23fcab0a2595a289cec7d8c863ffcb4322fb8cd6b90400aedfdbc"},
+    {file = "aiofiles-0.7.0.tar.gz", hash = "sha256:a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"},
+]
+alembic = [
+    {file = "alembic-1.6.5-py2.py3-none-any.whl", hash = "sha256:e78be5b919f5bb184e3e0e2dd1ca986f2362e29a2bc933c446fe89f39dbe4e9c"},
+    {file = "alembic-1.6.5.tar.gz", hash = "sha256:a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"},
+]
+anyio = [
+    {file = "anyio-3.3.0-py3-none-any.whl", hash = "sha256:929a6852074397afe1d989002aa96d457e3e1e5441357c60d03e7eea0e65e1b0"},
+    {file = "anyio-3.3.0.tar.gz", hash = "sha256:ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374"},
+]
+asgiref = [
+    {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"},
+    {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"},
+]
+atomicwrites = [
+    {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"},
+    {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
+]
+attrs = [
+    {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"},
+    {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"},
+]
+authlib = [
+    {file = "Authlib-0.15.2-py2.py3-none-any.whl", hash = "sha256:078b900fa9fbebf9f8dae1d5dc1ca857b6a742493093ef9b0b36ad926f36e41f"},
+    {file = "Authlib-0.15.2.tar.gz", hash = "sha256:21b34625c83ca48150684bbeca8f7c884cd281913c72d146dbf0e9d2fbfdec4e"},
+]
+bcrypt = [
+    {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6"},
+    {file = "bcrypt-3.2.0-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:63d4e3ff96188e5898779b6057878fecf3f11cfe6ec3b313ea09955d587ec7a7"},
+    {file = "bcrypt-3.2.0-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1"},
+    {file = "bcrypt-3.2.0-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d"},
+    {file = "bcrypt-3.2.0-cp36-abi3-win32.whl", hash = "sha256:a67fb841b35c28a59cebed05fbd3e80eea26e6d75851f0574a9273c80f3e9b55"},
+    {file = "bcrypt-3.2.0-cp36-abi3-win_amd64.whl", hash = "sha256:81fec756feff5b6818ea7ab031205e1d323d8943d237303baca2c5f9c7846f34"},
+    {file = "bcrypt-3.2.0.tar.gz", hash = "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"},
+]
+bleach = [
+    {file = "bleach-3.3.1-py2.py3-none-any.whl", hash = "sha256:ae976d7174bba988c0b632def82fdc94235756edfb14e6558a9c5be555c9fb78"},
+    {file = "bleach-3.3.1.tar.gz", hash = "sha256:306483a5a9795474160ad57fce3ddd1b50551e981eed8e15a582d34cef28aafa"},
+]
+certifi = [
+    {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"},
+    {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"},
+]
+cffi = [
+    {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"},
+    {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"},
+    {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"},
+    {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"},
+    {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"},
+    {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"},
+    {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"},
+    {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"},
+    {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"},
+    {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"},
+    {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"},
+    {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"},
+    {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"},
+    {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"},
+    {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"},
+    {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"},
+    {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"},
+    {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"},
+    {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"},
+    {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"},
+    {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"},
+    {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"},
+    {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"},
+    {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"},
+    {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"},
+    {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"},
+    {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"},
+    {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"},
+    {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"},
+    {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"},
+    {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"},
+    {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"},
+    {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"},
+    {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"},
+    {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"},
+    {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"},
+    {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"},
+    {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"},
+    {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"},
+    {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"},
+    {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"},
+    {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"},
+    {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"},
+    {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"},
+    {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"},
+]
+charset-normalizer = [
+    {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"},
+    {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"},
+]
+click = [
+    {file = "click-8.0.1-py3-none-any.whl", hash = "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"},
+    {file = "click-8.0.1.tar.gz", hash = "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a"},
+]
+colorama = [
+    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
+    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
+]
+coverage = [
+    {file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"},
+    {file = "coverage-5.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b"},
+    {file = "coverage-5.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669"},
+    {file = "coverage-5.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90"},
+    {file = "coverage-5.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c"},
+    {file = "coverage-5.5-cp27-cp27m-win32.whl", hash = "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a"},
+    {file = "coverage-5.5-cp27-cp27m-win_amd64.whl", hash = "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82"},
+    {file = "coverage-5.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905"},
+    {file = "coverage-5.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083"},
+    {file = "coverage-5.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5"},
+    {file = "coverage-5.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81"},
+    {file = "coverage-5.5-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6"},
+    {file = "coverage-5.5-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0"},
+    {file = "coverage-5.5-cp310-cp310-win_amd64.whl", hash = "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae"},
+    {file = "coverage-5.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb"},
+    {file = "coverage-5.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160"},
+    {file = "coverage-5.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6"},
+    {file = "coverage-5.5-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701"},
+    {file = "coverage-5.5-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793"},
+    {file = "coverage-5.5-cp35-cp35m-win32.whl", hash = "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e"},
+    {file = "coverage-5.5-cp35-cp35m-win_amd64.whl", hash = "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3"},
+    {file = "coverage-5.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066"},
+    {file = "coverage-5.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a"},
+    {file = "coverage-5.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465"},
+    {file = "coverage-5.5-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb"},
+    {file = "coverage-5.5-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821"},
+    {file = "coverage-5.5-cp36-cp36m-win32.whl", hash = "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45"},
+    {file = "coverage-5.5-cp36-cp36m-win_amd64.whl", hash = "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184"},
+    {file = "coverage-5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a"},
+    {file = "coverage-5.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53"},
+    {file = "coverage-5.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d"},
+    {file = "coverage-5.5-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638"},
+    {file = "coverage-5.5-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3"},
+    {file = "coverage-5.5-cp37-cp37m-win32.whl", hash = "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a"},
+    {file = "coverage-5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a"},
+    {file = "coverage-5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6"},
+    {file = "coverage-5.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2"},
+    {file = "coverage-5.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759"},
+    {file = "coverage-5.5-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873"},
+    {file = "coverage-5.5-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a"},
+    {file = "coverage-5.5-cp38-cp38-win32.whl", hash = "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6"},
+    {file = "coverage-5.5-cp38-cp38-win_amd64.whl", hash = "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502"},
+    {file = "coverage-5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b"},
+    {file = "coverage-5.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529"},
+    {file = "coverage-5.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b"},
+    {file = "coverage-5.5-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff"},
+    {file = "coverage-5.5-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b"},
+    {file = "coverage-5.5-cp39-cp39-win32.whl", hash = "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6"},
+    {file = "coverage-5.5-cp39-cp39-win_amd64.whl", hash = "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03"},
+    {file = "coverage-5.5-pp36-none-any.whl", hash = "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079"},
+    {file = "coverage-5.5-pp37-none-any.whl", hash = "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4"},
+    {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"},
+]
+cryptography = [
+    {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"},
+    {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"},
+    {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"},
+    {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"},
+    {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"},
+    {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"},
+    {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"},
+    {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"},
+    {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"},
+    {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af"},
+    {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a"},
+    {file = "cryptography-3.4.8-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06"},
+    {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498"},
+    {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7"},
+    {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9"},
+    {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"},
+    {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"},
+]
+dnspython = [
+    {file = "dnspython-2.1.0-py3-none-any.whl", hash = "sha256:95d12f6ef0317118d2a1a6fc49aac65ffec7eb8087474158f42f26a639135216"},
+    {file = "dnspython-2.1.0.zip", hash = "sha256:e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4"},
+]
+dunamai = [
+    {file = "dunamai-1.6.0-py3-none-any.whl", hash = "sha256:44a94a4edebb145bb6198a2f26de957b12b77d43b7c9c0646be814c60cf5d8df"},
+    {file = "dunamai-1.6.0.tar.gz", hash = "sha256:6f1111f47e869ed58d44a7d37f112e3e7c761dce3c71f2c5464526928d7e9896"},
+]
+email-validator = [
+    {file = "email_validator-1.1.3-py2.py3-none-any.whl", hash = "sha256:5675c8ceb7106a37e40e2698a57c056756bf3f272cfa8682a4f87ebd95d8440b"},
+    {file = "email_validator-1.1.3.tar.gz", hash = "sha256:aa237a65f6f4da067119b7df3f13e89c25c051327b2b5b66dc075f33d62480d7"},
+]
+fakeredis = [
+    {file = "fakeredis-1.6.0-py3-none-any.whl", hash = "sha256:3449b306f3a85102b28f8180c24722ef966fcb1e3c744758b6f635ec80321a5c"},
+    {file = "fakeredis-1.6.0.tar.gz", hash = "sha256:11ccfc9769d718d37e45b382e64a6ba02586b622afa0371a6bd85766d72255f3"},
+]
+fastapi = [
+    {file = "fastapi-0.66.0-py3-none-any.whl", hash = "sha256:85d8aee8c3c46171f4cb7bb3651425a42c07cb9183345d100ef55d88ca2ce15f"},
+    {file = "fastapi-0.66.0.tar.gz", hash = "sha256:6ea4225448786f3d6fae737713789f87631a7455f65580de0a4a2e50471060d9"},
+]
+feedgen = [
+    {file = "feedgen-0.9.0.tar.gz", hash = "sha256:8e811bdbbed6570034950db23a4388453628a70e689a6e8303ccec430f5a804a"},
+]
+flake8 = [
+    {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"},
+    {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"},
+]
+h11 = [
+    {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"},
+    {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
+]
+h2 = [
+    {file = "h2-4.0.0-py3-none-any.whl", hash = "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25"},
+    {file = "h2-4.0.0.tar.gz", hash = "sha256:bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"},
+]
+hpack = [
+    {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"},
+    {file = "hpack-4.0.0.tar.gz", hash = "sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"},
+]
+httpcore = [
+    {file = "httpcore-0.13.6-py3-none-any.whl", hash = "sha256:db4c0dcb8323494d01b8c6d812d80091a31e520033e7b0120883d6f52da649ff"},
+    {file = "httpcore-0.13.6.tar.gz", hash = "sha256:b0d16f0012ec88d8cc848f5a55f8a03158405f4bca02ee49bc4ca2c1fda49f3e"},
+]
+httpx = [
+    {file = "httpx-0.18.2-py3-none-any.whl", hash = "sha256:979afafecb7d22a1d10340bafb403cf2cb75aff214426ff206521fc79d26408c"},
+    {file = "httpx-0.18.2.tar.gz", hash = "sha256:9f99c15d33642d38bce8405df088c1c4cfd940284b4290cacbfb02e64f4877c6"},
+]
+hypercorn = [
+    {file = "Hypercorn-0.11.2-py3-none-any.whl", hash = "sha256:8007c10f81566920f8ae12c0e26e146f94ca70506da964b5a727ad610aa1d821"},
+    {file = "Hypercorn-0.11.2.tar.gz", hash = "sha256:5ba1e719c521080abd698ff5781a2331e34ef50fc1c89a50960538115a896a9a"},
+]
+hyperframe = [
+    {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"},
+    {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"},
+]
+idna = [
+    {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"},
+    {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"},
+]
+iniconfig = [
+    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
+    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+]
+isort = [
+    {file = "isort-5.9.3-py3-none-any.whl", hash = "sha256:e17d6e2b81095c9db0a03a8025a957f334d6ea30b26f9ec70805411e5c7c81f2"},
+    {file = "isort-5.9.3.tar.gz", hash = "sha256:9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899"},
+]
+itsdangerous = [
+    {file = "itsdangerous-2.0.1-py3-none-any.whl", hash = "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c"},
+    {file = "itsdangerous-2.0.1.tar.gz", hash = "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0"},
+]
+jinja2 = [
+    {file = "Jinja2-3.0.1-py3-none-any.whl", hash = "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4"},
+    {file = "Jinja2-3.0.1.tar.gz", hash = "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4"},
+]
+lxml = [
+    {file = "lxml-4.6.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:df7c53783a46febb0e70f6b05df2ba104610f2fb0d27023409734a3ecbb78fb2"},
+    {file = "lxml-4.6.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:1b7584d421d254ab86d4f0b13ec662a9014397678a7c4265a02a6d7c2b18a75f"},
+    {file = "lxml-4.6.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:079f3ae844f38982d156efce585bc540c16a926d4436712cf4baee0cce487a3d"},
+    {file = "lxml-4.6.3-cp27-cp27m-win32.whl", hash = "sha256:bc4313cbeb0e7a416a488d72f9680fffffc645f8a838bd2193809881c67dd106"},
+    {file = "lxml-4.6.3-cp27-cp27m-win_amd64.whl", hash = "sha256:8157dadbb09a34a6bd95a50690595e1fa0af1a99445e2744110e3dca7831c4ee"},
+    {file = "lxml-4.6.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:7728e05c35412ba36d3e9795ae8995e3c86958179c9770e65558ec3fdfd3724f"},
+    {file = "lxml-4.6.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:4bff24dfeea62f2e56f5bab929b4428ae6caba2d1eea0c2d6eb618e30a71e6d4"},
+    {file = "lxml-4.6.3-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:64812391546a18896adaa86c77c59a4998f33c24788cadc35789e55b727a37f4"},
+    {file = "lxml-4.6.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:c1a40c06fd5ba37ad39caa0b3144eb3772e813b5fb5b084198a985431c2f1e8d"},
+    {file = "lxml-4.6.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:74f7d8d439b18fa4c385f3f5dfd11144bb87c1da034a466c5b5577d23a1d9b51"},
+    {file = "lxml-4.6.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f90ba11136bfdd25cae3951af8da2e95121c9b9b93727b1b896e3fa105b2f586"},
+    {file = "lxml-4.6.3-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:4c61b3a0db43a1607d6264166b230438f85bfed02e8cff20c22e564d0faff354"},
+    {file = "lxml-4.6.3-cp35-cp35m-manylinux2014_x86_64.whl", hash = "sha256:5c8c163396cc0df3fd151b927e74f6e4acd67160d6c33304e805b84293351d16"},
+    {file = "lxml-4.6.3-cp35-cp35m-win32.whl", hash = "sha256:f2380a6376dfa090227b663f9678150ef27543483055cc327555fb592c5967e2"},
+    {file = "lxml-4.6.3-cp35-cp35m-win_amd64.whl", hash = "sha256:c4f05c5a7c49d2fb70223d0d5bcfbe474cf928310ac9fa6a7c6dddc831d0b1d4"},
+    {file = "lxml-4.6.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d2e35d7bf1c1ac8c538f88d26b396e73dd81440d59c1ef8522e1ea77b345ede4"},
+    {file = "lxml-4.6.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:289e9ca1a9287f08daaf796d96e06cb2bc2958891d7911ac7cae1c5f9e1e0ee3"},
+    {file = "lxml-4.6.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:bccbfc27563652de7dc9bdc595cb25e90b59c5f8e23e806ed0fd623755b6565d"},
+    {file = "lxml-4.6.3-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d916d31fd85b2f78c76400d625076d9124de3e4bda8b016d25a050cc7d603f24"},
+    {file = "lxml-4.6.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:820628b7b3135403540202e60551e741f9b6d3304371712521be939470b454ec"},
+    {file = "lxml-4.6.3-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:c47ff7e0a36d4efac9fd692cfa33fbd0636674c102e9e8d9b26e1b93a94e7617"},
+    {file = "lxml-4.6.3-cp36-cp36m-win32.whl", hash = "sha256:5a0a14e264069c03e46f926be0d8919f4105c1623d620e7ec0e612a2e9bf1c04"},
+    {file = "lxml-4.6.3-cp36-cp36m-win_amd64.whl", hash = "sha256:92e821e43ad382332eade6812e298dc9701c75fe289f2a2d39c7960b43d1e92a"},
+    {file = "lxml-4.6.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:efd7a09678fd8b53117f6bae4fa3825e0a22b03ef0a932e070c0bdbb3a35e654"},
+    {file = "lxml-4.6.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:efac139c3f0bf4f0939f9375af4b02c5ad83a622de52d6dfa8e438e8e01d0eb0"},
+    {file = "lxml-4.6.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:0fbcf5565ac01dff87cbfc0ff323515c823081c5777a9fc7703ff58388c258c3"},
+    {file = "lxml-4.6.3-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:36108c73739985979bf302006527cf8a20515ce444ba916281d1c43938b8bb96"},
+    {file = "lxml-4.6.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:122fba10466c7bd4178b07dba427aa516286b846b2cbd6f6169141917283aae2"},
+    {file = "lxml-4.6.3-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:cdaf11d2bd275bf391b5308f86731e5194a21af45fbaaaf1d9e8147b9160ea92"},
+    {file = "lxml-4.6.3-cp37-cp37m-win32.whl", hash = "sha256:3439c71103ef0e904ea0a1901611863e51f50b5cd5e8654a151740fde5e1cade"},
+    {file = "lxml-4.6.3-cp37-cp37m-win_amd64.whl", hash = "sha256:4289728b5e2000a4ad4ab8da6e1db2e093c63c08bdc0414799ee776a3f78da4b"},
+    {file = "lxml-4.6.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b007cbb845b28db4fb8b6a5cdcbf65bacb16a8bd328b53cbc0698688a68e1caa"},
+    {file = "lxml-4.6.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:76fa7b1362d19f8fbd3e75fe2fb7c79359b0af8747e6f7141c338f0bee2f871a"},
+    {file = "lxml-4.6.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:26e761ab5b07adf5f555ee82fb4bfc35bf93750499c6c7614bd64d12aaa67927"},
+    {file = "lxml-4.6.3-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:e1cbd3f19a61e27e011e02f9600837b921ac661f0c40560eefb366e4e4fb275e"},
+    {file = "lxml-4.6.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:66e575c62792c3f9ca47cb8b6fab9e35bab91360c783d1606f758761810c9791"},
+    {file = "lxml-4.6.3-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:1b38116b6e628118dea5b2186ee6820ab138dbb1e24a13e478490c7db2f326ae"},
+    {file = "lxml-4.6.3-cp38-cp38-win32.whl", hash = "sha256:89b8b22a5ff72d89d48d0e62abb14340d9e99fd637d046c27b8b257a01ffbe28"},
+    {file = "lxml-4.6.3-cp38-cp38-win_amd64.whl", hash = "sha256:2a9d50e69aac3ebee695424f7dbd7b8c6d6eb7de2a2eb6b0f6c7db6aa41e02b7"},
+    {file = "lxml-4.6.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ce256aaa50f6cc9a649c51be3cd4ff142d67295bfc4f490c9134d0f9f6d58ef0"},
+    {file = "lxml-4.6.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:7610b8c31688f0b1be0ef882889817939490a36d0ee880ea562a4e1399c447a1"},
+    {file = "lxml-4.6.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f8380c03e45cf09f8557bdaa41e1fa7c81f3ae22828e1db470ab2a6c96d8bc23"},
+    {file = "lxml-4.6.3-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:3082c518be8e97324390614dacd041bb1358c882d77108ca1957ba47738d9d59"},
+    {file = "lxml-4.6.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:884ab9b29feaca361f7f88d811b1eea9bfca36cf3da27768d28ad45c3ee6f969"},
+    {file = "lxml-4.6.3-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:6f12e1427285008fd32a6025e38e977d44d6382cf28e7201ed10d6c1698d2a9a"},
+    {file = "lxml-4.6.3-cp39-cp39-win32.whl", hash = "sha256:33bb934a044cf32157c12bfcfbb6649807da20aa92c062ef51903415c704704f"},
+    {file = "lxml-4.6.3-cp39-cp39-win_amd64.whl", hash = "sha256:542d454665a3e277f76954418124d67516c5f88e51a900365ed54a9806122b83"},
+    {file = "lxml-4.6.3.tar.gz", hash = "sha256:39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468"},
+]
+mako = [
+    {file = "Mako-1.1.5-py2.py3-none-any.whl", hash = "sha256:6804ee66a7f6a6416910463b00d76a7b25194cd27f1918500c5bd7be2a088a23"},
+    {file = "Mako-1.1.5.tar.gz", hash = "sha256:169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"},
+]
+markdown = [
+    {file = "Markdown-3.3.4-py3-none-any.whl", hash = "sha256:96c3ba1261de2f7547b46a00ea8463832c921d3f9d6aba3f255a6f71386db20c"},
+    {file = "Markdown-3.3.4.tar.gz", hash = "sha256:31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49"},
+]
+markupsafe = [
+    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
+    {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
+]
+mccabe = [
+    {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
+    {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
+]
+mysqlclient = [
+    {file = "mysqlclient-2.0.3-cp36-cp36m-win_amd64.whl", hash = "sha256:3381ca1a4f37ff1155fcfde20836b46416d66531add8843f6aa6d968982731c3"},
+    {file = "mysqlclient-2.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:0ac0dd759c4ca02c35a9fedc24bc982cf75171651e8187c2495ec957a87dfff7"},
+    {file = "mysqlclient-2.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:71c4b330cf2313bbda0307fc858cc9055e64493ba9bf28454d25cf8b3ee8d7f5"},
+    {file = "mysqlclient-2.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:fc575093cf81b6605bed84653e48b277318b880dc9becf42dd47fa11ffd3e2b6"},
+    {file = "mysqlclient-2.0.3.tar.gz", hash = "sha256:f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432"},
+]
+orjson = [
+    {file = "orjson-3.6.3-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:5f78ed46b179585272a5670537f2203dbb7b3e2f8e4db1be72839cc423e2daef"},
+    {file = "orjson-3.6.3-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:a99f310960e3acdda72ba1e98df8bf8c9145d90a0f72719786f43f4ea6937846"},
+    {file = "orjson-3.6.3-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:8a5e46418f51f03060f91d743b59aed70c8d02a5012428365cfa20b7f670e903"},
+    {file = "orjson-3.6.3-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:084de43ca9b19ad58c618c9f1ff93784e0190df2d88a02ae24c3cdebe9f2e9f7"},
+    {file = "orjson-3.6.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b68a601f49c0328bf16498309e56ab87c1d6c2bb0287abf70329eb958d565c62"},
+    {file = "orjson-3.6.3-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:9e4a26212851ea8ff81dee7e4e0da7e1e63b5b4f4330a8b4f27e99f1ba3f758b"},
+    {file = "orjson-3.6.3-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:5eb9d7f2f45e12cbc7500da4176f2d3221a73891b4be505fe79c52cbb800e872"},
+    {file = "orjson-3.6.3-cp37-none-win_amd64.whl", hash = "sha256:39aa7d42c9760fba36c37adb1d9c6752696ce9443c5dcb65222dd0994b5735e1"},
+    {file = "orjson-3.6.3-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:8d4430e0cc390c1d745aea3827fd0c6fd7aa5f0690de30a2fe25c406aa5efa20"},
+    {file = "orjson-3.6.3-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:be79e0ddea7f3a47332ec9573365c0b8a8cce4357e9682050f53c1bc75c1571f"},
+    {file = "orjson-3.6.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fce5ada0f8dd7c9e16c675626a29dfc5cc766e1eb67d8021b1e77d0861e4e850"},
+    {file = "orjson-3.6.3-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:1014a6f514b39dc414fce60568c9e7f635de97a1f1f5972ebc38f88a6160944a"},
+    {file = "orjson-3.6.3-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:c3beff02a339f194274ec1fcf03e2c1563e84f297b568eb3d45751722454a52e"},
+    {file = "orjson-3.6.3-cp38-none-win_amd64.whl", hash = "sha256:8f105e9290f901a618a0ced87f785fce2fcf6ab753699de081d82ee05c90f038"},
+    {file = "orjson-3.6.3-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:7936bef5589c9955ebee3423df51709d5f3b37ef54b830239bddb9fa5ead99f4"},
+    {file = "orjson-3.6.3-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:82e3afbf404cb91774f894ed7bf52fd83bb1cc6bd72221711f4ce4e7774f0560"},
+    {file = "orjson-3.6.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c702c78c33416fc8a138c5ec36eef5166ecfe8990c8f99c97551cd37c396e4d"},
+    {file = "orjson-3.6.3-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:4606907b9aaec9fea6159ac14f838dbd2851f18b05fb414c4b3143bff9f2bb0d"},
+    {file = "orjson-3.6.3-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:4ebb464b8b557a1401a03da6f41761544886db95b52280e60d25549da7427453"},
+    {file = "orjson-3.6.3-cp39-none-win_amd64.whl", hash = "sha256:720a7d7ba1dcf32bbd8fb380370b1fdd06ed916caea48403edd64f2ccf7883c1"},
+    {file = "orjson-3.6.3.tar.gz", hash = "sha256:353cc079cedfe990ea2d2186306f766e0d47bba63acd072e22d6df96c67be993"},
+]
+packaging = [
+    {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"},
+    {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"},
+]
+pluggy = [
+    {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},
+    {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
+]
+poetry-dynamic-versioning = [
+    {file = "poetry-dynamic-versioning-0.13.1.tar.gz", hash = "sha256:5c0e7b22560db76812057ef95dadad662ecc63eb270145787eabe73da7c222f9"},
+    {file = "poetry_dynamic_versioning-0.13.1-py3-none-any.whl", hash = "sha256:6d79f76436c624653fc06eb9bb54fb4f39b1d54362bc366ad2496855711d3a78"},
+]
+priority = [
+    {file = "priority-2.0.0-py3-none-any.whl", hash = "sha256:6f8eefce5f3ad59baf2c080a664037bb4725cd0a790d53d59ab4059288faf6aa"},
+    {file = "priority-2.0.0.tar.gz", hash = "sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"},
+]
+protobuf = [
+    {file = "protobuf-3.17.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ab6bb0e270c6c58e7ff4345b3a803cc59dbee19ddf77a4719c5b635f1d547aa8"},
+    {file = "protobuf-3.17.3-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:13ee7be3c2d9a5d2b42a1030976f760f28755fcf5863c55b1460fd205e6cd637"},
+    {file = "protobuf-3.17.3-cp35-cp35m-macosx_10_9_intel.whl", hash = "sha256:1556a1049ccec58c7855a78d27e5c6e70e95103b32de9142bae0576e9200a1b0"},
+    {file = "protobuf-3.17.3-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:f0e59430ee953184a703a324b8ec52f571c6c4259d496a19d1cabcdc19dabc62"},
+    {file = "protobuf-3.17.3-cp35-cp35m-win32.whl", hash = "sha256:a981222367fb4210a10a929ad5983ae93bd5a050a0824fc35d6371c07b78caf6"},
+    {file = "protobuf-3.17.3-cp35-cp35m-win_amd64.whl", hash = "sha256:6d847c59963c03fd7a0cd7c488cadfa10cda4fff34d8bc8cba92935a91b7a037"},
+    {file = "protobuf-3.17.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:145ce0af55c4259ca74993ddab3479c78af064002ec8227beb3d944405123c71"},
+    {file = "protobuf-3.17.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6ce4d8bf0321e7b2d4395e253f8002a1a5ffbcfd7bcc0a6ba46712c07d47d0b4"},
+    {file = "protobuf-3.17.3-cp36-cp36m-win32.whl", hash = "sha256:7a4c97961e9e5b03a56f9a6c82742ed55375c4a25f2692b625d4087d02ed31b9"},
+    {file = "protobuf-3.17.3-cp36-cp36m-win_amd64.whl", hash = "sha256:a22b3a0dbac6544dacbafd4c5f6a29e389a50e3b193e2c70dae6bbf7930f651d"},
+    {file = "protobuf-3.17.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ffea251f5cd3c0b9b43c7a7a912777e0bc86263436a87c2555242a348817221b"},
+    {file = "protobuf-3.17.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:9b7a5c1022e0fa0dbde7fd03682d07d14624ad870ae52054849d8960f04bc764"},
+    {file = "protobuf-3.17.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:8727ee027157516e2c311f218ebf2260a18088ffb2d29473e82add217d196b1c"},
+    {file = "protobuf-3.17.3-cp37-cp37m-win32.whl", hash = "sha256:14c1c9377a7ffbeaccd4722ab0aa900091f52b516ad89c4b0c3bb0a4af903ba5"},
+    {file = "protobuf-3.17.3-cp37-cp37m-win_amd64.whl", hash = "sha256:c56c050a947186ba51de4f94ab441d7f04fcd44c56df6e922369cc2e1a92d683"},
+    {file = "protobuf-3.17.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2ae692bb6d1992afb6b74348e7bb648a75bb0d3565a3f5eea5bec8f62bd06d87"},
+    {file = "protobuf-3.17.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:99938f2a2d7ca6563c0ade0c5ca8982264c484fdecf418bd68e880a7ab5730b1"},
+    {file = "protobuf-3.17.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6902a1e4b7a319ec611a7345ff81b6b004b36b0d2196ce7a748b3493da3d226d"},
+    {file = "protobuf-3.17.3-cp38-cp38-win32.whl", hash = "sha256:59e5cf6b737c3a376932fbfb869043415f7c16a0cf176ab30a5bbc419cd709c1"},
+    {file = "protobuf-3.17.3-cp38-cp38-win_amd64.whl", hash = "sha256:ebcb546f10069b56dc2e3da35e003a02076aaa377caf8530fe9789570984a8d2"},
+    {file = "protobuf-3.17.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4ffbd23640bb7403574f7aff8368e2aeb2ec9a5c6306580be48ac59a6bac8bde"},
+    {file = "protobuf-3.17.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:26010f693b675ff5a1d0e1bdb17689b8b716a18709113288fead438703d45539"},
+    {file = "protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e76d9686e088fece2450dbc7ee905f9be904e427341d289acbe9ad00b78ebd47"},
+    {file = "protobuf-3.17.3-cp39-cp39-win32.whl", hash = "sha256:a38bac25f51c93e4be4092c88b2568b9f407c27217d3dd23c7a57fa522a17554"},
+    {file = "protobuf-3.17.3-cp39-cp39-win_amd64.whl", hash = "sha256:85d6303e4adade2827e43c2b54114d9a6ea547b671cb63fafd5011dc47d0e13d"},
+    {file = "protobuf-3.17.3-py2.py3-none-any.whl", hash = "sha256:2bfb815216a9cd9faec52b16fd2bfa68437a44b67c56bee59bc3926522ecb04e"},
+    {file = "protobuf-3.17.3.tar.gz", hash = "sha256:72804ea5eaa9c22a090d2803813e280fb273b62d5ae497aaf3553d141c4fdd7b"},
+]
+py = [
+    {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
+    {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
+]
+pycodestyle = [
+    {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"},
+    {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"},
+]
+pycparser = [
+    {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
+    {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"},
+]
+pydantic = [
+    {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"},
+    {file = "pydantic-1.8.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7c6002203fe2c5a1b5cbb141bb85060cbff88c2d78eccbc72d97eb7022c43e4"},
+    {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:589eb6cd6361e8ac341db97602eb7f354551482368a37f4fd086c0733548308e"},
+    {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:10e5622224245941efc193ad1d159887872776df7a8fd592ed746aa25d071840"},
+    {file = "pydantic-1.8.2-cp36-cp36m-win_amd64.whl", hash = "sha256:99a9fc39470010c45c161a1dc584997f1feb13f689ecf645f59bb4ba623e586b"},
+    {file = "pydantic-1.8.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a83db7205f60c6a86f2c44a61791d993dff4b73135df1973ecd9eed5ea0bda20"},
+    {file = "pydantic-1.8.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:41b542c0b3c42dc17da70554bc6f38cbc30d7066d2c2815a94499b5684582ecb"},
+    {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:ea5cb40a3b23b3265f6325727ddfc45141b08ed665458be8c6285e7b85bd73a1"},
+    {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:18b5ea242dd3e62dbf89b2b0ec9ba6c7b5abaf6af85b95a97b00279f65845a23"},
+    {file = "pydantic-1.8.2-cp37-cp37m-win_amd64.whl", hash = "sha256:234a6c19f1c14e25e362cb05c68afb7f183eb931dd3cd4605eafff055ebbf287"},
+    {file = "pydantic-1.8.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:021ea0e4133e8c824775a0cfe098677acf6fa5a3cbf9206a376eed3fc09302cd"},
+    {file = "pydantic-1.8.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e710876437bc07bd414ff453ac8ec63d219e7690128d925c6e82889d674bb505"},
+    {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:ac8eed4ca3bd3aadc58a13c2aa93cd8a884bcf21cb019f8cfecaae3b6ce3746e"},
+    {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:4a03cbbe743e9c7247ceae6f0d8898f7a64bb65800a45cbdc52d65e370570820"},
+    {file = "pydantic-1.8.2-cp38-cp38-win_amd64.whl", hash = "sha256:8621559dcf5afacf0069ed194278f35c255dc1a1385c28b32dd6c110fd6531b3"},
+    {file = "pydantic-1.8.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8b223557f9510cf0bfd8b01316bf6dd281cf41826607eada99662f5e4963f316"},
+    {file = "pydantic-1.8.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:244ad78eeb388a43b0c927e74d3af78008e944074b7d0f4f696ddd5b2af43c62"},
+    {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:05ef5246a7ffd2ce12a619cbb29f3307b7c4509307b1b49f456657b43529dc6f"},
+    {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:54cd5121383f4a461ff7644c7ca20c0419d58052db70d8791eacbbe31528916b"},
+    {file = "pydantic-1.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:4be75bebf676a5f0f87937c6ddb061fa39cbea067240d98e298508c1bda6f3f3"},
+    {file = "pydantic-1.8.2-py3-none-any.whl", hash = "sha256:fec866a0b59f372b7e776f2d7308511784dace622e0992a0b59ea3ccee0ae833"},
+    {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"},
+]
+pyflakes = [
+    {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"},
+    {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"},
+]
+pygit2 = [
+    {file = "pygit2-1.6.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:547429774c11f5bc9d20a49aa86e4bd13c90a55140504ef05f55cf424470ee34"},
+    {file = "pygit2-1.6.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e75865d7b6fc161d93b16f10365eaad353cd546e302a98f2de2097ddea1066b"},
+    {file = "pygit2-1.6.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4a64b6090308ffd1c82e2dd4316cb79483715387b13818156d516134a5b17c"},
+    {file = "pygit2-1.6.1-cp36-cp36m-win32.whl", hash = "sha256:2666a3970b2ea1222a9f0463b466f98c8d564f29ec84cf0a58d9b0d3865dbaaf"},
+    {file = "pygit2-1.6.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2de12ca2d3b7eb86106223b40b2edc0c61103c71e7962e53092c6ddef71a194"},
+    {file = "pygit2-1.6.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:9c1d96c66fb6e69ec710078a73c19edff420bc1db430caa9e03a825eede3f25c"},
+    {file = "pygit2-1.6.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:454d42550fa6a6cd0e6a6ad9ab3f3262135fd157f57bad245ce156c36ee93370"},
+    {file = "pygit2-1.6.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce0827b77dd2f8a3465bdc181c4e65f27dd12dbd92635c038e58030cc90c2de0"},
+    {file = "pygit2-1.6.1-cp37-cp37m-win32.whl", hash = "sha256:b0161a141888d450eb821472fdcdadd14a072ddeda841fee9984956d34d3e19d"},
+    {file = "pygit2-1.6.1-cp37-cp37m-win_amd64.whl", hash = "sha256:af2fa259b6f7899227611ab978c600695724e85965836cb607d8b1e70cfea9b3"},
+    {file = "pygit2-1.6.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0e1e02c28983ddc004c0f54063f3e46fca388225d468e32e16689cfb750e0bd6"},
+    {file = "pygit2-1.6.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5dadc4844feb76cde5cc9a37656326a361dd8b5c8e8f8674dcd4a5ecf395db3"},
+    {file = "pygit2-1.6.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ef07458e4172a31318663295083b43f957d611145738ff56aa76db593542a6e8"},
+    {file = "pygit2-1.6.1-cp38-cp38-win32.whl", hash = "sha256:7a0c0a1f11fd41f57e8c6c64d903cc7fa4ec95d15592270be3217ed7f78eb023"},
+    {file = "pygit2-1.6.1-cp38-cp38-win_amd64.whl", hash = "sha256:2fd5c1b2d84dc6084f1bda836607afe37e95186a53a5a827a69083415e57fe4f"},
+    {file = "pygit2-1.6.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b9b88b7e9a5286a71be0b6c307f0523c9606aeedff6b61eb9c440e18817fa641"},
+    {file = "pygit2-1.6.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac12d32b714c3383ebccffee5eb6aff0b69a2542a40a664fd5ad370afcb28ee7"},
+    {file = "pygit2-1.6.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe682ed6afd2ab31127f6a502cf3e002dc1cc8d26c36a5d49dfd180250351eb6"},
+    {file = "pygit2-1.6.1-cp39-cp39-win32.whl", hash = "sha256:dbbf66a23860aa899949068ac9b503b4bc21e6063e8f53870440adbdc909405e"},
+    {file = "pygit2-1.6.1-cp39-cp39-win_amd64.whl", hash = "sha256:f90775afb11f69376e2af21ab56fcfbb52f6bc84117059ddf0355f81e5e36352"},
+    {file = "pygit2-1.6.1.tar.gz", hash = "sha256:c3303776f774d3e0115c1c4f6e1fc35470d15f113a7ae9401a0b90acfa1661ac"},
+]
+pyparsing = [
+    {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
+    {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
+]
+pytest = [
+    {file = "pytest-6.2.4-py3-none-any.whl", hash = "sha256:91ef2131a9bd6be8f76f1f08eac5c5317221d6ad1e143ae03894b862e8976890"},
+    {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"},
+]
+pytest-asyncio = [
+    {file = "pytest-asyncio-0.15.1.tar.gz", hash = "sha256:2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f"},
+    {file = "pytest_asyncio-0.15.1-py3-none-any.whl", hash = "sha256:3042bcdf1c5d978f6b74d96a151c4cfb9dcece65006198389ccd7e6c60eb1eea"},
+]
+pytest-cov = [
+    {file = "pytest-cov-2.12.1.tar.gz", hash = "sha256:261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7"},
+    {file = "pytest_cov-2.12.1-py2.py3-none-any.whl", hash = "sha256:261bb9e47e65bd099c89c3edf92972865210c36813f80ede5277dceb77a4a62a"},
+]
+pytest-tap = [
+    {file = "pytest-tap-3.2.tar.gz", hash = "sha256:1b585c4a636458dbd958d136381bbabb1752c5877d05fac7d6a6001a8a9ddc29"},
+    {file = "pytest_tap-3.2-py3-none-any.whl", hash = "sha256:18f59047f8bc68247d37f807fae7f2f8897d2c7397aea2fd2870f0421dc566cb"},
+]
+python-dateutil = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
+python-editor = [
+    {file = "python-editor-1.0.4.tar.gz", hash = "sha256:51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b"},
+    {file = "python_editor-1.0.4-py2-none-any.whl", hash = "sha256:5f98b069316ea1c2ed3f67e7f5df6c0d8f10b689964a4a811ff64f0106819ec8"},
+    {file = "python_editor-1.0.4-py2.7.egg", hash = "sha256:ea87e17f6ec459e780e4221f295411462e0d0810858e055fc514684350a2f522"},
+    {file = "python_editor-1.0.4-py3-none-any.whl", hash = "sha256:1bf6e860a8ad52a14c3ee1252d5dc25b2030618ed80c022598f00176adc8367d"},
+    {file = "python_editor-1.0.4-py3.5.egg", hash = "sha256:c3da2053dbab6b29c94e43c486ff67206eafbe7eb52dbec7390b5e2fb05aac77"},
+]
+python-multipart = [
+    {file = "python-multipart-0.0.5.tar.gz", hash = "sha256:f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"},
+]
+redis = [
+    {file = "redis-3.5.3-py2.py3-none-any.whl", hash = "sha256:432b788c4530cfe16d8d943a09d40ca6c16149727e4afe8c2c9d5580c59d9f24"},
+    {file = "redis-3.5.3.tar.gz", hash = "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2"},
+]
+requests = [
+    {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"},
+    {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"},
+]
+rfc3986 = [
+    {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"},
+    {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"},
+]
+six = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
+sniffio = [
+    {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"},
+    {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"},
+]
+sortedcontainers = [
+    {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"},
+    {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"},
+]
+sqlalchemy = [
+    {file = "SQLAlchemy-1.3.23-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:fd3b96f8c705af8e938eaa99cbd8fd1450f632d38cad55e7367c33b263bf98ec"},
+    {file = "SQLAlchemy-1.3.23-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:29cccc9606750fe10c5d0e8bd847f17a97f3850b8682aef1f56f5d5e1a5a64b1"},
+    {file = "SQLAlchemy-1.3.23-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:927ce09e49bff3104459e1451ce82983b0a3062437a07d883a4c66f0b344c9b5"},
+    {file = "SQLAlchemy-1.3.23-cp27-cp27m-win32.whl", hash = "sha256:b4b0e44d586cd64b65b507fa116a3814a1a53d55dce4836d7c1a6eb2823ff8d1"},
+    {file = "SQLAlchemy-1.3.23-cp27-cp27m-win_amd64.whl", hash = "sha256:6b8b8c80c7f384f06825612dd078e4a31f0185e8f1f6b8c19e188ff246334205"},
+    {file = "SQLAlchemy-1.3.23-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:9e9c25522933e569e8b53ccc644dc993cab87e922fb7e142894653880fdd419d"},
+    {file = "SQLAlchemy-1.3.23-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:a0e306e9bb76fd93b29ae3a5155298e4c1b504c7cbc620c09c20858d32d16234"},
+    {file = "SQLAlchemy-1.3.23-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:6c9e6cc9237de5660bcddea63f332428bb83c8e2015c26777281f7ffbd2efb84"},
+    {file = "SQLAlchemy-1.3.23-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:94f667d86be82dd4cb17d08de0c3622e77ca865320e0b95eae6153faa7b4ecaf"},
+    {file = "SQLAlchemy-1.3.23-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:751934967f5336a3e26fc5993ccad1e4fee982029f9317eb6153bc0bc3d2d2da"},
+    {file = "SQLAlchemy-1.3.23-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:63677d0c08524af4c5893c18dbe42141de7178001360b3de0b86217502ed3601"},
+    {file = "SQLAlchemy-1.3.23-cp35-cp35m-win32.whl", hash = "sha256:ddfb511e76d016c3a160910642d57f4587dc542ce5ee823b0d415134790eeeb9"},
+    {file = "SQLAlchemy-1.3.23-cp35-cp35m-win_amd64.whl", hash = "sha256:040bdfc1d76a9074717a3f43455685f781c581f94472b010cd6c4754754e1862"},
+    {file = "SQLAlchemy-1.3.23-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:d1a85dfc5dee741bf49cb9b6b6b8d2725a268e4992507cf151cba26b17d97c37"},
+    {file = "SQLAlchemy-1.3.23-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:639940bbe1108ac667dcffc79925db2966826c270112e9159439ab6bb14f8d80"},
+    {file = "SQLAlchemy-1.3.23-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:e8a1750b44ad6422ace82bf3466638f1aa0862dbb9689690d5f2f48cce3476c8"},
+    {file = "SQLAlchemy-1.3.23-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:e5bb3463df697279e5459a7316ad5a60b04b0107f9392e88674d0ece70e9cf70"},
+    {file = "SQLAlchemy-1.3.23-cp36-cp36m-win32.whl", hash = "sha256:e273367f4076bd7b9a8dc2e771978ef2bfd6b82526e80775a7db52bff8ca01dd"},
+    {file = "SQLAlchemy-1.3.23-cp36-cp36m-win_amd64.whl", hash = "sha256:ac2244e64485c3778f012951fdc869969a736cd61375fde6096d08850d8be729"},
+    {file = "SQLAlchemy-1.3.23-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:23927c3981d1ec6b4ea71eb99d28424b874d9c696a21e5fbd9fa322718be3708"},
+    {file = "SQLAlchemy-1.3.23-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d90010304abb4102123d10cbad2cdf2c25a9f2e66a50974199b24b468509bad5"},
+    {file = "SQLAlchemy-1.3.23-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:a8bfc1e1afe523e94974132d7230b82ca7fa2511aedde1f537ec54db0399541a"},
+    {file = "SQLAlchemy-1.3.23-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:269990b3ab53cb035d662dcde51df0943c1417bdab707dc4a7e4114a710504b4"},
+    {file = "SQLAlchemy-1.3.23-cp37-cp37m-win32.whl", hash = "sha256:fdd2ed7395df8ac2dbb10cefc44737b66c6a5cd7755c92524733d7a443e5b7e2"},
+    {file = "SQLAlchemy-1.3.23-cp37-cp37m-win_amd64.whl", hash = "sha256:6a939a868fdaa4b504e8b9d4a61f21aac11e3fecc8a8214455e144939e3d2aea"},
+    {file = "SQLAlchemy-1.3.23-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:24f9569e82a009a09ce2d263559acb3466eba2617203170e4a0af91e75b4f075"},
+    {file = "SQLAlchemy-1.3.23-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:2578dbdbe4dbb0e5126fb37ffcd9793a25dcad769a95f171a2161030bea850ff"},
+    {file = "SQLAlchemy-1.3.23-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:1fe5d8d39118c2b018c215c37b73fd6893c3e1d4895be745ca8ff6eb83333ed3"},
+    {file = "SQLAlchemy-1.3.23-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:c7dc052432cd5d060d7437e217dd33c97025287f99a69a50e2dc1478dd610d64"},
+    {file = "SQLAlchemy-1.3.23-cp38-cp38-win32.whl", hash = "sha256:ecce8c021894a77d89808222b1ff9687ad84db54d18e4bd0500ca766737faaf6"},
+    {file = "SQLAlchemy-1.3.23-cp38-cp38-win_amd64.whl", hash = "sha256:37b83bf81b4b85dda273aaaed5f35ea20ad80606f672d94d2218afc565fb0173"},
+    {file = "SQLAlchemy-1.3.23-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:8be835aac18ec85351385e17b8665bd4d63083a7160a017bef3d640e8e65cadb"},
+    {file = "SQLAlchemy-1.3.23-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6ec1044908414013ebfe363450c22f14698803ce97fbb47e53284d55c5165848"},
+    {file = "SQLAlchemy-1.3.23-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:eab063a70cca4a587c28824e18be41d8ecc4457f8f15b2933584c6c6cccd30f0"},
+    {file = "SQLAlchemy-1.3.23-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:baeb451ee23e264de3f577fee5283c73d9bbaa8cb921d0305c0bbf700094b65b"},
+    {file = "SQLAlchemy-1.3.23-cp39-cp39-win32.whl", hash = "sha256:94208867f34e60f54a33a37f1c117251be91a47e3bfdb9ab8a7847f20886ad06"},
+    {file = "SQLAlchemy-1.3.23-cp39-cp39-win_amd64.whl", hash = "sha256:f4d972139d5000105fcda9539a76452039434013570d6059993120dc2a65e447"},
+    {file = "SQLAlchemy-1.3.23.tar.gz", hash = "sha256:6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b"},
+]
+starlette = [
+    {file = "starlette-0.14.2-py3-none-any.whl", hash = "sha256:3c8e48e52736b3161e34c9f0e8153b4f32ec5d8995a3ee1d59410d92f75162ed"},
+    {file = "starlette-0.14.2.tar.gz", hash = "sha256:7d49f4a27f8742262ef1470608c59ddbc66baf37c148e938c7038e6bc7a998aa"},
+]
+"tap.py" = [
+    {file = "tap.py-3.0-py2.py3-none-any.whl", hash = "sha256:a598bfaa2e224d71f2e86147c2ef822c18ff2e1b8ef006397e5056b08f92f699"},
+    {file = "tap.py-3.0.tar.gz", hash = "sha256:f5eeeeebfd64e53d32661752bb4c288589a3babbb96db3f391a4ec29f1359c70"},
+]
+toml = [
+    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
+    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
+]
+tomlkit = [
+    {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"},
+    {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"},
+]
+typing = [
+    {file = "typing-3.7.4.3-py2-none-any.whl", hash = "sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5"},
+    {file = "typing-3.7.4.3.tar.gz", hash = "sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9"},
+]
+typing-extensions = [
+    {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
+    {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"},
+    {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"},
+]
+urllib3 = [
+    {file = "urllib3-1.26.6-py2.py3-none-any.whl", hash = "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4"},
+    {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"},
+]
+uvicorn = [
+    {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"},
+    {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"},
+]
+webencodings = [
+    {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"},
+    {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"},
+]
+werkzeug = [
+    {file = "Werkzeug-2.0.1-py3-none-any.whl", hash = "sha256:6c1ec500dcdba0baa27600f6a22f6333d8b662d22027ff9f6202e3367413caa8"},
+    {file = "Werkzeug-2.0.1.tar.gz", hash = "sha256:1de1db30d010ff1af14a009224ec49ab2329ad2cde454c8a708130642d579c42"},
+]
+wsproto = [
+    {file = "wsproto-1.0.0-py3-none-any.whl", hash = "sha256:d8345d1808dd599b5ffb352c25a367adb6157e664e140dbecba3f9bc007edb9f"},
+    {file = "wsproto-1.0.0.tar.gz", hash = "sha256:868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38"},
+]
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000..8cb276ce
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,100 @@
+# Poetry build configuration for the aurweb project.
+#
+# Dependencies:
+#   * python >= 3.9
+#   * pip
+#       * poetry
+#       * poetry-dynamic-versioning
+#
+[tool.poetry]
+name = "aurweb"
+version = "5.0.0" # Updated via poetry-dynamic-versioning
+license = "GPL-2.0-only"
+description = "Source code for the Arch User Repository's website"
+homepage = "https://aur.archlinux.org"
+repository = "https://gitlab.archlinux.org/archlinux/aurweb"
+documentation = "https://gitlab.archlinux.org/archlinux/aurweb/-/blob/master/README.md"
+keywords = ["aurweb", "aur", "Arch", "Linux"]
+authors = [
+    "Lucas Fleischer <lfleischer@archlinux.org>",
+    "Eli Schwartz <eschwartz@archlinux.org>",
+    "Kevin Morris <kevr@0cost.org>"
+]
+maintainers = [
+    "Eli Schwartz <eschwartz@archlinux.org>"
+]
+packages = [
+    { include = "aurweb" }
+]
+
+[tool.poetry-dynamic-versioning]
+enable = true
+vcs = "git"
+
+[build-system]
+requires = ["poetry>=1.1.8", "poetry-dynamic-versioning"]
+build-backend = "poetry.masonry.api"
+
+[tool.poetry.urls]
+"Repository" = "https://gitlab.archlinux.org/archlinux/aurweb"
+"Bug Tracker" = "https://gitlab.archlinux.org/archlinux/aurweb/-/issues"
+"Development Mailing List" = "https://lists.archlinux.org/listinfo/aur-dev"
+"General Mailing List" = "https://lists.archlinux.org/listinfo/aur-general"
+"Request Mailing List" = "https://lists.archlinux.org/listinfo/aur-requests"
+
+[tool.poetry.dependencies]
+# poetry-dynamic-versioning is used to produce tool.poetry.version
+# based on git tags.
+poetry-dynamic-versioning = { version = "0.13.1", python = "^3.9" }
+
+# General
+authlib = { version = "0.15.2", python = "^3.9" }
+aiofiles = { version = "0.7.0", python = "^3.9" }
+asgiref = { version = "3.4.1", python = "^3.9" }
+bcrypt = { version = "3.2.0", python = "^3.9" }
+bleach = { version = "3.3.1", python = "^3.9" }
+email-validator = { version = "1.1.3", python = "^3.9" }
+fakeredis = { version = "1.6.0", python = "^3.9" }
+fastapi = { version = "0.66.0", python = "^3.9" }
+feedgen = { version = "0.9.0", python = "^3.9" }
+httpx = { version = "0.18.2", python = "^3.9" }
+hypercorn = { version = "0.11.2", python = "^3.9" }
+itsdangerous = { version = "2.0.1", python = "^3.9" }
+jinja2 = { version = "3.0.1", python = "^3.9" }
+lxml = { version = "4.6.3", python = "^3.9" }
+markdown = { version = "3.3.4", python = "^3.9" }
+orjson = { version = "3.6.3", python = "^3.9" }
+protobuf = { version = "3.17.3", python = "^3.9" }
+pygit2 = { version = "1.6.1", python = "^3.9" }
+python-multipart = { version = "0.0.5", python = "^3.9" }
+redis = { version = "3.5.3", python = "^3.9" }
+requests = { version = "2.26.0", python = "^3.9" }
+werkzeug = { version = "2.0.1", python = "^3.9" }
+
+# SQL
+alembic = { version = "1.6.5", python = "^3.9" }
+sqlalchemy = { version = "1.3.23", python = "^3.9" }
+mysqlclient = { version = "2.0.3", python = "^3.9" }
+
+[tool.poetry.dev-dependencies]
+flake8 = { version = "3.9.2", python = "^3.9" }
+isort = { version = "5.9.3", python = "^3.9" }
+coverage = { version = "5.5", python = "^3.9" }
+pytest = { version = "6.2.4", python = "^3.9" }
+pytest-asyncio = { version = "0.15.1", python = "^3.9" }
+pytest-cov = { version = "2.12.1", python = "^3.9" }
+pytest-tap = { version = "3.2", python = "^3.9" }
+uvicorn = { version = "0.15.0", python = "^3.9" }
+
+[tool.poetry.scripts]
+aurweb-git-auth = "aurweb.git.auth:main"
+aurweb-git-serve = "aurweb.git.serve:main"
+aurweb-git-update = "aurweb.git.update:main"
+aurweb-aurblup = "aurweb.scripts.aurblup:main"
+aurweb-mkpkglists = "aurweb.scripts.mkpkglists:main"
+aurweb-notify = "aurweb.scripts.notify:main"
+aurweb-pkgmaint = "aurweb.scripts.pkgmaint:main"
+aurweb-popupdate = "aurweb.scripts.popupdate:main"
+aurweb-rendercomment = "aurweb.scripts.rendercomment:main"
+aurweb-tuvotereminder = "aurweb.scripts.tuvotereminder:main"
+aurweb-usermaint = "aurweb.scripts.usermaint:main"
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 37a12f61..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# General
-authlib==0.15.2
-aiofiles==0.7.0
-asgiref==3.4.1
-bcrypt==3.2.0
-bleach==3.3.1
-coverage==5.5
-email-validator==1.1.3
-fakeredis==1.6.0
-fastapi==0.66.0
-feedgen==0.9.0
-flake8==3.9.2
-httpx==0.18.2
-hypercorn==0.11.2
-isort==5.9.3
-itsdangerous==2.0.1
-jinja2==3.0.1
-lxml==4.6.3
-markdown==3.3.4
-orjson==3.6.3
-protobuf==3.17.3
-pygit2==1.6.1
-pytest==6.2.4
-pytest-asyncio==0.15.1
-pytest-cov==2.12.1
-pytest-tap==3.2
-python-multipart==0.0.5
-redis==3.5.3
-requests==2.26.0
-uvicorn==0.15.0
-werkzeug==2.0.1
-
-# SQL
-alembic==1.6.5
-sqlalchemy==1.3.23
-mysqlclient==2.0.3
diff --git a/setup.py b/setup.py
deleted file mode 100644
index cf88488c..00000000
--- a/setup.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import re
-import sys
-
-from setuptools import find_packages, setup
-
-version = None
-with open('web/lib/version.inc.php', 'r') as f:
-    for line in f.readlines():
-        match = re.match(r'^define\("AURWEB_VERSION", "v([0-9.]+)"\);$', line)
-        if match:
-            version = match.group(1)
-
-if not version:
-    sys.stderr.write('error: Failed to parse version file!')
-    sys.exit(1)
-
-setup(
-    name="aurweb",
-    version=version,
-    packages=find_packages(),
-    entry_points={
-        'console_scripts': [
-            'aurweb-git-auth = aurweb.git.auth:main',
-            'aurweb-git-serve = aurweb.git.serve:main',
-            'aurweb-git-update = aurweb.git.update:main',
-            'aurweb-aurblup = aurweb.scripts.aurblup:main',
-            'aurweb-mkpkglists = aurweb.scripts.mkpkglists:main',
-            'aurweb-notify = aurweb.scripts.notify:main',
-            'aurweb-pkgmaint = aurweb.scripts.pkgmaint:main',
-            'aurweb-popupdate = aurweb.scripts.popupdate:main',
-            'aurweb-rendercomment = aurweb.scripts.rendercomment:main',
-            'aurweb-tuvotereminder = aurweb.scripts.tuvotereminder:main',
-            'aurweb-usermaint = aurweb.scripts.usermaint:main',
-        ],
-    },
-)

From 3f034ac1287ec7533589807e23240d0d136aaeca Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Sep 2021 18:59:24 -0700
Subject: [PATCH 323/844] Docker: Fix incorrect ENV PATH specification

As root, seems that $HOME doesn't work like I expected it to.
Tested this before, but I apparently had some cache still holding
on. Fixing the issue in this commit here.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 76da62f7..b490d2fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM archlinux:base-devel
 
-ENV PATH="$HOME/.poetry/bin:${PATH}"
+ENV PATH="/root/.poetry/bin:${PATH}"
 ENV PYTHONPATH=/aurweb
 ENV AUR_CONFIG=conf/config
 

From fa07f940514fd30886acf3d47c3a37d79940adfa Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Sep 2021 19:08:10 -0700
Subject: [PATCH 324/844] Docker: Fix FastAPI db initialization

PHP was doing this correctly, but FastAPI was doing this
in it's exec script @ docker/scripts/run-fastapi.sh.

Modify the fastapi service so that it does the same thing as
PHP, and the existing "fastapi restart quirk" is no more.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/fastapi-entrypoint.sh  | 3 +++
 docker/scripts/run-fastapi.sh | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 41a88206..83a2cda8 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -14,4 +14,7 @@ sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config
 sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8444/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
 
+# Initialize the new database; ignore errors.
+python -m aurweb.initdb 2>/dev/null || /bin/true
+
 exec "$@"
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index 1db4c505..bb1a01a7 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Initialize the new database; ignore errors.
-python -m aurweb.initdb 2>/dev/null || /bin/true
-
 if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
     exec uvicorn --reload \
         --ssl-certfile /cache/localhost.cert.pem \

From e93b0a9b452da9db9b28b1c734fb323e367c991d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 5 Sep 2021 00:08:47 -0700
Subject: [PATCH 325/844] Docker: expose fastapi (18000) and php-fpm (19000)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0e91d6eb..e4eccb12 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -166,6 +166,8 @@ services:
       - ./web/template:/aurweb/web/template
       - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
+    ports:
+      - "19000:9000"
 
   fastapi:
     image: aurweb:latest
@@ -197,6 +199,8 @@ services:
       - ./web/template:/aurweb/web/template
       - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
+    ports:
+      - "18000:8000"
 
   nginx:
     image: aurweb:latest

From 95357687f9e0a6c9519e7dc2475059a3506abcd3 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sun, 5 Sep 2021 16:13:45 -0500
Subject: [PATCH 326/844] Added ability to specify fortune file via an
 environment variable

---
 schema/gendummydata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index 9224b051..275b3601 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -41,7 +41,7 @@ CLOSE_PROPOSALS = int(os.environ.get("CLOSE_PROPOSALS", 50))
 RANDOM_TLDS = ("edu", "com", "org", "net", "tw", "ru", "pl", "de", "es")
 RANDOM_URL = ("http://www.", "ftp://ftp.", "http://", "ftp://")
 RANDOM_LOCS = ("pub", "release", "files", "downloads", "src")
-FORTUNE_FILE = "/usr/share/fortune/cookie"
+FORTUNE_FILE = os.environ.get("FORTUNE_FILE", "/usr/share/fortune/cookie")
 
 # setup logging
 logformat = "%(levelname)s: %(message)s"

From 2e3f69ab126e6ac6ffa92b4e149faab61bfa3374 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 8 Sep 2021 17:10:14 -0700
Subject: [PATCH 327/844] fix(docker): Fix git service's update hook

The update hook was incorrectly linked to /usr/local/bin/aurweb-git-update,
which was neglected during the original patch regarding dependency
conversion to `poetry`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/git-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index cfd159c9..f07a5577 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -78,7 +78,7 @@ if [ ! -f $GIT_REPO/config ]; then
     git config --local transfer.hideRefs '^refs/'
     git config --local --add transfer.hideRefs '!refs/'
     git config --local --add transfer.hideRefs '!HEAD'
-    ln -sf /usr/local/bin/aurweb-git-update hooks/update
+    ln -sf /usr/bin/aurweb-git-update hooks/update
     cd $curdir
     chown -R aur:aur $GIT_REPO
 fi

From 0fd31b8d368a4e4a267b5e83d608bc088bb13b4d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 8 Sep 2021 17:14:55 -0700
Subject: [PATCH 328/844] refactor(docker): New mariadb_init service

Provides a single source of truth for mariadb database
initialization. Previously, php-fpm and fastapi were
racing against each other; while this wasn't an issue,
it was very messy.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml                | 45 +++++++++++++------------------
 docker/fastapi-entrypoint.sh      | 19 ++++++++-----
 docker/mariadb-entrypoint.sh      |  2 --
 docker/mariadb-init-entrypoint.sh | 20 ++++++++++++++
 docker/php-entrypoint.sh          | 18 +++++++++----
 5 files changed, 64 insertions(+), 40 deletions(-)
 create mode 100755 docker/mariadb-init-entrypoint.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index e4eccb12..309e95fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,8 +49,6 @@ services:
   mariadb:
     image: aurweb:latest
     init: true
-    environment:
-      - DB_HOST="%"
     entrypoint: /docker/mariadb-entrypoint.sh
     command: /usr/bin/mysqld_safe --datadir=/var/lib/mysql
     ports:
@@ -63,11 +61,23 @@ services:
     healthcheck:
       test: "bash /docker/health/mariadb.sh"
 
+  mariadb_init:
+    image: aurweb:latest
+    init: true
+    environment:
+      - DB_HOST=mariadb
+    entrypoint: /docker/mariadb-init-entrypoint.sh
+    command: echo "MariaDB tables initialized."
+    depends_on:
+      mariadb:
+        condition: service_healthy
+
   git:
     image: aurweb:latest
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
+      - DB_HOST=mariadb
     entrypoint: /docker/git-entrypoint.sh
     command: /docker/scripts/run-sshd.sh
     ports:
@@ -75,11 +85,9 @@ services:
     healthcheck:
       test: "bash /docker/health/sshd.sh"
     depends_on:
-      mariadb:
-        condition: service_healthy
+      mariadb_init:
+        condition: service_started
     volumes:
-      - mariadb_run:/var/run/mysqld
-      - mariadb_data:/var/lib/mysql
       - git_data:/aurweb/aur.git
       - ./cache:/cache
 
@@ -96,8 +104,6 @@ services:
       mariadb:
         condition: service_healthy
     volumes:
-      - mariadb_run:/var/run/mysqld
-      - mariadb_data:/var/lib/mysql
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - smartgit_run:/var/run/smartgit
@@ -114,8 +120,6 @@ services:
     depends_on:
       git:
         condition: service_healthy
-      php-fpm:
-        condition: service_healthy
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -131,8 +135,6 @@ services:
     depends_on:
       git:
         condition: service_healthy
-      fastapi:
-        condition: service_healthy
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -151,13 +153,9 @@ services:
         condition: service_started
       git:
         condition: service_healthy
-      mariadb:
-        condition: service_healthy
       memcached:
         condition: service_healthy
     volumes:
-      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
-      - mariadb_data:/var/lib/mysql
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
@@ -186,11 +184,7 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-      mariadb:
-        condition: service_healthy
     volumes:
-      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
-      - mariadb_data:/var/lib/mysql
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
@@ -268,10 +262,9 @@ services:
     stdin_open: true
     tty: true
     depends_on:
-      mariadb:
-        condition: service_healthy
+      mariadb_init:
+        condition: service_started
     volumes:
-      - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
@@ -292,7 +285,6 @@ services:
     stdin_open: true
     tty: true
     volumes:
-      - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
@@ -314,10 +306,9 @@ services:
     stdin_open: true
     tty: true
     depends_on:
-      mariadb:
-        condition: service_healthy
+      mariadb_init:
+        condition: service_started
     volumes:
-      - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 83a2cda8..3829b0bf 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -1,11 +1,21 @@
 #!/bin/bash
 set -eou pipefail
-dir="$(dirname $0)"
 
-bash $dir/test-mysql-entrypoint.sh
+[[ -z "$DB_HOST" ]] && echo 'Error: $DB_HOST required but missing.' && exit 1
+
+DB_NAME="aurweb"
+DB_USER="aur"
+DB_PASS="aur"
+
+# Setup a config for our mysql db.
+cp -vf conf/config.dev conf/config
+sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
+sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
+sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" conf/config
+sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" conf/config
+sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" conf/config
 
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8444;" conf/config
-sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
 
 # Setup Redis for FastAPI.
 sed -ri 's/^(cache) = .+/\1 = redis/' conf/config
@@ -14,7 +24,4 @@ sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config
 sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8444/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
 
-# Initialize the new database; ignore errors.
-python -m aurweb.initdb 2>/dev/null || /bin/true
-
 exec "$@"
diff --git a/docker/mariadb-entrypoint.sh b/docker/mariadb-entrypoint.sh
index 945a4b82..e1ebfa6a 100755
--- a/docker/mariadb-entrypoint.sh
+++ b/docker/mariadb-entrypoint.sh
@@ -3,8 +3,6 @@ set -eou pipefail
 
 MYSQL_DATA=/var/lib/mysql
 
-[[ -z "$DB_HOST" ]] && DB_HOST="localhost"
-
 mariadb-install-db --user=mysql --basedir=/usr --datadir=$MYSQL_DATA
 
 # Start it up.
diff --git a/docker/mariadb-init-entrypoint.sh b/docker/mariadb-init-entrypoint.sh
new file mode 100755
index 00000000..4cd6f46c
--- /dev/null
+++ b/docker/mariadb-init-entrypoint.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -eou pipefail
+
+[[ -z "$DB_HOST" ]] && echo 'Error: $DB_HOST required but missing.' && exit 1
+
+DB_NAME="aurweb"
+DB_USER="aur"
+DB_PASS="aur"
+
+# Setup a config for our mysql db.
+cp -vf conf/config.dev conf/config
+sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
+sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
+sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" conf/config
+sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" conf/config
+sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" conf/config
+
+python -m aurweb.initdb 2>/dev/null || /bin/true
+
+exec "$@"
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 1f3ed82b..8fda1830 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -1,11 +1,21 @@
 #!/bin/bash
 set -eou pipefail
-dir="$(dirname $0)"
 
-bash $dir/test-mysql-entrypoint.sh
+[[ -z "$DB_HOST" ]] && echo 'Error: $DB_HOST required but missing.' && exit 1
+
+DB_NAME="aurweb"
+DB_USER="aur"
+DB_PASS="aur"
+
+# Setup a config for our mysql db.
+cp -vf conf/config.dev conf/config
+sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
+sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
+sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" conf/config
+sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" conf/config
+sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" conf/config
 
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8443;" conf/config
-sed -ri 's/^(name) = .+/\1 = aurweb/' conf/config
 
 # Enable memcached.
 sed -ri 's/^(cache) = .+$/\1 = memcache/' conf/config
@@ -27,6 +37,4 @@ sed -ri 's/^;?(open_basedir).*$/\1 = \//' /etc/php/php.ini
 # Use the sqlite3 extension line for memcached.
 sed -ri 's/^;(extension)=sqlite3$/\1=memcached/' /etc/php/php.ini
 
-python -m aurweb.initdb 2>/dev/null || /bin/true
-
 exec "$@"

From ad3016ef4f98a3131af2680d8d7a80cf0ce6ac74 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 8 Sep 2021 17:36:37 -0700
Subject: [PATCH 329/844] fix: /account/{name}/edit Account Type selection

The "Account Type" selection was not properly being rendered
due to an incorrect equality. This has been fixed in
templates/partials/account_form.html.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/account_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 6374fd5e..f166c230 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -59,7 +59,7 @@
             <select name="T" id="id_type">
                 {% for value, type in account_types %}
                     <option value="{{ value }}"
-                            {% if account_type == type %}
+                            {% if request.user.AccountType.ID == value %}
                             selected="selected"
                             {% endif %}
                     >

From db2718fcbadec6750da9eb41e179eefdb7544004 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 9 Sep 2021 16:20:39 -0700
Subject: [PATCH 330/844] fix: util/fix-coverage sys.stderr typo

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 util/fix-coverage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/fix-coverage b/util/fix-coverage
index aa56591d..3446c4af 100755
--- a/util/fix-coverage
+++ b/util/fix-coverage
@@ -16,7 +16,7 @@ import aurweb.config
 
 
 def eprint(*args, **kwargs):
-    print(*args, **kwargs, file=sys.stderru)
+    print(*args, **kwargs, file=sys.stderr)
 
 
 def main():

From c2d3dc1daf9848cf265f691bedcce7278ab2fbb6 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Sun, 29 Aug 2021 20:52:07 -0500
Subject: [PATCH 331/844] Added info and multiinfo types for /rpc

---
 aurweb/asgi.py        |   4 +-
 aurweb/routers/rpc.py | 107 +++++++++++
 aurweb/rpc.py         | 188 ++++++++++++++++++++
 test/test_rpc.py      | 400 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 697 insertions(+), 2 deletions(-)
 create mode 100644 aurweb/routers/rpc.py
 create mode 100644 aurweb/rpc.py
 create mode 100644 test/test_rpc.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index dc6b4355..e892eb19 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -18,7 +18,7 @@ from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models.accepted_term import AcceptedTerm
 from aurweb.models.term import Term
-from aurweb.routers import accounts, auth, errors, html, packages, rss, sso, trusted_user
+from aurweb.routers import accounts, auth, errors, html, packages, rpc, rss, sso, trusted_user
 
 # Setup the FastAPI app.
 app = FastAPI(exception_handlers=errors.exceptions)
@@ -52,7 +52,7 @@ async def app_startup():
     app.include_router(trusted_user.router)
     app.include_router(rss.router)
     app.include_router(packages.router)
-
+    app.include_router(rpc.router)
     # Initialize the database engine and ORM.
     get_engine()
 
diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
new file mode 100644
index 00000000..f4274d77
--- /dev/null
+++ b/aurweb/routers/rpc.py
@@ -0,0 +1,107 @@
+from typing import List, Optional
+
+from fastapi import APIRouter, Query, Request
+
+from aurweb.rpc import RPC
+
+router = APIRouter()
+
+
+def arg_legacy_gen(request):
+    # '[]' characters in the path randomly kept getting transformed to (what
+    # appears to be) their HTML-formatted variants, so we keep that behavior
+    # just in case.
+    arguments = request.url.query.replace("%5B%5D", "[]").split("&")
+    arguments.reverse()
+
+    temp_args = []
+
+    for i in arguments:
+        # We only want to deal with 'arg' and 'arg[]' strings, so only take those.
+        if i.split("=")[0] in ("arg", "arg[]"):
+            temp_args += [i]
+
+    returned_arguments = []
+    argument_bracketed = False
+
+    for i in temp_args:
+        # Split argument on first occurance of '='.
+        current_argument = i.split("=")
+
+        argument_name = current_argument[0]
+        argument_value = "".join(current_argument[1:])
+
+        # Process argument.
+        if argument_name == "arg[]":
+            returned_arguments += [argument_value]
+            argument_bracketed = True
+
+        elif argument_name == "arg":
+            # Only set this argument if 'arg[]' hasen't previously been found.
+            if not argument_bracketed:
+                returned_arguments = [argument_value]
+            break
+
+    return returned_arguments
+
+
+@router.get("/rpc")
+async def rpc(request: Request,
+              v: Optional[int] = Query(None),
+              type: Optional[str] = Query(None),
+              arg: Optional[str] = Query(None),
+              args: Optional[List[str]] = Query(None, alias="arg[]")):
+
+    # Ensure valid version was passed
+    if v is None:
+        return {"error": "Please specify an API version."}
+    elif v != 5:
+        return {"error": "Invalid version specified."}
+
+    # The PHP implementation sets the type to 'multiinfo' when the type is set to 'info'.
+    if type == "info":
+        type = "multiinfo"
+
+    # Defaults for returned data
+    returned_data = {}
+
+    returned_data["version"] = v
+    returned_data["results"] = []
+    returned_data["resultcount"] = 0
+    returned_data["type"] = type
+
+    # Ensure type is valid.
+    if type is None:
+        returned_data["type"] = "error"
+        returned_data["error"] = "No request type/data specified."
+        return returned_data
+    elif type not in ("info", "multiinfo"):
+        returned_data["type"] = "error"
+        returned_data["error"] = "Incorrect request type specified."
+        return returned_data
+
+    # Take arguments from either 'args' or 'args[]' and put them into 'argument_list'.
+    argument_list = []
+
+    # In the PHP implementation, aurweb uses the last 'arg' value or all the
+    # last 'arg[]' values when both 'arg' and 'arg[]' are part of the query
+    # request. We thus preserve that behavior here for legacy purposes.
+    if arg is not None and args is not None:
+        argument_list = arg_legacy_gen(request)
+    elif arg is not None:
+        argument_list = [arg]
+    elif args is not None:
+        argument_list = args
+    else:
+        # Abort because no package arguments were passed.
+        returned_data["type"] = "error"
+        returned_data["error"] = "No request type/data specified."
+        return returned_data
+
+    # Process and return data
+    returned_data = RPC(v=v,
+                        type=type,
+                        argument_list=argument_list,
+                        returned_data=returned_data)
+
+    return returned_data
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
new file mode 100644
index 00000000..a9694f70
--- /dev/null
+++ b/aurweb/rpc.py
@@ -0,0 +1,188 @@
+import aurweb.config as config
+
+from aurweb import db
+from aurweb.models.dependency_type import CHECKDEPENDS_ID, DEPENDS_ID, MAKEDEPENDS_ID, OPTDEPENDS_ID
+from aurweb.models.license import License
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_dependency import PackageDependency
+from aurweb.models.package_keyword import PackageKeyword
+from aurweb.models.package_license import PackageLicense
+from aurweb.models.package_relation import PackageRelation
+from aurweb.models.package_vote import PackageVote
+from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
+from aurweb.models.user import User
+
+# Define dependency types.
+DEP_TYPES = {
+    DEPENDS_ID: "Depends",
+    MAKEDEPENDS_ID: "MakeDepends",
+    CHECKDEPENDS_ID: "CheckDepends",
+    OPTDEPENDS_ID: "OptDepends"
+}
+
+# Define relationship types.
+REL_TYPES = {
+    CONFLICTS_ID: "Conflicts",
+    PROVIDES_ID: "Provides",
+    REPLACES_ID: "Replaces"
+}
+
+
+# Define functions for request types.
+def add_deps(current_array, db_dep):
+    if db_dep.count() > 0:
+        # Create lists for all dependency types.
+        for i in DEP_TYPES.values():
+            current_array[i] = []
+
+        # Generate each dependency item in list.
+        for i in db_dep.all():
+            dep_string = i.DepName
+
+            # Add relationship version restrictor (i.e. '<=5') if it exists.
+            if i.DepCondition is not None:
+                dep_string += i.DepCondition
+
+            # Add item to list.
+            current_deptype = DEP_TYPES.get(i.DepTypeID)
+            current_array[current_deptype] += [dep_string]
+
+        # Remove any dependency lists that are empty.
+        for i in DEP_TYPES.values():
+            if current_array[i] == []:
+                current_array.pop(i)
+
+    return current_array
+
+
+def add_rels(current_array, db_rel):
+    if db_rel.count() > 0:
+        # Create lists for all relationship types.
+        for i in REL_TYPES.values():
+            current_array[i] = []
+
+        # Generate each relationship item in list.
+        for i in db_rel.all():
+            rel_string = i.RelName
+
+            # Add relationship version restrictor (i.e. '<=5') if it exists.
+            if i.RelCondition is not None:
+                rel_string += i.RelCondition
+
+            # Add item to list.
+            current_reltype = REL_TYPES.get(i.RelTypeID)
+            current_array[current_reltype] += [rel_string]
+
+        # Remove any relationship lists that are empty.
+        for i in REL_TYPES.values():
+            if current_array[i] == []:
+                current_array.pop(i)
+
+    return current_array
+
+
+def run_info(returned_data, package_name, snapshot_uri):
+    # Get package name.
+    db_package = db.query(Package).filter(Package.Name == package_name)
+
+    if db_package.count() == 0:
+        return returned_data
+
+    db_package = db_package.first()
+
+    # Get name of package under PackageBaseID.
+    db_package_baseid = db.query(PackageBase).filter(PackageBase.ID == db_package.PackageBaseID).first()
+
+    # Get maintainer info.
+    db_package_maintainer = db.query(User).filter(User.ID == db_package_baseid.MaintainerUID).first()
+
+    current_array = {}
+    returned_data["resultcount"] = returned_data["resultcount"] + 1
+
+    # Data from the Packages table.
+    current_array["ID"] = db_package.ID
+    current_array["Name"] = db_package.Name
+    current_array["PackageBaseID"] = db_package.PackageBaseID
+    current_array["Version"] = db_package.Version
+    current_array["Description"] = db_package.Description
+    current_array["URL"] = db_package.URL
+
+    # PackageBase table.
+    current_array["PackageBase"] = db_package_baseid.Name
+    current_array["NumVotes"] = db_package_baseid.NumVotes
+    current_array["Popularity"] = db_package_baseid.Popularity
+    current_array["OutOfDate"] = db_package_baseid.OutOfDateTS
+    current_array["FirstSubmitted"] = db_package_baseid.SubmittedTS
+    current_array["LastModified"] = db_package_baseid.ModifiedTS
+
+    # User table.
+    try:
+        current_array["Maintainer"] = db_package_maintainer.Username
+    except AttributeError:
+        current_array["Maintainer"] = None
+
+    # Generate and add snapshot_uri.
+    current_array["URLPath"] = snapshot_uri.replace("%s", package_name)
+
+    # Add package votes.
+    current_array["NumVotes"] = db.query(PackageVote).count()
+
+    # Generate dependency listing.
+    db_dep = db.query(PackageDependency).filter(PackageDependency.PackageID == db_package.ID)
+    current_array = add_deps(current_array, db_dep)
+
+    # Generate relationship listing.
+    db_rel = db.query(PackageRelation).filter(PackageRelation.PackageID == db_package.ID)
+    current_array = add_rels(current_array, db_rel)
+
+    # License table.
+    current_array["License"] = []
+
+    for i in db.query(PackageLicense).filter(PackageLicense.PackageID == db_package.ID):
+        current_array["License"] += [db.query(License).first().Name]
+
+    # Keywords table.
+    current_array["Keywords"] = []
+
+    for i in db.query(PackageKeyword).filter(PackageKeyword.PackageBaseID == db_package_baseid.ID):
+        current_array["Keywords"] += [i.Keyword]
+
+    # Add current array to returned results.
+    returned_data["results"] += [current_array]
+    return returned_data
+
+
+def RPC(**function_args):
+    # Get arguments.
+    #
+    # We'll use 'v' in the future when we add v6.
+    # v = function_args.get("v")
+    type = function_args.get("type")
+    args = function_args.get("argument_list")
+    returned_data = function_args.get("returned_data")
+
+    # Get Snapshot URI
+    snapshot_uri = config.get("options", "snapshot_uri")
+
+    # Remove duplicate arguments if type is 'multiinfo' so we don't fetch
+    # results for a package multiple times.
+    #
+    # Note that the type is set to 'multiinfo' when 'type=info' is passed.
+    if type == "multiinfo":
+        args = set(args)
+
+    # Set request type to run.
+    type_actions = {
+        "multiinfo": run_info
+    }
+
+    # This if statement should always be executed, as we checked if the
+    # specified type was valid in aurweb/routers/rpc.py.
+    if type in type_actions:
+        run_request = type_actions.get(type)
+
+        for i in args:
+            returned_data = run_request(returned_data, i, snapshot_uri)
+
+    return returned_data
diff --git a/test/test_rpc.py b/test/test_rpc.py
new file mode 100644
index 00000000..df35d168
--- /dev/null
+++ b/test/test_rpc.py
@@ -0,0 +1,400 @@
+import orjson
+
+from fastapi.testclient import TestClient
+
+from aurweb.asgi import app
+from aurweb.db import begin, create, query
+from aurweb.models.account_type import AccountType
+from aurweb.models.dependency_type import DependencyType
+from aurweb.models.license import License
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_dependency import PackageDependency
+from aurweb.models.package_keyword import PackageKeyword
+from aurweb.models.package_license import PackageLicense
+from aurweb.models.package_relation import PackageRelation
+from aurweb.models.package_vote import PackageVote
+from aurweb.models.relation_type import RelationType
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+
+
+def make_request(path):
+    with TestClient(app) as request:
+        return request.get(path)
+
+
+def setup():
+    # Set up tables.
+    setup_test_db("Users", "PackageBases", "Packages", "Licenses",
+                  "PackageDepends", "PackageRelations", "PackageLicenses",
+                  "PackageKeywords", "PackageVotes")
+
+    # Create test package details.
+    with begin():
+        # Get ID types.
+        account_type = query(AccountType, AccountType.AccountType == "User").first()
+
+        dependency_depends = query(DependencyType, DependencyType.Name == "depends").first()
+        dependency_optdepends = query(DependencyType, DependencyType.Name == "optdepends").first()
+        dependency_makedepends = query(DependencyType, DependencyType.Name == "makedepends").first()
+        dependency_checkdepends = query(DependencyType, DependencyType.Name == "checkdepends").first()
+
+        relation_conflicts = query(RelationType, RelationType.Name == "conflicts").first()
+        relation_provides = query(RelationType, RelationType.Name == "provides").first()
+        relation_replaces = query(RelationType, RelationType.Name == "replaces").first()
+
+        # Create database info.
+        user1 = create(User,
+                       Username="user1",
+                       Email="user1@example.com",
+                       RealName="Test User 1",
+                       Passwd="testPassword",
+                       AccountType=account_type)
+
+        user2 = create(User,
+                       Username="user2",
+                       Email="user2@example.com",
+                       RealName="Test User 2",
+                       Passwd="testPassword",
+                       AccountType=account_type)
+
+        user3 = create(User,
+                       Username="user3",
+                       Email="user3@example.com",
+                       RealName="Test User 3",
+                       Passwd="testPassword",
+                       AccountType=account_type)
+
+        pkgbase1 = create(PackageBase, Name="big-chungus", Maintainer=user1)
+
+        pkgname1 = create(Package,
+                          PackageBase=pkgbase1,
+                          Name=pkgbase1.Name,
+                          Description="Bunny bunny around bunny",
+                          URL="https://example.com/")
+
+        pkgbase2 = create(PackageBase, Name="chungy-chungus", Maintainer=user1)
+
+        pkgname2 = create(Package,
+                          PackageBase=pkgbase2,
+                          Name=pkgbase2.Name,
+                          Description="Wubby wubby on wobba wuubu",
+                          URL="https://example.com/")
+
+        pkgbase3 = create(PackageBase, Name="gluggly-chungus", Maintainer=user1)
+
+        create(Package,
+               PackageBase=pkgbase3,
+               Name=pkgbase3.Name,
+               Description="glurrba glurrba gur globba",
+               URL="https://example.com/")
+
+        pkgbase4 = create(PackageBase, Name="woogly-chungus", Maintainer=None)
+
+        create(Package,
+               PackageBase=pkgbase4,
+               Name=pkgbase4.Name,
+               Description="wuggla woblabeloop shemashmoop",
+               URL="https://example.com/")
+
+        # Dependencies.
+        create(PackageDependency,
+               Package=pkgname1,
+               DependencyType=dependency_depends,
+               DepName="chungus-depends")
+
+        create(PackageDependency,
+               Package=pkgname2,
+               DependencyType=dependency_depends,
+               DepName="chungy-depends")
+
+        create(PackageDependency,
+               Package=pkgname1,
+               DependencyType=dependency_optdepends,
+               DepName="chungus-optdepends",
+               DepCondition="=50")
+
+        create(PackageDependency,
+               Package=pkgname1,
+               DependencyType=dependency_makedepends,
+               DepName="chungus-makedepends")
+
+        create(PackageDependency,
+               Package=pkgname1,
+               DependencyType=dependency_checkdepends,
+               DepName="chungus-checkdepends")
+
+        # Relations.
+        create(PackageRelation,
+               Package=pkgname1,
+               RelationType=relation_conflicts,
+               RelName="chungus-conflicts")
+
+        create(PackageRelation,
+               Package=pkgname2,
+               RelationType=relation_conflicts,
+               RelName="chungy-conflicts")
+
+        create(PackageRelation,
+               Package=pkgname1,
+               RelationType=relation_provides,
+               RelName="chungus-provides",
+               RelCondition="<=200")
+
+        create(PackageRelation,
+               Package=pkgname1,
+               RelationType=relation_replaces,
+               RelName="chungus-replaces",
+               RelCondition="<=200")
+
+        license = create(License, Name="GPL")
+
+        create(PackageLicense,
+               Package=pkgname1,
+               License=license)
+
+        for i in ["big-chungus", "smol-chungus", "sizeable-chungus"]:
+            create(PackageKeyword,
+                   PackageBase=pkgbase1,
+                   Keyword=i)
+
+        for i in [user1, user2, user3]:
+            create(PackageVote,
+                   User=i,
+                   PackageBase=pkgbase1,
+                   VoteTS=5000)
+
+
+def test_rpc_singular_info():
+    # Define expected response.
+    expected_data = {
+                        "version": 5,
+                        "results": [{
+                            "Name": "big-chungus",
+                            "Version": "",
+                            "Description": "Bunny bunny around bunny",
+                            "URL": "https://example.com/",
+                            "PackageBase": "big-chungus",
+                            "NumVotes": 3,
+                            "Popularity": 0.0,
+                            "OutOfDate": None,
+                            "Maintainer": "user1",
+                            "URLPath": "/cgit/aur.git/snapshot/big-chungus.tar.gz",
+                            "Depends": ["chungus-depends"],
+                            "OptDepends": ["chungus-optdepends=50"],
+                            "MakeDepends": ["chungus-makedepends"],
+                            "CheckDepends": ["chungus-checkdepends"],
+                            "Conflicts": ["chungus-conflicts"],
+                            "Provides": ["chungus-provides<=200"],
+                            "Replaces": ["chungus-replaces<=200"],
+                            "License": ["GPL"],
+                            "Keywords": [
+                                "big-chungus",
+                                "sizeable-chungus",
+                                "smol-chungus"
+                            ]
+                        }],
+                        "resultcount": 1,
+                        "type": "multiinfo"
+                    }
+
+    # Make dummy request.
+    response_arg = make_request("/rpc/?v=5&type=info&arg=chungy-chungus&arg=big-chungus")
+
+    # Load  request response into Python dictionary.
+    response_info_arg = orjson.loads(response_arg.content.decode())
+
+    # Remove the FirstSubmitted LastModified, ID and PackageBaseID keys from
+    # reponse, as the key's values aren't guaranteed to match between the two
+    # (the keys are already removed from 'expected_data').
+    for i in ["FirstSubmitted", "LastModified", "ID", "PackageBaseID"]:
+        response_info_arg["results"][0].pop(i)
+
+    # Validate that the new dictionaries are the same.
+    assert response_info_arg == expected_data
+
+
+def test_rpc_nonexistent_package():
+    # Make dummy request.
+    response = make_request("/rpc/?v=5&type=info&arg=nonexistent-package")
+
+    # Load request response into Python dictionary.
+    response_data = orjson.loads(response.content.decode())
+
+    # Validate data.
+    assert response_data["resultcount"] == 0
+
+
+def test_rpc_multiinfo():
+    # Make dummy request.
+    request_packages = ["big-chungus", "chungy-chungus"]
+    response = make_request("/rpc/?v=5&type=info&arg[]=big-chungus&arg[]=chungy-chungus")
+
+    # Load request response into Python dictionary.
+    response_data = orjson.loads(response.content.decode())
+
+    # Validate data.
+    for i in response_data["results"]:
+        request_packages.remove(i["Name"])
+
+    assert request_packages == []
+
+
+def test_rpc_mixedargs():
+    # Make dummy request.
+    response1_packages = ["gluggly-chungus"]
+    response2_packages = ["gluggly-chungus", "chungy-chungus"]
+
+    response1 = make_request("/rpc/?v=5&arg[]=big-chungus&arg=gluggly-chungus&type=info")
+    response2 = make_request("/rpc/?v=5&arg=big-chungus&arg[]=gluggly-chungus&type=info&arg[]=chungy-chungus")
+
+    # Load request response into Python dictionary.
+    response1_data = orjson.loads(response1.content.decode())
+    response2_data = orjson.loads(response2.content.decode())
+
+    # Validate data.
+    for i in response1_data["results"]:
+        response1_packages.remove(i["Name"])
+
+    for i in response2_data["results"]:
+        response2_packages.remove(i["Name"])
+
+    for i in [response1_packages, response2_packages]:
+        assert i == []
+
+
+def test_rpc_no_dependencies():
+    """This makes sure things like 'MakeDepends' get removed from JSON strings
+    when they don't have set values."""
+
+    expected_response = {
+                        'version': 5,
+                        'results': [{
+                                    'Name': 'chungy-chungus',
+                                    'Version': '',
+                                    'Description': 'Wubby wubby on wobba wuubu',
+                                    'URL': 'https://example.com/',
+                                    'PackageBase': 'chungy-chungus',
+                                    'NumVotes': 3,
+                                    'Popularity': 0.0,
+                                    'OutOfDate': None,
+                                    'Maintainer': 'user1',
+                                    'URLPath': '/cgit/aur.git/snapshot/chungy-chungus.tar.gz',
+                                    'Depends': ['chungy-depends'],
+                                    'Conflicts': ['chungy-conflicts'],
+                                    'License': [],
+                                    'Keywords': []
+                                    }],
+                        'resultcount': 1,
+                        'type': 'multiinfo'
+                        }
+
+    # Make dummy request.
+    response = make_request("/rpc/?v=5&type=info&arg=chungy-chungus")
+    response_data = orjson.loads(response.content.decode())
+
+    # Remove inconsistent keys.
+    for i in ["ID", "PackageBaseID", "FirstSubmitted", "LastModified"]:
+        response_data["results"][0].pop(i)
+
+    assert response_data == expected_response
+
+
+def test_rpc_bad_type():
+    # Define expected response.
+    expected_data = {
+                        'version': 5,
+                        'results': [],
+                        'resultcount': 0,
+                        'type': 'error',
+                        'error': 'Incorrect request type specified.'
+                    }
+
+    # Make dummy request.
+    response = make_request("/rpc/?v=5&type=invalid-type&arg=big-chungus")
+
+    # Load  request response into Python dictionary.
+    response_data = orjson.loads(response.content.decode())
+
+    # Validate data.
+    assert expected_data == response_data
+
+
+def test_rpc_bad_version():
+    # Define expected response.
+    expected_data = {'error': 'Invalid version specified.'}
+
+    # Make dummy request.
+    response = make_request("/rpc/?v=0&type=info&arg=big-chungus")
+
+    # Load  request response into Python dictionary.
+    response_data = orjson.loads(response.content.decode())
+
+    # Validate data.
+    assert expected_data == response_data
+
+
+def test_rpc_no_version():
+    # Define expected response.
+    expected_data = {'error': 'Please specify an API version.'}
+
+    # Make dummy request.
+    response = make_request("/rpc/?type=info&arg=big-chungus")
+
+    # Load  request response into Python dictionary.
+    response_data = orjson.loads(response.content.decode())
+
+    # Validate data.
+    assert expected_data == response_data
+
+
+def test_rpc_no_type():
+    # Define expected response.
+    expected_data = {
+                    'version': 5,
+                    'results': [],
+                    'resultcount': 0,
+                    'type': 'error',
+                    'error': 'No request type/data specified.'
+                    }
+
+    # Make dummy request.
+    response = make_request("/rpc/?v=5&arg=big-chungus")
+
+    # Load  request response into Python dictionary.
+    response_data = orjson.loads(response.content.decode())
+
+    # Validate data.
+    assert expected_data == response_data
+
+
+def test_rpc_no_args():
+    # Define expected response.
+    expected_data = {
+                    'version': 5,
+                    'results': [],
+                    'resultcount': 0,
+                    'type': 'error',
+                    'error': 'No request type/data specified.'
+                    }
+
+    # Make dummy request.
+    response = make_request("/rpc/?v=5&type=info")
+
+    # Load  request response into Python dictionary.
+    response_data = orjson.loads(response.content.decode())
+
+    # Validate data.
+    assert expected_data == response_data
+
+
+def test_rpc_no_maintainer():
+    # Make dummy request.
+    response = make_request("/rpc/?v=5&type=info&arg=woogly-chungus")
+
+    # Load  request response into Python dictionary.
+    response_data = orjson.loads(response.content.decode())
+
+    # Validate data.
+    assert response_data["results"][0]["Maintainer"] is None

From ab8a44cede93ced1d2b89711b3cb93fce6a52241 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 12 Sep 2021 00:47:34 -0700
Subject: [PATCH 332/844] fix(FastAPI): only show comments partial if they
 exist

This was incorrectly displaying a comment section header
when no comments existed.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/packages/show.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/packages/show.html b/templates/packages/show.html
index 7a5aae2d..7480f573 100644
--- a/templates/packages/show.html
+++ b/templates/packages/show.html
@@ -18,6 +18,7 @@
 
     {% set pkgname = result.Name %}
     {% set pkgbase_id = result.ID %}
-    {% set comments = comments %}
-    {% include "partials/packages/comments.html" %}
+    {% if comments.count() %}
+        {% include "partials/packages/comments.html" %}
+    {% endif %}
 {% endblock %}

From 3ea515d705b05d221411d4f34fc2a26feaa94781 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 13 Sep 2021 14:16:44 -0700
Subject: [PATCH 333/844] fix(Docker): use cert chain for nginx

Additionally, simplify some of the certificate generation
scripts and rename `ca.ext` to `localhost.ext`.

Certificates should be regenerated as of this commit.
Users can run `rm -rf ./cache/*` to clear out any existing
certs, which will cause the `ca` service to regenerate them.

Additionally, since Docker infrastructure has been modified,
a new `aurweb:latest` image will need to be built.

See https://gitlab.archlinux.org/archlinux/aurweb/-/wikis/Docker

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/ca-entrypoint.sh          | 68 +++++++++++++++++++++-----------
 docker/{ca.ext => localhost.ext} |  0
 docker/nginx-entrypoint.sh       |  3 +-
 3 files changed, 47 insertions(+), 24 deletions(-)
 rename docker/{ca.ext => localhost.ext} (100%)

diff --git a/docker/ca-entrypoint.sh b/docker/ca-entrypoint.sh
index b7514187..e95d267c 100755
--- a/docker/ca-entrypoint.sh
+++ b/docker/ca-entrypoint.sh
@@ -1,36 +1,58 @@
 #!/bin/bash
 set -eou pipefail
 
-if [ -f /cache/localhost.cert.pem ] && \
-    [ -f /cache/localhost.key.pem ] && \
-    [ -f /cache/ca.root.pem ]; then
+if [ -f /cache/ca.root.pem ]; then
     echo "Already have certs, skipping."
-    exec "$@"
+    exit 0
 fi
 
-openssl genrsa -des3 -out ca.key \
-    -passout pass:devca 2048
+# Generate a new 2048-bit RSA key for the Root CA.
+openssl genrsa -des3 -out /cache/ca.key -passout pass:devca 2048
 
-openssl req -x509 -new -nodes \
-    -key ca.key -sha256 -days 1825 \
-    -out /cache/ca.root.pem \
-    -subj "/C=US/ST=California/L=Nowhere/O=aurweb/CN=localhost" \
-    --passin pass:devca
+# Request and self-sign a new Root CA certificate, using
+# the RSA key. Output Root CA PEM-format certificate and key:
+# /cache/ca.root.pem and /cache/ca.key.pem
+openssl req -x509 -new -nodes -sha256 -days 1825 \
+    -passin pass:devca \
+    -subj "/C=US/ST=California/L=Authority/O=aurweb/CN=localhost" \
+    -in /cache/ca.key -out /cache/ca.root.pem -keyout /cache/ca.key.pem
 
-# Generate keys for aurweb.
-openssl req -nodes -newkey rsa:2048 -keyout /cache/localhost.key.pem \
-    -out localhost.csr \
-    -subj "/C=US/ST=California/L=Nowhere/O=aurweb/CN=localhost"
+# Generate a new 2048-bit RSA key for a localhost server.
+openssl genrsa -out /cache/localhost.key 2048
 
-echo "$(hexdump -n 16 -e '4/4 "%08X" 1 "\n"' /dev/random)" \
-    > /cache/ca.root.srl
-openssl x509 -req -in localhost.csr -CA /cache/ca.root.pem \
-    -CAkey ca.key -CAserial /cache/ca.root.srl \
+# Generate a Certificate Signing Request (CSR) for the localhost server
+# using the RSA key we generated above.
+openssl req -new -key /cache/localhost.key -passout pass:devca \
+    -subj "/C=US/ST=California/L=Server/O=aurweb/CN=localhost" \
+    -out /cache/localhost.csr
+
+# Get our CSR signed by our Root CA PEM-formatted certificate and key
+# to produce a fresh /cache/localhost.cert.pem PEM-formatted certificate.
+openssl x509 -req -in /cache/localhost.csr \
+    -CA /cache/ca.root.pem -CAkey /cache/ca.key.pem \
+    -CAcreateserial \
     -out /cache/localhost.cert.pem \
-    -days 825 -sha256 -extfile /docker/ca.ext \
-    --passin pass:devca
+    -days 825 -sha256 \
+    -passin pass:devca \
+    -extfile /docker/localhost.ext
 
-chmod 666 /cache/localhost.{key,cert}.pem
-chmod 666 /cache/ca.root.pem
+# Convert RSA key to a PEM-formatted key: /cache/localhost.key.pem
+openssl rsa -in /cache/localhost.key -text > /cache/localhost.key.pem
+
+# At the end here, our notable certificates and keys are:
+#   - /cache/ca.root.pem
+#   - /cache/ca.key.pem
+#   - /cache/localhost.key.pem
+#   - /cache/localhost.cert.pem
+#
+# When running a server which uses the localhost certificate, a chain
+# should be used, starting with localhost.cert.pem:
+#   - cat /cache/localhost.cert.pem /cache/ca.root.pem > localhost.chain.pem
+#
+# The Root CA (ca.root.pem) should be imported into browsers or
+# ca-certificates on machines wishing to verify localhost.
+#
+
+chmod 666 /cache/*
 
 exec "$@"
diff --git a/docker/ca.ext b/docker/localhost.ext
similarity index 100%
rename from docker/ca.ext
rename to docker/localhost.ext
diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
index 347af50f..226ded8f 100755
--- a/docker/nginx-entrypoint.sh
+++ b/docker/nginx-entrypoint.sh
@@ -12,7 +12,8 @@ sed -ri 's/^;?(password) = .+/\1 = aur/' conf/config
 sed -ri "s|^(aur_location) = .+|\1 = https://localhost:8444|" conf/config
 sed -ri 's/^(disable_http_login) = .+/\1 = 1/' conf/config
 
-cp -vf /cache/localhost.cert.pem /etc/ssl/certs/localhost.cert.pem
+cat /cache/localhost.cert.pem /cache/ca.root.pem \
+    > /etc/ssl/certs/localhost.cert.pem
 cp -vf /cache/localhost.key.pem /etc/ssl/private/localhost.key.pem
 
 cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf

From a4f5c8bef666184acf3be666ae34ef2f5fcd23c4 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Thu, 16 Sep 2021 03:20:56 -0500
Subject: [PATCH 334/844] Fixed autopep violations in test/test_rpc.py

---
 test/test_rpc.py | 134 +++++++++++++++++++++++------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/test/test_rpc.py b/test/test_rpc.py
index df35d168..a2c86b27 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -169,35 +169,35 @@ def setup():
 def test_rpc_singular_info():
     # Define expected response.
     expected_data = {
-                        "version": 5,
-                        "results": [{
-                            "Name": "big-chungus",
-                            "Version": "",
-                            "Description": "Bunny bunny around bunny",
-                            "URL": "https://example.com/",
-                            "PackageBase": "big-chungus",
-                            "NumVotes": 3,
-                            "Popularity": 0.0,
-                            "OutOfDate": None,
-                            "Maintainer": "user1",
-                            "URLPath": "/cgit/aur.git/snapshot/big-chungus.tar.gz",
-                            "Depends": ["chungus-depends"],
-                            "OptDepends": ["chungus-optdepends=50"],
-                            "MakeDepends": ["chungus-makedepends"],
-                            "CheckDepends": ["chungus-checkdepends"],
-                            "Conflicts": ["chungus-conflicts"],
-                            "Provides": ["chungus-provides<=200"],
-                            "Replaces": ["chungus-replaces<=200"],
-                            "License": ["GPL"],
-                            "Keywords": [
-                                "big-chungus",
-                                "sizeable-chungus",
-                                "smol-chungus"
-                            ]
-                        }],
-                        "resultcount": 1,
-                        "type": "multiinfo"
-                    }
+        "version": 5,
+        "results": [{
+            "Name": "big-chungus",
+            "Version": "",
+            "Description": "Bunny bunny around bunny",
+            "URL": "https://example.com/",
+            "PackageBase": "big-chungus",
+            "NumVotes": 3,
+            "Popularity": 0.0,
+            "OutOfDate": None,
+            "Maintainer": "user1",
+            "URLPath": "/cgit/aur.git/snapshot/big-chungus.tar.gz",
+            "Depends": ["chungus-depends"],
+            "OptDepends": ["chungus-optdepends=50"],
+            "MakeDepends": ["chungus-makedepends"],
+            "CheckDepends": ["chungus-checkdepends"],
+            "Conflicts": ["chungus-conflicts"],
+            "Provides": ["chungus-provides<=200"],
+            "Replaces": ["chungus-replaces<=200"],
+            "License": ["GPL"],
+            "Keywords": [
+                "big-chungus",
+                "sizeable-chungus",
+                "smol-chungus"
+            ]
+        }],
+        "resultcount": 1,
+        "type": "multiinfo"
+    }
 
     # Make dummy request.
     response_arg = make_request("/rpc/?v=5&type=info&arg=chungy-chungus&arg=big-chungus")
@@ -269,26 +269,26 @@ def test_rpc_no_dependencies():
     when they don't have set values."""
 
     expected_response = {
-                        'version': 5,
-                        'results': [{
-                                    'Name': 'chungy-chungus',
-                                    'Version': '',
-                                    'Description': 'Wubby wubby on wobba wuubu',
-                                    'URL': 'https://example.com/',
-                                    'PackageBase': 'chungy-chungus',
-                                    'NumVotes': 3,
-                                    'Popularity': 0.0,
-                                    'OutOfDate': None,
-                                    'Maintainer': 'user1',
-                                    'URLPath': '/cgit/aur.git/snapshot/chungy-chungus.tar.gz',
-                                    'Depends': ['chungy-depends'],
-                                    'Conflicts': ['chungy-conflicts'],
-                                    'License': [],
-                                    'Keywords': []
-                                    }],
-                        'resultcount': 1,
-                        'type': 'multiinfo'
-                        }
+        'version': 5,
+        'results': [{
+            'Name': 'chungy-chungus',
+            'Version': '',
+            'Description': 'Wubby wubby on wobba wuubu',
+            'URL': 'https://example.com/',
+            'PackageBase': 'chungy-chungus',
+            'NumVotes': 3,
+            'Popularity': 0.0,
+            'OutOfDate': None,
+            'Maintainer': 'user1',
+            'URLPath': '/cgit/aur.git/snapshot/chungy-chungus.tar.gz',
+            'Depends': ['chungy-depends'],
+            'Conflicts': ['chungy-conflicts'],
+            'License': [],
+            'Keywords': []
+        }],
+        'resultcount': 1,
+        'type': 'multiinfo'
+    }
 
     # Make dummy request.
     response = make_request("/rpc/?v=5&type=info&arg=chungy-chungus")
@@ -304,12 +304,12 @@ def test_rpc_no_dependencies():
 def test_rpc_bad_type():
     # Define expected response.
     expected_data = {
-                        'version': 5,
-                        'results': [],
-                        'resultcount': 0,
-                        'type': 'error',
-                        'error': 'Incorrect request type specified.'
-                    }
+        'version': 5,
+        'results': [],
+        'resultcount': 0,
+        'type': 'error',
+        'error': 'Incorrect request type specified.'
+    }
 
     # Make dummy request.
     response = make_request("/rpc/?v=5&type=invalid-type&arg=big-chungus")
@@ -352,12 +352,12 @@ def test_rpc_no_version():
 def test_rpc_no_type():
     # Define expected response.
     expected_data = {
-                    'version': 5,
-                    'results': [],
-                    'resultcount': 0,
-                    'type': 'error',
-                    'error': 'No request type/data specified.'
-                    }
+        'version': 5,
+        'results': [],
+        'resultcount': 0,
+        'type': 'error',
+        'error': 'No request type/data specified.'
+    }
 
     # Make dummy request.
     response = make_request("/rpc/?v=5&arg=big-chungus")
@@ -372,12 +372,12 @@ def test_rpc_no_type():
 def test_rpc_no_args():
     # Define expected response.
     expected_data = {
-                    'version': 5,
-                    'results': [],
-                    'resultcount': 0,
-                    'type': 'error',
-                    'error': 'No request type/data specified.'
-                    }
+        'version': 5,
+        'results': [],
+        'resultcount': 0,
+        'type': 'error',
+        'error': 'No request type/data specified.'
+    }
 
     # Make dummy request.
     response = make_request("/rpc/?v=5&type=info")

From 25aea216c5c3e58d6738c1ff3c9a729626c1b596 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Thu, 16 Sep 2021 03:34:52 -0500
Subject: [PATCH 335/844] Simplified and reduced redundancy in code

- Removed 'if type == "info"' as requested by @kevr

- Checked for valid type against the type dictionary, removing the
needed to maintain two separate spots for type definitions.
---
 aurweb/routers/rpc.py |  4 ----
 aurweb/rpc.py         | 22 ++++++++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index f4274d77..bc5e482c 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -58,10 +58,6 @@ async def rpc(request: Request,
     elif v != 5:
         return {"error": "Invalid version specified."}
 
-    # The PHP implementation sets the type to 'multiinfo' when the type is set to 'info'.
-    if type == "info":
-        type = "multiinfo"
-
     # Defaults for returned data
     returned_data = {}
 
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index a9694f70..6abdba47 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -165,15 +165,14 @@ def RPC(**function_args):
     # Get Snapshot URI
     snapshot_uri = config.get("options", "snapshot_uri")
 
-    # Remove duplicate arguments if type is 'multiinfo' so we don't fetch
-    # results for a package multiple times.
-    #
-    # Note that the type is set to 'multiinfo' when 'type=info' is passed.
-    if type == "multiinfo":
+    # Remove duplicate arguments if type is 'info' or 'multiinfo' so we don't
+    # fetch results for a package multiple times.
+    if type in ("info", "multiinfo"):
         args = set(args)
 
     # Set request type to run.
     type_actions = {
+        "info": run_info,
         "multiinfo": run_info
     }
 
@@ -181,8 +180,19 @@ def RPC(**function_args):
     # specified type was valid in aurweb/routers/rpc.py.
     if type in type_actions:
         run_request = type_actions.get(type)
-
+        
         for i in args:
             returned_data = run_request(returned_data, i, snapshot_uri)
 
+    elif type is None:
+        returned_data["type"] = "error"
+        returned_data["error"] = "No request type/data specified."
+        return returned_data
+
+    else:
+        returned_data["type"] = "error"
+        returned_data["error"] = "Incorrect request type specified."
+        return returned_data
+
+
     return returned_data

From c56a23d21c1c92f45a6a646ef477a0e68386816b Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Thu, 16 Sep 2021 03:47:33 -0500
Subject: [PATCH 336/844] Fixed bug with with type in returned JSON introduced
 in previous commit

Also removed some redundant return statements
---
 aurweb/routers/rpc.py | 10 ----------
 aurweb/rpc.py         | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index bc5e482c..8bc761cc 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -66,16 +66,6 @@ async def rpc(request: Request,
     returned_data["resultcount"] = 0
     returned_data["type"] = type
 
-    # Ensure type is valid.
-    if type is None:
-        returned_data["type"] = "error"
-        returned_data["error"] = "No request type/data specified."
-        return returned_data
-    elif type not in ("info", "multiinfo"):
-        returned_data["type"] = "error"
-        returned_data["error"] = "Incorrect request type specified."
-        return returned_data
-
     # Take arguments from either 'args' or 'args[]' and put them into 'argument_list'.
     argument_list = []
 
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 6abdba47..9a7a2028 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -165,11 +165,6 @@ def RPC(**function_args):
     # Get Snapshot URI
     snapshot_uri = config.get("options", "snapshot_uri")
 
-    # Remove duplicate arguments if type is 'info' or 'multiinfo' so we don't
-    # fetch results for a package multiple times.
-    if type in ("info", "multiinfo"):
-        args = set(args)
-
     # Set request type to run.
     type_actions = {
         "info": run_info,
@@ -180,19 +175,27 @@ def RPC(**function_args):
     # specified type was valid in aurweb/routers/rpc.py.
     if type in type_actions:
         run_request = type_actions.get(type)
-        
+
+        # If type is 'info', overwrite type to 'multiinfo' to match the
+        # behavior of the PHP implementation.
+        if type == "info":
+            returned_data["type"] = "multiinfo"
+
+        # Remove duplicate arguments if type is 'multiinfo' so we don't
+        # fetch results for a package multiple times.
+        if returned_data["type"] == "multiinfo":
+            args = set(args)
+
         for i in args:
             returned_data = run_request(returned_data, i, snapshot_uri)
 
     elif type is None:
         returned_data["type"] = "error"
         returned_data["error"] = "No request type/data specified."
-        return returned_data
 
     else:
         returned_data["type"] = "error"
         returned_data["error"] = "Incorrect request type specified."
-        return returned_data
 
 
     return returned_data

From 6afcaf665e77520ba9ea83b7b4d66140d67065fa Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 16 Sep 2021 20:47:12 -0700
Subject: [PATCH 337/844] fix(FastAPI): Fix aurweb.template warnings

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_templates.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/test_templates.py b/test/test_templates.py
index 8e3017b4..b6aa2055 100644
--- a/test/test_templates.py
+++ b/test/test_templates.py
@@ -4,7 +4,8 @@ from aurweb.templates import register_filter
 
 
 @register_filter("func")
-def func(): pass
+def func():
+    pass
 
 
 def test_register_filter_exists_key_error():
@@ -12,4 +13,5 @@ def test_register_filter_exists_key_error():
     imports or template renders, so we only test failures here. """
     with pytest.raises(KeyError):
         @register_filter("func")
-        def some_func(): pass
+        def some_func():
+            pass

From 06ec6388b46ea656cff96a5f7134a607f541e188 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 17 Sep 2021 12:13:02 -0700
Subject: [PATCH 338/844] fix(FastAPI): fix flake8 violation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 9a7a2028..6160bef7 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -197,5 +197,4 @@ def RPC(**function_args):
         returned_data["type"] = "error"
         returned_data["error"] = "Incorrect request type specified."
 
-
     return returned_data

From 0bbb3cc4d07b94a57db37bbb5857625bd7b97a88 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 17 Sep 2021 12:33:23 -0700
Subject: [PATCH 339/844] fix(FastAPI): rpc - include other fields with errors

PHP does this, we should persist the behavior here for
v=5.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/rpc.py | 24 ++++++++++++++++--------
 test/test_rpc.py      | 16 ++++++++++++++--
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index 8bc761cc..f12dfc2e 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -51,20 +51,28 @@ async def rpc(request: Request,
               type: Optional[str] = Query(None),
               arg: Optional[str] = Query(None),
               args: Optional[List[str]] = Query(None, alias="arg[]")):
-
-    # Ensure valid version was passed
-    if v is None:
-        return {"error": "Please specify an API version."}
-    elif v != 5:
-        return {"error": "Invalid version specified."}
-
     # Defaults for returned data
     returned_data = {}
 
     returned_data["version"] = v
     returned_data["results"] = []
     returned_data["resultcount"] = 0
-    returned_data["type"] = type
+
+    # Default the type field to "error", until we determine that
+    # we're not erroneous (below).
+    returned_data["type"] = "error"
+
+    # Ensure valid version was passed
+    if v is None:
+        returned_data["error"] = "Please specify an API version."
+        return returned_data
+    elif v != 5:
+        returned_data["error"] = "Invalid version specified."
+        return returned_data
+    else:
+        # We got past initial error cases; set the type to what
+        # the user gave us.
+        returned_data["type"] = type
 
     # Take arguments from either 'args' or 'args[]' and put them into 'argument_list'.
     argument_list = []
diff --git a/test/test_rpc.py b/test/test_rpc.py
index a2c86b27..37e8db51 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -323,7 +323,13 @@ def test_rpc_bad_type():
 
 def test_rpc_bad_version():
     # Define expected response.
-    expected_data = {'error': 'Invalid version specified.'}
+    expected_data = {
+        'version': 0,
+        'resultcount': 0,
+        'results': [],
+        'type': 'error',
+        'error': 'Invalid version specified.'
+    }
 
     # Make dummy request.
     response = make_request("/rpc/?v=0&type=info&arg=big-chungus")
@@ -337,7 +343,13 @@ def test_rpc_bad_version():
 
 def test_rpc_no_version():
     # Define expected response.
-    expected_data = {'error': 'Please specify an API version.'}
+    expected_data = {
+        'version': None,
+        'resultcount': 0,
+        'results': [],
+        'type': 'error',
+        'error': 'Please specify an API version.'
+    }
 
     # Make dummy request.
     response = make_request("/rpc/?type=info&arg=big-chungus")

From f7818e26b54d87c3e07b47bd04012acb86389636 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 17 Sep 2021 12:42:32 -0700
Subject: [PATCH 340/844] fix(FastAPI): test_rpc.setup() should be a
 pytest.fixture

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_rpc.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test_rpc.py b/test/test_rpc.py
index 37e8db51..21817b45 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -1,4 +1,5 @@
 import orjson
+import pytest
 
 from fastapi.testclient import TestClient
 
@@ -24,6 +25,7 @@ def make_request(path):
         return request.get(path)
 
 
+@pytest.fixture(autouse=True)
 def setup():
     # Set up tables.
     setup_test_db("Users", "PackageBases", "Packages", "Licenses",

From 4de18d813453ee101a81d7a44727e4722966a061 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 18 Sep 2021 23:30:51 -0700
Subject: [PATCH 341/844] fix(FastAPI): voted/notified query efficiency

Previously, we were running a single ORM query for every single package
to check for its voted or notified states. Now, we perform a single
ORM query for each of the set of voted or notified packages in
relation with the request user.

This improves performance drastically at the expense of some
manual code additions and set-dependency; i.e. we add a bit
more complexity and roundabout way of getting our data.

Closes: https://gitlab.archlinux.org/archlinux/aurweb/-/issues/102

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py                  | 50 +++++++++++++++++++++++-
 aurweb/routers/html.py                   | 35 +++++++++++++++--
 templates/dashboard.html                 | 17 ++++++--
 templates/partials/packages/results.html |  8 ++--
 test/test_packages_util.py               | 27 +++++++++++++
 5 files changed, 126 insertions(+), 11 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 036e3441..18ac7a5a 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -1,5 +1,6 @@
+from collections import defaultdict
 from http import HTTPStatus
-from typing import List
+from typing import Dict, List
 
 import orjson
 
@@ -11,8 +12,11 @@ from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_dependency import PackageDependency
+from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
+from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import PROVIDES_ID, RelationType
+from aurweb.models.user import User
 from aurweb.redis import redis_connection
 from aurweb.templates import register_filter
 
@@ -164,3 +168,47 @@ def updated_packages(limit: int = 0, cache_ttl: int = 600) -> List[Package]:
 
     # Return the deserialized list of packages.
     return packages
+
+
+def query_voted(query: List[Package], user: User) -> Dict[int, bool]:
+    """ Produce a dictionary of package base ID keys to boolean values,
+    which indicate whether or not the package base has a vote record
+    related to user.
+
+    :param query: A collection of Package models
+    :param user: The user that is being notified or not
+    :return: Vote state dict (PackageBase.ID: int -> bool)
+    """
+    output = defaultdict(bool)
+    query_set = {pkg.PackageBase.ID for pkg in query}
+    voted = db.query(PackageVote).join(
+        PackageBase,
+        PackageBase.ID.in_(query_set)
+    ).filter(
+        PackageVote.UsersID == user.ID
+    )
+    for vote in voted:
+        output[vote.PackageBase.ID] = True
+    return output
+
+
+def query_notified(query: List[Package], user: User) -> Dict[int, bool]:
+    """ Produce a dictionary of package base ID keys to boolean values,
+    which indicate whether or not the package base has a notification
+    record related to user.
+
+    :param query: A collection of Package models
+    :param user: The user that is being notified or not
+    :return: Notification state dict (PackageBase.ID: int -> bool)
+    """
+    output = defaultdict(bool)
+    query_set = {pkg.PackageBase.ID for pkg in query}
+    notified = db.query(PackageNotification).join(
+        PackageBase,
+        PackageBase.ID.in_(query_set)
+    ).filter(
+        PackageNotification.UserID == user.ID
+    )
+    for notify in notified:
+        output[notify.PackageBase.ID] = True
+    return output
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index c3fd3db1..3d44cf87 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -19,7 +19,7 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_request import PackageRequest
 from aurweb.models.user import User
-from aurweb.packages.util import updated_packages
+from aurweb.packages.util import query_notified, query_voted, updated_packages
 from aurweb.templates import make_context, render_template
 
 router = APIRouter()
@@ -145,14 +145,25 @@ async def index(request: Request):
             PackageBase.MaintainerUID == request.user.ID
         )
 
+        # Packages maintained by the user that have been flagged.
         context["flagged_packages"] = maintained.filter(
             PackageBase.OutOfDateTS.isnot(None)
         ).order_by(
             PackageBase.ModifiedTS.desc(), Package.Name.asc()
         ).limit(50).all()
 
+        # Flagged packages that request.user has voted for.
+        context["flagged_packages_voted"] = query_voted(
+            context.get("flagged_packages"), request.user)
+
+        # Flagged packages that request.user is being notified about.
+        context["flagged_packages_notified"] = query_notified(
+            context.get("flagged_packages"), request.user)
+
         archive_time = aurweb.config.getint('options', 'request_archive_time')
         start = now - archive_time
+
+        # Package requests created by request.user.
         context["package_requests"] = request.user.package_requests.filter(
             PackageRequest.RequestTS >= start
         ).limit(50).all()
@@ -162,13 +173,31 @@ async def index(request: Request):
             PackageBase.ModifiedTS.desc(), Package.Name.desc()
         ).limit(50).all()
 
+        # Packages that request.user has voted for.
+        context["packages_voted"] = query_voted(
+            context.get("packages"), request.user)
+
+        # Packages that request.user is being notified about.
+        context["packages_notified"] = query_notified(
+            context.get("packages"), request.user)
+
         # Any packages that the request user comaintains.
         context["comaintained"] = packages.join(
-            PackageComaintainer).filter(
-            PackageComaintainer.UsersID == request.user.ID).order_by(
+            PackageComaintainer
+        ).filter(
+            PackageComaintainer.UsersID == request.user.ID
+        ).order_by(
             PackageBase.ModifiedTS.desc(), Package.Name.desc()
         ).limit(50).all()
 
+        # Comaintained packages that request.user has voted for.
+        context["comaintained_voted"] = query_voted(
+            context.get("comaintained"), request.user)
+
+        # Comaintained packages that request.user is being notified about.
+        context["comaintained_notified"] = query_notified(
+            context.get("comaintained"), request.user)
+
     return render_template(request, "index.html", context)
 
 
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 5ad89992..ec998187 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -5,7 +5,11 @@
     {% if not flagged_packages %}
         <p>{{ "No packages matched your search criteria." | tr }}</p>
     {% else %}
-        {% with table_id = "flagged-packages", packages = flagged_packages %}
+        {% with table_id = "flagged-packages",
+            packages = flagged_packages,
+            votes = flagged_packages_voted,
+            notified = flagged_packages_notified
+        %}
             {% include 'partials/packages/results.html' %}
         {% endwith %}
     {% endif %}
@@ -30,7 +34,10 @@
     {% if not packages %}
         <p>{{ "No packages matched your search criteria." | tr }}</p>
     {% else %}
-        {% with table_id = "my-packages" %}
+        {% with table_id = "my-packages",
+            votes = packages_voted,
+            notified = packages_notified
+        %}
             {% include 'partials/packages/results.html' %}
         {% endwith %}
     {% endif %}
@@ -46,7 +53,11 @@
     {% if not comaintained %}
         <p>{{ "No packages matched your search criteria." | tr }}</p>
     {% else %}
-        {% with table_id = "comaintained-packages", packages = comaintained %}
+        {% with table_id = "comaintained-packages",
+            packages = comaintained,
+            votes = comaintained_voted,
+            notified = comaintained_notified
+        %}
             {% include 'partials/packages/results.html' %}
         {% endwith %}
     {% endif %}
diff --git a/templates/partials/packages/results.html b/templates/partials/packages/results.html
index 80029d10..a9a206a1 100644
--- a/templates/partials/packages/results.html
+++ b/templates/partials/packages/results.html
@@ -28,14 +28,14 @@
                 <td>{{ pkg.PackageBase.Popularity | number_format(2) }}</td>
                 {% if request.user.is_authenticated() %}
                     <td>
-                        <!-- If I voted, display "Yes". -->
-                        {% if request.user.voted_for(pkg) %}
+                        {# If I voted, display "Yes". #}
+                        {% if pkg.PackageBase.ID in votes %}
                             {{ "Yes" | tr }}
                         {% endif %}
                     </td>
                     <td>
-                        <!-- If I'm being notified, display "Yes". -->
-                        {% if request.user.notified(pkg) %}
+                        {# If I'm being notified, display "Yes". #}
+                        {% if pkg.PackageBase.ID in notified %}
                             {{ "Yes" | tr }}
                         {% endif %}
                     </td>
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index 754e3b8d..1396734b 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 import pytest
 
 from fastapi.testclient import TestClient
@@ -7,6 +9,8 @@ from aurweb.models.account_type import USER_ID, AccountType
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_vote import PackageVote
 from aurweb.models.user import User
 from aurweb.packages import util
 from aurweb.redis import kill_redis
@@ -19,6 +23,8 @@ def setup():
         User.__tablename__,
         Package.__tablename__,
         PackageBase.__tablename__,
+        PackageVote.__tablename__,
+        PackageNotification.__tablename__,
         OfficialProvider.__tablename__
     )
 
@@ -71,3 +77,24 @@ def test_updated_packages(maintainer: User, package: Package):
     assert util.updated_packages(1, 0) == [expected]
     assert util.updated_packages(1, 600) == [expected]
     kill_redis()  # Kill it again, in case other tests use a real instance.
+
+
+def test_query_voted(maintainer: User, package: Package):
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        db.create(PackageVote, User=maintainer, VoteTS=now,
+                  PackageBase=package.PackageBase)
+
+    query = db.query(Package).filter(Package.ID == package.ID).all()
+    query_voted = util.query_voted(query, maintainer)
+    assert query_voted[package.PackageBase.ID]
+
+
+def test_query_notified(maintainer: User, package: Package):
+    with db.begin():
+        db.create(PackageNotification, User=maintainer,
+                  PackageBase=package.PackageBase)
+
+    query = db.query(Package).filter(Package.ID == package.ID).all()
+    query_notified = util.query_notified(query, maintainer)
+    assert query_notified[package.PackageBase.ID]

From aee1390e2c0aab59b2008d575c5f1750ca664733 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 19 Sep 2021 11:48:19 -0700
Subject: [PATCH 342/844] fix(FastAPI): registration sends WelcomeNotification

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index ef4b99af..3c799938 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -22,7 +22,7 @@ from aurweb.models.ban import Ban
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.term import Term
 from aurweb.models.user import User
-from aurweb.scripts.notify import ResetKeyNotification
+from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
@@ -414,7 +414,7 @@ async def account_register_post(request: Request,
 
     # Send a reset key notification to the new user.
     executor = db.ConnectionExecutor(db.get_engine().raw_connection())
-    ResetKeyNotification(executor, user.ID).send()
+    WelcomeNotification(executor, user.ID).send()
 
     context["complete"] = True
     context["user"] = user

From b59601a8b7af137c0f31cd92dbff10f52afe82f6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Sep 2021 19:14:47 -0700
Subject: [PATCH 343/844] feat(poetry): add paginate==0.5.6

With upstream at https://github.com/Pylons/paginate, this module
helps us deal with pagination without reinventing the wheel.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 13 ++++++++++++-
 pyproject.toml |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index 3cc84361..322e250f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -513,6 +513,14 @@ python-versions = ">=3.6"
 [package.dependencies]
 pyparsing = ">=2.0.2"
 
+[[package]]
+name = "paginate"
+version = "0.5.6"
+description = "Divides large result sets into pages for easier browsing"
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "pluggy"
 version = "0.13.1"
@@ -921,7 +929,7 @@ h11 = ">=0.9.0,<1"
 [metadata]
 lock-version = "1.1"
 python-versions = "*"
-content-hash = "96112731ca21a6ff5d0657c6c40979642bb992ae660ba8d6135421718737c6b0"
+content-hash = "c262ac1160b83593377fb7520d35c4b8ad81e5acff9d0a2060b2b048e3865b78"
 
 [metadata.files]
 aiofiles = [
@@ -1328,6 +1336,9 @@ packaging = [
     {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"},
     {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"},
 ]
+paginate = [
+    {file = "paginate-0.5.6.tar.gz", hash = "sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d"},
+]
 pluggy = [
     {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},
     {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
diff --git a/pyproject.toml b/pyproject.toml
index 8cb276ce..4b530493 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -70,6 +70,7 @@ python-multipart = { version = "0.0.5", python = "^3.9" }
 redis = { version = "3.5.3", python = "^3.9" }
 requests = { version = "2.26.0", python = "^3.9" }
 werkzeug = { version = "2.0.1", python = "^3.9" }
+paginate = { version = "0.5.6", python = "^3.9" }
 
 # SQL
 alembic = { version = "1.6.5", python = "^3.9" }

From c006386079b3f1dff893ba359eb978132800627c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 28 Aug 2021 16:14:07 -0700
Subject: [PATCH 344/844] add User.is_elevated()

This one returns true if the user is either a Trusted User
or a Developer.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py | 9 +++++++++
 test/test_user.py     | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 70d15f88..28aa613e 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -165,6 +165,15 @@ class User(Base):
             aurweb.models.account_type.TRUSTED_USER_AND_DEV_ID
         }
 
+    def is_elevated(self):
+        """ A User is 'elevated' when they have either a
+        Trusted User or Developer AccountType. """
+        return self.AccountType.ID in {
+            aurweb.models.account_type.TRUSTED_USER_ID,
+            aurweb.models.account_type.DEVELOPER_ID,
+            aurweb.models.account_type.TRUSTED_USER_AND_DEV_ID,
+        }
+
     def can_edit_user(self, user):
         """ Can this account record edit the target user? It must either
         be the target user or a user with enough permissions to do so.
diff --git a/test/test_user.py b/test/test_user.py
index 70eac079..43cbf58a 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -214,6 +214,11 @@ def test_user_credential_types():
     assert aurweb.auth.developer(user)
     assert aurweb.auth.trusted_user_or_dev(user)
 
+    # Some model authorization checks.
+    assert user.is_elevated()
+    assert user.is_trusted_user()
+    assert user.is_developer()
+
 
 def test_user_json():
     data = json.loads(user.json())

From 741cbfaa4e4d08dc02544140faf7bd1470ca7692 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 28 Aug 2021 16:15:48 -0700
Subject: [PATCH 345/844] auth: add several AnonymousUser method stubs

We'll need to use these, so this commit implements them here
with tests for coverage.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py    | 20 ++++++++++++++++++++
 test/test_auth.py | 27 ++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 26e4073d..2e6674b0 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -53,10 +53,30 @@ class AnonymousUser:
     def is_authenticated():
         return False
 
+    @staticmethod
+    def is_trusted_user():
+        return False
+
+    @staticmethod
+    def is_developer():
+        return False
+
+    @staticmethod
+    def is_elevated():
+        return False
+
     @staticmethod
     def has_credential(credential):
         return False
 
+    @staticmethod
+    def voted_for(package):
+        return False
+
+    @staticmethod
+    def notified(package):
+        return False
+
 
 class BasicAuthBackend(AuthenticationBackend):
     async def authenticate(self, conn: HTTPConnection):
diff --git a/test/test_auth.py b/test/test_auth.py
index caa39468..ced64064 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -5,7 +5,7 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.auth import BasicAuthBackend, account_type_required, has_credential
+from aurweb.auth import AnonymousUser, BasicAuthBackend, account_type_required, has_credential
 from aurweb.db import create, query
 from aurweb.models.account_type import USER, USER_ID, AccountType
 from aurweb.models.session import Session
@@ -92,3 +92,28 @@ def test_account_type_required():
     # But this one should! We have no "FAKE" key.
     with pytest.raises(KeyError):
         account_type_required({'FAKE'})
+
+
+def test_is_trusted_user():
+    user_ = AnonymousUser()
+    assert not user_.is_trusted_user()
+
+
+def test_is_developer():
+    user_ = AnonymousUser()
+    assert not user_.is_developer()
+
+
+def test_is_elevated():
+    user_ = AnonymousUser()
+    assert not user_.is_elevated()
+
+
+def test_voted_for():
+    user_ = AnonymousUser()
+    assert not user_.voted_for(None)
+
+
+def test_notified():
+    user_ = AnonymousUser()
+    assert not user_.notified(None)

From 6298b1228a7313de4375a567d79a7ab046bc2a26 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 15 Sep 2021 11:31:55 -0700
Subject: [PATCH 346/844] feat(FastAPI): add
 templates/partials/widgets/pager.html

A pager that can be used for paginated result tables.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/filters.py                     | 50 +++++++++++++++++++++++++++
 templates/partials/widgets/pager.html | 26 ++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 aurweb/filters.py
 create mode 100644 templates/partials/widgets/pager.html

diff --git a/aurweb/filters.py b/aurweb/filters.py
new file mode 100644
index 00000000..bb56c656
--- /dev/null
+++ b/aurweb/filters.py
@@ -0,0 +1,50 @@
+from typing import Any, Dict
+
+import paginate
+
+from jinja2 import pass_context
+
+from aurweb import util
+from aurweb.templates import register_filter
+
+
+@register_filter("pager_nav")
+@pass_context
+def pager_nav(context: Dict[str, Any],
+              page: int, total: int, prefix: str) -> str:
+    page = int(page)  # Make sure this is an int.
+
+    pp = context.get("PP", 50)
+
+    # Setup a local query string dict, optionally passed by caller.
+    q = context.get("q", dict())
+
+    search_by = context.get("SeB", None)
+    if search_by:
+        q["SeB"] = search_by
+
+    sort_by = context.get("SB", None)
+    if sort_by:
+        q["SB"] = sort_by
+
+    def create_url(page: int):
+        nonlocal q
+        offset = max(page * pp - pp, 0)
+        qs = util.to_qs(util.extend_query(q, ["O", offset]))
+        return f"{prefix}?{qs}"
+
+    # Use the paginate module to produce our linkage.
+    pager = paginate.Page([], page=page + 1,
+                          items_per_page=pp,
+                          item_count=total,
+                          url_maker=create_url)
+
+    return pager.pager(
+        link_attr={"class": "page"},
+        curpage_attr={"class": "page"},
+        separator="&nbsp",
+        format="$link_first $link_previous ~5~ $link_next $link_last",
+        symbol_first="« First",
+        symbol_previous="‹ Previous",
+        symbol_next="Next ›",
+        symbol_last="Last »")
diff --git a/templates/partials/widgets/pager.html b/templates/partials/widgets/pager.html
new file mode 100644
index 00000000..4809accf
--- /dev/null
+++ b/templates/partials/widgets/pager.html
@@ -0,0 +1,26 @@
+{# A pager widget that can be used for navigation of a number of results.
+
+Inputs required:
+
+    prefix: Request URI prefix used to produce navigation offsets
+    singular: Singular sentence to be translated via tn
+    plural: Plural sentence to be translated via tn
+    PP: The number of results per page
+    O: The current offset value
+    total: The total number of results
+#}
+
+{% set page = ((O / PP) | int) %}
+{% set pages = ((total / PP) | ceil) %}
+
+<div class="pkglist-stats">
+    <p>
+        {{ total | tn(singular, plural) | format(total) }}
+        {{ "Page %d of %d." | tr | format(page + 1, pages) }}
+    </p>
+    {% if pages > 1 %}
+        <p class="pkglist-nav">
+            {{ page | pager_nav(total, prefix) | safe }}
+        <p>
+    {% endif %}
+</div>

From 5cf70620921848050ed3ac92dff7f84df1dbf979 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 29 Aug 2021 22:21:39 -0700
Subject: [PATCH 347/844] feat(FastAPI): add /packages (get) search

In terms of performance, most queries on this page win over
PHP in query times, with the exception of sorting by Voted or
Notify (https://gitlab.archlinux.org/archlinux/aurweb/-/issues/102).
Otherwise, there are a few modifications: described below.

* Pagination
    * The `paginate` Python module has been used in the FastAPI
      project
      here to implement paging on the packages search page. This
      changes how pagination is displayed, however it serves the
      same purpose. We'll take advantage of this module in other
      places as well.
* Form action
    * The form action for actions now use `POST /packages` to
      perform. This is currently implemented and will be
      addressed in a follow-up commit.
* Input names and values
    * Input names and values have been modified to satisfy the
      snake_case naming convention we'd like to use as much as
      possible.
    * Some input names and values were modified to comply with
      FastAPI Forms: (IDs[<id>]) -> (IDs, <id>).

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/search.py                     | 195 +++++++
 aurweb/routers/packages.py                    |  83 ++-
 aurweb/templates.py                           |   2 +
 conf/config.defaults                          |   1 +
 setup.cfg                                     |   2 +
 templates/packages.html                       |  84 +++
 templates/partials/packages/search.html       |  58 +-
 .../partials/packages/search_actions.html     |  25 +
 .../partials/packages/search_results.html     | 114 ++++
 test/test_packages_routes.py                  | 540 +++++++++++++++++-
 web/html/css/aurweb.css                       |   7 +
 11 files changed, 1081 insertions(+), 30 deletions(-)
 create mode 100644 aurweb/packages/search.py
 create mode 100644 templates/packages.html
 create mode 100644 templates/partials/packages/search_actions.html
 create mode 100644 templates/partials/packages/search_results.html

diff --git a/aurweb/packages/search.py b/aurweb/packages/search.py
new file mode 100644
index 00000000..854834ee
--- /dev/null
+++ b/aurweb/packages/search.py
@@ -0,0 +1,195 @@
+from sqlalchemy import and_, case, or_, orm
+
+from aurweb import config, db
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comaintainer import PackageComaintainer
+from aurweb.models.package_keyword import PackageKeyword
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_vote import PackageVote
+from aurweb.models.user import User
+
+DEFAULT_MAX_RESULTS = 2500
+
+
+class PackageSearch:
+    """ A Package search query builder. """
+
+    # A constant mapping of short to full name sort orderings.
+    FULL_SORT_ORDER = {"d": "desc", "a": "asc"}
+
+    def __init__(self, user: User):
+        """ Construct an instance of PackageSearch.
+
+        This constructors performs several steps during initialization:
+            1. Setup self.query: an ORM query of Package joined by PackageBase.
+        """
+        self.user = user
+        self.query = db.query(Package).join(PackageBase).join(
+            PackageVote,
+            and_(PackageVote.PackageBaseID == PackageBase.ID,
+                 PackageVote.UsersID == self.user.ID),
+            isouter=True
+        ).join(
+            PackageNotification,
+            and_(PackageNotification.PackageBaseID == PackageBase.ID,
+                 PackageNotification.UserID == self.user.ID),
+            isouter=True
+        )
+        self.ordering = "d"
+
+        # Setup SeB (Search By) callbacks.
+        self.search_by_cb = {
+            "nd": self._search_by_namedesc,
+            "n": self._search_by_name,
+            "b": self._search_by_pkgbase,
+            "N": self._search_by_exact_name,
+            "B": self._search_by_exact_pkgbase,
+            "k": self._search_by_keywords,
+            "m": self._search_by_maintainer,
+            "c": self._search_by_comaintainer,
+            "M": self._search_by_co_or_maintainer,
+            "s": self._search_by_submitter
+        }
+
+        # Setup SB (Sort By) callbacks.
+        self.sort_by_cb = {
+            "n": self._sort_by_name,
+            "v": self._sort_by_votes,
+            "p": self._sort_by_popularity,
+            "w": self._sort_by_voted,
+            "o": self._sort_by_notify,
+            "m": self._sort_by_maintainer,
+            "l": self._sort_by_last_modified
+        }
+
+    def _search_by_namedesc(self, keywords: str) -> orm.Query:
+        self.query = self.query.filter(
+            or_(Package.Name.like(f"%{keywords}%"),
+                Package.Description.like(f"%{keywords}%"))
+        )
+        return self
+
+    def _search_by_name(self, keywords: str) -> orm.Query:
+        self.query = self.query.filter(Package.Name.like(f"%{keywords}%"))
+        return self
+
+    def _search_by_exact_name(self, keywords: str) -> orm.Query:
+        self.query = self.query.filter(Package.Name == keywords)
+        return self
+
+    def _search_by_pkgbase(self, keywords: str) -> orm.Query:
+        self.query = self.query.filter(PackageBase.Name.like(f"%{keywords}%"))
+        return self
+
+    def _search_by_exact_pkgbase(self, keywords: str) -> orm.Query:
+        self.query = self.query.filter(PackageBase.Name == keywords)
+        return self
+
+    def _search_by_keywords(self, keywords: str) -> orm.Query:
+        self.query = self.query.join(PackageKeyword).filter(
+            PackageKeyword.Keyword == keywords
+        )
+        return self
+
+    def _search_by_maintainer(self, keywords: str) -> orm.Query:
+        self.query = self.query.join(
+            User, User.ID == PackageBase.MaintainerUID
+        ).filter(User.Username == keywords)
+        return self
+
+    def _search_by_comaintainer(self, keywords: str) -> orm.Query:
+        self.query = self.query.join(PackageComaintainer).join(
+            User, User.ID == PackageComaintainer.UsersID
+        ).filter(User.Username == keywords)
+        return self
+
+    def _search_by_co_or_maintainer(self, keywords: str) -> orm.Query:
+        self.query = self.query.join(
+            PackageComaintainer,
+            isouter=True
+        ).join(
+            User, or_(User.ID == PackageBase.MaintainerUID,
+                      User.ID == PackageComaintainer.UsersID)
+        ).filter(User.Username == keywords)
+        return self
+
+    def _search_by_submitter(self, keywords: str) -> orm.Query:
+        self.query = self.query.join(
+            User, User.ID == PackageBase.SubmitterUID
+        ).filter(User.Username == keywords)
+        return self
+
+    def search_by(self, search_by: str, keywords: str) -> orm.Query:
+        if search_by not in self.search_by_cb:
+            search_by = "nd"  # Default: Name, Description
+        callback = self.search_by_cb.get(search_by)
+        result = callback(keywords)
+        return result
+
+    def _sort_by_name(self, order: str):
+        column = getattr(Package.Name, order)
+        self.query = self.query.order_by(column())
+        return self
+
+    def _sort_by_votes(self, order: str):
+        column = getattr(PackageBase.NumVotes, order)
+        self.query = self.query.order_by(column())
+        return self
+
+    def _sort_by_popularity(self, order: str):
+        column = getattr(PackageBase.Popularity, order)
+        self.query = self.query.order_by(column())
+        return self
+
+    def _sort_by_voted(self, order: str):
+        # FIXME: Currently, PHP is destroying this implementation
+        # in terms of performance. We should improve this; there's no
+        # reason it should take _longer_.
+        column = getattr(
+            case([(PackageVote.UsersID == self.user.ID, 1)], else_=0),
+            order
+        )
+        self.query = self.query.order_by(column(), Package.Name.desc())
+        return self
+
+    def _sort_by_notify(self, order: str):
+        # FIXME: Currently, PHP is destroying this implementation
+        # in terms of performance. We should improve this; there's no
+        # reason it should take _longer_.
+        column = getattr(
+            case([(PackageNotification.UserID == self.user.ID, 1)], else_=0),
+            order
+        )
+        self.query = self.query.order_by(column(), Package.Name.desc())
+        return self
+
+    def _sort_by_maintainer(self, order: str):
+        column = getattr(User.Username, order)
+        self.query = self.query.join(
+            User, User.ID == PackageBase.MaintainerUID, isouter=True
+        ).order_by(column())
+        return self
+
+    def _sort_by_last_modified(self, order: str):
+        column = getattr(PackageBase.ModifiedTS, order)
+        self.query = self.query.order_by(column())
+        return self
+
+    def sort_by(self, sort_by: str, ordering: str = "d") -> orm.Query:
+        if sort_by not in self.sort_by_cb:
+            sort_by = "n"  # Default: Name.
+        callback = self.sort_by_cb.get(sort_by)
+        if ordering not in self.FULL_SORT_ORDER:
+            ordering = "d"  # Default: Descending.
+        ordering = self.FULL_SORT_ORDER.get(ordering)
+        return callback(ordering)
+
+    def results(self) -> orm.Query:
+        # Store the total count of all records found up to limit.
+        limit = (config.getint("options", "max_search_results")
+                 or DEFAULT_MAX_RESULTS)
+        self.total_count = self.query.limit(limit).count()
+
+        # Return the query to the user.
+        return self.query
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index a20c97b1..3eda2539 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -5,6 +5,7 @@ from fastapi import APIRouter, Request, Response
 from fastapi.responses import RedirectResponse
 from sqlalchemy import and_
 
+import aurweb.filters
 import aurweb.models.package_comment
 import aurweb.models.package_keyword
 import aurweb.packages.util
@@ -21,12 +22,92 @@ from aurweb.models.package_request import PackageRequest
 from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID
-from aurweb.packages.util import get_pkgbase
+from aurweb.packages.search import PackageSearch
+from aurweb.packages.util import get_pkgbase, query_notified, query_voted
 from aurweb.templates import make_context, render_template
 
 router = APIRouter()
 
 
+async def packages_get(request: Request, context: Dict[str, Any]):
+    # Query parameters used in this request.
+    context["q"] = dict(request.query_params)
+
+    # Per page and offset.
+    per_page = context["PP"] = int(request.query_params.get("PP", 50))
+    offset = context["O"] = int(request.query_params.get("O", 0))
+
+    # Query search by.
+    search_by = context["SeB"] = request.query_params.get("SeB", "nd")
+
+    # Query sort by.
+    sort_by = context["SB"] = request.query_params.get("SB", "n")
+
+    # Query sort order.
+    sort_order = request.query_params.get("SO", None)
+
+    # Apply ordering, limit and offset.
+    search = PackageSearch(request.user)
+
+    # For each keyword found in K, apply a search_by filter.
+    # This means that for any sentences separated by spaces,
+    # they are used as if they were ANDed.
+    keywords = context["K"] = request.query_params.get("K", str())
+    keywords = keywords.split(" ")
+    for keyword in keywords:
+        search.search_by(search_by, keyword)
+
+    flagged = request.query_params.get("outdated", None)
+    if flagged:
+        # If outdated was given, set it up in the context.
+        context["outdated"] = flagged
+
+        # When outdated is set to "on," we filter records which do have
+        # an OutOfDateTS. When it's set to "off," we filter out any which
+        # do **not** have OutOfDateTS.
+        criteria = None
+        if flagged == "on":
+            criteria = PackageBase.OutOfDateTS.isnot
+        else:
+            criteria = PackageBase.OutOfDateTS.is_
+
+        # Apply the flag criteria to our PackageSearch.query.
+        search.query = search.query.filter(criteria(None))
+
+    submit = request.query_params.get("submit", "Go")
+    if submit == "Orphans":
+        # If the user clicked the "Orphans" button, we only want
+        # orphaned packages.
+        search.query = search.query.filter(PackageBase.MaintainerUID.is_(None))
+
+    # Apply user-specified specified sort column and ordering.
+    search.sort_by(sort_by, sort_order)
+
+    # If no SO was given, default the context SO to 'a' (Ascending).
+    # By default, if no SO is given, the search should sort by 'd'
+    # (Descending), but display "Ascending" for the Sort order select.
+    if sort_order is None:
+        sort_order = "a"
+    context["SO"] = sort_order
+
+    # Insert search results into the context.
+    results = search.results()
+    context["packages"] = results.limit(per_page).offset(offset)
+    context["packages_voted"] = query_voted(
+        context.get("packages"), request.user)
+    context["packages_notified"] = query_notified(
+        context.get("packages"), request.user)
+    context["packages_count"] = search.total_count
+
+    return render_template(request, "packages.html", context)
+
+
+@router.get("/packages")
+async def packages(request: Request) -> Response:
+    context = make_context(request, "Packages")
+    return await packages_get(request, context)
+
+
 async def make_single_context(request: Request,
                               pkgbase: PackageBase) -> Dict[str, Any]:
     """ Make a basic context for package or pkgbase.
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 6a1b6a1c..09be049c 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -1,5 +1,6 @@
 import copy
 import functools
+import math
 import os
 import zoneinfo
 
@@ -35,6 +36,7 @@ _env.filters["urlencode"] = util.to_qs
 _env.filters["quote_plus"] = quote_plus
 _env.filters["get_vote"] = util.get_vote
 _env.filters["number_format"] = util.number_format
+_env.filters["ceil"] = math.ceil
 
 # Add captcha filters.
 _env.filters["captcha_salt"] = captcha.captcha_salt_filter
diff --git a/conf/config.defaults b/conf/config.defaults
index 1c96a55d..988859a0 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -22,6 +22,7 @@ aur_location = https://aur.archlinux.org
 git_clone_uri_anon = https://aur.archlinux.org/%s.git
 git_clone_uri_priv = ssh://aur@aur.archlinux.org/%s.git
 max_rpc_results = 5000
+max_search_results = 2500
 max_depends = 1000
 aur_request_ml = aur-requests@lists.archlinux.org
 request_idle_time = 1209600
diff --git a/setup.cfg b/setup.cfg
index 1d67ca96..4f2bdf7d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,6 @@
 [pycodestyle]
 max-line-length = 127
+ignore = E741, W503
 
 [flake8]
 max-line-length = 127
@@ -25,6 +26,7 @@ max-complexity = 10
 per-file-ignores =
     aurweb/routers/accounts.py:E741,C901
     test/test_ssh_pub_key.py:E501
+    aurweb/routers/packages.py:E741
 
 [isort]
 line_length = 127
diff --git a/templates/packages.html b/templates/packages.html
new file mode 100644
index 00000000..8b5b06d1
--- /dev/null
+++ b/templates/packages.html
@@ -0,0 +1,84 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    {% if errors %}
+
+        <ul class="errorlist">
+            {% for error in errors %}
+                <li>{{ error | tr }}</li>
+            {% endfor %}
+        </ul>
+        {% include "partials/packages/search.html" %}
+
+    {% else %}
+
+        {% set pages = (packages_count / PP) | ceil %}
+        {% set page = O / PP %}
+
+        {% if success %}
+            <ul class="success">
+                {% for message in success %}
+                    <li>{{ message | tr }}</li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+
+        {# Search form #}
+        {% include "partials/packages/search.html" %}
+        <div id="pkglist-results" class="box">
+
+            {# /packages does things a bit roundabout-wise:
+
+            If SeB is not given, "nd" is the default.
+            If SB is not given, "n" is the default.
+            If SO is not given, "d" is the default.
+
+            However, we depend on flipping SO for column sorting.
+
+            This section sets those defaults for the context if
+            they are not already setup. #}
+            {% if not SeB %}
+                {% set SeB = "nd" %}
+            {% endif %}
+            {% if not SB %}
+                {% set SB = "n" %}
+            {% endif %}
+            {% if not SO %}
+                {% set SO = "d" %}
+            {% endif %}
+
+            {# Pagination widget #}
+            {% with total = packages_count,
+                    singular = "%d package found.",
+                    plural = "%d packages found.",
+                    prefix = "/packages" %}
+                {% include "partials/widgets/pager.html" %}
+            {% endwith %}
+
+            {# Package action form #}
+            <form id="pkglist-results-form"
+                  action="/packages/?{{ q | urlencode }}"
+                  method="post">
+
+                {# Search results #}
+                {% with voted = packages_voted, notified = packages_notified %}
+                    {% include "partials/packages/search_results.html" %}
+                {% endwith %}
+
+                {# Pagination widget #}
+                {% with total = packages_count,
+                        singular = "%d package found.",
+                        plural = "%d packages found.",
+                        prefix = "/packages" %}
+                    {% include "partials/widgets/pager.html" %}
+                {% endwith %}
+
+                {% if request.user.is_authenticated() %}
+                    {# Package actions #}
+                    {% include "partials/packages/search_actions.html" %}
+                {% endif %}
+            </form>
+        </div>
+
+    {% endif %}
+{% endblock %}
diff --git a/templates/partials/packages/search.html b/templates/partials/packages/search.html
index c4488b95..bb6fdb50 100644
--- a/templates/partials/packages/search.html
+++ b/templates/partials/packages/search.html
@@ -8,61 +8,65 @@
             <div>
                 <label for="id_method">{{ "Search by" | tr }}</label>
                 <select name='SeB'>
-                    <option value="nd">{{ "Name, Description" | tr }}</option>
-                    <option value="n">{{ "Name Only" | tr }}</option>
-                    <option value="b">{{ "Package Base" | tr }}</option>
-                    <option value="N">{{ "Exact Name" | tr }}</option>
-                    <option value="B">{{ "Exact Package Base" | tr }}</option>
-                    <option value="k">{{ "Keywords" | tr }}</option>
-                    <option value="m">{{ "Maintainer" | tr }}</option>
-                    <option value="c">{{ "Co-maintainer" | tr }}</option>
-                    <option value="M">{{ "Maintainer, Co-maintainer" | tr }}</option>
-                    <option value="s">{{ "Submitter" | tr }}</option>
+                    <option value="nd" {% if SeB == "nd" %}selected{% endif %}>{{ "Name, Description" | tr }}</option>
+                    <option value="n" {% if SeB == "n" %}selected{% endif %}>{{ "Name Only" | tr }}</option>
+                    <option value="b" {% if SeB == "b" %}selected{% endif%}>{{ "Package Base" | tr }}</option>
+                    <option value="N" {% if SeB == "N" %}selected{% endif %}>{{ "Exact Name" | tr }}</option>
+                    <option value="B" {% if SeB == "B" %}selected{% endif %}>{{ "Exact Package Base" | tr }}</option>
+                    <option value="k" {% if SeB == "k" %}selected{% endif %}>{{ "Keywords" | tr }}</option>
+                    <option value="m" {% if SeB == "m" %}selected{% endif %}>{{ "Maintainer" | tr }}</option>
+                    <option value="c" {% if SeB == "c" %}selected{% endif %}>{{ "Co-maintainer" | tr }}</option>
+                    <option value="M" {% if SeB == "M" %}selected{% endif %}>{{ "Maintainer, Co-maintainer" | tr }}</option>
+                    <option value="s" {% if SeB == "s" %}selected{% endif %}>{{ "Submitter" | tr }}</option>
                 </select>
             </div>
             <div>
                 <label for="id_q">{{ "Keywords" | tr }}</label>
-                <input type='text' name='K' size='30' value="" maxlength='35'/>
+                <input type='text' name='K' size='30' value="{{ K or '' }}" maxlength='35'/>
             </div>
             <div>
                 <label for="id_out_of_date">{{ "Out of Date" | tr }}</label>
                 <select name='outdated'>
                     <option value=''>{{ "All" | tr }}</option>
-                    <option value='on'>{{ "Flagged" | tr }}</option>
-                    <option value='off'>{{ "Not Flagged" | tr }}</option>
+                    <option value='on' {% if outdated == "on" %}selected{% endif %}>{{ "Flagged" | tr }}</option>
+                    <option value='off' {% if outdated == "off" %}selected{% endif %}>{{ "Not Flagged" | tr }}</option>
                 </select>
             </div>
             <div>
                 <label for="id_sort_by">{{ "Sort by" | tr }}</label>
                 <select name='SB'>
-                    <option value='n'>{{ "Name" | tr }}</option>
-                    <option value='v'>{{ "Votes" | tr }}</option>
-                    <option value='p'>{{ "Popularity" | tr }}</option>
-                    <option value='w'>{{ "Voted" | tr }}</option>
-                    <option value='o'>{{ "Notify" | tr }}</option>
-                    <option value='m'>{{ "Maintainer" | tr }}</option>
-                    <option value='l'>{{ "Last modified" | tr }}</option>
+                    <option value='n' {% if SB == "n" %}selected{% endif %}>{{ "Name" | tr }}</option>
+                    <option value='v' {% if SB == "v" %}selected{% endif %}>{{ "Votes" | tr }}</option>
+                    <option value='p' {% if SB == "p" %}selected{% endif %}>{{ "Popularity" | tr }}</option>
+                    <option value='w' {% if SB == "w" %}selected{% endif %}>{{ "Voted" | tr }}</option>
+                    <option value='o' {% if SB == "o" %}selected{% endif %}>{{ "Notify" | tr }}</option>
+                    <option value='m' {% if SB == "m" %}selected{% endif %}>{{ "Maintainer" | tr }}</option>
+                    <option value='l' {% if SB == "l" %}selected{% endif %}>{{ "Last modified" | tr }}</option>
                 </select>
             </div>
             <div>
                 <label for="id_order_by">{{ "Sort order" | tr }}</label>
                 <select name='SO'>
-                    <option value='a'>{{ "Ascending" | tr }}</option>
-                    <option value='d'>{{ "Descending" | tr }}</option>
+                    <option value='a' {% if SO == "a" %}selected{% endif %}>{{ "Ascending" | tr }}</option>
+                    <option value='d' {% if SO == "d" %}selected{% endif %}>{{ "Descending" | tr }}</option>
                 </select>
             </div>
             <div>
                 <label for="id_per_page">{{ "Per page" | tr }}</label>
                 <select name='PP'>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                    <option value="250">250</option>
+                    <option value="50" {% if PP == 50 %}selected{% endif %}>50</option>
+                    <option value="100" {% if PP == 100 %}selected{% endif %}>100</option>
+                    <option value="250" {% if PP == 250 %}selected{% endif %}>250</option>
                 </select>
             </div>
             <div>
                 <label>&nbsp;</label>
-                <input type='submit' class='button' name='do_Search' value='{{ "Go" | tr }}'/>
-                <input type='submit' class='button' name='do_Orphans' value='{{ "Orphans" | tr }}'/>
+                <button type='submit' class='button' name='submit' value='Go'>
+                    {{ "Go" | tr }}
+                </button>
+                <button type='submit' class='button' name='submit' value='Orphans'>
+                    {{ "Orphans" | tr }}
+                </button>
             </div>
         </fieldset>
     </form>
diff --git a/templates/partials/packages/search_actions.html b/templates/partials/packages/search_actions.html
new file mode 100644
index 00000000..2f5fe2e7
--- /dev/null
+++ b/templates/partials/packages/search_actions.html
@@ -0,0 +1,25 @@
+<p>
+    <select name="action">
+        <option value="">{{ "Actions" | tr }}</option>
+            <option value="unflag">{{ "Unflag Out-of-date" | tr }}</option>
+            <option value="adopt">{{ "Adopt Packages" | tr }}</option>
+            <option value="disown">{{ "Disown Packages" | tr }}</option>
+        {% if request.user.is_trusted_user() or request.user.is_developer() %}
+            <option value="delete">{{ "Delete Packages" | tr }}</option>
+        {% endif %}
+        <option value="notify">{{ "Notify" | tr }}</option>
+        <option value="unnotify">{{ "UnNotify" | tr }}</option>
+    </select>
+
+    {% if request.user.is_trusted_user() or request.user.is_developer() %}
+        <label for="merge_into">{{ "Merge into" | tr }}</label>
+        <input id="merge_into" type="text" name="merge_into" />
+    {% endif %}
+
+    <label class="confirmation">
+        <input type="checkbox" name="confirm" />
+        Confirm
+    </label>
+
+    <input id="search-action-submit" class="button" type="submit" value="Go" />
+</p>
diff --git a/templates/partials/packages/search_results.html b/templates/partials/packages/search_results.html
new file mode 100644
index 00000000..28cf0b48
--- /dev/null
+++ b/templates/partials/packages/search_results.html
@@ -0,0 +1,114 @@
+<table {% if table_id %}id="{{ table_id }}"{% endif %} class="results">
+    <thead>
+        <tr>
+            {% if request.user.is_authenticated() %}
+                <th></th>
+            {% endif %}
+            <th>
+                {% set order = SO %}
+                {% if SB == "n" %}
+                    {% set order = "d" if order == "a" else "a" %}
+                {% endif %}
+                <a href="/packages/?SB=n&SO={{ order }}">
+                    {{ "Name" | tr }}
+                </a>
+            </th>
+            <th>{{ "Version" | tr }}</th>
+            <th>
+                {% set order = SO %}
+                {% if SB == "v" %}
+                    {% set order = "d" if order == "a" else "a" %}
+                {% endif %}
+                <a href="/packages/?SB=v&SO={{ order }}">
+                    {{ "Votes" | tr }}
+                </a>
+            </th>
+            <th>
+                {% set order = SO %}
+                {% if SB == "p" %}
+                    {% set order = "d" if order == "a" else "a" %}
+                {% endif %}
+                <a href="/packages/?SB=p&SO={{ order }}">{{ "Popularity" | tr }}</a><span title="{{ 'Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.' | format(0.98) }}" class="hover-help"><sup>?</sup></span>
+            </th>
+            {% if request.user.is_authenticated() %}
+                <th>
+                    {% set order = SO %}
+                    {% if SB == "w" %}
+                        {% set order = "d" if order == "a" else "a" %}
+                    {% endif %}
+                    <a href="/packages/?SB=w&SO={{ order }}">
+                        {{ "Voted" | tr }}
+                    </a>
+                </th>
+                <th>
+                    {% set order = SO %}
+                    {% if SB == "o" %}
+                        {% set order = "d" if order == "a" else "a" %}
+                    {% endif %}
+                    <a href="/packages/?SB=o&SO={{ order }}">
+                        {{ "Notify" | tr }}
+                    </a>
+                </th>
+            {% endif %}
+            <th>{{ "Description" | tr }}</th>
+            <th>
+                    {% set order = SO %}
+                    {% if SB == "m" %}
+                        {% set order = "d" if order == "a" else "a" %}
+                    {% endif %}
+                    <a href="/packages/?SB=m&SO={{ order }}">
+                        {{ "Maintainer" | tr }}
+                    </a>
+            </th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for pkg in packages %}
+            {% set flagged = pkg.PackageBase.OutOfDateTS %}
+            <tr>
+                {% if request.user.is_authenticated() %}
+                    <td>
+                        <input type="checkbox" name="IDs" value="{{ pkg.ID }}" />
+                    </td>
+                {% endif %}
+                <td>
+                    <a href="/packages/{{ pkg.Name }}">
+                        {{ pkg.Name }}
+                    </a>
+                </td>
+                {% if flagged %}
+                    <td class="flagged">{{ pkg.Version }}</td>
+                {% else %}
+                    <td>{{ pkg.Version }}</td>
+                {% endif %}
+                <td>{{ pkg.PackageBase.NumVotes }}</td>
+                <td>
+                    {{ pkg.PackageBase.Popularity | number_format(2) }}
+                </td>
+                {% if request.user.is_authenticated() %}
+                    <td>
+                        {% if pkg.PackageBase.ID in voted %}
+                            {{ "Yes" | tr }}
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if pkg.PackageBase.ID in notified %}
+                            {{ "Yes" | tr }}
+                        {% endif %}
+                    </td>
+                {% endif %}
+                <td class="wrap">{{ pkg.Description or '' }}</td>
+                <td>
+                    {% set maintainer = pkg.PackageBase.Maintainer %}
+                    {% if maintainer %}
+                        <a href="/account/{{ maintainer.Username }}">
+                            {{ maintainer.Username }}
+                        </a>
+                    {% else %}
+                        <span class="error">{{ "orphan" | tr }}</span>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 8a468c15..fb45af88 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1,5 +1,8 @@
+import re
+
 from datetime import datetime
 from http import HTTPStatus
+from typing import List
 
 import pytest
 
@@ -11,11 +14,14 @@ from aurweb.models.dependency_type import DependencyType
 from aurweb.models.official_provider import OfficialProvider
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_comment import PackageComment
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_keyword import PackageKeyword
+from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_request import PackageRequest
+from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import PROVIDES_ID, RelationType
 from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
@@ -64,6 +70,9 @@ def setup():
         PackageDependency.__tablename__,
         PackageRelation.__tablename__,
         PackageKeyword.__tablename__,
+        PackageVote.__tablename__,
+        PackageNotification.__tablename__,
+        PackageComaintainer.__tablename__,
         OfficialProvider.__tablename__
     )
 
@@ -101,16 +110,41 @@ def maintainer() -> User:
 @pytest.fixture
 def package(maintainer: User) -> Package:
     """ Yield a Package created by user. """
+    now = int(datetime.utcnow().timestamp())
     with db.begin():
         pkgbase = db.create(PackageBase,
                             Name="test-package",
-                            Maintainer=maintainer)
+                            Maintainer=maintainer,
+                            Packager=maintainer,
+                            Submitter=maintainer,
+                            ModifiedTS=now)
         package = db.create(Package,
                             PackageBase=pkgbase,
                             Name=pkgbase.Name)
     yield package
 
 
+@pytest.fixture
+def packages(maintainer: User) -> List[Package]:
+    """ Yield 55 packages named pkg_0 .. pkg_54. """
+    packages_ = []
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        for i in range(55):
+            pkgbase = db.create(PackageBase,
+                                Name=f"pkg_{i}",
+                                Maintainer=maintainer,
+                                Packager=maintainer,
+                                Submitter=maintainer,
+                                ModifiedTS=now)
+            package = db.create(Package,
+                                PackageBase=pkgbase,
+                                Name=f"pkg_{i}")
+            packages_.append(package)
+
+    yield packages_
+
+
 def test_package_not_found(client: TestClient):
     with client as request:
         resp = request.get("/packages/not_found")
@@ -133,7 +167,7 @@ def test_package_official_not_found(client: TestClient, package: Package):
 
 
 def test_package(client: TestClient, package: Package):
-    """ Test a single /packages/{name} route. """
+    """ Test a single / packages / {name} route. """
     with client as request:
 
         resp = request.get(package_endpoint(package))
@@ -376,3 +410,505 @@ def test_pkgbase(client: TestClient, package: Package):
     pkgs = root.findall('.//div[@id="pkgs"]/ul/li/a')
     for i, name in enumerate(expected):
         assert pkgs[i].text.strip() == name
+
+
+def test_packages(client: TestClient, packages: List[Package]):
+    """ Test the / packages route with defaults.
+
+    Defaults:
+        50 results per page
+        offset of 0
+    """
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "X"  # "X" isn't valid, defaults to "nd"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    stats = root.xpath('//div[@class="pkglist-stats"]/p')[0]
+    pager_text = re.sub(r'\s+', " ", stats.text.replace("\n", "").strip())
+    assert pager_text == "55 packages found. Page 1 of 2."
+
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 50  # Default per-page
+
+
+def test_packages_search_by_name(client: TestClient, packages: List[Package]):
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "n",
+            "K": "pkg_"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 50  # Default per-page
+
+
+def test_packages_search_by_exact_name(client: TestClient,
+                                       packages: List[Package]):
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "N",
+            "K": "pkg_"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+
+    # There is no package named exactly 'pkg_', we get 0 results.
+    assert len(rows) == 0
+
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "N",
+            "K": "pkg_1"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+
+    # There's just one package named 'pkg_1', we get 1 result.
+    assert len(rows) == 1
+
+
+def test_packages_search_by_pkgbase(client: TestClient,
+                                    packages: List[Package]):
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "b",
+            "K": "pkg_"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 50
+
+
+def test_packages_search_by_exact_pkgbase(client: TestClient,
+                                          packages: List[Package]):
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "B",
+            "K": "pkg_"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 0
+
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "B",
+            "K": "pkg_1"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+
+def test_packages_search_by_keywords(client: TestClient,
+                                     packages: List[Package]):
+    # None of our packages have keywords, so this query should return nothing.
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "k",
+            "K": "testKeyword"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 0
+
+    # But now, let's create the keyword for the first package.
+    package = packages[0]
+    with db.begin():
+        db.create(PackageKeyword,
+                  PackageBase=package.PackageBase,
+                  Keyword="testKeyword")
+
+    # And request packages with that keyword, we should get 1 result.
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "k",
+            "K": "testKeyword"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+
+def test_packages_search_by_maintainer(client: TestClient,
+                                       maintainer: User,
+                                       package: Package):
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "m",
+            "K": maintainer.Username
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+
+def test_packages_search_by_comaintainer(client: TestClient,
+                                         maintainer: User,
+                                         package: Package):
+    # Nobody's a comaintainer yet.
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "c",
+            "K": maintainer.Username
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 0
+
+    # Now, we create a comaintainer.
+    with db.begin():
+        db.create(PackageComaintainer,
+                  PackageBase=package.PackageBase,
+                  User=maintainer,
+                  Priority=1)
+
+    # Then test that it's returned by our search.
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "c",
+            "K": maintainer.Username
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+
+def test_packages_search_by_co_or_maintainer(client: TestClient,
+                                             maintainer: User,
+                                             package: Package):
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "M",
+            "SB": "BLAH",  # Invalid SB; gets reset to default "n".
+            "K": maintainer.Username
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+    with db.begin():
+        user = db.create(User, Username="comaintainer",
+                         Email="comaintainer@example.org",
+                         Passwd="testPassword")
+        db.create(PackageComaintainer,
+                  PackageBase=package.PackageBase,
+                  User=user,
+                  Priority=1)
+
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "M",
+            "K": user.Username
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+
+def test_packages_search_by_submitter(client: TestClient,
+                                      maintainer: User,
+                                      package: Package):
+    with client as request:
+        response = request.get("/packages", params={
+            "SeB": "s",
+            "K": maintainer.Username
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+
+def test_packages_sort_by_votes(client: TestClient,
+                                maintainer: User,
+                                packages: List[Package]):
+    # Set the first package's NumVotes to 1.
+    with db.begin():
+        packages[0].PackageBase.NumVotes = 1
+
+    # Test that, by default, the first result is what we just set above.
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "v"  # Votes.
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    votes = rows[0].xpath('./td')[2]  # The third column of the first row.
+    assert votes.text.strip() == "1"
+
+    # Now, test that with an ascending order, the last result is
+    # the one we set, since the default (above) is descending.
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "v",  # Votes.
+            "SO": "a",  # Ascending.
+            "O": "50"  # Second page.
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    votes = rows[-1].xpath('./td')[2]  # The third column of the last row.
+    assert votes.text.strip() == "1"
+
+
+def test_packages_sort_by_popularity(client: TestClient,
+                                     maintainer: User,
+                                     packages: List[Package]):
+    # Set the first package's Popularity to 0.50.
+    with db.begin():
+        packages[0].PackageBase.Popularity = "0.50"
+
+    # Test that, by default, the first result is what we just set above.
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "p"  # Popularity
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    pop = rows[0].xpath('./td')[3]  # The fourth column of the first row.
+    assert pop.text.strip() == "0.50"
+
+
+def test_packages_sort_by_voted(client: TestClient,
+                                maintainer: User,
+                                packages: List[Package]):
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        db.create(PackageVote, PackageBase=packages[0].PackageBase,
+                  User=maintainer, VoteTS=now)
+
+    # Test that, by default, the first result is what we just set above.
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "w",  # Voted
+            "SO": "d"  # Descending, Voted first.
+        }, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    voted = rows[0].xpath('./td')[5]  # The sixth column of the first row.
+    assert voted.text.strip() == "Yes"
+
+    # Conversely, everything else was not voted on.
+    voted = rows[1].xpath('./td')[5]  # The sixth column of the second row.
+    assert voted.text.strip() == str()  # Empty.
+
+
+def test_packages_sort_by_notify(client: TestClient,
+                                 maintainer: User,
+                                 packages: List[Package]):
+    db.create(PackageNotification,
+              PackageBase=packages[0].PackageBase,
+              User=maintainer)
+
+    # Test that, by default, the first result is what we just set above.
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "o",  # Voted
+            "SO": "d"  # Descending, Voted first.
+        }, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    notify = rows[0].xpath('./td')[6]  # The sixth column of the first row.
+    assert notify.text.strip() == "Yes"
+
+    # Conversely, everything else was not voted on.
+    notify = rows[1].xpath('./td')[6]  # The sixth column of the second row.
+    assert notify.text.strip() == str()  # Empty.
+
+
+def test_packages_sort_by_maintainer(client: TestClient,
+                                     maintainer: User,
+                                     package: Package):
+    """ Sort a package search by the maintainer column. """
+
+    # Create a second package, so the two can be ordered and checked.
+    with db.begin():
+        maintainer2 = db.create(User, Username="maintainer2",
+                                Email="maintainer2@example.org",
+                                Passwd="testPassword")
+        base2 = db.create(PackageBase, Name="pkg_2", Maintainer=maintainer2,
+                          Submitter=maintainer2, Packager=maintainer2)
+        db.create(Package, Name="pkg_2", PackageBase=base2)
+
+    # Check the descending order route.
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "m",
+            "SO": "d"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    col = rows[0].xpath('./td')[5].xpath('./a')[0]  # Last column.
+
+    assert col.text.strip() == maintainer.Username
+
+    # On the other hand, with ascending, we should get reverse ordering.
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "m",
+            "SO": "a"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    col = rows[0].xpath('./td')[5].xpath('./a')[0]  # Last column.
+
+    assert col.text.strip() == maintainer2.Username
+
+
+def test_packages_sort_by_last_modified(client: TestClient,
+                                        packages: List[Package]):
+    now = int(datetime.utcnow().timestamp())
+    # Set the first package's ModifiedTS to be 1000 seconds before now.
+    package = packages[0]
+    with db.begin():
+        package.PackageBase.ModifiedTS = now - 1000
+
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "l",
+            "SO": "a"  # Ascending; oldest modification first.
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # We should have 50 (default per page) results.
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 50
+
+    # Let's assert that the first item returned was the one we modified above.
+    row = rows[0]
+    col = row.xpath('./td')[0].xpath('./a')[0]
+    assert col.text.strip() == package.Name
+
+
+def test_packages_flagged(client: TestClient, maintainer: User,
+                          packages: List[Package]):
+    package = packages[0]
+
+    now = int(datetime.utcnow().timestamp())
+
+    with db.begin():
+        package.PackageBase.OutOfDateTS = now
+        package.PackageBase.Flagger = maintainer
+
+    with client as request:
+        response = request.get("/packages", params={
+            "outdated": "on"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # We should only get one result from this query; the package we flagged.
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+    with client as request:
+        response = request.get("/packages", params={
+            "outdated": "off"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # In this case, we should get 54 results, which means that the first
+    # page will have 50 results (55 packages - 1 outdated = 54 not outdated).
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 50
+
+
+def test_packages_orphans(client: TestClient, packages: List[Package]):
+    package = packages[0]
+    with db.begin():
+        package.PackageBase.Maintainer = None
+
+    with client as request:
+        response = request.get("/packages", params={"submit": "Orphans"})
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # We only have one orphan. Let's make sure that's what is returned.
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
+
+
+def test_packages_per_page(client: TestClient, maintainer: User):
+    """ Test the ability for /packages to deal with the PP query
+    argument specifications (50, 100, 250; default: 50). """
+    with db.begin():
+        for i in range(255):
+            base = db.create(PackageBase, Name=f"pkg_{i}",
+                             Maintainer=maintainer,
+                             Submitter=maintainer,
+                             Packager=maintainer)
+            db.create(Package, PackageBase=base, Name=base.Name)
+
+    # Test default case, PP of 50.
+    with client as request:
+        response = request.get("/packages", params={"PP": 50})
+    assert response.status_code == int(HTTPStatus.OK)
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 50
+
+    # Alright, test the next case, PP of 100.
+    with client as request:
+        response = request.get("/packages", params={"PP": 100})
+    assert response.status_code == int(HTTPStatus.OK)
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 100
+
+    # And finally, the last case, a PP of 250.
+    with client as request:
+        response = request.get("/packages", params={"PP": 250})
+    assert response.status_code == int(HTTPStatus.OK)
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 250
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index b36dbd4d..62179769 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -222,3 +222,10 @@ button[type="reset"] {
     text-align: right;
 }
 
+input#search-action-submit {
+    width: 80px;
+}
+
+.success {
+    color: green;
+}

From 7e589863561a0777f8feb9f4b11f505715d80841 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 20 Sep 2021 01:30:12 -0700
Subject: [PATCH 348/844] feat: add util/adduser.py database tooling script

We'll need to add tests for these things at some point. However,
I'd like to include this script in here immediately for ease of
testing or administration in general.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 util/adduser.py | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 util/adduser.py

diff --git a/util/adduser.py b/util/adduser.py
new file mode 100644
index 00000000..7e35d13d
--- /dev/null
+++ b/util/adduser.py
@@ -0,0 +1,67 @@
+import argparse
+import sys
+import traceback
+
+from aurweb import db
+from aurweb.models.account_type import AccountType
+from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
+from aurweb.models.user import User
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="aurweb-adduser options")
+
+    parser.add_argument("-u", "--username", help="Username", required=True)
+    parser.add_argument("-e", "--email", help="Email", required=True)
+    parser.add_argument("-p", "--password", help="Password", required=True)
+    parser.add_argument("-r", "--realname", help="Real Name")
+    parser.add_argument("-i", "--ircnick", help="IRC Nick")
+    parser.add_argument("--pgp-key", help="PGP Key Fingerprint")
+    parser.add_argument("--ssh-pubkey", help="SSH PubKey")
+
+    parser.add_argument("-t", "--type", help="Account Type",
+                        choices=[
+                            "User",
+                            "Trusted User",
+                            "Developer",
+                            "Trusted User & Developer"
+                        ], default="User")
+
+    return parser.parse_args()
+
+
+def main():
+    args = parse_args()
+
+    type = db.query(AccountType,
+                    AccountType.AccountType == args.type).first()
+    with db.begin():
+        user = db.create(User, Username=args.username,
+                         Email=args.email, Passwd=args.password,
+                         RealName=args.realname, IRCNick=args.ircnick,
+                         PGPKey=args.pgp_key, AccountType=type)
+
+    if args.ssh_pubkey:
+        pubkey = args.ssh_pubkey.strip()
+
+        # Remove host from the pubkey if it's there.
+        pubkey = ' '.join(pubkey.split(' ')[:2])
+
+        with db.begin():
+            db.create(SSHPubKey,
+                      User=user,
+                      PubKey=pubkey,
+                      Fingerprint=get_fingerprint(pubkey))
+
+    print(user.json())
+    return 0
+
+
+if __name__ == "__main__":
+    e = 1
+    try:
+        e = main()
+    except Exception:
+        traceback.print_exc()
+        e = 1
+    sys.exit(e)

From dc5dc233ec120ace46e870a057b632b4d5c8149c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 21 Sep 2021 00:01:39 -0700
Subject: [PATCH 349/844] .gitlab-ci.yml: add coverage regex

This was required for the GitLab coverage badge to get the %
of coverage.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffea5308..a8ddf08f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,7 @@ test:
     - isort --check-only aurweb # Assert no isort violations in aurweb.
     - isort --check-only test # Assert no flake8 violations in test.
     - isort --check-only migrations # Assert no flake8 violations in migrations.
+  coverage: '/TOTAL.*\s+(\d+\%)/'
   artifacts:
     reports:
       cobertura: coverage.xml

From fbd91f346a69e41f44407fc568343c469ea59460 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 22 Sep 2021 18:33:58 -0700
Subject: [PATCH 350/844] feat(FastAPI): add /pkgbase/{name}/voters (get)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py    |  9 +++++++++
 templates/pkgbase/voters.html | 27 +++++++++++++++++++++++++++
 test/test_packages_routes.py  | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 templates/pkgbase/voters.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 3eda2539..72cd8c99 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -195,3 +195,12 @@ async def package_base(request: Request, name: str) -> Response:
     context["packages"] = pkgbase.packages.all()
 
     return render_template(request, "pkgbase.html", context)
+
+
+@router.get("/pkgbase/{name}/voters")
+async def package_base_voters(request: Request, name: str) -> Response:
+    # Get the PackageBase.
+    pkgbase = get_pkgbase(name)
+    context = make_context(request, "Voters")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "pkgbase/voters.html", context)
diff --git a/templates/pkgbase/voters.html b/templates/pkgbase/voters.html
new file mode 100644
index 00000000..be86f01f
--- /dev/null
+++ b/templates/pkgbase/voters.html
@@ -0,0 +1,27 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>
+            {{ "Votes" | tr }} for
+            <a href="/pkgbase/{{ pkgbase.Name }}">
+                {{ pkgbase.Name }}
+            </a>
+        </h2>
+
+        <div class="boxbody">
+            <ul>
+                {% for pkg_vote in pkgbase.package_votes %}
+                    <li>
+                        <a href="/account/{{ pkg_vote.User.Username }}">
+                            {{ pkg_vote.User.Username }}
+                        </a>
+
+                        {% set voted_at = pkg_vote.VoteTS | dt | as_timezone(timezone) %}
+                        ({{ voted_at.strftime("%Y-%m-%d %H:%M") }})
+                    </li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index fb45af88..2190dc18 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -912,3 +912,21 @@ def test_packages_per_page(client: TestClient, maintainer: User):
     root = parse_root(response.text)
     rows = root.xpath('//table[@class="results"]/tbody/tr')
     assert len(rows) == 250
+
+
+def test_pkgbase_voters(client: TestClient, maintainer: User, package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/voters"
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        db.create(PackageVote, User=maintainer, PackageBase=pkgbase,
+                  VoteTS=now)
+
+    with client as request:
+        resp = request.get(endpoint)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    rows = root.xpath('//div[@class="box"]//ul/li')
+    assert len(rows) == 1

From ad9997c48ff39d4412e888470b980330ea28e3ea Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 2 Oct 2021 12:59:49 -0700
Subject: [PATCH 351/844] feat(Docker): build aurweb:latest via docker-compose
 build

Users can now build the required image by running (in the aurweb root):

    $ docker-compose build

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 309e95fe..8e2d91d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,7 @@ version: "3.8"
 
 services:
   ca:
+    build: .
     image: aurweb:latest
     init: true
     entrypoint: /docker/ca-entrypoint.sh
@@ -30,6 +31,7 @@ services:
       - ./cache:/cache
 
   memcached:
+    build: .
     image: aurweb:latest
     init: true
     command: /docker/scripts/run-memcached.sh
@@ -37,6 +39,7 @@ services:
       test: "bash /docker/health/memcached.sh"
 
   redis:
+    build: .
     image: aurweb:latest
     init: true
     entrypoint: /docker/redis-entrypoint.sh
@@ -47,6 +50,7 @@ services:
       - "16379:6379"
 
   mariadb:
+    build: .
     image: aurweb:latest
     init: true
     entrypoint: /docker/mariadb-entrypoint.sh
@@ -62,6 +66,7 @@ services:
       test: "bash /docker/health/mariadb.sh"
 
   mariadb_init:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -73,6 +78,7 @@ services:
         condition: service_healthy
 
   git:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -92,6 +98,7 @@ services:
       - ./cache:/cache
 
   smartgit:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -109,6 +116,7 @@ services:
       - smartgit_run:/var/run/smartgit
 
   cgit-php:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -124,6 +132,7 @@ services:
       - git_data:/aurweb/aur.git
 
   cgit-fastapi:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -139,6 +148,7 @@ services:
       - git_data:/aurweb/aur.git
 
   php-fpm:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -168,6 +178,7 @@ services:
       - "19000:9000"
 
   fastapi:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -197,6 +208,7 @@ services:
       - "18000:8000"
 
   nginx:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -229,6 +241,7 @@ services:
       - smartgit_run:/var/run/smartgit
 
   sharness:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -252,6 +265,7 @@ services:
       - ./templates:/aurweb/templates
 
   pytest-mysql:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -276,6 +290,7 @@ services:
       - ./templates:/aurweb/templates
 
   pytest-sqlite:
+    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -296,6 +311,7 @@ services:
       - ./templates:/aurweb/templates
 
   test:
+    build: .
     image: aurweb:latest
     init: true
     environment:

From 3b1809e2ea8d7adcafaff09664569c75c35791e3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 2 Oct 2021 13:26:05 -0700
Subject: [PATCH 352/844] feat(Docker): allow custom certificates for
 fastapi/nginx

Now, when a `./cache/production.{cert,key}.pem` pair is found, it is
used in place of any certificates generated by the `ca` service.
This allows users to customize the certificate that the FastAPI
ASGI server uses as well as the front-end nginx certificates.

Optional:

- ./cache/production.cert.pem
- ./cache/production.key.pem

Fallback:

- ./cache/localhost.cert.pem + ./cache/root.ca.pem (chain)
- ./cache/localhost.key.pem

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf      |  8 ++++----
 docker/nginx-entrypoint.sh    | 20 +++++++++++++++++---
 docker/scripts/run-fastapi.sh | 20 ++++++++++++++++----
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index 3a8de801..4288a57d 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -43,8 +43,8 @@ http {
         listen 8443 ssl http2;
         server_name localhost default_server;
 
-        ssl_certificate /etc/ssl/certs/localhost.cert.pem;
-        ssl_certificate_key /etc/ssl/private/localhost.key.pem;
+        ssl_certificate /etc/ssl/certs/web.cert.pem;
+        ssl_certificate_key /etc/ssl/private/web.key.pem;
 
         root /aurweb/web/html;
         index index.php;
@@ -91,8 +91,8 @@ http {
         listen 8444 ssl http2;
         server_name localhost default_server;
 
-        ssl_certificate /etc/ssl/certs/localhost.cert.pem;
-        ssl_certificate_key /etc/ssl/private/localhost.key.pem;
+        ssl_certificate /etc/ssl/certs/web.cert.pem;
+        ssl_certificate_key /etc/ssl/private/web.key.pem;
 
         root /aurweb/web/html;
 
diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
index 226ded8f..63307948 100755
--- a/docker/nginx-entrypoint.sh
+++ b/docker/nginx-entrypoint.sh
@@ -1,6 +1,16 @@
 #!/bin/bash
 set -eou pipefail
 
+# If production.{cert,key}.pem exists, prefer them. This allows
+# user customization of the certificates that FastAPI uses.
+# Otherwise, fallback to localhost.{cert,key}.pem, generated by `ca`.
+
+CERT=/cache/production.cert.pem
+KEY=/cache/production.key.pem
+
+DEST_CERT=/etc/ssl/certs/web.cert.pem
+DEST_KEY=/etc/ssl/private/web.key.pem
+
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
@@ -12,9 +22,13 @@ sed -ri 's/^;?(password) = .+/\1 = aur/' conf/config
 sed -ri "s|^(aur_location) = .+|\1 = https://localhost:8444|" conf/config
 sed -ri 's/^(disable_http_login) = .+/\1 = 1/' conf/config
 
-cat /cache/localhost.cert.pem /cache/ca.root.pem \
-    > /etc/ssl/certs/localhost.cert.pem
-cp -vf /cache/localhost.key.pem /etc/ssl/private/localhost.key.pem
+if [ -f "$CERT" ]; then
+    cp -vf "$CERT" "$DEST_CERT"
+    cp -vf "$KEY" "$DEST_KEY"
+else
+    cat /cache/localhost.cert.pem /cache/ca.root.pem > "$DEST_CERT"
+    cp -vf /cache/localhost.key.pem "$DEST_KEY"
+fi
 
 cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf
 
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index bb1a01a7..4dcc1d96 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -1,17 +1,29 @@
 #!/bin/bash
 
+CERT=/cache/localhost.cert.pem
+KEY=/cache/localhost.key.pem
+
+# If production.{cert,key}.pem exists, prefer them. This allows
+# user customization of the certificates that FastAPI uses.
+if [ -f /cache/production.cert.pem ]; then
+    CERT=/cache/production.cert.pem
+fi
+if [ -f /cache/production.key.pem ]; then
+    KEY=/cache/production.key.pem
+fi
+
 if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
     exec uvicorn --reload \
-        --ssl-certfile /cache/localhost.cert.pem \
-        --ssl-keyfile /cache/localhost.key.pem \
+        --ssl-certfile "$CERT" \
+        --ssl-keyfile "$KEY" \
         --log-config /docker/logging.conf \
         --host "0.0.0.0" \
         --port 8000 \
         aurweb.asgi:app
 else
     exec hypercorn --reload \
-        --certfile /cache/localhost.cert.pem \
-        --keyfile /cache/localhost.key.pem \
+        --certfile "$CERT" \
+        --keyfile "$KEY" \
         --log-config /docker/logging.conf \
         -b "0.0.0.0:8000" \
         aurweb.asgi:app

From ef0c2d5a285f185143ec8d5c0632f53f28c230a6 Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Sat, 2 Oct 2021 23:54:10 +0200
Subject: [PATCH 353/844] magic

---
 docker-compose.override.yml | 47 +++++++++++++++++++++++++++++++++++++
 docker-compose.prod.yml     | 40 +++++++++++++++++++++++++++++++
 docker-compose.yml          | 39 ++++--------------------------
 3 files changed, 91 insertions(+), 35 deletions(-)
 create mode 100644 docker-compose.override.yml
 create mode 100644 docker-compose.prod.yml

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 00000000..c0bee88c
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,47 @@
+services:
+  ca:
+    volumes:
+      - ./cache:/cache
+
+  git:
+    volumes:
+      - git_data:/aurweb/aur.git
+      - ./cache:/cache
+
+  smartgit:
+    volumes:
+      - git_data:/aurweb/aur.git
+      - ./cache:/cache
+      - smartgit_run:/var/run/smartgit
+
+  php-fpm:
+    volumes:
+      - ./cache:/cache
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
+      - ./templates:/aurweb/templates
+
+  fastapi:
+    volumes:
+      - ./cache:/cache
+      - ./aurweb:/aurweb/aurweb
+      - ./migrations:/aurweb/migrations
+      - ./test:/aurweb/test
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
+      - ./templates:/aurweb/templates
+
+  nginx:
+    volumes:
+      - git_data:/aurweb/aur.git
+      - ./cache:/cache
+      - ./logs:/var/log/nginx
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
+      - smartgit_run:/var/run/smartgit
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
new file mode 100644
index 00000000..1addecb2
--- /dev/null
+++ b/docker-compose.prod.yml
@@ -0,0 +1,40 @@
+version: "3.8"
+
+services:
+  ca:
+    volumes:
+      - cache:/cache
+
+  git:
+    volumes:
+      - git_data:/aurweb/aur.git
+      - cache:/cache
+
+  smartgit:
+    volumes:
+      - git_data:/aurweb/aur.git
+      - cache:/cache
+      - smartgit_run:/var/run/smartgit
+
+  php-fpm:
+    volumes:
+      - cache:/cache
+
+  fastapi:
+    volumes:
+      - cache:/cache
+
+  nginx:
+    volumes:
+      - git_data:/aurweb/aur.git
+      - cache:/cache
+      - logs:/var/log/nginx
+      - smartgit_run:/var/run/smartgit
+
+volumes:
+  mariadb_run: {} # Share /var/run/mysqld/mysqld.sock
+  mariadb_data: {} # Share /var/lib/mysql
+  git_data: {} # Share aurweb/aur.git
+  smartgit_run: {}
+  cache: {}
+  logs: {}
diff --git a/docker-compose.yml b/docker-compose.yml
index 8e2d91d8..f19485e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,8 +27,6 @@ services:
     init: true
     entrypoint: /docker/ca-entrypoint.sh
     command: echo
-    volumes:
-      - ./cache:/cache
 
   memcached:
     build: .
@@ -93,9 +91,6 @@ services:
     depends_on:
       mariadb_init:
         condition: service_started
-    volumes:
-      - git_data:/aurweb/aur.git
-      - ./cache:/cache
 
   smartgit:
     build: .
@@ -110,10 +105,6 @@ services:
     depends_on:
       mariadb:
         condition: service_healthy
-    volumes:
-      - git_data:/aurweb/aur.git
-      - ./cache:/cache
-      - smartgit_run:/var/run/smartgit
 
   cgit-php:
     build: .
@@ -165,15 +156,6 @@ services:
         condition: service_healthy
       memcached:
         condition: service_healthy
-    volumes:
-      - ./cache:/cache
-      - ./aurweb:/aurweb/aurweb
-      - ./migrations:/aurweb/migrations
-      - ./test:/aurweb/test
-      - ./web/html:/aurweb/web/html
-      - ./web/template:/aurweb/web/template
-      - ./web/lib:/aurweb/web/lib
-      - ./templates:/aurweb/templates
     ports:
       - "19000:9000"
 
@@ -195,15 +177,6 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-    volumes:
-      - ./cache:/cache
-      - ./aurweb:/aurweb/aurweb
-      - ./migrations:/aurweb/migrations
-      - ./test:/aurweb/test
-      - ./web/html:/aurweb/web/html
-      - ./web/template:/aurweb/web/template
-      - ./web/lib:/aurweb/web/lib
-      - ./templates:/aurweb/templates
     ports:
       - "18000:8000"
 
@@ -231,18 +204,11 @@ services:
         condition: service_healthy
       php-fpm:
         condition: service_healthy
-    volumes:
-      - git_data:/aurweb/aur.git
-      - ./cache:/cache
-      - ./logs:/var/log/nginx
-      - ./web/html:/aurweb/web/html
-      - ./web/template:/aurweb/web/template
-      - ./web/lib:/aurweb/web/lib
-      - smartgit_run:/var/run/smartgit
 
   sharness:
     build: .
     image: aurweb:latest
+    profiles: ["dev"]
     init: true
     environment:
       - AUR_CONFIG=conf/config.sqlite
@@ -267,6 +233,7 @@ services:
   pytest-mysql:
     build: .
     image: aurweb:latest
+    profiles: ["dev"]
     init: true
     environment:
       - AUR_CONFIG=conf/config
@@ -292,6 +259,7 @@ services:
   pytest-sqlite:
     build: .
     image: aurweb:latest
+    profiles: ["dev"]
     init: true
     environment:
       - AUR_CONFIG=conf/config.sqlite
@@ -313,6 +281,7 @@ services:
   test:
     build: .
     image: aurweb:latest
+    profiles: ["dev"]
     init: true
     environment:
       - AUR_CONFIG=conf/config

From 438080827ab7e3700ad982b91d177ec6cf20dcc9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 2 Oct 2021 15:13:14 -0700
Subject: [PATCH 354/844] fix(Docker): add production config overrides

Additionally, `up -d` will no longer run tests unless `--profile dev`
is specified by the Docker user.

People should now be running docker with two files:

    $ docker-compose -f docker-compose.yml -f docker-compose.override.yml up -d nginx
    $ docker-compose -f docker-compose.yml -f docker-compose.dev.yml run test

Contributed by @klausenbusk. Thanks!

From a3cb81962f6ad29e28f15102cff4aaba4f4b21db Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 2 Oct 2021 16:18:18 -0700
Subject: [PATCH 355/844] add: added aur_request_ml setting to config.dev

For the dev environment, we use a no-op address. We don't want
to be spamming aur-requests with development notifications.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.dev | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/config.dev b/conf/config.dev
index 94a9630b..9f837171 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -35,6 +35,7 @@ cache = none
 memcache_servers = memcached:11211
 ; If cache = 'redis' this address is used to connect to Redis.
 redis_address = redis://127.0.0.1
+aur_request_ml = aur-requests@example-noop.org
 
 [notifications]
 ; For development/testing, use /usr/bin/sendmail

From 4abbf9a917a381141d7adce142df5f158325354c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 2 Oct 2021 16:34:34 -0700
Subject: [PATCH 356/844] fix: use @localhost for dev email addresses

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/config.dev b/conf/config.dev
index 9f837171..ec0b33dc 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -35,7 +35,7 @@ cache = none
 memcache_servers = memcached:11211
 ; If cache = 'redis' this address is used to connect to Redis.
 redis_address = redis://127.0.0.1
-aur_request_ml = aur-requests@example-noop.org
+aur_request_ml = aur-requests@localhost
 
 [notifications]
 ; For development/testing, use /usr/bin/sendmail

From f849e8b696416933282185df2d7581890e748f5a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 27 Sep 2021 13:49:33 -0700
Subject: [PATCH 357/844] change(FastAPI): allow User.notified to accept a
 Package OR PackageBase

In addition, shorten the `package_notifications` relationship to
`notifications`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py                        |  2 +-
 aurweb/models/package_notification.py |  4 ++--
 aurweb/models/user.py                 | 22 +++++++++++++++++++---
 aurweb/routers/packages.py            |  4 +---
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 2e6674b0..19c3a276 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -40,7 +40,7 @@ class AnonymousUser:
     ssh_pub_key = None
 
     # Add stubbed relationship backrefs.
-    package_notifications = StubQuery()
+    notifications = StubQuery()
     package_votes = StubQuery()
 
     # A nonce attribute, needed for all browser sessions; set in __init__.
diff --git a/aurweb/models/package_notification.py b/aurweb/models/package_notification.py
index ab23a212..803c0496 100644
--- a/aurweb/models/package_notification.py
+++ b/aurweb/models/package_notification.py
@@ -15,7 +15,7 @@ class PackageNotification(Base):
         Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
         nullable=False)
     User = relationship(
-        "User", backref=backref("package_notifications", lazy="dynamic"),
+        "User", backref=backref("notifications", lazy="dynamic"),
         foreign_keys=[UserID])
 
     PackageBaseID = Column(
@@ -23,7 +23,7 @@ class PackageNotification(Base):
         nullable=False)
     PackageBase = relationship(
         "PackageBase",
-        backref=backref("package_notifications", lazy="dynamic"),
+        backref=backref("notifications", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
     __mapper_args__ = {"primary_key": [UserID, PackageBaseID]}
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 28aa613e..5f848304 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -191,10 +191,26 @@ class User(Base):
         ).scalar())
 
     def notified(self, package) -> bool:
-        """ Is this User being notified about package? """
+        """ Is this User being notified about package (or package base)?
+
+        :param package: Package or PackageBase instance
+        :return: Boolean indicating state of package notification
+                 in relation to this User
+        """
+        from aurweb.models.package import Package
+        from aurweb.models.package_base import PackageBase
         from aurweb.models.package_notification import PackageNotification
-        return bool(package.PackageBase.package_notifications.filter(
-            PackageNotification.UserID == self.ID
+
+        query = None
+        if isinstance(package, Package):
+            query = package.PackageBase.notifications
+        elif isinstance(package, PackageBase):
+            query = package.notifications
+
+        # Run an exists() query where a pkgbase-related
+        # PackageNotification exists for self (a user).
+        return bool(db.query(
+            query.filter(PackageNotification.UserID == self.ID).exists()
         ).scalar())
 
     def packages(self):
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 72cd8c99..aa20e5fa 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -127,9 +127,7 @@ async def make_single_context(request: Request,
     context["comments"] = pkgbase.comments
     context["is_maintainer"] = (request.user.is_authenticated()
                                 and request.user.ID == pkgbase.MaintainerUID)
-    context["notified"] = request.user.package_notifications.filter(
-        PackageNotification.PackageBaseID == pkgbase.ID
-    ).scalar()
+    context["notified"] = request.user.notified(pkgbase)
 
     context["out_of_date"] = bool(pkgbase.OutOfDateTS)
 

From 5e95cfbc8a844c11682db57186ac01d9732e631d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 27 Sep 2021 14:58:07 -0700
Subject: [PATCH 358/844] fix(FastAPI): get_pkgbase -> get_pkg_or_base

`get_pkgbase` has been replaced with `get_pkg_or_base`, which is
quite similar, but it does take a new `cls` keyword argument which
is to be the model class which we search for via its `Name` column.

Additionally, this change fixes a bug in the `/packages/{name}` route
by supplying the Package object in question to the context and modifying
the template to use it instead of a hacky through-base workaround.

Examples:

    pkgbase = get_pkg_or_base("some_pkgbase_name", PackageBase)
    pkg = get_pkg_or_base("some_package_name", Package)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py      | 22 +++++++++++-----------
 aurweb/routers/packages.py   | 11 +++++++----
 templates/packages/show.html |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 18ac7a5a..696c158f 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -1,6 +1,6 @@
 from collections import defaultdict
 from http import HTTPStatus
-from typing import Dict, List
+from typing import Dict, List, Union
 
 import orjson
 
@@ -101,24 +101,24 @@ def provides_list(package: Package, depname: str) -> list:
     return string
 
 
-def get_pkgbase(name: str) -> PackageBase:
+def get_pkg_or_base(name: str, cls: Union[Package, PackageBase] = PackageBase):
     """ Get a PackageBase instance by its name or raise a 404 if
-    it can't be foudn in the database.
+    it can't be found in the database.
 
-    :param name: PackageBase.Name
-    :raises HTTPException: With status code 404 if PackageBase doesn't exist
-    :return: PackageBase instance
+    :param name: {Package,PackageBase}.Name
+    :raises HTTPException: With status code 404 if record doesn't exist
+    :return: {Package,PackageBase} instance
     """
-    pkgbase = db.query(PackageBase).filter(PackageBase.Name == name).first()
-    if not pkgbase:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
-
     provider = db.query(OfficialProvider).filter(
         OfficialProvider.Name == name).first()
     if provider:
         raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
 
-    return pkgbase
+    instance = db.query(cls).filter(cls.Name == name).first()
+    if cls == PackageBase and not instance:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+
+    return instance
 
 
 @register_filter("out_of_date")
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index aa20e5fa..8fd7717b 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -23,7 +23,7 @@ from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID
 from aurweb.packages.search import PackageSearch
-from aurweb.packages.util import get_pkgbase, query_notified, query_voted
+from aurweb.packages.util import get_pkg_or_base, query_notified, query_voted
 from aurweb.templates import make_context, render_template
 
 router = APIRouter()
@@ -143,11 +143,14 @@ async def make_single_context(request: Request,
 
 @router.get("/packages/{name}")
 async def package(request: Request, name: str) -> Response:
-    # Get the PackageBase.
-    pkgbase = get_pkgbase(name)
+    # Get the Package.
+    pkg = get_pkg_or_base(name, Package)
+    pkgbase = (get_pkg_or_base(name, PackageBase)
+               if not pkg else pkg.PackageBase)
 
     # Add our base information.
     context = await make_single_context(request, pkgbase)
+    context["package"] = pkg
 
     # Package sources.
     context["sources"] = db.query(PackageSource).join(Package).join(
@@ -181,7 +184,7 @@ async def package(request: Request, name: str) -> Response:
 @router.get("/pkgbase/{name}")
 async def package_base(request: Request, name: str) -> Response:
     # Get the PackageBase.
-    pkgbase = get_pkgbase(name)
+    pkgbase = get_pkg_or_base(name, PackageBase)
 
     # If this is not a split package, redirect to /packages/{name}.
     if pkgbase.packages.count() == 1:
diff --git a/templates/packages/show.html b/templates/packages/show.html
index 7480f573..0bf8d9fd 100644
--- a/templates/packages/show.html
+++ b/templates/packages/show.html
@@ -3,7 +3,7 @@
 {% block pageContent %}
     {% include "partials/packages/search.html" %}
     <div id="pkgdetails" class="box">
-        <h2>{{ 'Package Details' | tr }}: {{ pkgbase.Name }} {{ pkgbase.packages.first().Version }}</h2>
+        <h2>{{ 'Package Details' | tr }}: {{ package.Name }} {{ package.Version }}</h2>
 
         {% set result = pkgbase %}
         {% include "partials/packages/actions.html" %}

From 7961fa932a92b3743411a3b5307e5ee6636d6904 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 27 Sep 2021 15:01:45 -0700
Subject: [PATCH 359/844] feat(FastAPI): add templates.render_raw_template

This function is now used as `render_template`'s underlying
implementation of rendering a template, and uses that render
in its HTMLResponse path.

This separation allows users to directly render a template
without producing a Response object.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 09be049c..ef020bdf 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -102,12 +102,8 @@ async def make_variable_context(request: Request, title: str, next: str = None):
     return context
 
 
-def render_template(request: Request,
-                    path: str,
-                    context: dict,
-                    status_code: HTTPStatus = HTTPStatus.OK):
+def render_raw_template(request: Request, path: str, context: dict):
     """ Render a Jinja2 multi-lingual template with some context. """
-
     # Create a deep copy of our jinja2 _environment. The _environment in
     # total by itself is 48 bytes large (according to sys.getsizeof).
     # This is done so we can install gettext translations on the template
@@ -119,8 +115,15 @@ def render_template(request: Request,
     templates.install_gettext_translations(translator)
 
     template = templates.get_template(path)
-    rendered = template.render(context)
+    return template.render(context)
 
+
+def render_template(request: Request,
+                    path: str,
+                    context: dict,
+                    status_code: HTTPStatus = HTTPStatus.OK):
+    """ Render a template as an HTMLResponse. """
+    rendered = render_raw_template(request, path, context)
     response = HTMLResponse(rendered, status_code=status_code)
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURLANG", context.get("language"),

From 0d8216e8eabc96faa48d855a596597a510145cd7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 1 Oct 2021 17:50:23 -0700
Subject: [PATCH 360/844] change(FastAPI): decouple rendercomment logic from
 main

This commit decouples most of the rendercomment.py logic into
a function, `update_comment_render`, which can be used by other
Python modules to perform comment rendering.

In addition, we silence some deprecation warnings from python-markdown
by removing `md_globals` parameters from python-markdown callbacks.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/rendercomment.py | 43 +++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index f6dfd058..dd5da4f9 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import logging
 import sys
 
 import bleach
@@ -9,6 +10,7 @@ import pygit2
 import aurweb.config
 import aurweb.db
 
+logger = logging.getLogger(__name__)
 repo_path = aurweb.config.get('serve', 'repo-path')
 commit_uri = aurweb.config.get('options', 'commit_uri')
 
@@ -24,7 +26,7 @@ class LinkifyExtension(markdown.extensions.Extension):
     _urlre = (r'(\b(?:https?|ftp):\/\/[\w\/\#~:.?+=&%@!\-;,]+?'
               r'(?=[.:?\-;,]*(?:[^\w\/\#~:.?+=&%@!\-;,]|$)))')
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         processor = markdown.inlinepatterns.AutolinkInlineProcessor(self._urlre, md)
         # Register it right after the default <>-link processor (priority 120).
         md.inlinePatterns.register(processor, 'linkify', 119)
@@ -46,7 +48,7 @@ class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor):
 
 
 class FlysprayLinksExtension(markdown.extensions.Extension):
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         processor = FlysprayLinksInlineProcessor(r'\bFS#(\d+)\b', md)
         md.inlinePatterns.register(processor, 'flyspray-links', 118)
 
@@ -90,9 +92,12 @@ class GitCommitsExtension(markdown.extensions.Extension):
         self._head = head
         super(markdown.extensions.Extension, self).__init__()
 
-    def extendMarkdown(self, md, md_globals):
-        processor = GitCommitsInlineProcessor(md, self._head)
-        md.inlinePatterns.register(processor, 'git-commits', 117)
+    def extendMarkdown(self, md):
+        try:
+            processor = GitCommitsInlineProcessor(md, self._head)
+            md.inlinePatterns.register(processor, 'git-commits', 117)
+        except pygit2.GitError:
+            logger.error(f"No git repository found for '{self._head}'.")
 
 
 class HeadingTreeprocessor(markdown.treeprocessors.Treeprocessor):
@@ -105,7 +110,7 @@ class HeadingTreeprocessor(markdown.treeprocessors.Treeprocessor):
 
 
 class HeadingExtension(markdown.extensions.Extension):
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         # Priority doesn't matter since we don't conflict with other processors.
         md.treeprocessors.register(HeadingTreeprocessor(md), 'heading', 30)
 
@@ -123,19 +128,20 @@ def save_rendered_comment(conn, commentid, html):
                  [html, commentid])
 
 
-def main():
-    commentid = int(sys.argv[1])
-
+def update_comment_render(commentid):
     conn = aurweb.db.Connection()
 
     text, pkgbase = get_comment(conn, commentid)
-    html = markdown.markdown(text, extensions=['fenced_code',
-                                               LinkifyExtension(),
-                                               FlysprayLinksExtension(),
-                                               GitCommitsExtension(pkgbase),
-                                               HeadingExtension()])
-    allowed_tags = (bleach.sanitizer.ALLOWED_TAGS +
-                    ['p', 'pre', 'h4', 'h5', 'h6', 'br', 'hr'])
+    html = markdown.markdown(text, extensions=[
+        'fenced_code',
+        LinkifyExtension(),
+        FlysprayLinksExtension(),
+        GitCommitsExtension(pkgbase),
+        HeadingExtension()
+    ])
+
+    allowed_tags = (bleach.sanitizer.ALLOWED_TAGS
+                    + ['p', 'pre', 'h4', 'h5', 'h6', 'br', 'hr'])
     html = bleach.clean(html, tags=allowed_tags)
     save_rendered_comment(conn, commentid, html)
 
@@ -143,5 +149,10 @@ def main():
     conn.close()
 
 
+def main():
+    commentid = int(sys.argv[1])
+    update_comment_render(commentid)
+
+
 if __name__ == '__main__':
     main()

From fc28aad245a0350ec3190fc484543bae4612883d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 27 Sep 2021 18:46:20 -0700
Subject: [PATCH 361/844] feat(FastAPI): add pkgbase comments (new, edit)

In PHP, this was implemented using an /rpc type 'get-comment-form'.
With FastAPI, we've decided to reorganize this into a non-RPC route:
`/pkgbase/{name}/comments/{id}/form`, rendered via the new
`templates/partials/packages/comment_form.html` template.

When the comment_form.html template is provided a `comment` object,
it will produce an edit comment form. Otherwise, it will produce a new
comment form.

A few new FastAPI routes have been introduced:

- GET `/pkgbase/{name}/comments/{id}/form`
    - Produces a JSON response based on {"form": "<form_markup>"}.
- POST `/pkgbase/{name}/comments'
    - Creates a new comment.
- POST `/pkgbase/{name}/comments/{id}`
    - Edits an existing comment.

In addition, some Javascript has been modified for our new routes.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py                       |   8 ++
 aurweb/routers/packages.py                    | 105 +++++++++++++-
 templates/partials/packages/comment.html      |  50 ++++---
 templates/partials/packages/comment_form.html |  46 ++++++
 templates/partials/packages/comments.html     |  70 +++------
 test/test_packages_routes.py                  | 133 ++++++++++++++++++
 6 files changed, 333 insertions(+), 79 deletions(-)
 create mode 100644 templates/partials/packages/comment_form.html

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 696c158f..55149127 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -11,6 +11,7 @@ from aurweb import db
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comment import PackageComment
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
@@ -121,6 +122,13 @@ def get_pkg_or_base(name: str, cls: Union[Package, PackageBase] = PackageBase):
     return instance
 
 
+def get_pkgbase_comment(pkgbase: PackageBase, id: int) -> PackageComment:
+    comment = pkgbase.comments.filter(PackageComment.ID == id).first()
+    if not comment:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+    return comment
+
+
 @register_filter("out_of_date")
 def out_of_date(packages: orm.Query) -> orm.Query:
     return packages.filter(PackageBase.OutOfDateTS.isnot(None))
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 8fd7717b..d5c99e8d 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -1,8 +1,9 @@
+from datetime import datetime
 from http import HTTPStatus
 from typing import Any, Dict
 
-from fastapi import APIRouter, Request, Response
-from fastapi.responses import RedirectResponse
+from fastapi import APIRouter, Form, HTTPException, Request, Response
+from fastapi.responses import JSONResponse, RedirectResponse
 from sqlalchemy import and_
 
 import aurweb.filters
@@ -11,9 +12,11 @@ import aurweb.models.package_keyword
 import aurweb.packages.util
 
 from aurweb import db
+from aurweb.auth import auth_required
 from aurweb.models.license import License
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comment import PackageComment
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_license import PackageLicense
 from aurweb.models.package_notification import PackageNotification
@@ -23,8 +26,9 @@ from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID
 from aurweb.packages.search import PackageSearch
-from aurweb.packages.util import get_pkg_or_base, query_notified, query_voted
-from aurweb.templates import make_context, render_template
+from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
+from aurweb.scripts.rendercomment import update_comment_render
+from aurweb.templates import make_context, render_raw_template, render_template
 
 router = APIRouter()
 
@@ -124,7 +128,9 @@ async def make_single_context(request: Request,
     context["pkgbase"] = pkgbase
     context["packages_count"] = pkgbase.packages.count()
     context["keywords"] = pkgbase.keywords
-    context["comments"] = pkgbase.comments
+    context["comments"] = pkgbase.comments.order_by(
+        PackageComment.CommentTS.desc()
+    )
     context["is_maintainer"] = (request.user.is_authenticated()
                                 and request.user.ID == pkgbase.MaintainerUID)
     context["notified"] = request.user.notified(pkgbase)
@@ -201,7 +207,94 @@ async def package_base(request: Request, name: str) -> Response:
 @router.get("/pkgbase/{name}/voters")
 async def package_base_voters(request: Request, name: str) -> Response:
     # Get the PackageBase.
-    pkgbase = get_pkgbase(name)
+    pkgbase = get_pkg_or_base(name, PackageBase)
     context = make_context(request, "Voters")
     context["pkgbase"] = pkgbase
     return render_template(request, "pkgbase/voters.html", context)
+
+
+@router.post("/pkgbase/{name}/comments")
+@auth_required(True)
+async def pkgbase_comments_post(
+        request: Request, name: str,
+        comment: str = Form(default=str()),
+        enable_notifications: bool = Form(default=False)):
+    """ Add a new comment. """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    if not comment:
+        raise HTTPException(status_code=int(HTTPStatus.EXPECTATION_FAILED))
+
+    # If the provided comment is different than the record's version,
+    # update the db record.
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment = db.create(PackageComment, User=request.user,
+                            PackageBase=pkgbase,
+                            Comments=comment, RenderedComment=str(),
+                            CommentTS=now)
+
+        if enable_notifications and not request.user.notified(pkgbase):
+            db.create(PackageNotification,
+                      User=request.user,
+                      PackageBase=pkgbase)
+    update_comment_render(comment.ID)
+
+    # Redirect to the pkgbase page.
+    return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{comment.ID}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.get("/pkgbase/{name}/comments/{id}/form")
+@auth_required(True)
+async def pkgbase_comment_form(request: Request, name: str, id: int):
+    """ Produce a comment form for comment {id}. """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = pkgbase.comments.filter(PackageComment.ID == id).first()
+    if not comment:
+        return JSONResponse({}, status_code=int(HTTPStatus.NOT_FOUND))
+
+    if not request.user.is_elevated() and request.user != comment.User:
+        return JSONResponse({}, status_code=int(HTTPStatus.UNAUTHORIZED))
+
+    context = await make_single_context(request, pkgbase)
+    context["comment"] = comment
+
+    form = render_raw_template(
+        request, "partials/packages/comment_form.html", context)
+    return JSONResponse({"form": form})
+
+
+@router.post("/pkgbase/{name}/comments/{id}")
+@auth_required(True)
+async def pkgbase_comment_post(
+        request: Request, name: str, id: int,
+        comment: str = Form(default=str()),
+        enable_notifications: bool = Form(default=False)):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    db_comment = get_pkgbase_comment(pkgbase, id)
+
+    if not comment:
+        raise HTTPException(status_code=int(HTTPStatus.EXPECTATION_FAILED))
+
+    # If the provided comment is different than the record's version,
+    # update the db record.
+    now = int(datetime.utcnow().timestamp())
+    if db_comment.Comments != comment:
+        with db.begin():
+            db_comment.Comments = comment
+            db_comment.Editor = request.user
+            db_comment.EditedTS = now
+
+            db_notif = request.user.notifications.filter(
+                PackageNotification.PackageBaseID == pkgbase.ID
+            ).first()
+            if enable_notifications and not db_notif:
+                db.create(PackageNotification,
+                          User=request.user,
+                          PackageBase=pkgbase)
+    update_comment_render(db_comment.ID)
+
+    # Redirect to the pkgbase page anchored to the updated comment.
+    return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{db_comment.ID}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/partials/packages/comment.html b/templates/partials/packages/comment.html
index 6cf5f319..36696215 100644
--- a/templates/partials/packages/comment.html
+++ b/templates/partials/packages/comment.html
@@ -16,26 +16,38 @@
     )
     | safe
     }}
-    {% if is_maintainer %}
-    <form class="delete-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
-        <fieldset style="display:inline;">
-            <input type="hidden" name="action" value="do_DeleteComment" />
-            <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
-            <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
-            <input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="{{ 'Delete comment' | tr }}" title="{{ 'Delete comment' | tr }}" name="submit" value="1" />
-        </fieldset>
-    </form>
-    <a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
+    {% if comment.Editor %}
+        {% set edited_on = comment.EditedTS | dt | as_timezone(timezone) %}
+        <span class="edited">
+            ({{ "edited on %s by %s" | tr
+            | format(edited_on.strftime('%Y-%m-%d %H:%M'),
+            '<a href="/account/%s">%s</a>' | format(
+            comment.Editor.Username, comment.Editor.Username))
+            | safe
+            }})
+        </span>
+    {% endif %}
+    {% if request.user.is_elevated() or pkgbase.Maintainer == request.user %}
+        <form class="delete-comment-form" method="post" action="/pkgbase/{{ name }}/">
+            <fieldset style="display:inline;">
+                <input type="hidden" name="action" value="do_DeleteComment" />
+                <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
+                <input type="hidden" name="return_to" value="/pkgbase/{{ name }}/"/>
+                <input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="{{ 'Delete comment' | tr }}" title="{{ 'Delete comment' | tr }}" name="submit" value="1" />
+            </fieldset>
+        </form>
+        <a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
+
+        <form class="pin-comment-form" method="post" action="/pkgbase/{{ name }}/">
+            <fieldset style="display:inline;">
+                <input type="hidden" name="action" value="do_PinComment"/>
+                <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
+                <input type="hidden" name="package_base" value="{{ pkgbase.ID }}"/>
+                <input type="hidden" name="return_to" value="/pkgbase/{{ name }}/"/>
+                <input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="{{ 'Pin comment' | tr }}" title="{{ 'Pin comment' | tr }}" name="submit" value="1"/>
+            </fieldset>
+        </form>
     {% endif %}
-    <form class="pin-comment-form" method="post" action="/pkgbase/{{ pkgname }}/">
-        <fieldset style="display:inline;">
-            <input type="hidden" name="action" value="do_PinComment"/>
-            <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
-            <input type="hidden" name="package_base" value="{{ pkgbase_id }}"/>
-            <input type="hidden" name="return_to" value="/pkgbase/{{ pkgname }}/"/>
-            <input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="{{ 'Pin comment' | tr }}" title="{{ 'Pin comment' | tr }}" name="submit" value="1"/>
-        </fieldset>
-    </form>
 </h4>
 <div id="comment-{{ comment.ID }}-content" class="article-content">
     <div>
diff --git a/templates/partials/packages/comment_form.html b/templates/partials/packages/comment_form.html
new file mode 100644
index 00000000..c1c25f87
--- /dev/null
+++ b/templates/partials/packages/comment_form.html
@@ -0,0 +1,46 @@
+{# `action` is assigned the proper route to use for the form action.
+When `comment` is provided (PackageComment), we display an edit form
+for the comment. Otherwise, we display a new form.
+
+Routes:
+    new comment  - /pkgbase/{name}/comments
+    edit comment - /pkgbase/{name}/comments/{id}
+#}
+{% set action = "/pkgbase/%s/comments" | format(pkgbase.Name) %}
+{% if comment %}
+    {% set action = "/pkgbase/%s/comments/%d" | format(pkgbase.Name, comment.ID) %}
+{% endif %}
+
+<form action="{{ action }}" method="post">
+    <fieldset>
+        <p>
+            {{ "Git commit identifiers referencing commits in the AUR package "
+            "repository and URLs are converted to links automatically." | tr }}
+            {{ "%sMarkdown syntax%s is partially supported." | tr
+            | format('<a href="https://daringfireball.net/projects/markdown/syntax">',
+                     "</a>")
+            | safe }}
+        </p>
+        <p>
+        <textarea id="id_comment"
+                  name="comment"
+                  cols="80"
+                  rows="10"
+        >{% if comment %}{{ comment.Comments or '' }}{% endif %}</textarea>
+        </p>
+        <p>
+            <button type="submit" class="button">
+                {{ ("Save" if comment else "Add Comment") | tr }}
+            </button>
+            {% if comment and not request.user.notified(pkgbase) %}
+                <span class="comment-enable-notifications">
+                    <input type="checkbox" name="enable_notifications"
+                           id="id_enable_notifications" />
+                    <label for="id_enable_notifications">
+                        {{ "Enable notifications" | tr }}
+                    </label>
+                </span>
+            {% endif %}
+        </p>
+    </fieldset>
+</form>
diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
index 39cfb363..7c8a32e5 100644
--- a/templates/partials/packages/comments.html
+++ b/templates/partials/packages/comments.html
@@ -8,44 +8,7 @@
 {% if request.user.is_authenticated() %}
 <div id="generic-form" class="box">
     <h2>Add Comment</h2>
-    <form action="/pkgbase/{{ pkgname }}/" method="post">
-        <fieldset>
-            <div>
-                <input type="hidden" name="action" value="do_AddComment"/>
-                <input type="hidden" name="ID" value="{{ pkgbase_id }}"/>
-            </div>
-            <p>
-                {{
-                "Git commit identifiers referencing commits in the AUR package"
-                " repository and URLs are converted to links automatically."
-                | tr
-                }}
-                {{
-                "%sMarkdown Syntax%s is partially supported."
-                | tr
-                | format('<a href="https://daringfireball.net/projects/markdown/syntax">', '</a>')
-                | safe
-                }}
-            </p>
-            <p>
-                <textarea id="id_comment" name="comment" cols="80" rows="10"></textarea>
-            </p>
-            <p>
-                <input type="submit" value="{{ 'Add Comment' | tr }}"/>
-                {% if not notifications_enabled %}
-                    <span class="comment-enable-notifications">
-                        <input id="id_enable_notifications"
-                               type="checkbox"
-                               name="enable_notifications"
-                        />
-                        <label for="id_enable_notifications">
-                            {{ "Enable notifications" | tr }}
-                        </label>
-                    </span>
-                {% endif %}
-            </p>
-        </fieldset>
-    </form>
+    {% include "partials/packages/comment_form.html" %}
 </div>
 {% endif %}
 
@@ -99,29 +62,28 @@ function handleEditCommentClick(event) {
     // The div class="article-content" which contains the comment
     const edit_form = parent_element.nextElementSibling;
 
-    const params = new URLSearchParams({
-        type: "get-comment-form",
-        arg: comment_id,
-        base_id: {{ pkgbase.ID }},
-        pkgbase_name: {{ pkgbase.Name }}
-    });
-
-    const url = '/rpc?' + params.toString();
+    const url = "/pkgbase/{{ pkgbase.Name }}/comments/" + comment_id + "/form";
 
     add_busy_indicator(event.target);
 
     fetch(url, {
-        method: 'GET'
+        method: 'GET',
+        credentials: 'same-origin'
+    })
+    .then(function(response) {
+        if (!response.ok) {
+            throw Error(response.statusText);
+        }
+        return response.json();
     })
-    .then(function(response) { return response.json(); })
     .then(function(data) {
         remove_busy_indicator(event.target);
-        if (data.success) {
-            edit_form.innerHTML = data.form;
-            edit_form.querySelector('textarea').focus();
-        } else {
-            alert(data.error);
-        }
+        edit_form.innerHTML = data.form;
+        edit_form.querySelector('textarea').focus();
+    })
+    .catch(function(error) {
+        remove_busy_indicator(event.target);
+        console.error(error);
     });
 }
 
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 2190dc18..1bfa5fc0 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -73,6 +73,7 @@ def setup():
         PackageVote.__tablename__,
         PackageNotification.__tablename__,
         PackageComaintainer.__tablename__,
+        PackageComment.__tablename__,
         OfficialProvider.__tablename__
     )
 
@@ -930,3 +931,135 @@ def test_pkgbase_voters(client: TestClient, maintainer: User, package: Package):
     root = parse_root(resp.text)
     rows = root.xpath('//div[@class="box"]//ul/li')
     assert len(rows) == 1
+
+
+def test_pkgbase_comment_not_found(client: TestClient, maintainer: User,
+                                   package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = 12345  # A non-existing comment.
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments/{comment_id}"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comment": "Failure"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comment_form_unauthorized(client: TestClient, user: User,
+                                           maintainer: User, package: Package):
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment = db.create(PackageComment, PackageBase=package.PackageBase,
+                            User=maintainer, Comments="Test",
+                            RenderedComment=str(), CommentTS=now)
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/form"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comment_form_not_found(client: TestClient, maintainer: User,
+                                        package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = 12345  # A non-existing comment.
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/form"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comments_missing_comment(client: TestClient, maintainer: User,
+                                          package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+
+
+def test_pkgbase_comments(client: TestClient, maintainer: User,
+                          package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comment": "Test comment.",
+            "enable_notifications": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    expected_prefix = f"/pkgbase/{pkgbasename}"
+    prefix_len = len(expected_prefix)
+    assert resp.headers.get("location")[:prefix_len] == expected_prefix
+
+    with client as request:
+        resp = request.get(resp.headers.get("location"))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    headers = root.xpath('//h4[@class="comment-header"]')
+    bodies = root.xpath('//div[@class="article-content"]/div/p')
+
+    assert len(headers) == 1
+    assert len(bodies) == 1
+
+    assert bodies[0].text.strip() == "Test comment."
+
+    # Clear up the PackageNotification. This doubles as testing
+    # that the notification was created and clears it up so we can
+    # test enabling it during edit.
+    pkgbase = package.PackageBase
+    db_notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == maintainer.ID
+    ).first()
+    with db.begin():
+        db.session.delete(db_notif)
+
+    # Now, let's edit the comment we just created.
+    comment_id = int(headers[0].attrib["id"].split("-")[-1])
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comment": "Edited comment.",
+            "enable_notifications": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    with client as request:
+        resp = request.get(resp.headers.get("location"))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    headers = root.xpath('//h4[@class="comment-header"]')
+    bodies = root.xpath('//div[@class="article-content"]/div/p')
+
+    assert len(headers) == 1
+    assert len(bodies) == 1
+
+    assert bodies[0].text.strip() == "Edited comment."
+
+    # Ensure that a notification was created.
+    db_notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == maintainer.ID
+    ).first()
+    assert db_notif is not None
+
+    # Don't supply a comment; should return EXPECTATION_FAILED.
+    with client as request:
+        fail_resp = request.post(endpoint, cookies=cookies)
+    assert fail_resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+
+    # Now, test the form route, which should return form markup
+    # via JSON.
+    endpoint = f"{endpoint}/form"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    data = resp.json()
+    assert "form" in data

From 59d04d6e0c50d3b0443dae29715de63f197be890 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 30 Sep 2021 13:53:31 -0700
Subject: [PATCH 362/844] fix(FastAPI): comment.html template rendering

Deleters and edits were not previously taken into account.
This fix addresses that issue using User.has_credential.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/comment.html | 148 ++++++++++++++---------
 1 file changed, 89 insertions(+), 59 deletions(-)

diff --git a/templates/partials/packages/comment.html b/templates/partials/packages/comment.html
index 36696215..6af5cd9e 100644
--- a/templates/partials/packages/comment.html
+++ b/templates/partials/packages/comment.html
@@ -1,60 +1,90 @@
-<h4 id="comment-{{ comment.ID }}" class="comment-header">
-    {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
-    {% set view_account_info = 'View account information for %s' | tr | format(comment.User.Username) %}
-    {{
-    "%s commented on %s" | tr | format(
-        ('<a href="/account/%s" title="%s">%s</a>' | format(
-            comment.User.Username,
-            view_account_info,
-            comment.User.Username
-        )) if request.user.is_authenticated() else
-        (comment.User.Username),
-        '<a href="#comment-%s" class="date">%s</a>' | format(
-            comment.ID,
-            commented_at.strftime("%Y-%m-%d %H:%M")
-        )
-    )
-    | safe
-    }}
-    {% if comment.Editor %}
-        {% set edited_on = comment.EditedTS | dt | as_timezone(timezone) %}
-        <span class="edited">
-            ({{ "edited on %s by %s" | tr
-            | format(edited_on.strftime('%Y-%m-%d %H:%M'),
-            '<a href="/account/%s">%s</a>' | format(
-            comment.Editor.Username, comment.Editor.Username))
-            | safe
-            }})
-        </span>
-    {% endif %}
-    {% if request.user.is_elevated() or pkgbase.Maintainer == request.user %}
-        <form class="delete-comment-form" method="post" action="/pkgbase/{{ name }}/">
-            <fieldset style="display:inline;">
-                <input type="hidden" name="action" value="do_DeleteComment" />
-                <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
-                <input type="hidden" name="return_to" value="/pkgbase/{{ name }}/"/>
-                <input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="{{ 'Delete comment' | tr }}" title="{{ 'Delete comment' | tr }}" name="submit" value="1" />
-            </fieldset>
-        </form>
-        <a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
+{% set header_cls = "comment-header" %}
+{% set article_cls = "article-content" %}
+{% if comment.Deleter %}
+	{% set header_cls = "%s %s" | format(header_cls, "comment-deleted") %}
+	{% set article_cls = "%s %s" | format(article_cls, "comment-deleted") %}
+{% endif %}
 
-        <form class="pin-comment-form" method="post" action="/pkgbase/{{ name }}/">
-            <fieldset style="display:inline;">
-                <input type="hidden" name="action" value="do_PinComment"/>
-                <input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
-                <input type="hidden" name="package_base" value="{{ pkgbase.ID }}"/>
-                <input type="hidden" name="return_to" value="/pkgbase/{{ name }}/"/>
-                <input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="{{ 'Pin comment' | tr }}" title="{{ 'Pin comment' | tr }}" name="submit" value="1"/>
-            </fieldset>
-        </form>
-    {% endif %}
-</h4>
-<div id="comment-{{ comment.ID }}-content" class="article-content">
-    <div>
-        {% if comment.RenderedComment %}
-            {{ comment.RenderedComment | safe }}
-        {% else %}
-            {{ comment.Comments }}
-        {% endif %}
-    </div>
-</div>
+{% if not comment.Deleter or request.user.has_credential("CRED_COMMENT_VIEW_DELETED", approved=[comment.Deleter]) %}
+	<h4 id="comment-{{ comment.ID }}" class="{{ header_cls }}">
+		{% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
+		{% set view_account_info = 'View account information for %s' | tr | format(comment.User.Username) %}
+		{{
+		"%s commented on %s" | tr | format(
+			('<a href="/account/%s" title="%s">%s</a>' | format(
+				comment.User.Username,
+				view_account_info,
+				comment.User.Username
+			)) if request.user.is_authenticated() else
+			(comment.User.Username),
+			'<a href="#comment-%s" class="date">%s</a>' | format(
+				comment.ID,
+				commented_at.strftime("%Y-%m-%d %H:%M")
+			)
+		)
+		| safe
+		}}
+		{% if comment.Editor %}
+			{% set edited_on = comment.EditedTS | dt | as_timezone(timezone) %}
+			<span class="edited">
+				({{ "edited on %s by %s" | tr
+				| format(edited_on.strftime('%Y-%m-%d %H:%M'),
+				'<a href="/account/%s">%s</a>' | format(
+				comment.Editor.Username, comment.Editor.Username))
+				| safe
+				}})
+			</span>
+		{% endif %}
+		{% if not comment.Deleter %}
+			{% if request.user.has_credential('CRED_COMMENT_DELETE', approved=[comment.User]) %}
+				<form class="delete-comment-form" method="post"
+					  action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/delete">
+					<fieldset style="display:inline;">
+						<input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="{{ 'Delete comment' | tr }}" title="{{ 'Delete comment' | tr }}" name="submit" value="1" />
+					</fieldset>
+				</form>
+			{% endif %}
+
+			{% if request.user.has_credential('CRED_COMMENT_EDIT', approved=[comment.User]) %}
+				<a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
+			{% endif %}
+
+			{% if request.user.has_credential("CRED_COMMENT_PIN", approved=[pkgbase.Maintainer]) %}
+				<form class="pin-comment-form" method="post" action="/pkgbase/{{ name }}/">
+					<fieldset style="display:inline;">
+						<input type="hidden" name="action" value="do_PinComment"/>
+						<input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
+						<input type="hidden" name="package_base" value="{{ pkgbase.ID }}"/>
+						<input type="hidden" name="return_to" value="/pkgbase/{{ name }}/"/>
+						<input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="{{ 'Pin comment' | tr }}" title="{{ 'Pin comment' | tr }}" name="submit" value="1"/>
+					</fieldset>
+				</form>
+			{% endif %}
+		{% else %}
+			{% if request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
+				<form class="undelete-comment-form"
+					  method="post"
+					  action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/undelete"
+				>
+					<fieldset style="display:inline;">
+						<input type="image"
+							   class="undelete-comment"
+							   src="/images/action-undo.min.svg"
+							   alt="{{ 'Undelete comment' | tr }}"
+							   title="{{ 'Undelete comment' | tr }}"
+							   name="submit" value="1" width="11" height="11" />
+					</fieldset>
+				</form>
+			{% endif %}
+		{% endif %}
+	</h4>
+	<div id="comment-{{ comment.ID }}-content" class="{{ article_cls }}">
+		<div>
+			{% if comment.RenderedComment %}
+				{{ comment.RenderedComment | safe }}
+			{% else %}
+				{{ comment.Comments }}
+			{% endif %}
+		</div>
+	</div>
+{% endif %}

From 6644c42922ad4645104bef114e1685973ea1a92d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 30 Sep 2021 13:56:14 -0700
Subject: [PATCH 363/844] fix(FastAPI): AnonymousUser.has_credential also takes
 kwargs

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py    | 2 +-
 test/test_auth.py | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 19c3a276..d1a9d9cb 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -66,7 +66,7 @@ class AnonymousUser:
         return False
 
     @staticmethod
-    def has_credential(credential):
+    def has_credential(credential, **kwargs):
         return False
 
     @staticmethod
diff --git a/test/test_auth.py b/test/test_auth.py
index ced64064..7aea17a0 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -117,3 +117,8 @@ def test_voted_for():
 def test_notified():
     user_ = AnonymousUser()
     assert not user_.notified(None)
+
+
+def test_has_credential():
+    user_ = AnonymousUser()
+    assert not user_.has_credential("FAKE_CREDENTIAL")

From d3be30744ccfe6556f0299d08a1bf8bc63b2ae44 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 1 Oct 2021 15:44:24 -0700
Subject: [PATCH 364/844] add(FeatAPI): comment pytest.fixture

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_packages_routes.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 1bfa5fc0..93a7f524 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -125,6 +125,20 @@ def package(maintainer: User) -> Package:
     yield package
 
 
+@pytest.fixture
+def comment(user: User, package: Package) -> PackageComment:
+    pkgbase = package.PackageBase
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment = db.create(PackageComment,
+                            User=user,
+                            PackageBase=pkgbase,
+                            Comments="Test comment.",
+                            RenderedComment=str(),
+                            CommentTS=now)
+    yield comment
+
+
 @pytest.fixture
 def packages(maintainer: User) -> List[Package]:
     """ Yield 55 packages named pkg_0 .. pkg_54. """

From 40cd1b9029cc50e41c21d69e502947996862b7b4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 30 Sep 2021 13:58:37 -0700
Subject: [PATCH 365/844] feat(FastAPI): add
 /pkgbase/{name}/comments/{id}/delete (post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 25 ++++++++++++++++++++-
 test/test_packages_routes.py | 43 +++++++++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index d5c99e8d..3a5ca047 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -11,7 +11,7 @@ import aurweb.models.package_comment
 import aurweb.models.package_keyword
 import aurweb.packages.util
 
-from aurweb import db
+from aurweb import db, l10n
 from aurweb.auth import auth_required
 from aurweb.models.license import License
 from aurweb.models.package import Package
@@ -298,3 +298,26 @@ async def pkgbase_comment_post(
     # Redirect to the pkgbase page anchored to the updated comment.
     return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{db_comment.ID}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/comments/{id}/delete")
+@auth_required(True)
+async def pkgbase_comment_delete(request: Request, name: str, id: int):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    authorized = request.user.has_credential("CRED_COMMENT_DELETE",
+                                             [comment.User])
+    if not authorized:
+        _ = l10n.get_translator_for_request(request)
+        raise HTTPException(
+            status_code=int(HTTPStatus.UNAUTHORIZED),
+            detail=_("You are not allowed to delete this comment."))
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment.Deleter = request.user
+        comment.DelTS = now
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 93a7f524..eb3da41a 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -995,7 +995,7 @@ def test_pkgbase_comments_missing_comment(client: TestClient, maintainer: User,
     assert resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
 
 
-def test_pkgbase_comments(client: TestClient, maintainer: User,
+def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
                           package: Package):
     cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
     pkgbasename = package.PackageBase.Name
@@ -1077,3 +1077,44 @@ def test_pkgbase_comments(client: TestClient, maintainer: User,
 
     data = resp.json()
     assert "form" in data
+
+
+def test_pkgbase_comment_delete(client: TestClient,
+                                user: User,
+                                package: Package,
+                                comment: PackageComment):
+    # Test the unauthorized case of comment deletion.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/delete"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    expected = f"/pkgbase/{pkgbasename}"
+    assert resp.headers.get("location") == expected
+
+
+def test_pkgbase_comment_delete_unauthorized(client: TestClient,
+                                             maintainer: User,
+                                             package: Package,
+                                             comment: PackageComment):
+    # Test the unauthorized case of comment deletion.
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/delete"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comment_delete_not_found(client: TestClient,
+                                          maintainer: User,
+                                          package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = 12345  # Non-existing comment.
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/delete"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)

From bb45ae7ac3f8da424c51051981bc6af91742e70e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 30 Sep 2021 19:48:25 -0700
Subject: [PATCH 366/844] feat(FastAPI): add
 /pkgbase/{name}/comments/{id}/undelete (post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 22 ++++++++++++++++++++++
 test/test_packages_routes.py | 25 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 3a5ca047..92fc9361 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -321,3 +321,25 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int):
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/comments/{id}/undelete")
+@auth_required(True)
+async def pkgbase_comment_undelete(request: Request, name: str, id: int):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    has_cred = request.user.has_credential("CRED_COMMENT_UNDELETE",
+                                           approved=[comment.User])
+    if not has_cred:
+        _ = l10n.get_translator_for_request(request)
+        raise HTTPException(
+            status_code=int(HTTPStatus.UNAUTHORIZED),
+            detail=_("You are not allowed to undelete this comment."))
+
+    with db.begin():
+        comment.Deleter = None
+        comment.DelTS = None
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index eb3da41a..47b5ed81 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1080,6 +1080,7 @@ def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
 
 
 def test_pkgbase_comment_delete(client: TestClient,
+                                maintainer: User,
                                 user: User,
                                 package: Package,
                                 comment: PackageComment):
@@ -1094,6 +1095,18 @@ def test_pkgbase_comment_delete(client: TestClient,
     expected = f"/pkgbase/{pkgbasename}"
     assert resp.headers.get("location") == expected
 
+    # Test the unauthorized case of comment undeletion.
+    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/undelete"
+    with client as request:
+        resp = request.post(endpoint, cookies=maint_cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+    # And move on to undeleting it.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
 
 def test_pkgbase_comment_delete_unauthorized(client: TestClient,
                                              maintainer: User,
@@ -1118,3 +1131,15 @@ def test_pkgbase_comment_delete_not_found(client: TestClient,
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comment_undelete_not_found(client: TestClient,
+                                            maintainer: User,
+                                            package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = 12345  # Non-existing comment.
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/undelete"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)

From 0895dd07ee621d24007a30b4f3d076d7b55c23f0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 1 Oct 2021 15:47:16 -0700
Subject: [PATCH 367/844] feat(FastAPI): add /pkgbase/{name}/comments/{id}/pin
 (post)

In addition, fix up some templates to display pinned comments,
and include the unpin form input for pinned comments, which is
not yet implemented.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py                | 26 ++++++++++++++
 templates/packages/show.html              |  4 +--
 templates/partials/packages/comment.html  | 42 +++++++++++++++++------
 templates/partials/packages/comments.html | 16 ++++++++-
 test/test_packages_routes.py              | 26 ++++++++++++++
 5 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 92fc9361..681cde4f 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -131,6 +131,10 @@ async def make_single_context(request: Request,
     context["comments"] = pkgbase.comments.order_by(
         PackageComment.CommentTS.desc()
     )
+    context["pinned_comments"] = pkgbase.comments.filter(
+        PackageComment.PinnedTS != 0
+    ).order_by(PackageComment.CommentTS.desc())
+
     context["is_maintainer"] = (request.user.is_authenticated()
                                 and request.user.ID == pkgbase.MaintainerUID)
     context["notified"] = request.user.notified(pkgbase)
@@ -343,3 +347,25 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int):
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/comments/{id}/pin")
+@auth_required(True)
+async def pkgbase_comment_pin(request: Request, name: str, id: int):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    has_cred = request.user.has_credential("CRED_COMMENT_PIN",
+                                           approved=[pkgbase.Maintainer])
+    if not has_cred:
+        _ = l10n.get_translator_for_request(request)
+        raise HTTPException(
+            status_code=int(HTTPStatus.UNAUTHORIZED),
+            detail=_("You are not allowed to pin this comment."))
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment.PinnedTS = now
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/packages/show.html b/templates/packages/show.html
index 0bf8d9fd..ba531fc8 100644
--- a/templates/packages/show.html
+++ b/templates/packages/show.html
@@ -18,7 +18,5 @@
 
     {% set pkgname = result.Name %}
     {% set pkgbase_id = result.ID %}
-    {% if comments.count() %}
-        {% include "partials/packages/comments.html" %}
-    {% endif %}
+    {% include "partials/packages/comments.html" %}
 {% endblock %}
diff --git a/templates/partials/packages/comment.html b/templates/partials/packages/comment.html
index 6af5cd9e..97f11723 100644
--- a/templates/partials/packages/comment.html
+++ b/templates/partials/packages/comment.html
@@ -49,16 +49,38 @@
 				<a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
 			{% endif %}
 
-			{% if request.user.has_credential("CRED_COMMENT_PIN", approved=[pkgbase.Maintainer]) %}
-				<form class="pin-comment-form" method="post" action="/pkgbase/{{ name }}/">
-					<fieldset style="display:inline;">
-						<input type="hidden" name="action" value="do_PinComment"/>
-						<input type="hidden" name="comment_id" value="{{ comment.ID }}"/>
-						<input type="hidden" name="package_base" value="{{ pkgbase.ID }}"/>
-						<input type="hidden" name="return_to" value="/pkgbase/{{ name }}/"/>
-						<input type="image" class="pin-comment" src="/images/pin.min.svg" width="11" height="11" alt="{{ 'Pin comment' | tr }}" title="{{ 'Pin comment' | tr }}" name="submit" value="1"/>
-					</fieldset>
-				</form>
+            {% if request.user.has_credential("CRED_COMMENT_PIN", approved=[pkgbase.Maintainer]) %}
+                {% if comment.PinnedTS %}
+                    <form class="pin-comment-form"
+                          method="post"
+                          action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/unpin"
+                    >
+                        <fieldset style="display:inline;">
+                            <input type="image"
+                                   class="pin-comment"
+                                   src="/images/unpin.min.svg"
+                                   alt="{{ 'Unpin comment' | tr }}"
+                                   title="{{ 'Unpin comment' | tr }}"
+                                   name="submit"
+                                   value="1" width="11" height="11" />
+                        </fieldset>
+                    </form>
+                {% else %}
+                    <form class="pin-comment-form"
+                          method="post"
+                          action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/pin"
+                    >
+                        <fieldset style="display:inline;">
+                            <input type="image"
+                                   class="pin-comment"
+                                   src="/images/pin.min.svg"
+                                   alt="{{ 'Pin comment' | tr }}"
+                                   title="{{ 'Pin comment' | tr }}"
+                                   name="submit"
+                                   value="1" width="11" height="11" />
+                        </fieldset>
+                    </form>
+                {% endif %}
 			{% endif %}
 		{% else %}
 			{% if request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
index 7c8a32e5..56b5ab03 100644
--- a/templates/partials/packages/comments.html
+++ b/templates/partials/packages/comments.html
@@ -12,7 +12,21 @@
 </div>
 {% endif %}
 
-{% if comments %}
+{% if pinned_comments.count() %}
+    <div class="comments package-comments">
+        <div class="comments-header">
+            <h3>
+                <span class="text">{{ "Pinned Comments" | tr }}</span>
+                <span class="arrow"></span>
+            </h3>
+        </div>
+        {% for comment in pinned_comments.all() %}
+            {% include "partials/packages/comment.html" %}
+        {% endfor %}
+    </div>
+{% endif %}
+
+{% if comments.count() %}
     <div class="comments package-comments">
         <div class="comments-header">
             <h3>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 47b5ed81..6bf4b975 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1143,3 +1143,29 @@ def test_pkgbase_comment_undelete_not_found(client: TestClient,
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comment_pin(client: TestClient,
+                             maintainer: User,
+                             package: Package,
+                             comment: PackageComment):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = comment.ID
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/pin"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_pkgbase_comment_pin_unauthorized(client: TestClient,
+                                          user: User,
+                                          package: Package,
+                                          comment: PackageComment):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    comment_id = comment.ID
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/pin"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)

From 2efd254974fd2db0253ebc4aec725a08ba525d67 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 1 Oct 2021 17:51:39 -0700
Subject: [PATCH 368/844] feat(FastAPI): add
 /pkgbase/{name}/comments/{id}/unpin (post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 21 +++++++++++++++++++++
 test/test_packages_routes.py | 27 +++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 681cde4f..5ae19d07 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -369,3 +369,24 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int):
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/comments/{id}/unpin")
+@auth_required(True)
+async def pkgbase_comment_unpin(request: Request, name: str, id: int):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    has_cred = request.user.has_credential("CRED_COMMENT_PIN",
+                                           approved=[pkgbase.Maintainer])
+    if not has_cred:
+        _ = l10n.get_translator_for_request(request)
+        raise HTTPException(
+            status_code=int(HTTPStatus.UNAUTHORIZED),
+            detail=_("You are not allowed to unpin this comment."))
+
+    with db.begin():
+        comment.PinnedTS = 0
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 6bf4b975..1c7d5d3e 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1152,11 +1152,25 @@ def test_pkgbase_comment_pin(client: TestClient,
     cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
     comment_id = comment.ID
     pkgbasename = package.PackageBase.Name
+
+    # Pin the comment.
     endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/pin"
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
 
+    # Assert that PinnedTS got set.
+    assert comment.PinnedTS > 0
+
+    # Unpin the comment we just pinned.
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/unpin"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Let's assert that PinnedTS was unset.
+    assert comment.PinnedTS == 0
+
 
 def test_pkgbase_comment_pin_unauthorized(client: TestClient,
                                           user: User,
@@ -1169,3 +1183,16 @@ def test_pkgbase_comment_pin_unauthorized(client: TestClient,
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comment_unpin_unauthorized(client: TestClient,
+                                            user: User,
+                                            package: Package,
+                                            comment: PackageComment):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    comment_id = comment.ID
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/unpin"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)

From 986fa9ee305ed113172f7f214d451a7af071ecc2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 26 Sep 2021 20:26:24 -0700
Subject: [PATCH 369/844] feat(PHP): add aurweb Prometheus metrics

Along with this initial requests metric implementation,
we also now serve the `/metrics` route, which grabs request
metrics out of cache and renders them properly for Prometheus.

**NOTE** Metrics are only enabled when the aurweb system admin
has enabled caching by configuring `options.cache` correctly
in `$AUR_CONFIG`. Otherwise, an error is logged about no cache
being configured.

New dependencies have been added which require the use of
`composer`. See `INSTALL` for the dependency section in regards
to composer dependencies and how to install them properly for
aurweb.

Metrics are in the following forms:

    aurweb_http_requests_count(method="GET",route="/some_route")
    aurweb_api_requests_count(method="GET",route="/rpc",type="search")

This should allow us to search through the requests for specific routes
and queries.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL                     |   8 ++-
 web/html/index.php          |  29 ++++++++
 web/html/metrics.php        |  16 +++++
 web/lib/metricfuncs.inc.php | 129 ++++++++++++++++++++++++++++++++++++
 web/lib/routing.inc.php     |   3 +-
 5 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 web/html/metrics.php
 create mode 100644 web/lib/metricfuncs.inc.php

diff --git a/INSTALL b/INSTALL
index 9bcd0759..b161edd2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -49,9 +49,15 @@ read the instructions below.
 
     # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy \
                 python-bleach python-markdown python-alembic python-jinja \
-                python-itsdangerous python-authlib python-httpx hypercorn
+                python-itsdangerous python-authlib python-httpx hypercorn \
+                composer
     # python3 setup.py install
 
+4a) Install `composer` dependencies while inside of aurweb's root:
+
+    $ cd /path/to/aurweb
+    /path/to/aurweb $ composer require promphp/prometheus_client_php
+
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
 
     $ python -m aurweb.initdb
diff --git a/web/html/index.php b/web/html/index.php
index e57e7708..82a44c55 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -3,10 +3,39 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include_once("aur.inc.php");
 include_once("pkgfuncs.inc.php");
+include_once("cachefuncs.inc.php");
+include_once("metricfuncs.inc.php");
 
 $path = $_SERVER['PATH_INFO'];
 $tokens = explode('/', $path);
 
+$query_string = $_SERVER['QUERY_STRING'];
+
+// If no options.cache is configured, we no-op metric storage operations.
+$is_cached = defined('EXTENSION_LOADED_APC') || defined('EXTENSION_LOADED_MEMCACHE');
+if ($is_cached) {
+	$method = $_SERVER['REQUEST_METHOD'];
+	// We'll always add +1 to our total request count to this $path,
+	// unless this path == /metrics.
+	if ($path !== "/metrics")
+		add_metric("http_requests_count", $method, $path);
+
+	// Extract $type out of $query_string, if we can.
+	$type = null;
+	$query = array();
+	if ($query_string)
+		parse_str($query_string, $query);
+	$type = $query['type'];
+
+	// Only store RPC metrics for valid types.
+	$good_types = [
+		"info", "multiinfo", "search", "msearch",
+		"suggest", "suggest-pkgbase", "get-comment-form"
+	];
+	if ($path === "/rpc" && in_array($type, $good_types))
+		add_metric("api_requests_count", $method, $path, $type);
+}
+
 if (config_get_bool('options', 'enable-maintenance') && (empty($tokens[1]) || ($tokens[1] != "css" && $tokens[1] != "images"))) {
 	if (!in_array($_SERVER['REMOTE_ADDR'], explode(" ", config_get('options', 'maintenance-exceptions')))) {
 		header("HTTP/1.0 503 Service Unavailable");
diff --git a/web/html/metrics.php b/web/html/metrics.php
new file mode 100644
index 00000000..dfa860ed
--- /dev/null
+++ b/web/html/metrics.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Provide some variable Prometheus metrics. A new requests.route type
+ * gets created for each request made and we keep a count using our
+ * existing Memcached or APC configurable cache, with route
+ * = {request_uri}?{query_string}.
+ *
+ * TL;DR -- The 'requests' counter is used to give variable requests
+ * based on their request_uris and query_strings.
+ **/
+include_once('metricfuncs.inc.php');
+
+// Render metrics based on options.cache storage.
+render_metrics();
+
+?>
diff --git a/web/lib/metricfuncs.inc.php b/web/lib/metricfuncs.inc.php
new file mode 100644
index 00000000..acfc30d7
--- /dev/null
+++ b/web/lib/metricfuncs.inc.php
@@ -0,0 +1,129 @@
+<?php
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
+
+require __DIR__ . '/../../vendor/autoload.php';
+include_once("cachefuncs.inc.php");
+
+use \Prometheus\Storage\InMemory;
+use \Prometheus\CollectorRegistry;
+use \Prometheus\RenderTextFormat;
+
+// We always pass through an InMemory cache. This means that
+// metrics are only good while the php-fpm service is running
+// and will start again at 0 if it's restarted.
+$registry = new CollectorRegistry(new InMemory());
+
+function add_metric($anchor, $method, $path, $type = null) {
+
+	global $registry;
+	// We keep track of which routes we're interested in by storing
+	// a JSON-encoded list into the "prometheus_metrics" key,
+	// with each item being a JSON-encoded associative array
+	// in the form: {'path': <route>, 'query_string': <query_string>}.
+	$metrics = get_cache_value("prometheus_metrics");
+	$metrics = $metrics ? json_decode($metrics) : array();
+
+	$key = "$path:$type";
+
+	// If the current request $path isn't yet in $metrics create
+	// a new assoc array for it and push it into $metrics.
+	if (!in_array($key, $metrics)) {
+		$data = array(
+			'anchor' => $anchor,
+			'method' => $method,
+			'path' => $path,
+			'type' => $type
+		);
+		array_push($metrics, json_encode($data));
+	}
+
+	// Cache-wise, we also store the count values of each route
+	// through the "prometheus:<route>" key. Grab the cache value
+	// representing the current $path we're on (defaulted to 1).
+	$count = get_cache_value("prometheus:$key");
+	$count = $count ? $count + 1 : 1;
+
+	$labels = ["method", "route"];
+	if ($type)
+		array_push($labels, "type");
+
+	$gauge = $registry->getOrRegisterGauge(
+		'aurweb',
+		$anchor,
+		'A metric count for the aurweb platform.',
+		$labels
+	);
+
+	$label_values = [$data['method'], $data['path']];
+	if ($type)
+		array_push($label_values, $type);
+
+	$gauge->set($count, $label_values);
+
+	// Update cache values.
+	set_cache_value("prometheus:$key", $count, 0);
+	set_cache_value("prometheus_metrics", json_encode($metrics), 0);
+
+}
+
+function render_metrics() {
+	if (!defined('EXTENSION_LOADED_APC') && !defined('EXTENSION_LOADED_MEMCACHE')) {
+		error_log("The /metrics route requires a valid 'options.cache' "
+			. "configuration; no cache is configured.");
+		return http_response_code(417); // EXPECTATION_FAILED
+	}
+
+	global $registry;
+
+	// First, we grab the set of metrics we're interested in in the
+	// form of a cached JSON list, if we can.
+	$metrics = get_cache_value("prometheus_metrics");
+	if (!$metrics)
+		$metrics = array();
+	else
+		$metrics = json_decode($metrics);
+
+	// Now, we walk through each of those list values one by one,
+	// which happen to be JSON-serialized associative arrays,
+	// and process each metric via its associative array's contents:
+	// The route path and the query string.
+	// See web/html/index.php for the creation of such metrics.
+	foreach ($metrics as $metric) {
+		$data = json_decode($metric, true);
+
+		$anchor = $data['anchor'];
+		$path = $data['path'];
+		$type = $data['type'];
+		$key = "$path:$type";
+
+		$labels = ["method", "route"];
+		if ($type)
+			array_push($labels, "type");
+
+		$count = get_cache_value("prometheus:$key");
+		$gauge = $registry->getOrRegisterGauge(
+			'aurweb',
+			$anchor,
+			'A metric count for the aurweb platform.',
+			$labels
+		);
+
+		$label_values = [$data['method'], $data['path']];
+		if ($type)
+			array_push($label_values, $type);
+
+		$gauge->set($count, $label_values);
+	}
+
+	// Construct the results from RenderTextFormat renderer and
+	// registry's samples.
+	$renderer = new RenderTextFormat();
+	$result = $renderer->render($registry->getMetricFamilySamples());
+
+	// Output the results with the right content type header.
+	http_response_code(200); // OK
+	header('Content-Type: ' . RenderTextFormat::MIME_TYPE);
+	echo $result;
+}
+
+?>
diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php
index 73c667d2..0f452f22 100644
--- a/web/lib/routing.inc.php
+++ b/web/lib/routing.inc.php
@@ -19,7 +19,8 @@ $ROUTES = array(
 	'/rss' => 'rss.php',
 	'/tos' => 'tos.php',
 	'/tu' => 'tu.php',
-	'/addvote' => 'addvote.php',
+    '/addvote' => 'addvote.php',
+    '/metrics' => 'metrics.php' // Prometheus Metrics
 );
 
 $PKG_PATH = '/packages';

From 4d191b51f9d5b9a4d365c2b2f806c257f0a720e3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 16 Sep 2021 19:42:09 -0700
Subject: [PATCH 370/844] feat(FastAPI): add /pkgbase/{name}/comaintainers
 (get, post)

Changes from PHP:

- Form action now points to `/pkgbase/{name}/comaintainers`.
- When an error occurs, users are sent back to
  `/pkgbase/{name}/comaintainers` with an error at the top of the page.
  (PHP used to send people to /pkgbase/, which ended up at a blank
  search page).

Closes: https://gitlab.archlinux.org/archlinux/aurweb/-/issues/51

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 145 +++++++++++++++++++++++
 templates/partials/packages/actions.html |   4 +-
 templates/pkgbase/comaintainers.html     |  40 +++++++
 test/test_packages_routes.py             | 108 +++++++++++++++++
 4 files changed, 295 insertions(+), 2 deletions(-)
 create mode 100644 templates/pkgbase/comaintainers.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 5ae19d07..385d91db 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -16,6 +16,7 @@ from aurweb.auth import auth_required
 from aurweb.models.license import License
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_comment import PackageComment
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_license import PackageLicense
@@ -25,8 +26,10 @@ from aurweb.models.package_request import PackageRequest
 from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID
+from aurweb.models.user import User
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
+from aurweb.scripts import notify
 from aurweb.scripts.rendercomment import update_comment_render
 from aurweb.templates import make_context, render_raw_template, render_template
 
@@ -390,3 +393,145 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int):
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.get("/pkgbase/{name}/comaintainers")
+@auth_required(True)
+async def package_base_comaintainers(request: Request, name: str) -> Response:
+    # Get the PackageBase.
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
+    # get redirected to the package base's page.
+    has_creds = request.user.has_credential("CRED_PKGBASE_EDIT_COMAINTAINERS",
+                                            approved=[pkgbase.Maintainer])
+    if not has_creds:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+
+    # Add our base information.
+    context = make_context(request, "Manage Co-maintainers")
+    context["pkgbase"] = pkgbase
+
+    context["comaintainers"] = [
+        c.User.Username for c in pkgbase.comaintainers
+    ]
+
+    return render_template(request, "pkgbase/comaintainers.html", context)
+
+
+def remove_users(pkgbase, usernames):
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    notifications = []
+    with db.begin():
+        for username in usernames:
+            # We know that the users we passed here are in the DB.
+            # No need to check for their existence.
+            comaintainer = pkgbase.comaintainers.join(User).filter(
+                User.Username == username
+            ).first()
+            notifications.append(
+                notify.ComaintainerRemoveNotification(
+                    conn, comaintainer.User.ID, pkgbase.ID
+                )
+            )
+            db.session.delete(comaintainer)
+
+    # Send out notifications if need be.
+    for notify_ in notifications:
+        notify_.send()
+
+
+@router.post("/pkgbase/{name}/comaintainers")
+@auth_required(True)
+async def package_base_comaintainers_post(
+        request: Request, name: str,
+        users: str = Form(default=str())) -> Response:
+    # Get the PackageBase.
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
+    # get redirected to the package base's page.
+    has_creds = request.user.has_credential("CRED_PKGBASE_EDIT_COMAINTAINERS",
+                                            approved=[pkgbase.Maintainer])
+    if not has_creds:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+
+    users = set(users.split("\n"))
+    users.remove(str())  # Remove any empty strings from the set.
+    records = {c.User.Username for c in pkgbase.comaintainers}
+
+    remove_users(pkgbase, records.difference(users))
+
+    # Default priority (lowest value; most preferred).
+    priority = 1
+
+    # Get the highest priority in the comaintainer set.
+    last_priority = pkgbase.comaintainers.order_by(
+        PackageComaintainer.Priority.desc()
+    ).limit(1).first()
+
+    # If that record exists, we use a priority which is 1 higher.
+    # TODO: This needs to ensure that it wraps around and preserves
+    # ordering in the case where we hit the max number allowed by
+    # the Priority column type.
+    if last_priority:
+        priority = last_priority.Priority + 1
+
+    def add_users(usernames):
+        """ Add users as comaintainers to pkgbase.
+
+        :param usernames: An iterable of username strings
+        :return: None on success, an error string on failure. """
+        nonlocal request, pkgbase, priority
+
+        # First, perform a check against all usernames given; for each
+        # username, add its related User object to memo.
+        _ = l10n.get_translator_for_request(request)
+        memo = {}
+        for username in usernames:
+            user = db.query(User).filter(User.Username == username).first()
+            if not user:
+                return _("Invalid user name: %s") % username
+            memo[username] = user
+
+        # Alright, now that we got past the check, add them all to the DB.
+        conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+        notifications = []
+        with db.begin():
+            for username in usernames:
+                user = memo.get(username)
+                if pkgbase.Maintainer == user:
+                    # Already a maintainer. Move along.
+                    continue
+
+                # If we get here, our user model object is in the memo.
+                comaintainer = db.create(
+                    PackageComaintainer,
+                    PackageBase=pkgbase,
+                    User=user,
+                    Priority=priority)
+                priority += 1
+
+                notifications.append(
+                    notify.ComaintainerAddNotification(
+                        conn, comaintainer.User.ID, pkgbase.ID)
+                )
+
+        # Send out notifications.
+        for notify_ in notifications:
+            notify_.send()
+
+    error = add_users(users.difference(records))
+    if error:
+        context = make_context(request, "Manage Co-maintainers")
+        context["pkgbase"] = pkgbase
+        context["comaintainers"] = [
+            c.User.Username for c in pkgbase.comaintainers
+        ]
+        context["errors"] = [error]
+        return render_template(request, "pkgbase/comaintainers.html", context)
+
+    return RedirectResponse(f"/pkgbase/{pkgbase.Name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index d552f2dd..6c30153c 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -117,9 +117,9 @@
 
                 {% endif %}
             </form>
-            {% if is_maintainer %}
+            {% if request.user.has_credential('CRED_PKGBASE_EDIT_COMAINTAINERS', approved=[pkgbase.Maintainer]) %}
                 <li>
-                    <a href="/pkgbase/{{ result.Name }}/comaintainers/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/comaintainers/">
                         {{ "Manage Co-Maintainers" | tr }}
                     </a>
                 </li>
diff --git a/templates/pkgbase/comaintainers.html b/templates/pkgbase/comaintainers.html
new file mode 100644
index 00000000..06e8b9d7
--- /dev/null
+++ b/templates/pkgbase/comaintainers.html
@@ -0,0 +1,40 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    {% if errors %}
+        <ul class="errorlist">
+            {% for error in errors %}
+                <li>{{ error | tr }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+
+    <div class="box">
+        <h2>{{ "Manage Co-maintainers" | tr }}:</h2>
+        <p>
+            {{
+                "Use this form to add co-maintainers for %s%s%s "
+                "(one user name per line):"
+                | tr | format("<strong>", pkgbase.Name, "</strong>")
+                | safe
+            }}
+        </p>
+
+        <form action="/pkgbase/{{ pkgbase.Name }}/comaintainers" method="post">
+            <fieldset>
+                <p>
+                    <label for="id_users">{{ "Users" | tr }}:</label>
+                    <textarea id="id_users" name="users"
+                              rows="5" cols="50">{{ "\n".join(comaintainers) }}</textarea>
+                </p>
+
+                <p>
+                    <button class="button" type="submit">
+                        {{ "Save" | tr }}
+                    </button>
+                </p>
+            </fieldset>
+        </form>
+
+    </div>
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 1c7d5d3e..f1c20067 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1196,3 +1196,111 @@ def test_pkgbase_comment_unpin_unauthorized(client: TestClient,
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comaintainers_not_found(client: TestClient, maintainer: User):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = "/pkgbase/fake/comaintainers"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comaintainers_post_not_found(client: TestClient,
+                                              maintainer: User):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = "/pkgbase/fake/comaintainers"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comaintainers_unauthorized(client: TestClient, user: User,
+                                            package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+
+def test_pkgbase_comaintainers_post_unauthorized(client: TestClient,
+                                                 user: User,
+                                                 package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+
+def test_pkgbase_comaintainers_post_invalid_user(client: TestClient,
+                                                 maintainer: User,
+                                                 package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "users": "\nfake\n"
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    assert error.text.strip() == "Invalid user name: fake"
+
+
+def test_pkgbase_comaintainers(client: TestClient, user: User,
+                               maintainer: User, package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+
+    # Start off by adding user as a comaintainer to package.
+    # The maintainer username given should be ignored.
+    with client as request:
+        resp = request.post(endpoint, data={
+            "users": f"\n{user.Username}\n{maintainer.Username}\n"
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    # Do it again to exercise the last_priority bump path.
+    with client as request:
+        resp = request.post(endpoint, data={
+            "users": f"\n{user.Username}\n{maintainer.Username}\n"
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    # Now that we've added a comaintainer to the pkgbase,
+    # let's perform a GET request to make sure that the backend produces
+    # the user we added in the users textarea.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    users = root.xpath('//textarea[@id="id_users"]')[0]
+    assert users.text.strip() == user.Username
+
+    # Finish off by removing all the comaintainers.
+    with client as request:
+        resp = request.post(endpoint, data={
+            "users": str()
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    users = root.xpath('//textarea[@id="id_users"]')[0]
+    assert users is not None and users.text is None

From c164abe256e2c1ee71be1ab3815b365fcb3f80de Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 1 Sep 2021 13:55:41 -0700
Subject: [PATCH 371/844] feat(FastAPI): add Requests navigation item

Along with this, created a new test suite at test/test_html.py,
which has the responsibility of testing various HTML things
that are not suitable for another test suite.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/archdev-navbar.html |  5 ++
 test/test_html.py                      | 99 ++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 test/test_html.py

diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 13459e1a..9a3ba780 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -7,6 +7,11 @@
         {% endif %}
         <li><a href="/packages/">{% trans %}Packages{% endtrans %}</a></li>
         {% if request.user.is_authenticated() %}
+            <li>
+                <a href="/requests/">
+                    {% trans %}Requests{% endtrans %}
+                </a>
+            </li>
             {% if request.user.is_trusted_user() or request.user.is_developer() %}
                 <li>
                     <a href="/accounts/">
diff --git a/test/test_html.py b/test/test_html.py
new file mode 100644
index 00000000..562d6a63
--- /dev/null
+++ b/test/test_html.py
@@ -0,0 +1,99 @@
+""" A test suite used to test HTML renders in different cases. """
+from http import HTTPStatus
+
+import pytest
+
+from fastapi.testclient import TestClient
+
+from aurweb import asgi, db
+from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID, AccountType
+from aurweb.models.user import User
+from aurweb.testing import setup_test_db
+from aurweb.testing.html import parse_root
+from aurweb.testing.requests import Request
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db(User.__tablename__)
+
+
+@pytest.fixture
+def client() -> TestClient:
+    yield TestClient(app=asgi.app)
+
+
+@pytest.fixture
+def user() -> User:
+    user_type = db.query(AccountType, AccountType.ID == USER_ID).first()
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         Passwd="testPassword", AccountType=user_type)
+    yield user
+
+
+@pytest.fixture
+def trusted_user(user: User) -> User:
+    tu_type = db.query(AccountType,
+                       AccountType.ID == TRUSTED_USER_ID).first()
+    with db.begin():
+        user.AccountType = tu_type
+    yield user
+
+
+def test_archdev_navbar(client: TestClient):
+    expected = [
+        "AUR Home",
+        "Packages",
+        "Register",
+        "Login"
+    ]
+    with client as request:
+        resp = request.get("/")
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    items = root.xpath('//div[@id="archdev-navbar"]/ul/li/a')
+    for i, item in enumerate(items):
+        assert item.text.strip() == expected[i]
+
+
+def test_archdev_navbar_authenticated(client: TestClient, user: User):
+    expected = [
+        "Dashboard",
+        "Packages",
+        "Requests",
+        "My Account",
+        "Logout"
+    ]
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/", cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    items = root.xpath('//div[@id="archdev-navbar"]/ul/li/a')
+    for i, item in enumerate(items):
+        assert item.text.strip() == expected[i]
+
+
+def test_archdev_navbar_authenticated_tu(client: TestClient,
+                                         trusted_user: User):
+    expected = [
+        "Dashboard",
+        "Packages",
+        "Requests",
+        "Accounts",
+        "My Account",
+        "Trusted User",
+        "Logout"
+    ]
+    cookies = {"AURSID": trusted_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/", cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    items = root.xpath('//div[@id="archdev-navbar"]/ul/li/a')
+    for i, item in enumerate(items):
+        assert item.text.strip() == expected[i]

From 99482f9962de96de0d5b248f0ee99cdd15a6a740 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 10 Sep 2021 13:28:11 -0700
Subject: [PATCH 372/844] feat(FastAPI): added /requests (get) route

Introduces `aurweb.defaults` and `aurweb.filters`.

`aurweb.filters` is a location developers can put their additional
Jinja2 filters and/or functions. We should slowly move all of our
filters over here, where it makes sense.

`aurweb.defaults` is a new module which hosts some default constants
and utility functions, starting with offsets (O) and per page values
(PP).

As far as the new GET /requests is concerned, we match up here to
PHP's implementation, with some minor improvements:

Improvements:

* PP on this page is now configurable: 50 (default), 100, or 250.
    * Example: `https://localhost:8444/requests?PP=250`

Modifications:

* The pagination is a bit different, but serves the exact same purpose.
* "Last" no longer goes to an empty page.
    * Closes: https://gitlab.archlinux.org/archlinux/aurweb/-/issues/14

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py               |  15 +++++
 aurweb/defaults.py           |  18 ++++++
 aurweb/filters.py            |  14 ++++-
 aurweb/routers/packages.py   |  40 ++++++++++--
 aurweb/templates.py          |  15 +++++
 setup.cfg                    |  19 +++---
 templates/requests.html      | 115 +++++++++++++++++++++++++++++++++++
 test/test_defaults.py        |  14 +++++
 test/test_packages_routes.py |  84 ++++++++++++++++++++++++-
 test/test_templates.py       |  16 ++++-
 test/test_util.py            |   8 ++-
 11 files changed, 341 insertions(+), 17 deletions(-)
 create mode 100644 aurweb/defaults.py
 create mode 100644 templates/requests.html
 create mode 100644 test/test_defaults.py

diff --git a/aurweb/auth.py b/aurweb/auth.py
index d1a9d9cb..21d31081 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -31,8 +31,23 @@ class StubQuery:
 
 
 class AnonymousUser:
+    """ A stubbed User class used when an unauthenticated User
+    makes a request against FastAPI. """
     # Stub attributes used to mimic a real user.
     ID = 0
+
+    class AccountType:
+        """ A stubbed AccountType static class. In here, we use an ID
+        and AccountType which do not exist in our constant records.
+        All records primary keys (AccountType.ID) should be non-zero,
+        so using a zero here means that we'll never match against a
+        real AccountType. """
+        ID = 0
+        AccountType = "Anonymous"
+
+    # AccountTypeID == AccountType.ID; assign a stubbed column.
+    AccountTypeID = AccountType.ID
+
     LangPreference = aurweb.config.get("options", "default_lang")
     Timezone = aurweb.config.get("options", "default_timezone")
 
diff --git a/aurweb/defaults.py b/aurweb/defaults.py
new file mode 100644
index 00000000..c2568d05
--- /dev/null
+++ b/aurweb/defaults.py
@@ -0,0 +1,18 @@
+""" Constant default values centralized in one place. """
+
+# Default [O]ffset
+O = 0
+
+# Default [P]er [P]age
+PP = 50
+
+# A whitelist of valid PP values
+PP_WHITELIST = {50, 100, 250}
+
+
+def fallback_pp(per_page: int) -> int:
+    """ If `per_page` is a valid value in PP_WHITELIST, return it.
+    Otherwise, return defaults.PP. """
+    if per_page not in PP_WHITELIST:
+        return PP
+    return per_page
diff --git a/aurweb/filters.py b/aurweb/filters.py
index bb56c656..f9f56b5d 100644
--- a/aurweb/filters.py
+++ b/aurweb/filters.py
@@ -4,8 +4,8 @@ import paginate
 
 from jinja2 import pass_context
 
-from aurweb import util
-from aurweb.templates import register_filter
+from aurweb import config, util
+from aurweb.templates import register_filter, register_function
 
 
 @register_filter("pager_nav")
@@ -48,3 +48,13 @@ def pager_nav(context: Dict[str, Any],
         symbol_previous="‹ Previous",
         symbol_next="Next ›",
         symbol_last="Last »")
+
+
+@register_function("config_getint")
+def config_getint(section: str, key: str) -> int:
+    return config.getint(section, key)
+
+
+@register_function("round")
+def do_round(f: float) -> int:
+    return round(f)
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 385d91db..5751a3ee 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -2,17 +2,18 @@ from datetime import datetime
 from http import HTTPStatus
 from typing import Any, Dict
 
-from fastapi import APIRouter, Form, HTTPException, Request, Response
+from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse
-from sqlalchemy import and_
+from sqlalchemy import and_, case
 
 import aurweb.filters
 import aurweb.models.package_comment
 import aurweb.models.package_keyword
 import aurweb.packages.util
 
-from aurweb import db, l10n
-from aurweb.auth import auth_required
+from aurweb import db, defaults, l10n
+from aurweb.auth import account_type_required, auth_required
+from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND_DEV
 from aurweb.models.license import License
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -22,10 +23,11 @@ from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_license import PackageLicense
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
-from aurweb.models.package_request import PackageRequest
+from aurweb.models.package_request import PENDING_ID, PackageRequest
 from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID
+from aurweb.models.request_type import RequestType
 from aurweb.models.user import User
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
@@ -535,3 +537,31 @@ async def package_base_comaintainers_post(
 
     return RedirectResponse(f"/pkgbase/{pkgbase.Name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.get("/requests")
+@account_type_required({TRUSTED_USER, DEVELOPER, TRUSTED_USER_AND_DEV})
+@auth_required(True, redirect="/")
+async def requests(request: Request,
+                   O: int = Query(default=defaults.O),
+                   PP: int = Query(default=defaults.PP)):
+    context = make_context(request, "Requests")
+
+    context["q"] = dict(request.query_params)
+    context["O"] = O
+    context["PP"] = PP
+
+    # A PackageRequest query, with left inner joined User and RequestType.
+    query = db.query(PackageRequest).join(
+        User, PackageRequest.UsersID == User.ID
+    ).join(RequestType)
+
+    context["total"] = query.count()
+    context["results"] = query.order_by(
+        # Order primarily by the Status column being PENDING_ID,
+        # and secondarily by RequestTS; both in descending order.
+        case([(PackageRequest.Status == PENDING_ID, 1)], else_=0).desc(),
+        PackageRequest.RequestTS.desc()
+    ).limit(PP).offset(O).all()
+
+    return render_template(request, "requests.html", context)
diff --git a/aurweb/templates.py b/aurweb/templates.py
index ef020bdf..2301cfe2 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -71,6 +71,20 @@ def register_filter(name: str) -> Callable:
     return decorator
 
 
+def register_function(name: str) -> Callable:
+    """ A decorator that can be used to register a function.
+    """
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            return func(*args, **kwargs)
+        if name in _env.globals:
+            raise KeyError(f"Jinja already has a function named '{name}'")
+        _env.globals[name] = wrapper
+        return wrapper
+    return decorator
+
+
 def make_context(request: Request, title: str, next: str = None):
     """ Create a context for a jinja2 TemplateResponse. """
 
@@ -83,6 +97,7 @@ def make_context(request: Request, title: str, next: str = None):
         "timezones": time.SUPPORTED_TIMEZONES,
         "title": title,
         "now": datetime.now(tz=zoneinfo.ZoneInfo(timezone)),
+        "utcnow": int(datetime.utcnow().timestamp()),
         "config": aurweb.config,
         "next": next if next else request.url.path
     }
diff --git a/setup.cfg b/setup.cfg
index 4f2bdf7d..cec1bcf5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,17 +6,22 @@ ignore = E741, W503
 max-line-length = 127
 max-complexity = 10
 
-# aurweb/routers/accounts.py
 #   Ignore some unavoidable flake8 warnings; we know this is against
-#   pycodestyle, but some of the existing codebase uses `I` variables,
+#   PEP8, but some of the existing codebase uses `I` variables,
 #   so specifically silence warnings about it in pre-defined files.
+#
 #   In E741, the 'I', 'O', 'l' are ambiguous variable names.
 #   Our current implementation uses these variables through HTTP
 #   and the FastAPI form specification wants them named as such.
-#   In C901's case, our process_account_form function is way too
-#   complex for PEP (too many if statements). However, we need to
-#   process these anyways, and making it any more complex would
-#   just add confusion to the implementation.
+#
+#   With {W503,W504}, PEP8 does not want us to break lines before
+#   or after a binary operator. We have many scripts that already
+#   do this, so we're ignoring it here.
+ignore = E741, W503, W504
+
+# aurweb/routers/accounts.py
+#   Ignore over-reaching complexity.
+#   TODO: This should actually be addressed so we do not ignore C901.
 #
 # test/test_ssh_pub_key.py
 #   E501 is detected due to our >127 width test constant. Ignore it.
@@ -24,7 +29,7 @@ max-complexity = 10
 #   Anything like this should be questioned.
 #
 per-file-ignores =
-    aurweb/routers/accounts.py:E741,C901
+    aurweb/routers/accounts.py:C901
     test/test_ssh_pub_key.py:E501
     aurweb/routers/packages.py:E741
 
diff --git a/templates/requests.html b/templates/requests.html
new file mode 100644
index 00000000..a9017e2f
--- /dev/null
+++ b/templates/requests.html
@@ -0,0 +1,115 @@
+{% extends "partials/layout.html" %}
+
+{% set singular = "%d package request found." %}
+{% set plural = "%d package requests found." %}
+
+{% block pageContent %}
+    <div id="pkglist-results" class="box">
+        {% if not total %}
+            <p>{{ "No requests matched your search criteria." | tr }}</p>
+        {% else %}
+            {% include "partials/widgets/pager.html" %}
+            <table class="results">
+                <thead>
+                    <tr>
+                        <th>{{ "Package" | tr }}</th>
+                        <th>{{ "Type" | tr }}</th>
+                        <th>{{ "Comments" | tr }}</th>
+                        <th>{{ "Filed by" | tr }}</th>
+                        <th>{{ "Date" | tr }}</th>
+                        <th>{{ "Status" | tr }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for result in results %}
+                        <tr>
+                            <td>
+                                {# Package #}
+                                <a href="/pkgbase/{{ result.PackageBaseName }}">
+                                    {{ result.PackageBaseName }}
+                                </a>
+                            </td>
+                            {# Type #}
+                            <td>
+                                {{ result.RequestType.name_display() }}
+                                {# If the RequestType is a merge and request.MergeBaseName is valid... #}
+                                {% if result.RequestType.ID == 3 and result.MergeBaseName %}
+                                    ({{ result.MergeBaseName }})
+                                {% endif %}
+                            </td>
+                            {# Comments #}
+                            <td class="wrap">{{ result.Comments }}</td>
+                            <td>
+                                {# Filed by #}
+                                <a href="/account/{{ result.User.Username }}">
+                                    {{ result.User.Username }}
+                                </a>
+                            </td>
+                            {% set idle_time = config_getint("options", "request_idle_time") %}
+                            {% set time_delta = (utcnow - result.RequestTS) | int %}
+
+                            {% set due = result.Status == 0 and time_delta > idle_time %}
+                            <td
+                                {% if due %}
+                                class="flagged"
+                                {% endif %}
+                            >
+                                {# Date #}
+                                {% set date = result.RequestTS | dt | as_timezone(timezone) %}
+                                {{ date.strftime("%Y-%m-%d %H:%M") }}
+                            </td>
+                            <td>
+                                {# Status #}
+                                {% if result.Status == 0 %}
+                                    {% set temp_q = { "next": "/requests" } %}
+
+                                    {% if result.RequestType.ID == 1 %}
+                                        {% set action = "delete" %}
+                                    {% elif result.RequestType.ID == 2 %}
+                                        {% set action = "disown" %}
+                                    {% elif result.RequestType.ID == 3 %}
+                                        {% set action = "merge" %}
+                                        {# Add the 'via' url query parameter. #}
+                                        {% set temp_q = temp_q | extend_query(
+                                            ["via", result.ID],
+                                            ["into", result.MergeBaseName]
+                                        ) %}
+                                    {% endif %}
+
+                                    {% if request.user.is_elevated() %}
+                                        {% if result.RequestType.ID == 2 and not due %}
+                                            {% set time_left = idle_time - time_delta %}
+                                            {% if time_left > 48 * 3600 %}
+                                                {% set n = round(time_left / (24 * 3600)) %}
+                                                {% set time_left_fmt = (n | tn("~%d day left", "~%d days left") | format(n)) %}
+                                            {% elif time_left > 3600 %}
+                                                {% set n = round(time_left / 3600) %}
+                                                {% set time_left_fmt = (n | tn("~%d hour left", "~%d hours left") | format(n)) %}
+                                            {% else %}
+                                                {% set time_left_fmt = ("<1 hour left" | tr) %}
+                                            {% endif %}
+                                            {{ "Locked" | tr }}
+                                            ({{ time_left_fmt }})
+                                        {% else %}
+                                            {# Only elevated users (TU or Dev) are allowed to accept requests. #}
+                                            <a href="/pkgbase/{{ result.PackageBaseName }}/{{ action }}?{{ temp_q | urlencode }}">
+                                                {{ "Accept" | tr }}
+                                            </a>
+                                        {% endif %}
+                                        <br />
+                                    {% endif %}
+                                    <a href="/requests/{{ result.ID }}/close">
+                                        {{ "Close" | tr }}
+                                    </a>
+                                {% else %}
+                                    {{ result.status_display() }}
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+            {% include "partials/widgets/pager.html" %}
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/test/test_defaults.py b/test/test_defaults.py
new file mode 100644
index 00000000..4803fb5a
--- /dev/null
+++ b/test/test_defaults.py
@@ -0,0 +1,14 @@
+from aurweb import defaults
+
+
+def test_fallback_pp():
+    assert defaults.fallback_pp(75) == defaults.PP
+    assert defaults.fallback_pp(100) == 100
+
+
+def test_pp():
+    assert defaults.PP == 50
+
+
+def test_o():
+    assert defaults.O == 0
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index f1c20067..a25fcb7e 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -8,7 +8,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import asgi, db
+from aurweb import asgi, db, defaults
 from aurweb.models.account_type import USER_ID, AccountType
 from aurweb.models.dependency_type import DependencyType
 from aurweb.models.official_provider import OfficialProvider
@@ -74,6 +74,7 @@ def setup():
         PackageNotification.__tablename__,
         PackageComaintainer.__tablename__,
         PackageComment.__tablename__,
+        PackageRequest.__tablename__,
         OfficialProvider.__tablename__
     )
 
@@ -108,6 +109,18 @@ def maintainer() -> User:
     yield maintainer
 
 
+@pytest.fixture
+def tu_user():
+    tu_type = db.query(AccountType,
+                       AccountType.AccountType == "Trusted User").first()
+    with db.begin():
+        tu_user = db.create(User, Username="test_tu",
+                            Email="test_tu@example.org",
+                            RealName="Test TU", Passwd="testPassword",
+                            AccountType=tu_type)
+    yield tu_user
+
+
 @pytest.fixture
 def package(maintainer: User) -> Package:
     """ Yield a Package created by user. """
@@ -160,6 +173,25 @@ def packages(maintainer: User) -> List[Package]:
     yield packages_
 
 
+@pytest.fixture
+def requests(user: User, packages: List[Package]) -> List[PackageRequest]:
+    pkgreqs = []
+    deletion_type = db.query(RequestType).filter(
+        RequestType.ID == DELETION_ID
+    ).first()
+    with db.begin():
+        for i in range(55):
+            pkgreq = db.create(PackageRequest,
+                               RequestType=deletion_type,
+                               User=user,
+                               PackageBase=packages[i].PackageBase,
+                               PackageBaseName=packages[i].Name,
+                               Comments=f"Deletion request for pkg_{i}",
+                               ClosureComment=str())
+            pkgreqs.append(pkgreq)
+    yield pkgreqs
+
+
 def test_package_not_found(client: TestClient):
     with client as request:
         resp = request.get("/packages/not_found")
@@ -1304,3 +1336,53 @@ def test_pkgbase_comaintainers(client: TestClient, user: User,
     root = parse_root(resp.text)
     users = root.xpath('//textarea[@id="id_users"]')[0]
     assert users is not None and users.text is None
+
+
+def test_requests_unauthorized(client: TestClient,
+                               maintainer: User,
+                               tu_user: User,
+                               packages: List[Package],
+                               requests: List[PackageRequest]):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/requests", cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_requests(client: TestClient,
+                  maintainer: User,
+                  tu_user: User,
+                  packages: List[Package],
+                  requests: List[PackageRequest]):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/requests", params={
+            # Pass in url query parameters O, SeB and SB to exercise
+            # their paths inside of the pager_nav used in this request.
+            "O": 0,  # Page 1
+            "SeB": "nd",
+            "SB": "n"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    assert "Next ›" in resp.text
+    assert "Last »" in resp.text
+
+    root = parse_root(resp.text)
+    # We have 55 requests, our defaults.PP is 50, so expect we have 50 rows.
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == defaults.PP
+
+    # Request page 2 of the requests page.
+    with client as request:
+        resp = request.get("/requests", params={
+            "O": 50  # Page 2
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    assert "‹ Previous" in resp.text
+    assert "« First" in resp.text
+
+    root = parse_root(resp.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 5  # There are five records left on the second page.
diff --git a/test/test_templates.py b/test/test_templates.py
index b6aa2055..86fbf611 100644
--- a/test/test_templates.py
+++ b/test/test_templates.py
@@ -1,6 +1,6 @@
 import pytest
 
-from aurweb.templates import register_filter
+from aurweb.templates import register_filter, register_function
 
 
 @register_filter("func")
@@ -8,6 +8,11 @@ def func():
     pass
 
 
+@register_function("function")
+def function():
+    pass
+
+
 def test_register_filter_exists_key_error():
     """ Most instances of register_filter are tested through module
     imports or template renders, so we only test failures here. """
@@ -15,3 +20,12 @@ def test_register_filter_exists_key_error():
         @register_filter("func")
         def some_func():
             pass
+
+
+def test_register_function_exists_key_error():
+    """ Most instances of register_filter are tested through module
+    imports or template renders, so we only test failures here. """
+    with pytest.raises(KeyError):
+        @register_function("function")
+        def some_func():
+            pass
diff --git a/test/test_util.py b/test/test_util.py
index 0cc45409..99b77a78 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
-from aurweb import util
+from aurweb import filters, util
 
 
 def test_timestamp_to_datetime():
@@ -34,3 +34,9 @@ def test_to_qs():
     query = {"a": "b", "c": [1, 2, 3]}
     qs = util.to_qs(query)
     assert qs == "a=b&c=1&c=2&c=3"
+
+
+def test_round():
+    assert filters.do_round(1.3) == 1
+    assert filters.do_round(1.5) == 2
+    assert filters.do_round(2.0) == 2

From 1cf9420997bc6788b4ae3264d8e019fd0ec13d56 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 12 Sep 2021 20:05:49 -0700
Subject: [PATCH 373/844] feat(FastAPI): allow reporters to cancel their own
 requests (1/2)

This change required a slight modification of how we handle
the Requests page. It is now available to all users.

This commit provides 1/2 of the implementation which actually
satisfies this feature. 2/2 will contain the actual implementation
of closures of requests, which will also allow users who created
the request to decide to close it.

Issue: https://gitlab.archlinux.org/archlinux/aurweb/-/issues/20

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   |  9 ++++++---
 test/test_packages_routes.py | 28 +++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 5751a3ee..2b350478 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -12,8 +12,7 @@ import aurweb.models.package_keyword
 import aurweb.packages.util
 
 from aurweb import db, defaults, l10n
-from aurweb.auth import account_type_required, auth_required
-from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND_DEV
+from aurweb.auth import auth_required
 from aurweb.models.license import License
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -540,7 +539,6 @@ async def package_base_comaintainers_post(
 
 
 @router.get("/requests")
-@account_type_required({TRUSTED_USER, DEVELOPER, TRUSTED_USER_AND_DEV})
 @auth_required(True, redirect="/")
 async def requests(request: Request,
                    O: int = Query(default=defaults.O),
@@ -556,6 +554,11 @@ async def requests(request: Request,
         User, PackageRequest.UsersID == User.ID
     ).join(RequestType)
 
+    # If the request user is not elevated (TU or Dev), then
+    # filter PackageRequests which are owned by the request user.
+    if not request.user.is_elevated():
+        query = query.filter(PackageRequest.UsersID == request.user.ID)
+
     context["total"] = query.count()
     context["results"] = query.order_by(
         # Order primarily by the Status column being PENDING_ID,
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index a25fcb7e..9867ce42 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1338,14 +1338,9 @@ def test_pkgbase_comaintainers(client: TestClient, user: User,
     assert users is not None and users.text is None
 
 
-def test_requests_unauthorized(client: TestClient,
-                               maintainer: User,
-                               tu_user: User,
-                               packages: List[Package],
-                               requests: List[PackageRequest]):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+def test_requests_unauthorized(client: TestClient):
     with client as request:
-        resp = request.get("/requests", cookies=cookies, allow_redirects=False)
+        resp = request.get("/requests", allow_redirects=False)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
 
 
@@ -1386,3 +1381,22 @@ def test_requests(client: TestClient,
     root = parse_root(resp.text)
     rows = root.xpath('//table[@class="results"]/tbody/tr')
     assert len(rows) == 5  # There are five records left on the second page.
+
+
+def test_requests_selfmade(client: TestClient, user: User,
+                           requests: List[PackageRequest]):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/requests", cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # As the user who creates all of the requests, we should see all of them.
+    # However, we are not allowed to accept any of them ourselves.
+    root = parse_root(resp.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == defaults.PP
+
+    # Our first and only link in the last row should be "Close".
+    for row in rows:
+        last_row = row.xpath('./td')[-1].xpath('./a')[0]
+        assert last_row.text.strip() == "Close"

From ad8369395e323d99bd4b3cae430269ac8dd19491 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 12 Sep 2021 21:51:20 -0700
Subject: [PATCH 374/844] feat(FastAPI): add /pkgbase/{name}/request (get)

This change brings in the package base request form
for new submissions.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 14 ++++
 templates/pkgbase/request.html           | 87 ++++++++++++++++++++++++
 test/test_packages_routes.py             | 20 ++++++
 web/html/js/typeahead-pkgbase-request.js | 36 ++++++++++
 4 files changed, 157 insertions(+)
 create mode 100644 templates/pkgbase/request.html
 create mode 100644 web/html/js/typeahead-pkgbase-request.js

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 2b350478..9c9a41e3 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -568,3 +568,17 @@ async def requests(request: Request,
     ).limit(PP).offset(O).all()
 
     return render_template(request, "requests.html", context)
+
+
+@router.get("/pkgbase/{name}/request")
+@auth_required(True)
+async def package_request(request: Request, name: str):
+    context = make_context(request, "Submit Request")
+
+    pkgbase = db.query(PackageBase).filter(PackageBase.Name == name).first()
+
+    if not pkgbase:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+
+    context["pkgbase"] = pkgbase
+    return render_template(request, "pkgbase/request.html", context)
diff --git a/templates/pkgbase/request.html b/templates/pkgbase/request.html
new file mode 100644
index 00000000..66d69f07
--- /dev/null
+++ b/templates/pkgbase/request.html
@@ -0,0 +1,87 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Submit Request" | tr }}: {{ pkgbase.Name }}</h2>
+        <p>
+            {{ "Use this form to file a request against package base "
+            "%s%s%s which includes the following packages:"
+            | tr | format("<strong>", pkgbase.Name, "</strong>") | safe }}
+        </p>
+        <ul>
+            {% for package in pkgbase.packages %}
+                <li>{{ package.Name }}</li>
+            {% endfor %}
+        </ul>
+
+        {# Request form #}
+        <form id="request-form" action="/pkgbase/{{ pkgbase.Name }}/request">
+            <fieldset>
+                <p>
+                    <label for="id_type">{{ "Request type" | tr }}:</label>
+                    <select id="id_type" name="type">
+                        <option value="deletion">{{ "Deletion" | tr }}</option>
+                        <option value="merge">{{ "Merge" | tr }}</option>
+                        <option value="orphan">{{ "Orphan" | tr }}</option>
+                    </select>
+                </p>
+
+                {# Javascript included for HTML-changing triggers depending
+                on the selected type (above). #}
+                <script type="text/javascript"
+                        src="/static/js/typeahead-pkgbase-request.js"></script>
+
+                <p id="merge_section" style="display: none">
+                    <label for="id_merge_into">{{ "Merge into" | tr }}:</label>
+                    <input id="id_merge_into" type="text" name="merge_into"
+                           autocomplete="off" />
+                </p>
+
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments" name="comments"
+                              rows="5" cols="50"></textarea>
+                </p>
+
+                <p id="deletion_hint">
+                    {{
+                        "By submitting a deletion request, you ask a Trusted "
+                        "User to delete the package base. This type of "
+                        "request should be used for duplicates, software "
+                        "abandoned by upstream, as well as illegal and "
+                        "irreparably broken packages." | tr
+                    }}
+                </p>
+
+                <p id="merge_hint" style="display: none">
+                    {{
+                        "By submitting a merge request, you ask a Trusted "
+                        "User to delete the package base and transfer its "
+                        "votes and comments to another package base. "
+                        "Merging a package does not affect the corresponding "
+                        "Git repositories. Make sure you update the Git "
+                        "history of the target package yourself." | tr
+                    }}
+                </p>
+
+                <p id="orphan_hint" style="display: none">
+                    {{
+                        "By submitting an orphan request, you ask a Trusted "
+                        "User to disown the package base. Please only do this "
+                        "if the package needs maintainer action, the "
+                        "maintainer is MIA and you already tried to contact "
+                        "the maintainer previously." | tr
+                    }}
+                </p>
+
+                <p>
+                    <button class="button" type="submit">
+                        {{ "Submit Request" | tr }}
+                    </button>
+                </p>
+
+            </fieldset>
+        </form>
+
+    </div>
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 9867ce42..8704d702 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1400,3 +1400,23 @@ def test_requests_selfmade(client: TestClient, user: User,
     for row in rows:
         last_row = row.xpath('./td')[-1].xpath('./a')[0]
         assert last_row.text.strip() == "Close"
+
+
+def test_pkgbase_request_not_found(client: TestClient, user: User):
+    pkgbase_name = "fake"
+    endpoint = f"/pkgbase/{pkgbase_name}/request"
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_request(client: TestClient, user: User, package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
diff --git a/web/html/js/typeahead-pkgbase-request.js b/web/html/js/typeahead-pkgbase-request.js
new file mode 100644
index 00000000..e012d55f
--- /dev/null
+++ b/web/html/js/typeahead-pkgbase-request.js
@@ -0,0 +1,36 @@
+function showHideMergeSection() {
+    const elem = document.getElementById('id_type');
+    const merge_section = document.getElementById('merge_section');
+    if (elem.value == 'merge') {
+        merge_section.style.display = '';
+    } else {
+        merge_section.style.display = 'none';
+    }
+}
+
+function showHideRequestHints() {
+    document.getElementById('deletion_hint').style.display = 'none';
+    document.getElementById('merge_hint').style.display = 'none';
+    document.getElementById('orphan_hint').style.display = 'none';
+
+    const elem = document.getElementById('id_type');
+    document.getElementById(elem.value + '_hint').style.display = '';
+}
+
+document.addEventListener('DOMContentLoaded', function() {
+    showHideMergeSection();
+    showHideRequestHints();
+
+    const input = document.getElementById('id_merge_into');
+    const form = document.getElementById('request-form');
+    const type = "suggest-pkgbase";
+
+    typeahead.init(type, input, form, false);
+});
+
+// Bind the change event here, otherwise we have to inline javascript,
+// which angers CSP (Content Security Policy).
+document.getElementById("id_type").addEventListener("change", function() {
+    showHideMergeSection();
+    showHideRequestHints();
+});

From 1c031638c65588ef5c219adffdaf1a7b695d0d02 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 13 Sep 2021 17:26:25 -0700
Subject: [PATCH 375/844] feat(FastAPI): add /pkgbase/{name}/request (post)

This change implements the FastAPI version of the
/pkgbase/{name}/request form's action.

Changes from PHP:

- Additional errors are now displayed for the **merge_into** field,
  which are only displayed when the Merge type is selected.
    - If the **merge_into** field is empty, a new error is displayed:
      'The "Merge into" field must not be empty.'
    - If the **merge_into** field is given the name of a package base
      which does not exist, a new error is displayed:
      "The package base you want to merge into does not exist."
    - If the **merge_into** field is given the name of the package
      base that a request is being created for, a new error is
      displayed: "You cannot merge a package base into itself."
- When an error is encountered, users are now brought back to
  the request form which they submitted and an error is displayed
  at the top of the page.
- If an invalid type is provided, users are returned to a BAD_REQUEST
  status rendering of the request form.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/request_type.py  |   6 ++
 aurweb/routers/packages.py     |  69 ++++++++++++++
 templates/pkgbase/request.html |  12 ++-
 test/test_packages_routes.py   | 161 +++++++++++++++++++++++++++++++++
 4 files changed, 247 insertions(+), 1 deletion(-)

diff --git a/aurweb/models/request_type.py b/aurweb/models/request_type.py
index a26dcf9a..48ace3a3 100644
--- a/aurweb/models/request_type.py
+++ b/aurweb/models/request_type.py
@@ -20,6 +20,12 @@ class RequestType(Base):
         name = self.Name
         return name[0].upper() + name[1:]
 
+    def title(self) -> str:
+        return self.name_display()
+
+    def __getitem__(self, n: int) -> str:
+        return self.Name[n]
+
 
 DELETION_ID = db.query(RequestType, RequestType.Name == DELETION).first().ID
 ORPHAN_ID = db.query(RequestType, RequestType.Name == ORPHAN).first().ID
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 9c9a41e3..231f953b 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -582,3 +582,72 @@ async def package_request(request: Request, name: str):
 
     context["pkgbase"] = pkgbase
     return render_template(request, "pkgbase/request.html", context)
+
+
+@router.post("/pkgbase/{name}/request")
+@auth_required(True)
+async def pkgbase_request_post(request: Request, name: str,
+                               type: str = Form(...),
+                               merge_into: str = Form(default=None),
+                               comments: str = Form(default=str())):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    # Create our render context.
+    context = make_context(request, "Submit Request")
+    context["pkgbase"] = pkgbase
+    if type not in {"deletion", "merge", "orphan"}:
+        # In the case that someone crafted a POST request with an invalid
+        # type, just return them to the request form with BAD_REQUEST status.
+        return render_template(request, "pkgbase/request.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    if not comments:
+        context["errors"] = ["The comment field must not be empty."]
+        return render_template(request, "pkgbase/request.html", context)
+
+    if type == "merge":
+        # Perform merge-related checks.
+        if not merge_into:
+            # TODO: This error needs to be translated.
+            context["errors"] = ['The "Merge into" field must not be empty.']
+            return render_template(request, "pkgbase/request.html", context)
+
+        target = db.query(PackageBase).filter(
+            PackageBase.Name == merge_into
+        ).first()
+        if not target:
+            # TODO: This error needs to be translated.
+            context["errors"] = [
+                "The package base you want to merge into does not exist."
+            ]
+            return render_template(request, "pkgbase/request.html", context)
+
+        if target.ID == pkgbase.ID:
+            # TODO: This error needs to be translated.
+            context["errors"] = [
+                "You cannot merge a package base into itself."
+            ]
+            return render_template(request, "pkgbase/request.html", context)
+
+    # All good. Create a new PackageRequest based on the given type.
+    now = int(datetime.utcnow().timestamp())
+    reqtype = db.query(RequestType, RequestType.Name == type).first()
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    notify_ = None
+    with db.begin():
+        pkgreq = db.create(PackageRequest, RequestType=reqtype, RequestTS=now,
+                           PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+                           MergeBaseName=merge_into, User=request.user,
+                           Comments=comments, ClosureComment=str())
+
+    # Prepare notification object.
+    notify_ = notify.RequestOpenNotification(
+        conn, request.user.ID, pkgreq.ID, reqtype,
+        pkgreq.PackageBase.ID, merge_into=merge_into or None)
+
+    # Send the notification now that we're out of the DB scope.
+    notify_.send()
+
+    # Redirect the submitting user to /packages.
+    return RedirectResponse("/packages",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/pkgbase/request.html b/templates/pkgbase/request.html
index 66d69f07..bb9b5aba 100644
--- a/templates/pkgbase/request.html
+++ b/templates/pkgbase/request.html
@@ -1,8 +1,17 @@
 {% extends "partials/layout.html" %}
 
 {% block pageContent %}
+    {% if errors %}
+        <ul class="errorlist">
+            {% for error in errors %}
+                <li>{{ error | tr }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+
     <div class="box">
         <h2>{{ "Submit Request" | tr }}: {{ pkgbase.Name }}</h2>
+
         <p>
             {{ "Use this form to file a request against package base "
             "%s%s%s which includes the following packages:"
@@ -15,7 +24,8 @@
         </ul>
 
         {# Request form #}
-        <form id="request-form" action="/pkgbase/{{ pkgbase.Name }}/request">
+        <form id="request-form" action="/pkgbase/{{ pkgbase.Name }}/request"
+              method="post">
             <fieldset>
                 <p>
                     <label for="id_type">{{ "Request type" | tr }}:</label>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 8704d702..5353d3bf 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1420,3 +1420,164 @@ def test_pkgbase_request(client: TestClient, user: User, package: Package):
     with client as request:
         resp = request.get(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.OK)
+
+
+def test_pkgbase_request_post_deletion(client: TestClient, user: User,
+                                       package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "deletion",
+            "comments": "We want to delete this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = db.query(PackageRequest).filter(
+        PackageRequest.PackageBaseID == package.PackageBase.ID
+    ).first()
+    assert pkgreq is not None
+    assert pkgreq.RequestType.Name == "deletion"
+    assert pkgreq.PackageBaseName == package.PackageBase.Name
+    assert pkgreq.Comments == "We want to delete this."
+
+
+def test_pkgbase_request_post_orphan(client: TestClient, user: User,
+                                     package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "orphan",
+            "comments": "We want to disown this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = db.query(PackageRequest).filter(
+        PackageRequest.PackageBaseID == package.PackageBase.ID
+    ).first()
+    assert pkgreq is not None
+    assert pkgreq.RequestType.Name == "orphan"
+    assert pkgreq.PackageBaseName == package.PackageBase.Name
+    assert pkgreq.Comments == "We want to disown this."
+
+
+def test_pkgbase_request_post_merge(client: TestClient, user: User,
+                                    package: Package):
+    with db.begin():
+        pkgbase2 = db.create(PackageBase, Name="new-pkgbase",
+                             Submitter=user, Maintainer=user, Packager=user)
+        target = db.create(Package, PackageBase=pkgbase2,
+                           Name=pkgbase2.Name, Version="1.0.0")
+
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "merge",
+            "merge_into": target.PackageBase.Name,
+            "comments": "We want to merge this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = db.query(PackageRequest).filter(
+        PackageRequest.PackageBaseID == package.PackageBase.ID
+    ).first()
+    assert pkgreq is not None
+    assert pkgreq.RequestType.Name == "merge"
+    assert pkgreq.PackageBaseName == package.PackageBase.Name
+    assert pkgreq.MergeBaseName == target.PackageBase.Name
+    assert pkgreq.Comments == "We want to merge this."
+
+
+def test_pkgbase_request_post_not_found(client: TestClient, user: User):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/pkgbase/fake/request", data={
+            "type": "fake"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_request_post_invalid_type(client: TestClient,
+                                           user: User,
+                                           package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={"type": "fake"}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_pkgbase_request_post_no_comment_error(client: TestClient,
+                                               user: User,
+                                               package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "deletion",
+            "comments": ""  # An empty comment field causes an error.
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    expected = "The comment field must not be empty."
+    assert error.text.strip() == expected
+
+
+def test_pkgbase_request_post_merge_not_found_error(client: TestClient,
+                                                    user: User,
+                                                    package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "merge",
+            "merge_into": "fake",  # There is no PackageBase.Name "fake"
+            "comments": "We want to merge this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    expected = "The package base you want to merge into does not exist."
+    assert error.text.strip() == expected
+
+
+def test_pkgbase_request_post_merge_no_merge_into_error(client: TestClient,
+                                                        user: User,
+                                                        package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "merge",
+            "merge_into": "",  # There is no PackageBase.Name "fake"
+            "comments": "We want to merge this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    expected = 'The "Merge into" field must not be empty.'
+    assert error.text.strip() == expected
+
+
+def test_pkgbase_request_post_merge_self_error(client: TestClient, user: User,
+                                               package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "merge",
+            "merge_into": package.PackageBase.Name,
+            "comments": "We want to merge this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    expected = "You cannot merge a package base into itself."
+    assert error.text.strip() == expected

From f6141ff1778e8d1376a0db3b92e7a7d7fa2f9097 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 14 Sep 2021 21:37:35 -0700
Subject: [PATCH 376/844] feat(FastAPI): add /requests/{id}/close (get, post)

Changes from PHP:

- If a user submits a POST request with an invalid reason,
  they are returned back to the closure form with a BAD_REQUEST status.
- Now, users which created a PackageRequest have the ability to close
  their own.
- Form action has been changed to `/requests/{id}/close`.

Closes https://gitlab.archlinux.org/archlinux/aurweb/-/issues/20

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py    | 52 ++++++++++++++++++++-
 templates/requests/close.html | 60 ++++++++++++++++++++++++
 test/test_packages_routes.py  | 86 ++++++++++++++++++++++++++++++++++-
 3 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100644 templates/requests/close.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 231f953b..a3effb36 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -22,7 +22,7 @@ from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_license import PackageLicense
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
-from aurweb.models.package_request import PENDING_ID, PackageRequest
+from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID, PackageRequest
 from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID
@@ -651,3 +651,53 @@ async def pkgbase_request_post(request: Request, name: str,
     # Redirect the submitting user to /packages.
     return RedirectResponse("/packages",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.get("/requests/{id}/close")
+@auth_required(True)
+async def requests_close(request: Request, id: int):
+    pkgreq = db.query(PackageRequest).filter(PackageRequest.ID == id).first()
+    if not request.user.is_elevated() and request.user != pkgreq.User:
+        # Request user doesn't have permission here: redirect to '/'.
+        return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
+
+    context = make_context(request, "Close Request")
+    context["pkgreq"] = pkgreq
+    return render_template(request, "requests/close.html", context)
+
+
+@router.post("/requests/{id}/close")
+@auth_required(True)
+async def requests_close_post(request: Request, id: int,
+                              reason: int = Form(default=0),
+                              comments: str = Form(default=str())):
+    pkgreq = db.query(PackageRequest).filter(PackageRequest.ID == id).first()
+    if not request.user.is_elevated() and request.user != pkgreq.User:
+        # Request user doesn't have permission here: redirect to '/'.
+        return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
+
+    context = make_context(request, "Close Request")
+    context["pkgreq"] = pkgreq
+
+    if reason not in {ACCEPTED_ID, REJECTED_ID}:
+        # If the provided reason is not valid, send the user back to
+        # the closure form with a BAD_REQUEST status.
+        return render_template(request, "requests/close.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    if not request.user.is_elevated():
+        # If we're closing the request as the user who created it,
+        # the reason should just be a REJECTION.
+        reason = REJECTED_ID
+
+    with db.begin():
+        pkgreq.Closer = request.user
+        pkgreq.Status = reason
+        pkgreq.ClosureComment = comments
+
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    notify_ = notify.RequestCloseNotification(
+        conn, request.user.ID, pkgreq.ID, pkgreq.status_display())
+    notify_.send()
+
+    return RedirectResponse("/requests", status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/requests/close.html b/templates/requests/close.html
new file mode 100644
index 00000000..7862064a
--- /dev/null
+++ b/templates/requests/close.html
@@ -0,0 +1,60 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Close Request" | tr }}: {{ pkgreq.PackageBaseName }}</h2>
+
+        <p>
+            {{
+                "Use this form to close the request for package base %s%s%s."
+                | tr | format("<strong>", pkgreq.PackageBaseName, "</strong>")
+                | safe
+            }}
+        </p>
+
+        <p>
+            <em>{{ "Note" | tr }}:</em>
+            {{
+                "The comments field can be left empty. However, it is highly "
+                "recommended to add a comment when rejecting a request."
+                | tr
+            }}
+        </p>
+
+        <form action="/requests/{{ pkgreq.ID }}/close" method="post">
+            <fieldset>
+                <p>
+                    <label for="id_reason">{{ "Reason" | tr }}:</label>
+                    <select id="id_reason" name="reason">
+                        {# Value 2 == "Accepted" status.
+                        See aurweb.models.package_request. #}
+                        {% if request.user.is_elevated() %}
+                            <option value="2">
+                                {{ "Accepted" | tr }}
+                            </option>
+                        {% endif %}
+                        {# Value 3 == "Rejected" status.
+                        See aurweb.models.package_request. #}
+                        <option value="3">
+                            {{ "Rejected" | tr }}
+                        </option>
+                    </select>
+                </p>
+
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments" name="comments"
+                              rows="5" cols="50"></textarea>
+                </p>
+
+                <p>
+                    <button class="button" type="submit">
+                        {{ "Close Request" | tr }}
+                    </button>
+                </p>
+
+            </fieldset>
+        </form>
+
+    </div>
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 5353d3bf..5afe011a 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -20,7 +20,7 @@ from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_keyword import PackageKeyword
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
-from aurweb.models.package_request import PackageRequest
+from aurweb.models.package_request import ACCEPTED_ID, REJECTED_ID, PackageRequest
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import PROVIDES_ID, RelationType
 from aurweb.models.request_type import DELETION_ID, RequestType
@@ -1581,3 +1581,87 @@ def test_pkgbase_request_post_merge_self_error(client: TestClient, user: User,
     error = root.xpath('//ul[@class="errorlist"]/li')[0]
     expected = "You cannot merge a package base into itself."
     assert error.text.strip() == expected
+
+
+@pytest.fixture
+def pkgreq(user: User, package: Package) -> PackageRequest:
+    reqtype = db.query(RequestType).filter(
+        RequestType.ID == DELETION_ID
+    ).first()
+    with db.begin():
+        pkgreq = db.create(PackageRequest,
+                           RequestType=reqtype,
+                           User=user,
+                           PackageBase=package.PackageBase,
+                           PackageBaseName=package.PackageBase.Name,
+                           Comments=str(),
+                           ClosureComment=str())
+    yield pkgreq
+
+
+def test_requests_close(client: TestClient, user: User,
+                        pkgreq: PackageRequest):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(f"/requests/{pkgreq.ID}/close", cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+
+def test_requests_close_unauthorized(client: TestClient, maintainer: User,
+                                     pkgreq: PackageRequest):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(f"/requests/{pkgreq.ID}/close", cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == "/"
+
+
+def test_requests_close_post_invalid_reason(client: TestClient, user: User,
+                                            pkgreq: PackageRequest):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
+            "reason": 0
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_requests_close_post_unauthorized(client: TestClient, maintainer: User,
+                                          pkgreq: PackageRequest):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
+            "reason": ACCEPTED_ID
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == "/"
+
+
+def test_requests_close_post(client: TestClient, user: User,
+                             pkgreq: PackageRequest):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
+            "reason": REJECTED_ID
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    assert pkgreq.Status == REJECTED_ID
+    assert pkgreq.Closer == user
+    assert pkgreq.ClosureComment == str()
+
+
+def test_requests_close_post_rejected(client: TestClient, user: User,
+                                      pkgreq: PackageRequest):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
+            "reason": REJECTED_ID
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    assert pkgreq.Status == REJECTED_ID
+    assert pkgreq.Closer == user
+    assert pkgreq.ClosureComment == str()

From b5f8e69b8aaefc093eabb3163eb0dd6445682a8b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 3 Oct 2021 10:22:34 -0700
Subject: [PATCH 377/844] feat(FastAPI): use SQLAlchemy's scoped_session

Closes #113

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index ea6b6918..2b934300 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -3,6 +3,7 @@ import math
 import re
 
 from sqlalchemy import event
+from sqlalchemy.orm import scoped_session
 
 import aurweb.config
 import aurweb.util
@@ -167,7 +168,8 @@ def get_engine(echo: bool = False):
                                connect_args=connect_args,
                                echo=echo)
 
-        Session = sessionmaker(autocommit=True, autoflush=False, bind=engine)
+        Session = scoped_session(
+            sessionmaker(autocommit=True, autoflush=False, bind=engine))
         session = Session()
 
         if db_backend == "sqlite":

From 7bfc2bf9b44ba13526b20160531aea208f694c89 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 3 Oct 2021 15:11:42 -0700
Subject: [PATCH 378/844] fix(FastAPI): Improve sqlite testing speed

This commit adds a new Arch dependency: `libeatmydata`, which
provides the `eatmydata` executable that stubs out fsync() operations.
We use `eatmydata` to run our sharness and pytests in Docker now.

With `autocommit=True`, required by SQLAlchemy to keep the
session up to date with external DB modifications, many fsync
calls are used in the SQLite backend; especially because we're wiping
and creating records in every DB-bound test.

**Before:**

- mysql: 1m42s (elapsed during pytest run)
- sqlite: 3m06s (elapsed during pytest run)

**After:**

- mysql: 1m40s (elapsed during pytest run)
- sqlite: 1m50s (elapsed during pytest run)

Shout out to @klausenbusk, who suggested this as a possible fix,
and it was. Thanks, Kristian!

Closes #120

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/install-deps.sh |  2 +-
 docker/scripts/run-pytests.sh  |  2 +-
 docker/scripts/run-sharness.sh |  2 +-
 test/README.md                 | 10 ++++++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index f8881d05..fc068b06 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -8,7 +8,7 @@ pacman -Syu --noconfirm --noprogressbar \
     --cachedir .pkg-cache git gpgme nginx redis openssh \
       mariadb mariadb-libs cgit uwsgi uwsgi-plugin-cgi \
       php php-fpm memcached php-memcached python-pip pyalpm \
-      python-srcinfo curl
+      python-srcinfo curl libeatmydata
 
 # https://python-poetry.org/docs/ Installation section.
 curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
diff --git a/docker/scripts/run-pytests.sh b/docker/scripts/run-pytests.sh
index c6baa939..ef8a2318 100755
--- a/docker/scripts/run-pytests.sh
+++ b/docker/scripts/run-pytests.sh
@@ -27,7 +27,7 @@ python -m aurweb.initdb 2>/dev/null || \
     (echo "Error: aurweb.initdb failed; already initialized?" && /bin/true)
 
 # Run pytest with optional targets in front of it.
-make -C test "${PARAMS[@]}" pytest
+eatmydata -- make -C test "${PARAMS[@]}" pytest
 
 # By default, report coverage and move it into cache.
 if [ $COVERAGE -eq 1 ]; then
diff --git a/docker/scripts/run-sharness.sh b/docker/scripts/run-sharness.sh
index 8e928b3f..fe16751c 100755
--- a/docker/scripts/run-sharness.sh
+++ b/docker/scripts/run-sharness.sh
@@ -4,4 +4,4 @@ set -eou pipefail
 # Initialize the new database; ignore errors.
 python -m aurweb.initdb 2>/dev/null || /bin/true
 
-make -C test sh
+eatmydata -- make -C test sh
diff --git a/test/README.md b/test/README.md
index ef8a08f4..13fb0a0c 100644
--- a/test/README.md
+++ b/test/README.md
@@ -31,6 +31,10 @@ For all the test to run, the following Arch packages should be installed:
 - postfix
 - openssh
 
+Optional (faster testing)
+
+- libeatmydata
+
 Test Configuration
 ------------------
 
@@ -115,6 +119,12 @@ To run `pytest` Python test suites:
 
     $ make -C test pytest
 
+**Note:** For SQLite tests, users may want to use `eatmydata`
+to improve speed:
+
+    $ eatmydata -- make -C test sh
+    $ eatmydata -- make -C test pytest
+
 To produce coverage reports related to Python when running tests manually,
 use the following method:
 

From 08068e0a5c70ef8d5ef94c20952d9aa15ba6c8dc Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Mon, 4 Oct 2021 13:30:25 -0400
Subject: [PATCH 379/844] fix(FastAPI): use configured letter case for SSH
 fingerprints

Currently, the config parser converts all keys to lowercase which is
inconsistent with the old PHP behavior. This has been fixed and relevant
fingerprint-getting functions have been simplified without changes in
behavior.

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/config.py      | 8 ++++----
 aurweb/util.py        | 8 +-------
 test/test_homepage.py | 4 +++-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/aurweb/config.py b/aurweb/config.py
index 52fadda2..aa111f15 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -17,6 +17,7 @@ def _get_parser():
         defaults = os.environ.get('AUR_CONFIG_DEFAULTS', path + '.defaults')
 
         _parser = configparser.RawConfigParser()
+        _parser.optionxform = lambda option: option
         if os.path.isfile(defaults):
             with open(defaults) as f:
                 _parser.read_file(f)
@@ -48,7 +49,6 @@ def getint(section, option, fallback=None):
     return _get_parser().getint(section, option, fallback=fallback)
 
 
-def get_section(section_name):
-    for section in _get_parser().sections():
-        if section == section_name:
-            return _get_parser()[section]
+def get_section(section):
+    if section in _get_parser().sections():
+        return _get_parser()[section]
diff --git a/aurweb/util.py b/aurweb/util.py
index f9181811..08e6d7c6 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -166,10 +166,4 @@ def add_samesite_fields(response: Response, value: str):
 
 
 def get_ssh_fingerprints():
-    fingerprints = {}
-    fingerprint_section = aurweb.config.get_section("fingerprints")
-
-    if fingerprint_section:
-        fingerprints = {key: fingerprint_section[key] for key in fingerprint_section.keys()}
-
-    return fingerprints
+    return aurweb.config.get_section("fingerprints") or {}
diff --git a/test/test_homepage.py b/test/test_homepage.py
index fef3532d..5c678b71 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -96,7 +96,9 @@ def test_homepage_ssh_fingerprints(get_ssh_fingerprints_mock):
     with client as request:
         response = request.get("/")
 
-    assert list(fingerprints.values())[0] in response.content.decode()
+    for key, value in fingerprints.items():
+        assert key in response.content.decode()
+        assert value in response.content.decode()
     assert 'The following SSH fingerprints are used for the AUR' in response.content.decode()
 
 

From 5c179dc4d35b8c2bbacce61d0664fc7285d99e56 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Mon, 4 Oct 2021 17:04:23 -0400
Subject: [PATCH 380/844] fix(FastAPI): use consistent ordering on dashboard
 and request page

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/routers/html.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 3d44cf87..6e7697e4 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -6,7 +6,7 @@ from http import HTTPStatus
 
 from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
-from sqlalchemy import and_, or_
+from sqlalchemy import and_, case, or_
 
 import aurweb.config
 import aurweb.models.package_request
@@ -17,7 +17,7 @@ from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_comaintainer import PackageComaintainer
-from aurweb.models.package_request import PackageRequest
+from aurweb.models.package_request import PENDING_ID, PackageRequest
 from aurweb.models.user import User
 from aurweb.packages.util import query_notified, query_voted, updated_packages
 from aurweb.templates import make_context, render_template
@@ -166,6 +166,11 @@ async def index(request: Request):
         # Package requests created by request.user.
         context["package_requests"] = request.user.package_requests.filter(
             PackageRequest.RequestTS >= start
+        ).order_by(
+            # Order primarily by the Status column being PENDING_ID,
+            # and secondarily by RequestTS; both in descending order.
+            case([(PackageRequest.Status == PENDING_ID, 1)], else_=0).desc(),
+            PackageRequest.RequestTS.desc()
         ).limit(50).all()
 
         # Packages that the request user maintains or comaintains.

From 9af76a73a331b889815e42866e3df4bbe8ddc5d0 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Mon, 4 Oct 2021 16:32:10 -0400
Subject: [PATCH 381/844] fix(FastAPI): include MergeBaseName in merge request
 type

This was done on the dedicated requests page, but missed on the
dashboard.

Signed-off-by: Steven Guikal <void@fluix.one>
---
 templates/partials/packages/requests.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/partials/packages/requests.html b/templates/partials/packages/requests.html
index 5239ca72..5188a476 100644
--- a/templates/partials/packages/requests.html
+++ b/templates/partials/packages/requests.html
@@ -20,7 +20,13 @@
                         {{ request.PackageBase.Name }}
                     </a>
                 </td>
-                <td>{{ request.RequestType.name_display() | tr }}</td>
+                <td>
+                    {{ request.RequestType.name_display() | tr }}
+                    {# If the RequestType is a merge and request.MergeBaseName is valid... #}
+                    {% if request.RequestType.ID == 3 and request.MergeBaseName %}
+                        ({{ request.MergeBaseName }})
+                    {% endif %}
+                </td>
                 <td class="wrap">{{ request.Comments }}</td>
                 <td>
                     <a href="/account/{{ request.User.Username }}"

From f392b3607eeb8a0a0e9e8983160fd0db31b53273 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Mon, 4 Oct 2021 17:37:25 -0400
Subject: [PATCH 382/844] fix(FastAPI): add missing translation filter for
 request type

Signed-off-by: Steven Guikal <void@fluix.one>
---
 templates/requests.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/requests.html b/templates/requests.html
index a9017e2f..74ea6416 100644
--- a/templates/requests.html
+++ b/templates/requests.html
@@ -31,7 +31,7 @@
                             </td>
                             {# Type #}
                             <td>
-                                {{ result.RequestType.name_display() }}
+                                {{ result.RequestType.name_display() | tr }}
                                 {# If the RequestType is a merge and request.MergeBaseName is valid... #}
                                 {% if result.RequestType.ID == 3 and result.MergeBaseName %}
                                     ({{ result.MergeBaseName }})

From 1956be0f469e5870d957a8dec2fa48100a247273 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Tue, 5 Oct 2021 14:00:12 -0400
Subject: [PATCH 383/844] fix(FastAPI): prefill login fields with entered data

---
 aurweb/routers/auth.py   | 16 ++++++++--------
 templates/login.html     |  9 +++++++--
 test/test_auth_routes.py | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 8f37fe27..a985281e 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -9,14 +9,14 @@ import aurweb.config
 from aurweb import util
 from aurweb.auth import auth_required
 from aurweb.models.user import User
-from aurweb.templates import make_context, render_template
+from aurweb.templates import make_variable_context, render_template
 
 router = APIRouter()
 
 
-def login_template(request: Request, next: str, errors: list = None):
+async def login_template(request: Request, next: str, errors: list = None):
     """ Provide login-specific template context to render_template. """
-    context = make_context(request, "Login", next)
+    context = await make_variable_context(request, "Login", next)
     context["errors"] = errors
     context["url_base"] = f"{request.url.scheme}://{request.url.netloc}"
     return render_template(request, "login.html", context)
@@ -25,7 +25,7 @@ def login_template(request: Request, next: str, errors: list = None):
 @router.get("/login", response_class=HTMLResponse)
 @auth_required(False)
 async def login_get(request: Request, next: str = "/"):
-    return login_template(request, next)
+    return await login_template(request, next)
 
 
 @router.post("/login", response_class=HTMLResponse)
@@ -39,8 +39,8 @@ async def login_post(request: Request,
 
     user = session.query(User).filter(User.Username == user).first()
     if not user:
-        return login_template(request, next,
-                              errors=["Bad username or password."])
+        return await login_template(request, next,
+                                    errors=["Bad username or password."])
 
     cookie_timeout = 0
 
@@ -50,8 +50,8 @@ async def login_post(request: Request,
 
     sid = user.login(request, passwd, cookie_timeout)
     if not sid:
-        return login_template(request, next,
-                              errors=["Bad username or password."])
+        return await login_template(request, next,
+                                    errors=["Bad username or password."])
 
     login_timeout = aurweb.config.getint("options", "login_timeout")
 
diff --git a/templates/login.html b/templates/login.html
index da7bd722..3c4f945f 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -45,7 +45,8 @@
                     </label>
 
                     <input id="id_username" type="text" name="user" size="30"
-                           maxlength="254" autofocus="autofocus">
+                           maxlength="254" autofocus="autofocus"
+                           value="{{ user or '' }}">
                 </p>
 
                 <p>
@@ -57,7 +58,11 @@
                 </p>
 
                 <p>
-                    <input id="id_remember_me" type="checkbox" name="remember_me">
+                    <input id="id_remember_me" type="checkbox" name="remember_me"
+                        {% if remember_me %}
+                            checked="checked"
+                        {% endif %}
+                    >
                     <label for="id_remember_me">
                         {% trans %}Remember me{% endtrans %}
                     </label>
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index 1d8f9cbe..313f9927 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -160,6 +160,11 @@ def test_login_missing_username():
         response = request.post("/login", data=post_data)
     assert "AURSID" not in response.cookies
 
+    # Make sure password isn't prefilled and remember_me isn't checked.
+    content = response.content.decode()
+    assert post_data["passwd"] not in content
+    assert "checked" not in content
+
 
 def test_login_remember_me():
     post_data = {
@@ -188,6 +193,26 @@ def test_login_remember_me():
     assert _session.LastUpdateTS < expected_ts + 5
 
 
+def test_login_incorrect_password_remember_me():
+    post_data = {
+        "user": "test",
+        "passwd": "badPassword",
+        "next": "/",
+        "remember_me": "on"
+    }
+
+    with client as request:
+        response = request.post("/login", data=post_data)
+    assert "AURSID" not in response.cookies
+
+    # Make sure username is prefilled, password isn't prefilled, and remember_me
+    # is checked.
+    content = response.content.decode()
+    assert post_data["user"] in content
+    assert post_data["passwd"] not in content
+    assert "checked" in content
+
+
 def test_login_missing_password():
     post_data = {
         "user": "test",
@@ -198,6 +223,11 @@ def test_login_missing_password():
         response = request.post("/login", data=post_data)
     assert "AURSID" not in response.cookies
 
+    # Make sure username is prefilled and remember_me isn't checked.
+    content = response.content.decode()
+    assert post_data["user"] in content
+    assert "checked" not in content
+
 
 def test_login_incorrect_password():
     post_data = {
@@ -209,3 +239,10 @@ def test_login_incorrect_password():
     with client as request:
         response = request.post("/login", data=post_data)
     assert "AURSID" not in response.cookies
+
+    # Make sure username is prefilled, password isn't prefilled and remember_me
+    # isn't checked.
+    content = response.content.decode()
+    assert post_data["user"] in content
+    assert post_data["passwd"] not in content
+    assert "checked" not in content

From 1bce53bbb7343fc861f253e97be171403bb930f4 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Tue, 5 Oct 2021 14:36:46 -0400
Subject: [PATCH 384/844] fix(FastAPI): mark user and passwd as required fields

---
 templates/login.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/login.html b/templates/login.html
index 3c4f945f..45fc1645 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -46,7 +46,7 @@
 
                     <input id="id_username" type="text" name="user" size="30"
                            maxlength="254" autofocus="autofocus"
-                           value="{{ user or '' }}">
+                           required="required" value="{{ user or '' }}">
                 </p>
 
                 <p>
@@ -54,7 +54,7 @@
                         {% trans %}Password{% endtrans %}:
                     </label>
                     <input id="id_password" type="password" name="passwd"
-                           size="30">
+                           size="30" required="required">
                 </p>
 
                 <p>

From a54a09f61d0495789b22724c5f83bf883af83b45 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Tue, 5 Oct 2021 12:38:31 -0400
Subject: [PATCH 385/844] fix(FastAPI): fix padding on email inputs

Signed-off-by: Steven Guikal <void@fluix.one>
---
 web/html/css/archweb.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css
index b935d7db..45b9bff0 100644
--- a/web/html/css/archweb.css
+++ b/web/html/css/archweb.css
@@ -329,6 +329,7 @@ label {
 
 input[type=text],
 input[type=password],
+input[type=email],
 textarea {
     padding: 0.10em;
 }

From 889c5b1e21788a1f3126dfa121b6253ea9497501 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 6 Oct 2021 22:08:17 -0700
Subject: [PATCH 386/844] fix(FastAPI): pkgbase actions template

Display Delete, Merge and Disown actions based on user credentials.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/actions.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 6c30153c..a54d4c90 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -142,17 +142,21 @@
                 </a>
             {% endif %}
             </li>
-            {% if is_maintainer %}
+            {% if request.user.has_credential("CRED_PKGBASE_DELETE") %}
                 <li>
                     <a href="/pkgbase/{{ result.Name }}/delete/">
                         {{ "Delete Package" | tr }}
                     </a>
                 </li>
+            {% endif %}
+            {% if request.user.has_credential("CRED_PKGBASE_MERGE") %}
                 <li>
                     <a href="/pkgbase/{{ result.Name }}/merge/">
                         {{ "Merge Package" | tr }}
                     </a>
                 </li>
+            {% endif %}
+            {% if request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
                 <li>
                     <form action="/pkgbase/{{ result.Name }}/disown/" method="post">
                         <input type="submit"

From 33b18907ebe30a35bad5d6e377fcafea15f010e1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 6 Oct 2021 22:29:53 -0700
Subject: [PATCH 387/844] feat(FastAPI): add CRED_PKGBASE_MERGE

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 21d31081..fb062eab 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -268,6 +268,7 @@ CRED_PKGREQ_LIST = 18
 CRED_TU_ADD_VOTE = 19
 CRED_TU_LIST_VOTES = 20
 CRED_TU_VOTE = 21
+CRED_PKGBASE_MERGE = 29
 
 
 def has_any(user, *account_types):
@@ -321,6 +322,7 @@ cred_filters = {
     CRED_TU_LIST_VOTES: trusted_user,
     CRED_TU_VOTE: trusted_user,
     CRED_ACCOUNT_EDIT_DEV: developer,
+    CRED_PKGBASE_MERGE: trusted_user_or_dev,
 }
 
 

From e5299b5ed4c9c9041217f196f5721d8b49bfbf00 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 6 Oct 2021 23:17:08 -0700
Subject: [PATCH 388/844] fix(FastAPI): pkgbase/package tests

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_packages_routes.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 5afe011a..4118744a 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -335,6 +335,30 @@ def test_package_authenticated_maintainer(client: TestClient,
         resp = request.get(package_endpoint(package), cookies=cookies)
     assert resp.status_code == int(HTTPStatus.OK)
 
+    expected = [
+        "View PKGBUILD",
+        "View Changes",
+        "Download snapshot",
+        "Search wiki",
+        "Flag package out-of-date",
+        "Vote for this package",
+        "Enable notifications",
+        "Manage Co-Maintainers",
+        "Submit Request",
+        "Disown Package"
+    ]
+    for expected_text in expected:
+        assert expected_text in resp.text
+
+
+def test_package_authenticated_tu(client: TestClient,
+                                  tu_user: User,
+                                  package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(package_endpoint(package), cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
     expected = [
         "View PKGBUILD",
         "View Changes",

From 75c49e4f8ada4cae1c5c5fd02ddd3ce73e7ac06a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 00:03:24 -0700
Subject: [PATCH 389/844] feat(FastAPI): support {named} fmt in auth_required
 redirect

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index fb062eab..d44d4ded 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -1,4 +1,5 @@
 import functools
+import re
 
 from datetime import datetime
 from http import HTTPStatus
@@ -121,6 +122,7 @@ class BasicAuthBackend(AuthenticationBackend):
 
 
 def auth_required(is_required: bool = True,
+                  login: bool = False,
                   redirect: str = "/",
                   template: tuple = None,
                   status_code: HTTPStatus = HTTPStatus.UNAUTHORIZED):
@@ -162,8 +164,16 @@ def auth_required(is_required: bool = True,
         async def wrapper(request, *args, **kwargs):
             if request.user.is_authenticated() != is_required:
                 url = "/"
+
                 if redirect:
-                    url = redirect
+                    path_params_expr = re.compile(r'\{(\w+)\}')
+                    match = re.findall(path_params_expr, redirect)
+                    args = {k: request.path_params.get(k) for k in match}
+                    url = redirect.format(**args)
+
+                    if login:
+                        url = "/login?" + util.urlencode({"next": url})
+
                 if template:
                     # template=("template.html",
                     #           ["Some Title", "someFormatted {}"],

From 8bc1fab74df9f14a47ad1923a718633702ae82eb Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 00:26:57 -0700
Subject: [PATCH 390/844] change(FastAPI): automate request login requirement

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 2 +-
 templates/partials/packages/actions.html | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index a3effb36..539f9526 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -571,7 +571,7 @@ async def requests(request: Request,
 
 
 @router.get("/pkgbase/{name}/request")
-@auth_required(True)
+@auth_required(True, login=True, redirect="/pkgbase/{name}")
 async def package_request(request: Request, name: str):
     context = make_context(request, "Submit Request")
 
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index a54d4c90..7355420c 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -132,15 +132,9 @@
                 </li>
             {% endif %}
             <li>
-            {% if not request.user.is_authenticated() %}
-                <a href="/login?next={{ '/pkgbase/%s/request' | format(result.Name) | quote_plus }}">
-                    {{ "Submit Request" | tr }}
-                </a>
-            {% else %}
                 <a href="/pkgbase/{{ result.Name }}/request/">
                     {{ "Submit Request" | tr }}
                 </a>
-            {% endif %}
             </li>
             {% if request.user.has_credential("CRED_PKGBASE_DELETE") %}
                 <li>

From dc11a88ed35f9cfc8c253e23f5814867448f3ac0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 00:39:25 -0700
Subject: [PATCH 391/844] change(FastAPI): depend on auth_required redirect for
 pkgbase actions

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/actions.html | 133 +++++++++--------------
 1 file changed, 51 insertions(+), 82 deletions(-)

diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 7355420c..f1863663 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -23,99 +23,68 @@
                     {{ "Search wiki" | tr }}
                 </a>
             </li>
-            {% if not request.user.is_authenticated() %}
-                {% if not out_of_date %}
+            {% if not out_of_date %}
                 <li>
                     <a href="/pkgbase/{{ result.Name }}/flag/">
                         {{ "Flag package out-of-date" | tr }}
                     </a>
                 </li>
-                {% else %}
-                    <li>
-                        <span class="flagged">
-                            {% set ood_ts = result.OutOfDateTS | dt | as_timezone(timezone) %}
-                            {{
-                            "Flagged out-of-date (%s)"
-                            | tr | format(ood_ts.strftime("%Y-%m-%d"))
-                            }}
-                        </span>
-                    </li>
-                {% endif %}
-                <li>
-                    <a href="/login?next={{ request.url.path | quote_plus }}">
-                        {{ "Vote for this package" | tr }}
-                    </a>
-                </li>
-                <li>
-                    <a href="/login?next={{ request.url.path | quote_plus }}">
-                        {{ "Enable notifications" | tr }}
-                    </a>
-                </li>
             {% else %}
-                {% if not out_of_date %}
-                    <li>
-                        <a href="/pkgbase/{{ result.Name }}/flag/">
-                            {{ "Flag package out-of-date" | tr }}
-                        </a>
-                    </li>
-                {% else %}
-                    <li>
-                        <span class="flagged">
-                            {% set ood_ts = result.OutOfDateTS | dt | as_timezone(timezone) %}
-                            {{
-                            "Flagged out-of-date (%s)"
-                            | tr | format(ood_ts.strftime("%Y-%m-%d"))
-                            }}
-                        </span>
-                    </li>
-                    <li>
-                        <form action="/pkgbase/{{ result.Name }}/unflag" method="post">
-                            <input class="button text-button"
-                                   type="submit"
-                                   name="do_UnFlag"
-                                   value="{{ 'Unflag package' | tr }}"
+                <li>
+                    <span class="flagged">
+                        {% set ood_ts = result.OutOfDateTS | dt | as_timezone(timezone) %}
+                        {{
+                        "Flagged out-of-date (%s)"
+                        | tr | format(ood_ts.strftime("%Y-%m-%d"))
+                        }}
+                    </span>
+                </li>
+                <li>
+                    <form action="/pkgbase/{{ result.Name }}/unflag" method="post">
+                        <input class="button text-button"
+                               type="submit"
+                               name="do_UnFlag"
+                               value="{{ 'Unflag package' | tr }}"
+                        />
+                    </form>
+                </li>
+            {% endif %}
+                <li>
+                    {% if not voted %}
+                    <form action="/pkgbase/{{ result.Name }}/vote/" method="post">
+                        <input type="submit"
+                               class="button text-button"
+                               name="do_Vote"
+                               value="{{ 'Vote for this package' | tr }}" />
+                    </form>
+                    {% else %}
+                    <form action="/pkgbase/{{ result.Name }}/unvote/" method="post">
+                        <input type="submit"
+                               class="button text-button"
+                               name="do_UnVote"
+                               value="{{ 'Remove vote' | tr }}" />
+                    </form>
+                    {% endif %}
+                </li>
+                <li>
+                    {% if notified %}
+                        <form action="/pkgbase/{{ result.Name }}/unnotify/" method="post">
+                            <input type="submit"
+                                   class="button text-button"
+                                   name="do_UnNotify"
+                                   value="{{ 'Disable notifications' | tr }}"
                             />
                         </form>
-                    </li>
-                {% endif %}
-                    <li>
-                        {% if not voted %}
-                        <form action="/pkgbase/{{ result.Name }}/vote/" method="post">
+                    {% else %}
+                        <form action="/pkgbase/{{ result.Name }}/notify/" method="post">
                             <input type="submit"
                                    class="button text-button"
-                                   name="do_Vote"
-                                   value="{{ 'Vote for this package' | tr }}" />
+                                   name="do_Notify"
+                                   value="{{ 'Enable notifications' | tr }}"
+                            />
                         </form>
-                        {% else %}
-                        <form action="/pkgbase/{{ result.Name }}/unvote/" method="post">
-                            <input type="submit"
-                                   class="button text-button"
-                                   name="do_UnVote"
-                                   value="{{ 'Remove vote' | tr }}" />
-                        </form>
-                        {% endif %}
-                    </li>
-                    <li>
-                        {% if notified %}
-                            <form action="/pkgbase/{{ result.Name }}/unnotify/" method="post">
-                                <input type="submit"
-                                       class="button text-button"
-                                       name="do_UnNotify"
-                                       value="{{ 'Disable notifications' | tr }}"
-                                />
-                            </form>
-                        {% else %}
-                            <form action="/pkgbase/{{ result.Name }}/notify/" method="post">
-                                <input type="submit"
-                                       class="button text-button"
-                                       name="do_Notify"
-                                       value="{{ 'Enable notifications' | tr }}"
-                                />
-                            </form>
-                        {% endif %}
-                    </li>
-
-                {% endif %}
+                    {% endif %}
+                </li>
             </form>
             {% if request.user.has_credential('CRED_PKGBASE_EDIT_COMAINTAINERS', approved=[pkgbase.Maintainer]) %}
                 <li>

From a756691d08408b2098557ebc6a50cf205ffe0084 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 10:00:46 -0700
Subject: [PATCH 392/844] change(FastAPI): user_developer_or_trusted_user
 always True

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index fb062eab..9f56f90f 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -276,8 +276,7 @@ def has_any(user, *account_types):
 
 
 def user_developer_or_trusted_user(user):
-    return has_any(user, "User", "Trusted User", "Developer",
-                   "Trusted User & Developer")
+    return True
 
 
 def trusted_user(user):

From 2e6f8cb9f40869198bd6aaba34597467a5951476 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 09:43:47 -0700
Subject: [PATCH 393/844] change(FastAPI): @auth_required login kwarg defaulted
 to True

We pretty much want @auth_required to send users to login
if we enforce auth requirements but don't otherwise specify
a way to deal with it.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py                   |  3 ++-
 aurweb/routers/accounts.py       | 20 ++++++++++----------
 aurweb/routers/packages.py       | 28 ++++++++++++++--------------
 aurweb/routers/trusted_user.py   | 10 +++++-----
 test/test_trusted_user_routes.py |  6 ++++--
 5 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index d44d4ded..fb52fade 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -122,7 +122,7 @@ class BasicAuthBackend(AuthenticationBackend):
 
 
 def auth_required(is_required: bool = True,
-                  login: bool = False,
+                  login: bool = True,
                   redirect: str = "/",
                   template: tuple = None,
                   status_code: HTTPStatus = HTTPStatus.UNAUTHORIZED):
@@ -152,6 +152,7 @@ def auth_required(is_required: bool = True,
     applying any format operations.
 
     :param is_required: A boolean indicating whether the function requires auth
+    :param login: Redirect to `/login`, passing `next=<redirect>`
     :param redirect: Path to redirect to if is_required isn't True
     :param template: A three-element template tuple:
                      (path, title_iterable, variable_iterable)
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 3c799938..fc1c5242 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -30,14 +30,14 @@ logger = logging.getLogger(__name__)
 
 
 @router.get("/passreset", response_class=HTMLResponse)
-@auth_required(False)
+@auth_required(False, login=False)
 async def passreset(request: Request):
     context = await make_variable_context(request, "Password Reset")
     return render_template(request, "passreset.html", context)
 
 
 @router.post("/passreset", response_class=HTMLResponse)
-@auth_required(False)
+@auth_required(False, login=False)
 async def passreset_post(request: Request,
                          user: str = Form(...),
                          resetkey: str = Form(default=None),
@@ -315,7 +315,7 @@ def make_account_form_context(context: dict,
 
 
 @router.get("/register", response_class=HTMLResponse)
-@auth_required(False)
+@auth_required(False, login=False)
 async def account_register(request: Request,
                            U: str = Form(default=str()),    # Username
                            E: str = Form(default=str()),    # Email
@@ -341,7 +341,7 @@ async def account_register(request: Request,
 
 
 @router.post("/register", response_class=HTMLResponse)
-@auth_required(False)
+@auth_required(False, login=False)
 async def account_register_post(request: Request,
                                 U: str = Form(default=str()),  # Username
                                 E: str = Form(default=str()),  # Email
@@ -432,7 +432,7 @@ def cannot_edit(request, user):
 
 
 @router.get("/account/{username}/edit", response_class=HTMLResponse)
-@auth_required(True)
+@auth_required(True, redirect="/account/{username}")
 async def account_edit(request: Request,
                        username: str):
     user = db.query(User, User.Username == username).first()
@@ -448,7 +448,7 @@ async def account_edit(request: Request,
 
 
 @router.post("/account/{username}/edit", response_class=HTMLResponse)
-@auth_required(True)
+@auth_required(True, redirect="/account/{username}")
 async def account_edit_post(request: Request,
                             username: str,
                             U: str = Form(default=str()),  # Username
@@ -594,7 +594,7 @@ async def account(request: Request, username: str):
 
 
 @router.get("/accounts/")
-@auth_required(True)
+@auth_required(True, redirect="/accounts/")
 @account_type_required({TRUSTED_USER, DEVELOPER, TRUSTED_USER_AND_DEV})
 async def accounts(request: Request):
     context = make_context(request, "Accounts")
@@ -602,7 +602,7 @@ async def accounts(request: Request):
 
 
 @router.post("/accounts/")
-@auth_required(True)
+@auth_required(True, redirect="/accounts/")
 @account_type_required({TRUSTED_USER, DEVELOPER, TRUSTED_USER_AND_DEV})
 async def accounts_post(request: Request,
                         O: int = Form(default=0),  # Offset
@@ -688,7 +688,7 @@ def render_terms_of_service(request: Request,
 
 
 @router.get("/tos")
-@auth_required(True, redirect="/")
+@auth_required(True, redirect="/tos")
 async def terms_of_service(request: Request):
     # Query the database for terms that were previously accepted,
     # but now have a bumped Revision that needs to be accepted.
@@ -709,7 +709,7 @@ async def terms_of_service(request: Request):
 
 
 @router.post("/tos")
-@auth_required(True, redirect="/")
+@auth_required(True, redirect="/tos")
 async def terms_of_service_post(request: Request,
                                 accept: bool = Form(default=False)):
     # Query the database for terms that were previously accepted,
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 539f9526..ee6d71ba 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -222,7 +222,7 @@ async def package_base_voters(request: Request, name: str) -> Response:
 
 
 @router.post("/pkgbase/{name}/comments")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/comments")
 async def pkgbase_comments_post(
         request: Request, name: str,
         comment: str = Form(default=str()),
@@ -254,7 +254,7 @@ async def pkgbase_comments_post(
 
 
 @router.get("/pkgbase/{name}/comments/{id}/form")
-@auth_required(True)
+@auth_required(True, login=False)
 async def pkgbase_comment_form(request: Request, name: str, id: int):
     """ Produce a comment form for comment {id}. """
     pkgbase = get_pkg_or_base(name, PackageBase)
@@ -274,7 +274,7 @@ async def pkgbase_comment_form(request: Request, name: str, id: int):
 
 
 @router.post("/pkgbase/{name}/comments/{id}")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/comments/{id}")
 async def pkgbase_comment_post(
         request: Request, name: str, id: int,
         comment: str = Form(default=str()),
@@ -309,7 +309,7 @@ async def pkgbase_comment_post(
 
 
 @router.post("/pkgbase/{name}/comments/{id}/delete")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/delete")
 async def pkgbase_comment_delete(request: Request, name: str, id: int):
     pkgbase = get_pkg_or_base(name, PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
@@ -332,7 +332,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int):
 
 
 @router.post("/pkgbase/{name}/comments/{id}/undelete")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/undelete")
 async def pkgbase_comment_undelete(request: Request, name: str, id: int):
     pkgbase = get_pkg_or_base(name, PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
@@ -354,7 +354,7 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int):
 
 
 @router.post("/pkgbase/{name}/comments/{id}/pin")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/pin")
 async def pkgbase_comment_pin(request: Request, name: str, id: int):
     pkgbase = get_pkg_or_base(name, PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
@@ -376,7 +376,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int):
 
 
 @router.post("/pkgbase/{name}/comments/{id}/unpin")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/unpin")
 async def pkgbase_comment_unpin(request: Request, name: str, id: int):
     pkgbase = get_pkg_or_base(name, PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
@@ -397,7 +397,7 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int):
 
 
 @router.get("/pkgbase/{name}/comaintainers")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/comaintainers")
 async def package_base_comaintainers(request: Request, name: str) -> Response:
     # Get the PackageBase.
     pkgbase = get_pkg_or_base(name, PackageBase)
@@ -444,7 +444,7 @@ def remove_users(pkgbase, usernames):
 
 
 @router.post("/pkgbase/{name}/comaintainers")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/comaintainers")
 async def package_base_comaintainers_post(
         request: Request, name: str,
         users: str = Form(default=str())) -> Response:
@@ -539,7 +539,7 @@ async def package_base_comaintainers_post(
 
 
 @router.get("/requests")
-@auth_required(True, redirect="/")
+@auth_required(True, redirect="/requests")
 async def requests(request: Request,
                    O: int = Query(default=defaults.O),
                    PP: int = Query(default=defaults.PP)):
@@ -571,7 +571,7 @@ async def requests(request: Request,
 
 
 @router.get("/pkgbase/{name}/request")
-@auth_required(True, login=True, redirect="/pkgbase/{name}")
+@auth_required(True, redirect="/pkgbase/{name}")
 async def package_request(request: Request, name: str):
     context = make_context(request, "Submit Request")
 
@@ -585,7 +585,7 @@ async def package_request(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/request")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/request")
 async def pkgbase_request_post(request: Request, name: str,
                                type: str = Form(...),
                                merge_into: str = Form(default=None),
@@ -654,7 +654,7 @@ async def pkgbase_request_post(request: Request, name: str,
 
 
 @router.get("/requests/{id}/close")
-@auth_required(True)
+@auth_required(True, redirect="/requests/{id}/close")
 async def requests_close(request: Request, id: int):
     pkgreq = db.query(PackageRequest).filter(PackageRequest.ID == id).first()
     if not request.user.is_elevated() and request.user != pkgreq.User:
@@ -667,7 +667,7 @@ async def requests_close(request: Request, id: int):
 
 
 @router.post("/requests/{id}/close")
-@auth_required(True)
+@auth_required(True, redirect="/requests/{id}/close")
 async def requests_close_post(request: Request, id: int,
                               reason: int = Form(default=0),
                               comments: str = Form(default=str())):
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index a977b31a..b897a635 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -45,7 +45,7 @@ ADDVOTE_SPECIFICS = {
 
 
 @router.get("/tu")
-@auth_required(True, redirect="/")
+@auth_required(True, redirect="/tu")
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user(request: Request,
                        coff: int = 0,  # current offset
@@ -149,7 +149,7 @@ def render_proposal(request: Request,
 
 
 @router.get("/tu/{proposal}")
-@auth_required(True, redirect="/")
+@auth_required(True, redirect="/tu/{proposal}")
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal(request: Request, proposal: int):
     context = await make_variable_context(request, "Trusted User")
@@ -175,7 +175,7 @@ async def trusted_user_proposal(request: Request, proposal: int):
 
 
 @router.post("/tu/{proposal}")
-@auth_required(True, redirect="/")
+@auth_required(True, redirect="/tu/{proposal}")
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal_post(request: Request,
                                      proposal: int,
@@ -223,7 +223,7 @@ async def trusted_user_proposal_post(request: Request,
 
 
 @router.get("/addvote")
-@auth_required(True)
+@auth_required(True, redirect="/addvote")
 @account_type_required({"Trusted User", "Trusted User & Developer"})
 async def trusted_user_addvote(request: Request,
                                user: str = str(),
@@ -243,7 +243,7 @@ async def trusted_user_addvote(request: Request,
 
 
 @router.post("/addvote")
-@auth_required(True)
+@auth_required(True, redirect="/addvote")
 @account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote_post(request: Request,
                                     user: str = Form(default=str()),
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index 67181db3..0579247e 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -9,7 +9,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import db
+from aurweb import db, util
 from aurweb.models.account_type import AccountType
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
@@ -128,7 +128,9 @@ def test_tu_index_guest(client):
     with client as request:
         response = request.get("/tu", allow_redirects=False)
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
-    assert response.headers.get("location") == "/"
+
+    params = util.urlencode({"next": "/tu"})
+    assert response.headers.get("location") == f"/login?{params}"
 
 
 def test_tu_index_unauthorized(client, user):

From 8eadb4251da6029cb4edb528b222eebb0d3b821c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 5 Oct 2021 16:04:19 -0700
Subject: [PATCH 394/844] feat(FastAPI): add /pkgbase/{name}/[un]flag (post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 32 ++++++++++++++++++++++++++++++++
 test/test_packages_routes.py | 31 +++++++++++++++++++++++++++++++
 test/test_user.py            |  1 -
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index ee6d71ba..8790327f 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -701,3 +701,35 @@ async def requests_close_post(request: Request, id: int,
     notify_.send()
 
     return RedirectResponse("/requests", status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/flag")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_flag(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential("CRED_PKGBASE_FLAG")
+    if has_cred and not pkgbase.Flagger:
+        now = int(datetime.utcnow().timestamp())
+        with db.begin():
+            pkgbase.OutOfDateTS = now
+            pkgbase.Flagger = request.user
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/unflag")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_unflag(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential(
+        "CRED_PKGBASE_UNFLAG", approved=[pkgbase.Flagger])
+    if has_cred:
+        with db.begin():
+            pkgbase.OutOfDateTS = None
+            pkgbase.Flagger = None
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 4118744a..db36d1a9 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1689,3 +1689,34 @@ def test_requests_close_post_rejected(client: TestClient, user: User,
     assert pkgreq.Status == REJECTED_ID
     assert pkgreq.Closer == user
     assert pkgreq.ClosureComment == str()
+
+
+def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
+                      package: Package):
+    pkgbase = package.PackageBase
+
+    # We shouldn't have flagged the package yet; assert so.
+    assert pkgbase.Flagger is None
+
+    # Flag it.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/flag"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert pkgbase.Flagger == user
+
+    # Now, test that the 'maintainer' user can't unflag it, because they
+    # didn't flag it to begin with.
+    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/unflag"
+    with client as request:
+        resp = request.post(endpoint, cookies=maint_cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert pkgbase.Flagger == user
+
+    # Now, unflag it for real.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert pkgbase.Flagger is None
diff --git a/test/test_user.py b/test/test_user.py
index 43cbf58a..771611d8 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -166,7 +166,6 @@ def test_user_minimum_passwd_length():
 
 
 def test_user_has_credential():
-    assert user.has_credential("CRED_PKGBASE_FLAG")
     assert not user.has_credential("CRED_ACCOUNT_CHANGE_TYPE")
 
 

From 0dfff2bcb24d8915f5fd317c79f5e750f0897e5a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 5 Oct 2021 21:13:51 -0700
Subject: [PATCH 395/844] feat(FastAPI): add /pkgbase/{name}/[un]notify (post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 36 ++++++++++++++++++++++++++++++++++++
 test/test_packages_routes.py | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 8790327f..ced9ea3d 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -733,3 +733,39 @@ async def pkgbase_unflag(request: Request, name: str):
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/notify")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_notify(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    notif = db.query(pkgbase.notifications.filter(
+        PackageNotification.UserID == request.user.ID
+    ).exists()).scalar()
+    has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
+    if has_cred and not notif:
+        with db.begin():
+            db.create(PackageNotification,
+                      PackageBase=pkgbase,
+                      User=request.user)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/unnotify")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_unnotify(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == request.user.ID
+    ).first()
+    has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
+    if has_cred and notif:
+        with db.begin():
+            db.session.delete(notif)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index db36d1a9..1d7fe17c 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1720,3 +1720,36 @@ def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
         resp = request.post(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
     assert pkgbase.Flagger is None
+
+
+def test_pkgbase_notify(client: TestClient, user: User, package: Package):
+    pkgbase = package.PackageBase
+
+    # We have no notif record yet; assert that.
+    notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == user.ID
+    ).first()
+    assert notif is None
+
+    # Enable notifications.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/notify"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == user.ID
+    ).first()
+    assert notif is not None
+
+    # Disable notifications.
+    endpoint = f"/pkgbase/{pkgbase.Name}/unnotify"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == user.ID
+    ).first()
+    assert notif is None

From 0a02df363a80e7571c9a0bbb9829b84f18cf7f4c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 5 Oct 2021 21:32:12 -0700
Subject: [PATCH 396/844] feat(FastAPI): add /pkgbase/{name}/[un]vote (post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 38 ++++++++++++++++++++++++++++++++++++
 test/test_packages_routes.py | 27 +++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index ced9ea3d..8bfb680e 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -769,3 +769,41 @@ async def pkgbase_unnotify(request: Request, name: str):
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/vote")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_vote(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    vote = pkgbase.package_votes.filter(
+        PackageVote.UsersID == request.user.ID
+    ).first()
+    has_cred = request.user.has_credential("CRED_PKGBASE_VOTE")
+    if has_cred and not vote:
+        now = int(datetime.utcnow().timestamp())
+        with db.begin():
+            db.create(PackageVote,
+                      User=request.user,
+                      PackageBase=pkgbase,
+                      VoteTS=now)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.post("/pkgbase/{name}/unvote")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_unvote(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    vote = pkgbase.package_votes.filter(
+        PackageVote.UsersID == request.user.ID
+    ).first()
+    has_cred = request.user.has_credential("CRED_PKGBASE_VOTE")
+    if has_cred and vote:
+        with db.begin():
+            db.session.delete(vote)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 1d7fe17c..a03c5920 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1753,3 +1753,30 @@ def test_pkgbase_notify(client: TestClient, user: User, package: Package):
         PackageNotification.UserID == user.ID
     ).first()
     assert notif is None
+
+
+def test_pkgbase_vote(client: TestClient, user: User, package: Package):
+    pkgbase = package.PackageBase
+
+    # We haven't voted yet.
+    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
+    assert vote is None
+
+    # Vote for the package.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/vote"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
+    assert vote is not None
+
+    # Remove vote.
+    endpoint = f"/pkgbase/{pkgbase.Name}/unvote"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
+    assert vote is None

From 16d516c221112d36ead6ce36b5beb6a54015c8a2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 6 Oct 2021 22:07:20 -0700
Subject: [PATCH 397/844] feat(FastAPI): add /pkgbase/{name}/disown (get, post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 63 +++++++++++++++++++++++
 templates/packages/disown.html           | 55 ++++++++++++++++++++
 templates/partials/packages/actions.html | 10 ++--
 test/test_packages_routes.py             | 65 ++++++++++++++++++++++++
 4 files changed, 186 insertions(+), 7 deletions(-)
 create mode 100644 templates/packages/disown.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 8bfb680e..af1ebe46 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -807,3 +807,66 @@ async def pkgbase_unvote(request: Request, name: str):
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+def disown_pkgbase(pkgbase: PackageBase, disowner: User):
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    notif = notify.DisownNotification(conn, disowner.ID, pkgbase.ID)
+
+    if disowner != pkgbase.Maintainer:
+        with db.begin():
+            pkgbase.Maintainer = None
+    else:
+        co = pkgbase.comaintainers.order_by(
+            PackageComaintainer.Priority.asc()
+        ).limit(1).first()
+
+        if co:
+            with db.begin():
+                pkgbase.Maintainer = co.User
+                db.session.delete(co)
+        else:
+            pkgbase.Maintainer = None
+
+    notif.send()
+
+
+@router.get("/pkgbase/{name}/disown")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_disown_get(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential("CRED_PKGBASE_DISOWN",
+                                           approved=[pkgbase.Maintainer])
+    if not has_cred:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                int(HTTPStatus.SEE_OTHER))
+
+    context = make_context(request, "Disown Package")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "packages/disown.html", context)
+
+
+@router.post("/pkgbase/{name}/disown")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_disown_post(request: Request, name: str,
+                              confirm: bool = Form(default=False)):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential("CRED_PKGBASE_DISOWN",
+                                           approved=[pkgbase.Maintainer])
+    if not has_cred:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                int(HTTPStatus.SEE_OTHER))
+
+    if not confirm:
+        context = make_context(request, "Disown Package")
+        context["pkgbase"] = pkgbase
+        context["errors"] = [("The selected packages have not been disowned, "
+                              "check the confirmation checkbox.")]
+        return render_template(request, "packages/disown.html", context,
+                               status_code=int(HTTPStatus.EXPECTATION_FAILED))
+
+    disown_pkgbase(pkgbase, request.user)
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/packages/disown.html b/templates/packages/disown.html
new file mode 100644
index 00000000..8d5a8574
--- /dev/null
+++ b/templates/packages/disown.html
@@ -0,0 +1,55 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+
+    {% if errors %}
+        <ul class="errorlist">
+            {% for error in errors %}
+                <li>{{ error | tr }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+
+    <div class="box">
+        <h2>{{ "Disown Package" | tr }}: {{ pkgbase.Name }}</h2>
+
+        <p>
+            {{
+                "Use this form to disown the package base %s%s%s which "
+                "includes the following packages: "
+                | tr | format("<strong>", pkgbase.Name, "</strong>") | safe
+            }}
+        </p>
+
+        <ul>
+            {% for package in pkgbase.packages.all() %}
+                <li>{{ package.Name }}</li>
+            {% endfor %}
+        </ul>
+
+        <p>
+            {{
+                "By selecting the checkbox, you confirm that you want to "
+                "disown the package." | tr
+            }}
+        </p>
+
+        <form action="/pkgbase/{{ pkgbase.Name }}/disown" method="post">
+            <fieldset>
+                <p>
+                    <label class="confirmation">
+                        <input type="checkbox" name="confirm" value="1" />
+                        {{ "Confirm to disown the package" | tr }}
+                    </label>
+                </p>
+                <p>
+                    <input class="button"
+                           type="submit"
+                           value="{{ 'Disown' | tr }}"
+                    />
+                </p>
+            </fieldset>
+        </form>
+
+    </div>
+{% endblock %}
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index f1863663..2b26144e 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -121,13 +121,9 @@
             {% endif %}
             {% if request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
                 <li>
-                    <form action="/pkgbase/{{ result.Name }}/disown/" method="post">
-                        <input type="submit"
-                               class="button text-button"
-                               name="do_Disown"
-                               value="{{ 'Disown Package' | tr }}"
-                        />
-                    </form>
+                    <a href="/pkgbase/{{ result.Name }}/disown/">
+                        {{ "Disown Package" | tr }}
+                    </a>
                 </li>
             {% endif %}
         </ul>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index a03c5920..c9622431 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1780,3 +1780,68 @@ def test_pkgbase_vote(client: TestClient, user: User, package: Package):
 
     vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
     assert vote is None
+
+
+def test_pkgbase_disown_as_tu(client: TestClient, tu_user: User,
+                              package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+
+    # But we do here.
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_pkgbase_disown_as_sole_maintainer(client: TestClient,
+                                           maintainer: User,
+                                           package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+
+    # But we do here.
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_pkgbase_disown(client: TestClient, user: User, maintainer: User,
+                        package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    user_cookies = {"AURSID": user.login(Request(), "testPassword")}
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+
+    with db.begin():
+        db.create(PackageComaintainer,
+                  User=user,
+                  PackageBase=pkgbase,
+                  Priority=1)
+
+    # GET as a normal user, which is rejected for lack of credentials.
+    with client as request:
+        resp = request.get(endpoint, cookies=user_cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # GET as the maintainer.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # POST as a normal user, which is rejected for lack of credentials.
+    with client as request:
+        resp = request.post(endpoint, cookies=user_cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # POST as the maintainer without "confirm".
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+
+    # POST as the maintainer with "confirm".
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)

From c8d01cc5e8083a6586ae61a6c3371d7ed2428f6a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 19 Sep 2021 19:27:29 -0700
Subject: [PATCH 398/844] feat(FastAPI): add aurweb.util.apply_all(iterable,
 fn)

A helper which allows us to apply a specific function to each
item in an iterable.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index 08e6d7c6..44f711f1 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -7,7 +7,7 @@ import secrets
 import string
 
 from datetime import datetime
-from typing import Any, Dict
+from typing import Any, Callable, Dict, Iterable
 from urllib.parse import urlencode, urlparse
 from zoneinfo import ZoneInfo
 
@@ -167,3 +167,8 @@ def add_samesite_fields(response: Response, value: str):
 
 def get_ssh_fingerprints():
     return aurweb.config.get_section("fingerprints") or {}
+
+
+def apply_all(iterable: Iterable, fn: Callable):
+    for item in iterable:
+        fn(item)

From ed68fa2b57f7f4cf916fd2e40312e1f64da2c71e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 19 Sep 2021 19:27:03 -0700
Subject: [PATCH 399/844] feat(FastAPI): add aurweb.db.delete_all(iterable)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/aurweb/db.py b/aurweb/db.py
index 2b934300..c1e80751 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -2,6 +2,8 @@ import functools
 import math
 import re
 
+from typing import Iterable
+
 from sqlalchemy import event
 from sqlalchemy.orm import scoped_session
 
@@ -71,6 +73,12 @@ def delete(model, *args, **kwargs):
         session.delete(record)
 
 
+def delete_all(iterable: Iterable):
+    with begin():
+        for obj in iterable:
+            session.delete(obj)
+
+
 def rollback():
     session.rollback()
 

From 0ddc969bdcd07fe0181e05a8e2abdb2e23301212 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 6 Oct 2021 15:33:23 -0700
Subject: [PATCH 400/844] feat(FastAPI-dev): add package_delete helper

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 76 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 3 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index af1ebe46..40322785 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from http import HTTPStatus
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse
@@ -11,7 +11,7 @@ import aurweb.models.package_comment
 import aurweb.models.package_keyword
 import aurweb.packages.util
 
-from aurweb import db, defaults, l10n
+from aurweb import db, defaults, l10n, util
 from aurweb.auth import auth_required
 from aurweb.models.license import License
 from aurweb.models.package import Package
@@ -26,7 +26,7 @@ from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID,
 from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID
-from aurweb.models.request_type import RequestType
+from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
@@ -116,6 +116,76 @@ async def packages(request: Request) -> Response:
     return await packages_get(request, context)
 
 
+def create_request_if_missing(requests: List[PackageRequest],
+                              reqtype: RequestType,
+                              user: User,
+                              package: Package):
+    now = int(datetime.utcnow().timestamp())
+    pkgreq = db.query(PackageRequest).filter(
+        PackageRequest.PackageBaseName == package.PackageBase.Name
+    ).first()
+    if not pkgreq:
+        # No PackageRequest existed. Create one.
+        comments = "Automatically generated by aurweb."
+        closure_comment = "Deleted by aurweb."
+        pkgreq = db.create(PackageRequest,
+                           RequestType=reqtype,
+                           PackageBase=package.PackageBase,
+                           PackageBaseName=package.PackageBase.Name,
+                           User=user,
+                           Status=ACCEPTED_ID,
+                           Comments=comments,
+                           ClosureComment=closure_comment,
+                           ClosedTS=now,
+                           Closer=user)
+        requests.append(pkgreq)
+
+
+def delete_package(deleter: User,
+                   package: Package):
+    notifications = []
+    requests = []
+    bases_to_delete = []
+
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    # In all cases, though, just delete the Package in question.
+    if package.PackageBase.packages.count() == 1:
+        reqtype = db.query(RequestType).filter(
+            RequestType.ID == DELETION_ID
+        ).first()
+
+        with db.begin():
+            create_request_if_missing(
+                requests, reqtype, deleter, package)
+
+        bases_to_delete.append(package.PackageBase)
+
+        # Prepare DeleteNotification.
+        notifications.append(
+            notify.DeleteNotification(conn, deleter.ID, package.PackageBase.ID)
+        )
+
+    # For each PackageRequest created, mock up an open and close notification.
+    basename = package.PackageBase.Name
+    for pkgreq in requests:
+        notifications.append(
+            notify.RequestOpenNotification(
+                conn, deleter.ID, pkgreq.ID, reqtype.Name,
+                pkgreq.PackageBase.ID, merge_into=basename or None)
+        )
+        notifications.append(
+            notify.RequestCloseNotification(
+                conn, deleter.ID, pkgreq.ID, pkgreq.status_display())
+        )
+
+    # Perform all the deletions.
+    db.delete_all([package])
+    db.delete_all(bases_to_delete)
+
+    # Send out all the notifications.
+    util.apply_all(notifications, lambda n: n.send())
+
+
 async def make_single_context(request: Request,
                               pkgbase: PackageBase) -> Dict[str, Any]:
     """ Make a basic context for package or pkgbase.

From 4e7d2295da657ece2dc0fd1422ecd0e75e4facb7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 6 Oct 2021 20:17:58 -0700
Subject: [PATCH 401/844] fix(FastAPI): add package-related missing backref
 cascades

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_comment.py    | 3 ++-
 aurweb/models/package_dependency.py | 3 ++-
 aurweb/models/package_relation.py   | 3 ++-
 aurweb/models/package_source.py     | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/aurweb/models/package_comment.py b/aurweb/models/package_comment.py
index c52ee270..92ae8911 100644
--- a/aurweb/models/package_comment.py
+++ b/aurweb/models/package_comment.py
@@ -17,7 +17,8 @@ class PackageComment(Base):
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         nullable=False)
     PackageBase = relationship(
-        "PackageBase", backref=backref("comments", lazy="dynamic"),
+        "PackageBase", backref=backref("comments", lazy="dynamic",
+                                       cascade="all,delete"),
         foreign_keys=[PackageBaseID])
 
     UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index 9ce0b019..fb66c6f2 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -15,7 +15,8 @@ class PackageDependency(Base):
         Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
         nullable=False)
     Package = relationship(
-        "Package", backref=backref("package_dependencies", lazy="dynamic"),
+        "Package", backref=backref("package_dependencies", lazy="dynamic",
+                                   cascade="all,delete"),
         foreign_keys=[PackageID])
 
     DepTypeID = Column(
diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
index 1e6c146c..d4921859 100644
--- a/aurweb/models/package_relation.py
+++ b/aurweb/models/package_relation.py
@@ -16,7 +16,8 @@ class PackageRelation(Base):
         Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
         nullable=False)
     Package = relationship(
-        "Package", backref=backref("package_relations", lazy="dynamic"),
+        "Package", backref=backref("package_relations", lazy="dynamic",
+                                   cascade="all,delete"),
         foreign_keys=[PackageID])
 
     RelTypeID = Column(
diff --git a/aurweb/models/package_source.py b/aurweb/models/package_source.py
index 4ffa23df..f016bee0 100644
--- a/aurweb/models/package_source.py
+++ b/aurweb/models/package_source.py
@@ -13,7 +13,8 @@ class PackageSource(Base):
     PackageID = Column(Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
                        nullable=False)
     Package = relationship(
-        "Package", backref=backref("package_sources", lazy="dynamic"),
+        "Package", backref=backref("package_sources", lazy="dynamic",
+                                   cascade="all,delete"),
         foreign_keys=[PackageID])
 
     __mapper_args__ = {"primary_key": [PackageID]}

From d38abd783250d13f93294944f3897a38e1209d31 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 6 Oct 2021 13:54:14 -0700
Subject: [PATCH 402/844] feat(FastAPI): add /pkgbase/{name}/delete (get, post)

In addition, we've had to add cascade arguments to backref so
sqlalchemy treats the relationships as proper cascades.

Furthermore, our pkgbase actions template was not rendering
actions properly based on TU credentials.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py     | 37 ++++++++++++++++++++++
 templates/packages/delete.html | 56 ++++++++++++++++++++++++++++++++++
 test/test_packages_routes.py   | 46 ++++++++++++++++++++++++++++
 3 files changed, 139 insertions(+)
 create mode 100644 templates/packages/delete.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 40322785..4426d0be 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -940,3 +940,40 @@ async def pkgbase_disown_post(request: Request, name: str,
     disown_pkgbase(pkgbase, request.user)
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
+
+
+@router.get("/pkgbase/{name}/delete")
+@auth_required(True)
+async def pkgbase_delete_get(request: Request, name: str):
+    if not request.user.has_credential("CRED_PKGBASE_DELETE"):
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+
+    context = make_context(request, "Package Deletion")
+    context["pkgbase"] = get_pkg_or_base(name, PackageBase)
+    return render_template(request, "packages/delete.html", context)
+
+
+@router.post("/pkgbase/{name}/delete")
+@auth_required(True)
+async def pkgbase_delete_post(request: Request, name: str,
+                              confirm: bool = Form(default=False)):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    if not request.user.has_credential("CRED_PKGBASE_DELETE"):
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+
+    if not confirm:
+        context = make_context(request, "Package Deletion")
+        context["pkgbase"] = pkgbase
+        context["errors"] = [("The selected packages have not been deleted, "
+                              "check the confirmation checkbox.")]
+        return render_template(request, "packages/delete.html", context,
+                               status_code=int(HTTPStatus.EXPECTATION_FAILED))
+
+    packages = pkgbase.packages.all()
+    for package in packages:
+        delete_package(request.user, package)
+
+    return RedirectResponse("/packages", status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/packages/delete.html b/templates/packages/delete.html
new file mode 100644
index 00000000..6e882d05
--- /dev/null
+++ b/templates/packages/delete.html
@@ -0,0 +1,56 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+
+    {% if errors %}
+        <ul class="errorlist">
+            {% for error in errors %}
+                <li>{{ error | tr }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+
+    <div class="box">
+        <h2>{{ "Delete Package" | tr }}: {{ pkgbase.Name }}</h2>
+
+        <p>
+            {{
+                "Use this form to delete the package base %s%s%s and "
+                "the following packages from the AUR: "
+                | tr | format("<strong>", pkgbase.Name, "</strong>") | safe
+            }}
+        </p>
+
+        <ul>
+            {% for package in pkgbase.packages.all() %}
+                <li>{{ package.Name }}</li>
+            {% endfor %}
+        </ul>
+
+        <p>
+            {{
+                "Deletion of a package is permanent. "
+                "Select the checkbox to confirm action." | tr
+            }}
+        </p>
+
+        <form action="/pkgbase/{{ pkgbase.Name }}/delete" method="post">
+            <fieldset>
+                <p>
+                    <label class="confirmation">
+                        <input type="checkbox" name="confirm" value="1" />
+                        {{ "Confirm package deletion" | tr }}
+                    </label>
+                </p>
+
+                <p>
+                    <input class="button"
+                           type="submit"
+                           value="{{ 'Delete' | tr }}"
+                    />
+                </p>
+            </fieldset>
+        </form>
+
+    </div>
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index c9622431..1f258497 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1845,3 +1845,49 @@ def test_pkgbase_disown(client: TestClient, user: User, maintainer: User,
     with client as request:
         resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_pkgbase_delete_unauthorized(client: TestClient, user: User,
+                                     package: Package):
+    pkgbase = package.PackageBase
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
+
+    # Test GET.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    # Test POST.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+
+def test_pkgbase_delete(client: TestClient, tu_user: User, package: Package):
+    pkgbase = package.PackageBase
+
+    # Test that the GET request works.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Test that POST works and denies us because we haven't confirmed.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+
+    # Test that we can actually delete the pkgbase.
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Let's assert that the package base record got removed.
+    record = db.query(PackageBase).filter(
+        PackageBase.Name == pkgbase.Name
+    ).first()
+    assert record is None

From 01fb42c5d97fe930b63ef8b71d4b2a2b62f32a5e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 22:44:54 -0700
Subject: [PATCH 403/844] fix(scripts.popupdate): use forced-utc timestamp

Additionally, clean up some controversial PEP-8 warnings by
removing the '+' string concatenation.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/popupdate.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/aurweb/scripts/popupdate.py b/aurweb/scripts/popupdate.py
index b1e70403..96155eef 100755
--- a/aurweb/scripts/popupdate.py
+++ b/aurweb/scripts/popupdate.py
@@ -1,21 +1,21 @@
 #!/usr/bin/env python3
 
-import time
+from datetime import datetime
 
 import aurweb.db
 
 
 def main():
     conn = aurweb.db.Connection()
-    conn.execute("UPDATE PackageBases SET NumVotes = (" +
-                 "SELECT COUNT(*) FROM PackageVotes " +
-                 "WHERE PackageVotes.PackageBaseID = PackageBases.ID)")
+    conn.execute(("UPDATE PackageBases SET NumVotes = ("
+                  "SELECT COUNT(*) FROM PackageVotes "
+                  "WHERE PackageVotes.PackageBaseID = PackageBases.ID)"))
 
-    now = int(time.time())
-    conn.execute("UPDATE PackageBases SET Popularity = (" +
-                 "SELECT COALESCE(SUM(POWER(0.98, (? - VoteTS) / 86400)), 0.0) " +
-                 "FROM PackageVotes WHERE PackageVotes.PackageBaseID = " +
-                 "PackageBases.ID AND NOT VoteTS IS NULL)", [now])
+    now = int(datetime.utcnow().timestamp())
+    conn.execute(("UPDATE PackageBases SET Popularity = ("
+                  "SELECT COALESCE(SUM(POWER(0.98, (? - VoteTS) / 86400)), 0.0) "
+                  "FROM PackageVotes WHERE PackageVotes.PackageBaseID = "
+                  "PackageBases.ID AND NOT VoteTS IS NULL)"), [now])
 
     conn.commit()
     conn.close()

From 63498f5edde58d231eba34359ac231ea217a34d9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 22:48:31 -0700
Subject: [PATCH 404/844] fix(FastAPI): use popupdate when [un]voting

The `aurweb.scripts.popupdate` script is used to maintain
the NumVotes and Popularity field. We could do the NumVotes
change more simply; however, since this is already a long-term
implementation, we're going to use it until we move scripts
over to ORM.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 10 +++++++-
 aurweb/scripts/popupdate.py  | 45 ++++++++++++++++++++++++++++--------
 test/test_packages_routes.py |  2 ++
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 4426d0be..f806f054 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -30,7 +30,7 @@ from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
-from aurweb.scripts import notify
+from aurweb.scripts import notify, popupdate
 from aurweb.scripts.rendercomment import update_comment_render
 from aurweb.templates import make_context, render_raw_template, render_template
 
@@ -858,6 +858,10 @@ async def pkgbase_vote(request: Request, name: str):
                       PackageBase=pkgbase,
                       VoteTS=now)
 
+        # Update NumVotes/Popularity.
+        conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+        popupdate.run_single(conn, pkgbase)
+
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
 
@@ -875,6 +879,10 @@ async def pkgbase_unvote(request: Request, name: str):
         with db.begin():
             db.session.delete(vote)
 
+        # Update NumVotes/Popularity.
+        conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+        popupdate.run_single(conn, pkgbase)
+
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
 
diff --git a/aurweb/scripts/popupdate.py b/aurweb/scripts/popupdate.py
index 96155eef..fa82208d 100755
--- a/aurweb/scripts/popupdate.py
+++ b/aurweb/scripts/popupdate.py
@@ -5,17 +5,44 @@ from datetime import datetime
 import aurweb.db
 
 
-def main():
-    conn = aurweb.db.Connection()
-    conn.execute(("UPDATE PackageBases SET NumVotes = ("
-                  "SELECT COUNT(*) FROM PackageVotes "
-                  "WHERE PackageVotes.PackageBaseID = PackageBases.ID)"))
+def run_single(conn, pkgbase):
+    """ A single popupdate. The given pkgbase instance will be
+    refreshed after the database update is done.
+
+    NOTE: This function is compatible only with aurweb FastAPI.
+
+    :param conn: db.Connection[Executor]
+    :param pkgbase: Instance of db.PackageBase
+    """
+
+    conn.execute("UPDATE PackageBases SET NumVotes = ("
+                 "SELECT COUNT(*) FROM PackageVotes "
+                 "WHERE PackageVotes.PackageBaseID = PackageBases.ID) "
+                 "WHERE PackageBases.ID = ?", [pkgbase.ID])
 
     now = int(datetime.utcnow().timestamp())
-    conn.execute(("UPDATE PackageBases SET Popularity = ("
-                  "SELECT COALESCE(SUM(POWER(0.98, (? - VoteTS) / 86400)), 0.0) "
-                  "FROM PackageVotes WHERE PackageVotes.PackageBaseID = "
-                  "PackageBases.ID AND NOT VoteTS IS NULL)"), [now])
+    conn.execute("UPDATE PackageBases SET Popularity = ("
+                 "SELECT COALESCE(SUM(POWER(0.98, (? - VoteTS) / 86400)), 0.0) "
+                 "FROM PackageVotes WHERE PackageVotes.PackageBaseID = "
+                 "PackageBases.ID AND NOT VoteTS IS NULL) WHERE "
+                 "PackageBases.ID = ?", [now, pkgbase.ID])
+
+    conn.commit()
+    conn.close()
+    aurweb.db.session.refresh(pkgbase)
+
+
+def main():
+    conn = aurweb.db.Connection()
+    conn.execute("UPDATE PackageBases SET NumVotes = ("
+                 "SELECT COUNT(*) FROM PackageVotes "
+                 "WHERE PackageVotes.PackageBaseID = PackageBases.ID)")
+
+    now = int(datetime.utcnow().timestamp())
+    conn.execute("UPDATE PackageBases SET Popularity = ("
+                 "SELECT COALESCE(SUM(POWER(0.98, (? - VoteTS) / 86400)), 0.0) "
+                 "FROM PackageVotes WHERE PackageVotes.PackageBaseID = "
+                 "PackageBases.ID AND NOT VoteTS IS NULL)", [now])
 
     conn.commit()
     conn.close()
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 1f258497..7b9c520c 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1771,6 +1771,7 @@ def test_pkgbase_vote(client: TestClient, user: User, package: Package):
 
     vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
     assert vote is not None
+    assert pkgbase.NumVotes == 1
 
     # Remove vote.
     endpoint = f"/pkgbase/{pkgbase.Name}/unvote"
@@ -1780,6 +1781,7 @@ def test_pkgbase_vote(client: TestClient, user: User, package: Package):
 
     vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
     assert vote is None
+    assert pkgbase.NumVotes == 0
 
 
 def test_pkgbase_disown_as_tu(client: TestClient, tu_user: User,

From 305d07797371087b5e04bb49827d619c793a2d63 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 22:01:04 -0700
Subject: [PATCH 405/844] feat(FastAPI): add /pkgbase/{name}/adopt (post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 17 ++++++++++++
 templates/partials/packages/actions.html | 19 +++++++++++---
 test/test_packages_routes.py             | 33 ++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index f806f054..b623ca10 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -950,6 +950,23 @@ async def pkgbase_disown_post(request: Request, name: str,
                             status_code=int(HTTPStatus.SEE_OTHER))
 
 
+@router.post("/pkgbase/{name}/adopt")
+@auth_required(True)
+async def pkgbase_adopt_post(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential("CRED_PKGBASE_ADOPT")
+    if has_cred or not pkgbase.Maintainer:
+        # If the user has credentials, they'll adopt the package regardless
+        # of maintainership. Otherwise, we'll promote the user to maintainer
+        # if no maintainer currently exists.
+        with db.begin():
+            pkgbase.Maintainer = request.user
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=int(HTTPStatus.SEE_OTHER))
+
+
 @router.get("/pkgbase/{name}/delete")
 @auth_required(True)
 async def pkgbase_delete_get(request: Request, name: str):
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 2b26144e..dd83c84d 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -119,12 +119,23 @@
                     </a>
                 </li>
             {% endif %}
-            {% if request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
+            {% if not result.Maintainer %}
                 <li>
-                    <a href="/pkgbase/{{ result.Name }}/disown/">
-                        {{ "Disown Package" | tr }}
-                    </a>
+                    <form action="/pkgbase/{{ result.Name }}/adopt" method="post">
+                        <input type="submit"
+                               class="button text-button"
+                               value="{{ 'Adopt Package' | tr }}"
+                        />
+                    </form>
                 </li>
+            {% else %}
+                {% if request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
+                    <li>
+                        <a href="/pkgbase/{{ result.Name }}/disown/">
+                            {{ "Disown Package" | tr }}
+                        </a>
+                    </li>
+                {% endif %}
             {% endif %}
         </ul>
     </div>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 7b9c520c..86949996 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1849,6 +1849,39 @@ def test_pkgbase_disown(client: TestClient, user: User, maintainer: User,
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
 
 
+def test_pkgbase_adopt(client: TestClient, user: User, tu_user: User,
+                       maintainer: User, package: Package):
+    # Unset the maintainer as if package is orphaned.
+    with db.begin():
+        package.PackageBase.Maintainer = None
+
+    pkgbasename = package.PackageBase.Name
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbasename}/adopt"
+
+    # Adopt the package base.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert package.PackageBase.Maintainer == maintainer
+
+    # Try to adopt it when it already has a maintainer; nothing changes.
+    user_cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, cookies=user_cookies,
+                            allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert package.PackageBase.Maintainer == maintainer
+
+    # Steal the package as a TU.
+    tu_cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, cookies=tu_cookies,
+                            allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert package.PackageBase.Maintainer == tu_user
+
+
 def test_pkgbase_delete_unauthorized(client: TestClient, user: User,
                                      package: Package):
     pkgbase = package.PackageBase

From 5bbc94f2ef333bbe5d33ee1893067e2864de5eb1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 9 Oct 2021 18:41:32 -0700
Subject: [PATCH 406/844] fix(FastAPI): add /pkgbase/{name}/flag (get)

This was missed in the [un]flag (post) commit.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 28 +++++++++++++++++-
 templates/packages/flag.html | 57 ++++++++++++++++++++++++++++++++++++
 test/test_packages_routes.py | 20 ++++++++++++-
 3 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 templates/packages/flag.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index b623ca10..8f4a7e1f 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -773,17 +773,42 @@ async def requests_close_post(request: Request, id: int,
     return RedirectResponse("/requests", status_code=int(HTTPStatus.SEE_OTHER))
 
 
+@router.get("/pkgbase/{name}/flag")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_flag_get(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential("CRED_PKGBASE_FLAG")
+    if not has_cred or pkgbase.Flagger is not None:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+
+    context = make_context(request, "Flag Package Out-Of-Date")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "packages/flag.html", context)
+
+
 @router.post("/pkgbase/{name}/flag")
 @auth_required(True, redirect="/pkgbase/{name}")
-async def pkgbase_flag(request: Request, name: str):
+async def pkgbase_flag_post(request: Request, name: str,
+                            comments: str = Form(default=str())):
     pkgbase = get_pkg_or_base(name, PackageBase)
 
+    if not comments:
+        context = make_context(request, "Flag Package Out-Of-Date")
+        context["pkgbase"] = pkgbase
+        context["errors"] = ["The selected packages have not been flagged, "
+                             "please enter a comment."]
+        return render_template(request, "packages/flag.html", context,
+                               status_code=int(HTTPStatus.BAD_REQUEST))
+
     has_cred = request.user.has_credential("CRED_PKGBASE_FLAG")
     if has_cred and not pkgbase.Flagger:
         now = int(datetime.utcnow().timestamp())
         with db.begin():
             pkgbase.OutOfDateTS = now
             pkgbase.Flagger = request.user
+            pkgbase.FlaggerComment = comments
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
@@ -800,6 +825,7 @@ async def pkgbase_unflag(request: Request, name: str):
         with db.begin():
             pkgbase.OutOfDateTS = None
             pkgbase.Flagger = None
+            pkgbase.FlaggerComment = str()
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=int(HTTPStatus.SEE_OTHER))
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
new file mode 100644
index 00000000..4e133acb
--- /dev/null
+++ b/templates/packages/flag.html
@@ -0,0 +1,57 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Flag Package Out-Of-Date" | tr }}: {{ pkgbase.Name }}</h2>
+
+        <p>
+            {{
+                "Use this form to flag the package base %s%s%s and "
+                "the following packages out-of-date: "
+                | tr | format("<strong>", pkgbase.Name, "</strong>") | safe
+            }}
+        </p>
+
+        <ul>
+            {% for package in pkgbase.packages.all() %}
+                <li>{{ package.Name }}</li>
+            {% endfor %}
+        </ul>
+
+        <p>
+            {{
+                "Please do %snot%s use this form to report bugs. "
+                "Use the package comments instead."
+                | tr | format("<strong>", "</strong>") | safe
+            }}
+            {{
+                "Enter details on why the package is out-of-date below, "
+                "preferably including links to the release announcement "
+                "or the new release tarball." | tr
+            }}
+        </p>
+
+        {% if errors %}
+            <ul class="errorlist">
+                {% for error in errors %}
+                    <li>{{ error | tr }}</li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+
+        <form action="/pkgbase/{{ pkgbase.Name }}/flag" method="post">
+            <fieldset>
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments"
+                              name="comments"
+                              rows="5"
+                              cols="50"></textarea>
+                </p>
+                <p>
+                    <input class="button" type="submit" value="{{ 'Flag' | tr }}" />
+                </p>
+            </fieldset>
+        </form>
+    </div>
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 86949996..12d7e33e 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1698,13 +1698,31 @@ def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
     # We shouldn't have flagged the package yet; assert so.
     assert pkgbase.Flagger is None
 
-    # Flag it.
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     endpoint = f"/pkgbase/{pkgbase.Name}/flag"
+
+    # Get the flag page.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Try to flag it without a comment.
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    # Flag it with a valid comment.
+    with client as request:
+        resp = request.post(endpoint, {"comments": "Test"}, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
     assert pkgbase.Flagger == user
+    assert pkgbase.FlaggerComment == "Test"
+
+    # Now try to perform a get; we should be redirected because
+    # it's already flagged.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
 
     # Now, test that the 'maintainer' user can't unflag it, because they
     # didn't flag it to begin with.

From d9ab65cb6f2e0f0985f2463c352acc52621e1026 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 9 Oct 2021 20:46:52 -0700
Subject: [PATCH 407/844] add Feedback.md GitLab issue template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Feedback.md | 56 +++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 .gitlab/issue_templates/Feedback.md

diff --git a/.gitlab/issue_templates/Feedback.md b/.gitlab/issue_templates/Feedback.md
new file mode 100644
index 00000000..e32120aa
--- /dev/null
+++ b/.gitlab/issue_templates/Feedback.md
@@ -0,0 +1,56 @@
+**NOTE:** This issue template is only applicable to FastAPI implementations
+in the code-base, which only exists within the `pu` branch. If you wish to
+file an issue for the current PHP implementation of aurweb, please file a
+standard issue prefixed with `[Bug]` or `[Feature]`.
+
+
+**Checklist**
+
+- [ ] I have prefixed the issue title with `[Feedback]` along with a message
+      pointing to the route or feature tested.
+    - Example: `[Feedback] /packages/{name}`
+- [ ] I have completed the [Changes](#changes) section.
+- [ ] I have completed the [Bugs](#bugs) section.
+- [ ] I have completed the [Improvements](#improvements) section.
+- [ ] I have completed the [Summary](#summary) section.
+
+### Changes
+
+Please describe changes in user experience when compared to the PHP
+implementation. This section can actually hold a lot of info if you
+are up for it -- changes in routes, HTML rendering, back-end behavior,
+etc.
+
+If you cannot see any changes from your standpoint, include a short
+statement about that fact.
+
+### Bugs
+
+Please describe any bugs you've experienced while testing the route
+pertaining to this issue. A "perfect" bug report would include your
+specific experience, what you expected to occur, and what happened
+otherwise. If you can, please include output of `docker-compose logs fastapi`
+with your report; especially if any unintended exceptions occurred.
+
+### Improvements
+
+If you've experienced improvements in the route when compared to PHP,
+please do include those here. We'd like to know if users are noticing
+these improvements and how they feel about them.
+
+There are multiple routes with no improvements. For these, just include
+a short sentence about the fact that you've experienced none.
+
+### Summary
+
+First: If you've gotten here and completed the [Changes](#changes),
+[Bugs](#bugs), and [Improvements](#improvements) sections, we'd like
+to thank you very much for your contribution and willingness to test.
+We are not a company, and we are not a large team; any bit of assistance
+here helps the project astronomically and moves us closer toward a
+new release.
+
+That being said: please include an overall summary of your experience
+and how you felt about the current implementation which you're testing
+in comparison with PHP (current aur.archlinux.org, or https://localhost:8443
+through docker).

From 34c96ed81b017b1b8273e14d98d69a69f9029e37 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 9 Oct 2021 20:46:52 -0700
Subject: [PATCH 408/844] add Feedback.md GitLab issue template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Feedback.md | 56 +++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 .gitlab/issue_templates/Feedback.md

diff --git a/.gitlab/issue_templates/Feedback.md b/.gitlab/issue_templates/Feedback.md
new file mode 100644
index 00000000..e32120aa
--- /dev/null
+++ b/.gitlab/issue_templates/Feedback.md
@@ -0,0 +1,56 @@
+**NOTE:** This issue template is only applicable to FastAPI implementations
+in the code-base, which only exists within the `pu` branch. If you wish to
+file an issue for the current PHP implementation of aurweb, please file a
+standard issue prefixed with `[Bug]` or `[Feature]`.
+
+
+**Checklist**
+
+- [ ] I have prefixed the issue title with `[Feedback]` along with a message
+      pointing to the route or feature tested.
+    - Example: `[Feedback] /packages/{name}`
+- [ ] I have completed the [Changes](#changes) section.
+- [ ] I have completed the [Bugs](#bugs) section.
+- [ ] I have completed the [Improvements](#improvements) section.
+- [ ] I have completed the [Summary](#summary) section.
+
+### Changes
+
+Please describe changes in user experience when compared to the PHP
+implementation. This section can actually hold a lot of info if you
+are up for it -- changes in routes, HTML rendering, back-end behavior,
+etc.
+
+If you cannot see any changes from your standpoint, include a short
+statement about that fact.
+
+### Bugs
+
+Please describe any bugs you've experienced while testing the route
+pertaining to this issue. A "perfect" bug report would include your
+specific experience, what you expected to occur, and what happened
+otherwise. If you can, please include output of `docker-compose logs fastapi`
+with your report; especially if any unintended exceptions occurred.
+
+### Improvements
+
+If you've experienced improvements in the route when compared to PHP,
+please do include those here. We'd like to know if users are noticing
+these improvements and how they feel about them.
+
+There are multiple routes with no improvements. For these, just include
+a short sentence about the fact that you've experienced none.
+
+### Summary
+
+First: If you've gotten here and completed the [Changes](#changes),
+[Bugs](#bugs), and [Improvements](#improvements) sections, we'd like
+to thank you very much for your contribution and willingness to test.
+We are not a company, and we are not a large team; any bit of assistance
+here helps the project astronomically and moves us closer toward a
+new release.
+
+That being said: please include an overall summary of your experience
+and how you felt about the current implementation which you're testing
+in comparison with PHP (current aur.archlinux.org, or https://localhost:8443
+through docker).

From 27fbda5e7ba21a43c64ca0324c24f42a484196c0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 9 Oct 2021 22:00:18 -0700
Subject: [PATCH 409/844] feat(FastAPI): add get_(errors|successes) testing
 HTML helpers

These functions will allow us to more easily check errors or success
messages when testing routes.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/html.py | 11 +++++++++++
 test/test_html.py      | 22 +++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/aurweb/testing/html.py b/aurweb/testing/html.py
index d5f0c256..f01aaf3d 100644
--- a/aurweb/testing/html.py
+++ b/aurweb/testing/html.py
@@ -1,4 +1,5 @@
 from io import StringIO
+from typing import List
 
 from lxml import etree
 
@@ -12,3 +13,13 @@ def parse_root(html: str) -> etree.Element:
     :return: etree.Element
     """
     return etree.parse(StringIO(html), parser)
+
+
+def get_errors(content: str) -> List[etree._Element]:
+    root = parse_root(content)
+    return root.xpath('//ul[@class="errorlist"]/li')
+
+
+def get_successes(content: str) -> List[etree._Element]:
+    root = parse_root(content)
+    return root.xpath('//ul[@class="success"]/li')
diff --git a/test/test_html.py b/test/test_html.py
index 562d6a63..2018840b 100644
--- a/test/test_html.py
+++ b/test/test_html.py
@@ -9,7 +9,7 @@ from aurweb import asgi, db
 from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID, AccountType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.html import parse_root
+from aurweb.testing.html import get_errors, get_successes, parse_root
 from aurweb.testing.requests import Request
 
 
@@ -97,3 +97,23 @@ def test_archdev_navbar_authenticated_tu(client: TestClient,
     items = root.xpath('//div[@id="archdev-navbar"]/ul/li/a')
     for i, item in enumerate(items):
         assert item.text.strip() == expected[i]
+
+
+def test_get_errors():
+    html = """
+    <ul class="errorlist">
+        <li>Test</li>
+    </ul>
+"""
+    errors = get_errors(html)
+    assert errors[0].text.strip() == "Test"
+
+
+def test_get_successes():
+    html = """
+    <ul class="success">
+        <li>Test</li>
+    </ul>
+"""
+    successes = get_successes(html)
+    assert successes[0].text.strip() == "Test"

From 4525a11d923f3669e46204626b7c1115927d4703 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 10 Oct 2021 00:59:08 -0700
Subject: [PATCH 410/844] fix(FastAPI): change a deep copy instead of original

This was updating offsets and causing unintended behavior.
We should be a bit more functional anyway.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index 44f711f1..61ed5cfb 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -1,4 +1,5 @@
 import base64
+import copy
 import logging
 import math
 import random
@@ -127,9 +128,10 @@ def as_timezone(dt: datetime, timezone: str):
 
 def extend_query(query: Dict[str, Any], *additions) -> Dict[str, Any]:
     """ Add additional key value pairs to query. """
+    q = copy.copy(query)
     for k, v in list(additions):
-        query[k] = v
-    return query
+        q[k] = v
+    return q
 
 
 def to_qs(query: Dict[str, Any]) -> str:

From 68383b79e24b645c0079627149187c06b3dda734 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 11 Oct 2021 14:13:29 -0700
Subject: [PATCH 411/844] add Feature.md GitLab issue template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Feature.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .gitlab/issue_templates/Feature.md

diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
new file mode 100644
index 00000000..5b1524b1
--- /dev/null
+++ b/.gitlab/issue_templates/Feature.md
@@ -0,0 +1,30 @@
+- [ ] I have summed up the feature in concise words in the [Summary](#summary) section.
+- [ ] I have completely described the feature in the [Description](#description) section.
+- [ ] I have completed the [Blockers](#blockers) section.
+
+### Summary
+
+Fill this section out with a concise wording about the feature being
+requested.
+
+Example: _A new `Tyrant` account type for users_.
+
+### Description
+
+Describe your feature in full detail.
+
+Example: _The `Tyrant` account type should be used to allow a user to be
+tyrannical. When a user is a `Tyrant`, they should be able to assassinate
+users due to not complying with their laws. Laws can be configured by updating
+the Tyrant laws page at https://aur.archlinux.org/account/{username}/laws.
+More specifics about laws._
+
+### Blockers
+
+Include any blockers in a list. If there are no blockers, this section
+should be omitted from the issue.
+
+Example:
+
+- [Feature] Do not allow users to be Tyrants
+    - \<(issue|merge_request)_link\>

From 3d971bfc8d70c48f69090b7ec0b0b1899178c03d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 11 Oct 2021 14:48:00 -0700
Subject: [PATCH 412/844] add Bug.md GitLab issue template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Bug.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .gitlab/issue_templates/Bug.md

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
new file mode 100644
index 00000000..d84a5181
--- /dev/null
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,34 @@
+- [ ] I have described the bug in complete detail in the
+      [Description](#description) section.
+- [ ] I have specified steps in the [Reproduction](#reproduction) section.
+- [ ] I have included any logs related to the bug in the
+      [Logs](#logs) section.
+- [ ] I have included the versions which are affected in the
+      [Version(s)](#versions) section.
+
+### Description
+
+Describe the bug in full detail.
+
+### Reproduction
+
+Describe a specific set of actions that can be used to reproduce
+this bug.
+
+### Logs
+
+If you have any logs relevent to the bug, include them here in
+quoted or code blocks.
+
+### Version(s)
+
+In this section, please include a list of versions you have found
+to be affected by this program. This can either come in the form
+of `major.minor.patch` (if it affects a release tarball), or a
+commit hash if the bug does not directly affect a release version.
+
+All development is done without modifying version displays in
+aurweb's HTML render output. If you're testing locally, use the
+commit on which you are experiencing the bug. If you have found
+a bug which exists on live aur.archlinux.org, include the version
+located at the bottom of the webpage.

From 748faca87d314e23557a1e20223db939d8b19192 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 12 Oct 2021 17:55:03 -0700
Subject: [PATCH 413/844] fix(FastAPI): translate some untranslated strings

Affects: templates/partials/packages/search_actions.html

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/search_actions.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/partials/packages/search_actions.html b/templates/partials/packages/search_actions.html
index 2f5fe2e7..221189fb 100644
--- a/templates/partials/packages/search_actions.html
+++ b/templates/partials/packages/search_actions.html
@@ -18,8 +18,8 @@
 
     <label class="confirmation">
         <input type="checkbox" name="confirm" />
-        Confirm
+        {{ "Confirm" | tr }}
     </label>
 
-    <input id="search-action-submit" class="button" type="submit" value="Go" />
+    <input id="search-action-submit" class="button" type="submit" value="{{ 'Go' | tr }}" />
 </p>

From 22b3af61b568732861be17e9759be68715a709fb Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 13 Oct 2021 17:10:16 -0700
Subject: [PATCH 414/844] fix(PHP): sanitize and produce metrics at shutdown

This change now requires that PHP routes do not return HTTP 404
to be considered for the /metrics population. Additionally,
we make a small sanitization here to avoid trailing '/'
characters, unless we're on the homepage route.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 web/html/index.php          | 24 ++---------------------
 web/lib/metricfuncs.inc.php | 38 +++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/web/html/index.php b/web/html/index.php
index 82a44c55..99046930 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -13,28 +13,8 @@ $query_string = $_SERVER['QUERY_STRING'];
 
 // If no options.cache is configured, we no-op metric storage operations.
 $is_cached = defined('EXTENSION_LOADED_APC') || defined('EXTENSION_LOADED_MEMCACHE');
-if ($is_cached) {
-	$method = $_SERVER['REQUEST_METHOD'];
-	// We'll always add +1 to our total request count to this $path,
-	// unless this path == /metrics.
-	if ($path !== "/metrics")
-		add_metric("http_requests_count", $method, $path);
-
-	// Extract $type out of $query_string, if we can.
-	$type = null;
-	$query = array();
-	if ($query_string)
-		parse_str($query_string, $query);
-	$type = $query['type'];
-
-	// Only store RPC metrics for valid types.
-	$good_types = [
-		"info", "multiinfo", "search", "msearch",
-		"suggest", "suggest-pkgbase", "get-comment-form"
-	];
-	if ($path === "/rpc" && in_array($type, $good_types))
-		add_metric("api_requests_count", $method, $path, $type);
-}
+if ($is_cached)
+	register_shutdown_function('update_metrics');
 
 if (config_get_bool('options', 'enable-maintenance') && (empty($tokens[1]) || ($tokens[1] != "css" && $tokens[1] != "images"))) {
 	if (!in_array($_SERVER['REMOTE_ADDR'], explode(" ", config_get('options', 'maintenance-exceptions')))) {
diff --git a/web/lib/metricfuncs.inc.php b/web/lib/metricfuncs.inc.php
index acfc30d7..7ebb59be 100644
--- a/web/lib/metricfuncs.inc.php
+++ b/web/lib/metricfuncs.inc.php
@@ -13,6 +13,44 @@ use \Prometheus\RenderTextFormat;
 // and will start again at 0 if it's restarted.
 $registry = new CollectorRegistry(new InMemory());
 
+function update_metrics() {
+	// With no code given to http_response_code, it gets the current
+	// response code set (via http_response_code or header).
+	if(http_response_code() == 404)
+		return;
+
+	$path = $_SERVER['PATH_INFO'];
+	$method = $_SERVER['REQUEST_METHOD'];
+	$query_string = $_SERVER['QUERY_STRING'];
+
+	// If $path is at least 1 character, strip / off the end.
+	// This turns $paths like '/packages/' into '/packages'.
+	if (strlen($path) > 1)
+		$path = rtrim($path, "/");
+
+	// We'll always add +1 to our total request count to this $path,
+	// unless this path == /metrics.
+	if ($path !== "/metrics")
+		add_metric("http_requests_count", $method, $path);
+
+	// Extract $type out of $query_string, if we can.
+	$type = null;
+	$query = array();
+	if ($query_string)
+		parse_str($query_string, $query);
+
+	if (array_key_exists("type", $query))
+		$type = $query["type"];
+
+	// Only store RPC metrics for valid types.
+	$good_types = [
+		"info", "multiinfo", "search", "msearch",
+		"suggest", "suggest-pkgbase", "get-comment-form"
+	];
+	if ($path === "/rpc" && in_array($type, $good_types))
+		add_metric("api_requests_count", $method, $path, $type);
+}
+
 function add_metric($anchor, $method, $path, $type = null) {
 
 	global $registry;

From 5bfc1e9094e2a67bad534f7380b1b6b20fe13ef9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 13:18:58 -0700
Subject: [PATCH 415/844] Revert "fix(PHP): sanitize and produce metrics at
 shutdown"

This reverts commit 22b3af61b568732861be17e9759be68715a709fb.
---
 web/html/index.php          | 24 +++++++++++++++++++++--
 web/lib/metricfuncs.inc.php | 38 -------------------------------------
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/web/html/index.php b/web/html/index.php
index 99046930..82a44c55 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -13,8 +13,28 @@ $query_string = $_SERVER['QUERY_STRING'];
 
 // If no options.cache is configured, we no-op metric storage operations.
 $is_cached = defined('EXTENSION_LOADED_APC') || defined('EXTENSION_LOADED_MEMCACHE');
-if ($is_cached)
-	register_shutdown_function('update_metrics');
+if ($is_cached) {
+	$method = $_SERVER['REQUEST_METHOD'];
+	// We'll always add +1 to our total request count to this $path,
+	// unless this path == /metrics.
+	if ($path !== "/metrics")
+		add_metric("http_requests_count", $method, $path);
+
+	// Extract $type out of $query_string, if we can.
+	$type = null;
+	$query = array();
+	if ($query_string)
+		parse_str($query_string, $query);
+	$type = $query['type'];
+
+	// Only store RPC metrics for valid types.
+	$good_types = [
+		"info", "multiinfo", "search", "msearch",
+		"suggest", "suggest-pkgbase", "get-comment-form"
+	];
+	if ($path === "/rpc" && in_array($type, $good_types))
+		add_metric("api_requests_count", $method, $path, $type);
+}
 
 if (config_get_bool('options', 'enable-maintenance') && (empty($tokens[1]) || ($tokens[1] != "css" && $tokens[1] != "images"))) {
 	if (!in_array($_SERVER['REMOTE_ADDR'], explode(" ", config_get('options', 'maintenance-exceptions')))) {
diff --git a/web/lib/metricfuncs.inc.php b/web/lib/metricfuncs.inc.php
index 7ebb59be..acfc30d7 100644
--- a/web/lib/metricfuncs.inc.php
+++ b/web/lib/metricfuncs.inc.php
@@ -13,44 +13,6 @@ use \Prometheus\RenderTextFormat;
 // and will start again at 0 if it's restarted.
 $registry = new CollectorRegistry(new InMemory());
 
-function update_metrics() {
-	// With no code given to http_response_code, it gets the current
-	// response code set (via http_response_code or header).
-	if(http_response_code() == 404)
-		return;
-
-	$path = $_SERVER['PATH_INFO'];
-	$method = $_SERVER['REQUEST_METHOD'];
-	$query_string = $_SERVER['QUERY_STRING'];
-
-	// If $path is at least 1 character, strip / off the end.
-	// This turns $paths like '/packages/' into '/packages'.
-	if (strlen($path) > 1)
-		$path = rtrim($path, "/");
-
-	// We'll always add +1 to our total request count to this $path,
-	// unless this path == /metrics.
-	if ($path !== "/metrics")
-		add_metric("http_requests_count", $method, $path);
-
-	// Extract $type out of $query_string, if we can.
-	$type = null;
-	$query = array();
-	if ($query_string)
-		parse_str($query_string, $query);
-
-	if (array_key_exists("type", $query))
-		$type = $query["type"];
-
-	// Only store RPC metrics for valid types.
-	$good_types = [
-		"info", "multiinfo", "search", "msearch",
-		"suggest", "suggest-pkgbase", "get-comment-form"
-	];
-	if ($path === "/rpc" && in_array($type, $good_types))
-		add_metric("api_requests_count", $method, $path, $type);
-}
-
 function add_metric($anchor, $method, $path, $type = null) {
 
 	global $registry;

From 040bb0d7f4d43af66126abdc677fcea05afa058a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 13:19:07 -0700
Subject: [PATCH 416/844] Revert "feat(PHP): add aurweb Prometheus metrics"

This reverts commit 986fa9ee305ed113172f7f214d451a7af071ecc2.
---
 INSTALL                     |   8 +--
 web/html/index.php          |  29 --------
 web/html/metrics.php        |  16 -----
 web/lib/metricfuncs.inc.php | 129 ------------------------------------
 web/lib/routing.inc.php     |   3 +-
 5 files changed, 2 insertions(+), 183 deletions(-)
 delete mode 100644 web/html/metrics.php
 delete mode 100644 web/lib/metricfuncs.inc.php

diff --git a/INSTALL b/INSTALL
index b161edd2..9bcd0759 100644
--- a/INSTALL
+++ b/INSTALL
@@ -49,15 +49,9 @@ read the instructions below.
 
     # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy \
                 python-bleach python-markdown python-alembic python-jinja \
-                python-itsdangerous python-authlib python-httpx hypercorn \
-                composer
+                python-itsdangerous python-authlib python-httpx hypercorn
     # python3 setup.py install
 
-4a) Install `composer` dependencies while inside of aurweb's root:
-
-    $ cd /path/to/aurweb
-    /path/to/aurweb $ composer require promphp/prometheus_client_php
-
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
 
     $ python -m aurweb.initdb
diff --git a/web/html/index.php b/web/html/index.php
index 82a44c55..e57e7708 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -3,39 +3,10 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include_once("aur.inc.php");
 include_once("pkgfuncs.inc.php");
-include_once("cachefuncs.inc.php");
-include_once("metricfuncs.inc.php");
 
 $path = $_SERVER['PATH_INFO'];
 $tokens = explode('/', $path);
 
-$query_string = $_SERVER['QUERY_STRING'];
-
-// If no options.cache is configured, we no-op metric storage operations.
-$is_cached = defined('EXTENSION_LOADED_APC') || defined('EXTENSION_LOADED_MEMCACHE');
-if ($is_cached) {
-	$method = $_SERVER['REQUEST_METHOD'];
-	// We'll always add +1 to our total request count to this $path,
-	// unless this path == /metrics.
-	if ($path !== "/metrics")
-		add_metric("http_requests_count", $method, $path);
-
-	// Extract $type out of $query_string, if we can.
-	$type = null;
-	$query = array();
-	if ($query_string)
-		parse_str($query_string, $query);
-	$type = $query['type'];
-
-	// Only store RPC metrics for valid types.
-	$good_types = [
-		"info", "multiinfo", "search", "msearch",
-		"suggest", "suggest-pkgbase", "get-comment-form"
-	];
-	if ($path === "/rpc" && in_array($type, $good_types))
-		add_metric("api_requests_count", $method, $path, $type);
-}
-
 if (config_get_bool('options', 'enable-maintenance') && (empty($tokens[1]) || ($tokens[1] != "css" && $tokens[1] != "images"))) {
 	if (!in_array($_SERVER['REMOTE_ADDR'], explode(" ", config_get('options', 'maintenance-exceptions')))) {
 		header("HTTP/1.0 503 Service Unavailable");
diff --git a/web/html/metrics.php b/web/html/metrics.php
deleted file mode 100644
index dfa860ed..00000000
--- a/web/html/metrics.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Provide some variable Prometheus metrics. A new requests.route type
- * gets created for each request made and we keep a count using our
- * existing Memcached or APC configurable cache, with route
- * = {request_uri}?{query_string}.
- *
- * TL;DR -- The 'requests' counter is used to give variable requests
- * based on their request_uris and query_strings.
- **/
-include_once('metricfuncs.inc.php');
-
-// Render metrics based on options.cache storage.
-render_metrics();
-
-?>
diff --git a/web/lib/metricfuncs.inc.php b/web/lib/metricfuncs.inc.php
deleted file mode 100644
index acfc30d7..00000000
--- a/web/lib/metricfuncs.inc.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
-
-require __DIR__ . '/../../vendor/autoload.php';
-include_once("cachefuncs.inc.php");
-
-use \Prometheus\Storage\InMemory;
-use \Prometheus\CollectorRegistry;
-use \Prometheus\RenderTextFormat;
-
-// We always pass through an InMemory cache. This means that
-// metrics are only good while the php-fpm service is running
-// and will start again at 0 if it's restarted.
-$registry = new CollectorRegistry(new InMemory());
-
-function add_metric($anchor, $method, $path, $type = null) {
-
-	global $registry;
-	// We keep track of which routes we're interested in by storing
-	// a JSON-encoded list into the "prometheus_metrics" key,
-	// with each item being a JSON-encoded associative array
-	// in the form: {'path': <route>, 'query_string': <query_string>}.
-	$metrics = get_cache_value("prometheus_metrics");
-	$metrics = $metrics ? json_decode($metrics) : array();
-
-	$key = "$path:$type";
-
-	// If the current request $path isn't yet in $metrics create
-	// a new assoc array for it and push it into $metrics.
-	if (!in_array($key, $metrics)) {
-		$data = array(
-			'anchor' => $anchor,
-			'method' => $method,
-			'path' => $path,
-			'type' => $type
-		);
-		array_push($metrics, json_encode($data));
-	}
-
-	// Cache-wise, we also store the count values of each route
-	// through the "prometheus:<route>" key. Grab the cache value
-	// representing the current $path we're on (defaulted to 1).
-	$count = get_cache_value("prometheus:$key");
-	$count = $count ? $count + 1 : 1;
-
-	$labels = ["method", "route"];
-	if ($type)
-		array_push($labels, "type");
-
-	$gauge = $registry->getOrRegisterGauge(
-		'aurweb',
-		$anchor,
-		'A metric count for the aurweb platform.',
-		$labels
-	);
-
-	$label_values = [$data['method'], $data['path']];
-	if ($type)
-		array_push($label_values, $type);
-
-	$gauge->set($count, $label_values);
-
-	// Update cache values.
-	set_cache_value("prometheus:$key", $count, 0);
-	set_cache_value("prometheus_metrics", json_encode($metrics), 0);
-
-}
-
-function render_metrics() {
-	if (!defined('EXTENSION_LOADED_APC') && !defined('EXTENSION_LOADED_MEMCACHE')) {
-		error_log("The /metrics route requires a valid 'options.cache' "
-			. "configuration; no cache is configured.");
-		return http_response_code(417); // EXPECTATION_FAILED
-	}
-
-	global $registry;
-
-	// First, we grab the set of metrics we're interested in in the
-	// form of a cached JSON list, if we can.
-	$metrics = get_cache_value("prometheus_metrics");
-	if (!$metrics)
-		$metrics = array();
-	else
-		$metrics = json_decode($metrics);
-
-	// Now, we walk through each of those list values one by one,
-	// which happen to be JSON-serialized associative arrays,
-	// and process each metric via its associative array's contents:
-	// The route path and the query string.
-	// See web/html/index.php for the creation of such metrics.
-	foreach ($metrics as $metric) {
-		$data = json_decode($metric, true);
-
-		$anchor = $data['anchor'];
-		$path = $data['path'];
-		$type = $data['type'];
-		$key = "$path:$type";
-
-		$labels = ["method", "route"];
-		if ($type)
-			array_push($labels, "type");
-
-		$count = get_cache_value("prometheus:$key");
-		$gauge = $registry->getOrRegisterGauge(
-			'aurweb',
-			$anchor,
-			'A metric count for the aurweb platform.',
-			$labels
-		);
-
-		$label_values = [$data['method'], $data['path']];
-		if ($type)
-			array_push($label_values, $type);
-
-		$gauge->set($count, $label_values);
-	}
-
-	// Construct the results from RenderTextFormat renderer and
-	// registry's samples.
-	$renderer = new RenderTextFormat();
-	$result = $renderer->render($registry->getMetricFamilySamples());
-
-	// Output the results with the right content type header.
-	http_response_code(200); // OK
-	header('Content-Type: ' . RenderTextFormat::MIME_TYPE);
-	echo $result;
-}
-
-?>
diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php
index 0f452f22..73c667d2 100644
--- a/web/lib/routing.inc.php
+++ b/web/lib/routing.inc.php
@@ -19,8 +19,7 @@ $ROUTES = array(
 	'/rss' => 'rss.php',
 	'/tos' => 'tos.php',
 	'/tu' => 'tu.php',
-    '/addvote' => 'addvote.php',
-    '/metrics' => 'metrics.php' // Prometheus Metrics
+	'/addvote' => 'addvote.php',
 );
 
 $PKG_PATH = '/packages';

From dd420f8c4148a7696554499fd99eb8c5c726a994 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 11 Oct 2021 14:13:29 -0700
Subject: [PATCH 417/844] add Feature.md GitLab issue template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Feature.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .gitlab/issue_templates/Feature.md

diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
new file mode 100644
index 00000000..5b1524b1
--- /dev/null
+++ b/.gitlab/issue_templates/Feature.md
@@ -0,0 +1,30 @@
+- [ ] I have summed up the feature in concise words in the [Summary](#summary) section.
+- [ ] I have completely described the feature in the [Description](#description) section.
+- [ ] I have completed the [Blockers](#blockers) section.
+
+### Summary
+
+Fill this section out with a concise wording about the feature being
+requested.
+
+Example: _A new `Tyrant` account type for users_.
+
+### Description
+
+Describe your feature in full detail.
+
+Example: _The `Tyrant` account type should be used to allow a user to be
+tyrannical. When a user is a `Tyrant`, they should be able to assassinate
+users due to not complying with their laws. Laws can be configured by updating
+the Tyrant laws page at https://aur.archlinux.org/account/{username}/laws.
+More specifics about laws._
+
+### Blockers
+
+Include any blockers in a list. If there are no blockers, this section
+should be omitted from the issue.
+
+Example:
+
+- [Feature] Do not allow users to be Tyrants
+    - \<(issue|merge_request)_link\>

From 81c9312606458395c90984be3f4a758636f93c9f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 11 Oct 2021 14:48:00 -0700
Subject: [PATCH 418/844] add Bug.md GitLab issue template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Bug.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .gitlab/issue_templates/Bug.md

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
new file mode 100644
index 00000000..d84a5181
--- /dev/null
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,34 @@
+- [ ] I have described the bug in complete detail in the
+      [Description](#description) section.
+- [ ] I have specified steps in the [Reproduction](#reproduction) section.
+- [ ] I have included any logs related to the bug in the
+      [Logs](#logs) section.
+- [ ] I have included the versions which are affected in the
+      [Version(s)](#versions) section.
+
+### Description
+
+Describe the bug in full detail.
+
+### Reproduction
+
+Describe a specific set of actions that can be used to reproduce
+this bug.
+
+### Logs
+
+If you have any logs relevent to the bug, include them here in
+quoted or code blocks.
+
+### Version(s)
+
+In this section, please include a list of versions you have found
+to be affected by this program. This can either come in the form
+of `major.minor.patch` (if it affects a release tarball), or a
+commit hash if the bug does not directly affect a release version.
+
+All development is done without modifying version displays in
+aurweb's HTML render output. If you're testing locally, use the
+commit on which you are experiencing the bug. If you have found
+a bug which exists on live aur.archlinux.org, include the version
+located at the bottom of the webpage.

From 71b3f781f799f8c9d1d8b3e39682972b89d6c9c2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 15:11:45 -0700
Subject: [PATCH 419/844] fix(FastAPI): maintainers are allowed to unflag their
 packages

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   |  2 +-
 test/test_packages_routes.py | 30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 8f4a7e1f..15d0591c 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -820,7 +820,7 @@ async def pkgbase_unflag(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
 
     has_cred = request.user.has_credential(
-        "CRED_PKGBASE_UNFLAG", approved=[pkgbase.Flagger])
+        "CRED_PKGBASE_UNFLAG", approved=[pkgbase.Flagger, pkgbase.Maintainer])
     if has_cred:
         with db.begin():
             pkgbase.OutOfDateTS = None
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 12d7e33e..e2811a46 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1713,7 +1713,9 @@ def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
 
     # Flag it with a valid comment.
     with client as request:
-        resp = request.post(endpoint, {"comments": "Test"}, cookies=cookies)
+        resp = request.post(endpoint, data={
+            "comments": "Test"
+        }, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
     assert pkgbase.Flagger == user
     assert pkgbase.FlaggerComment == "Test"
@@ -1724,14 +1726,34 @@ def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
         resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
 
-    # Now, test that the 'maintainer' user can't unflag it, because they
+    with db.begin():
+        user2 = db.create(User, Username="test2",
+                          Email="test2@example.org",
+                          Passwd="testPassword",
+                          AccountType=user.AccountType)
+
+    # Now, test that the 'user2' user can't unflag it, because they
     # didn't flag it to begin with.
-    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    user2_cookies = {"AURSID": user2.login(Request(), "testPassword")}
     endpoint = f"/pkgbase/{pkgbase.Name}/unflag"
+    with client as request:
+        resp = request.post(endpoint, cookies=user2_cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert pkgbase.Flagger == user
+
+    # Now, test that the 'maintainer' user can.
+    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
     with client as request:
         resp = request.post(endpoint, cookies=maint_cookies)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert pkgbase.Flagger == user
+    assert pkgbase.Flagger is None
+
+    # Flag it again.
+    with client as request:
+        resp = request.post(f"/pkgbase/{pkgbase.Name}/flag", data={
+            "comments": "Test"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
 
     # Now, unflag it for real.
     with client as request:

From 2d46811c45a14b89f0c9251ed25b53c8a7f0e775 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 16:15:53 -0700
Subject: [PATCH 420/844] fix(FastAPI): display VCS note when flagging a VCS
 package

Closes: #131

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 po/aurweb.pot                |  9 +++++++++
 templates/packages/flag.html | 14 ++++++++++++++
 test/test_packages_routes.py | 21 +++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/po/aurweb.pot b/po/aurweb.pot
index aeed9f02..1f7e8784 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -568,6 +568,15 @@ msgstr ""
 msgid "Flag Package Out-Of-Date"
 msgstr ""
 
+#: templates/packages/flag.html
+msgid "This seems to be a VCS package. Please do %snot%s flag "
+"it out-of-date if the package version in the AUR does "
+"not match the most recent commit. Flagging this package "
+"should only be done if the sources moved or changes in "
+"the PKGBUILD are required because of recent upstream "
+"changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 4e133acb..0335cf18 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -18,6 +18,20 @@
             {% endfor %}
         </ul>
 
+        {% if pkgbase.Name.endswith(('-cvs', '-svn', '-git', '-hg', '-bzr', '-darcs')) %}
+            <p class="error">
+                {# TODO: This error is not yet translated. #}
+                {{
+                    "This seems to be a VCS package. Please do %snot%s flag "
+                    "it out-of-date if the package version in the AUR does "
+                    "not match the most recent commit. Flagging this package "
+                    "should only be done if the sources moved or changes in "
+                    "the PKGBUILD are required because of recent upstream "
+                    "changes." | tr | format("<strong>", "</strong>") | safe
+                }}
+            </p>
+        {% endif %}
+
         <p>
             {{
                 "Please do %snot%s use this form to report bugs. "
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index e2811a46..7eb4e532 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1762,6 +1762,27 @@ def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
     assert pkgbase.Flagger is None
 
 
+def test_pkgbase_flag_vcs(client: TestClient, user: User, package: Package):
+    # Morph our package fixture into a VCS package (-git).
+    with db.begin():
+        package.PackageBase.Name += "-git"
+        package.Name += "-git"
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(f"/pkgbase/{package.PackageBase.Name}/flag",
+                           cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    expected = ("This seems to be a VCS package. Please do "
+                "<strong>not</strong> flag it out-of-date if the package "
+                "version in the AUR does not match the most recent commit. "
+                "Flagging this package should only be done if the sources "
+                "moved or changes in the PKGBUILD are required because of "
+                "recent upstream changes.")
+    assert expected in resp.text
+
+
 def test_pkgbase_notify(client: TestClient, user: User, package: Package):
     pkgbase = package.PackageBase
 

From 8040ef5a9c53048598eb6d0b356923db00467b7e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 19:02:53 -0700
Subject: [PATCH 421/844] fix(FastAPI): use pkgbase in package actions

Previously, `result` was being used which was directly set to
`pkgbase` before rendering the actions.html partial. It didn't
make much sense. This commit cleans things up a bit.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/packages/show.html             |  5 ++--
 templates/partials/packages/actions.html | 36 ++++++++++++------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/templates/packages/show.html b/templates/packages/show.html
index ba531fc8..fbc9c0ea 100644
--- a/templates/packages/show.html
+++ b/templates/packages/show.html
@@ -5,7 +5,6 @@
     <div id="pkgdetails" class="box">
         <h2>{{ 'Package Details' | tr }}: {{ package.Name }} {{ package.Version }}</h2>
 
-        {% set result = pkgbase %}
         {% include "partials/packages/actions.html" %}
 
         {% set show_package_details = True %}
@@ -16,7 +15,7 @@
         </div>
     </div>
 
-    {% set pkgname = result.Name %}
-    {% set pkgbase_id = result.ID %}
+    {% set pkgname = package.Name %}
+    {% set pkgbase_id = pkgbase.ID %}
     {% include "partials/packages/comments.html" %}
 {% endblock %}
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index dd83c84d..81536a3d 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -1,38 +1,38 @@
 <!--
-    This partial requires result.Name to render
+    This partial requires pkgbase.Name to render
 -->
 <div id="detailslinks" class="listing">
     <div id="actionlist">
         <h4>{{ "Package Actions" | tr }}</h4>
         <ul class="small">
             <li>
-                <a href="/cgit/aur.git/tree/PKGBUILD?h={{ result.Name }}">
+                <a href="/cgit/aur.git/tree/PKGBUILD?h={{ pkgbase.Name }}">
                     {{ "View PKGBUILD" | tr }}
                 </a>
                 /
-                <a href="/cgit/aur.git/log/?h={{ result.Name }}">
+                <a href="/cgit/aur.git/log/?h={{ pkgbase.Name }}">
                     {{ "View Changes" | tr }}
                 </a>
             </li>
             <li>
-                <a href="/cgit/aur.git/snapshot/{{ result.Name }}.tar.gz">
+                <a href="/cgit/aur.git/snapshot/{{ pkgbase.Name }}.tar.gz">
                     {{ "Download snapshot" | tr }}
                 </a>
             <li>
-                <a href="https://wiki.archlinux.org/title/Special:Search?search={{ result.Name }}">
+                <a href="https://wiki.archlinux.org/title/Special:Search?search={{ pkgbase.Name }}">
                     {{ "Search wiki" | tr }}
                 </a>
             </li>
             {% if not out_of_date %}
                 <li>
-                    <a href="/pkgbase/{{ result.Name }}/flag/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/flag/">
                         {{ "Flag package out-of-date" | tr }}
                     </a>
                 </li>
             {% else %}
                 <li>
                     <span class="flagged">
-                        {% set ood_ts = result.OutOfDateTS | dt | as_timezone(timezone) %}
+                        {% set ood_ts = pkgbase.OutOfDateTS | dt | as_timezone(timezone) %}
                         {{
                         "Flagged out-of-date (%s)"
                         | tr | format(ood_ts.strftime("%Y-%m-%d"))
@@ -40,7 +40,7 @@
                     </span>
                 </li>
                 <li>
-                    <form action="/pkgbase/{{ result.Name }}/unflag" method="post">
+                    <form action="/pkgbase/{{ pkgbase.Name }}/unflag" method="post">
                         <input class="button text-button"
                                type="submit"
                                name="do_UnFlag"
@@ -51,14 +51,14 @@
             {% endif %}
                 <li>
                     {% if not voted %}
-                    <form action="/pkgbase/{{ result.Name }}/vote/" method="post">
+                    <form action="/pkgbase/{{ pkgbase.Name }}/vote/" method="post">
                         <input type="submit"
                                class="button text-button"
                                name="do_Vote"
                                value="{{ 'Vote for this package' | tr }}" />
                     </form>
                     {% else %}
-                    <form action="/pkgbase/{{ result.Name }}/unvote/" method="post">
+                    <form action="/pkgbase/{{ pkgbase.Name }}/unvote/" method="post">
                         <input type="submit"
                                class="button text-button"
                                name="do_UnVote"
@@ -68,7 +68,7 @@
                 </li>
                 <li>
                     {% if notified %}
-                        <form action="/pkgbase/{{ result.Name }}/unnotify/" method="post">
+                        <form action="/pkgbase/{{ pkgbase.Name }}/unnotify/" method="post">
                             <input type="submit"
                                    class="button text-button"
                                    name="do_UnNotify"
@@ -76,7 +76,7 @@
                             />
                         </form>
                     {% else %}
-                        <form action="/pkgbase/{{ result.Name }}/notify/" method="post">
+                        <form action="/pkgbase/{{ pkgbase.Name }}/notify/" method="post">
                             <input type="submit"
                                    class="button text-button"
                                    name="do_Notify"
@@ -101,27 +101,27 @@
                 </li>
             {% endif %}
             <li>
-                <a href="/pkgbase/{{ result.Name }}/request/">
+                <a href="/pkgbase/{{ pkgbase.Name }}/request/">
                     {{ "Submit Request" | tr }}
                 </a>
             </li>
             {% if request.user.has_credential("CRED_PKGBASE_DELETE") %}
                 <li>
-                    <a href="/pkgbase/{{ result.Name }}/delete/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/delete/">
                         {{ "Delete Package" | tr }}
                     </a>
                 </li>
             {% endif %}
             {% if request.user.has_credential("CRED_PKGBASE_MERGE") %}
                 <li>
-                    <a href="/pkgbase/{{ result.Name }}/merge/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/merge/">
                         {{ "Merge Package" | tr }}
                     </a>
                 </li>
             {% endif %}
-            {% if not result.Maintainer %}
+            {% if not pkgbase.Maintainer %}
                 <li>
-                    <form action="/pkgbase/{{ result.Name }}/adopt" method="post">
+                    <form action="/pkgbase/{{ pkgbase.Name }}/adopt" method="post">
                         <input type="submit"
                                class="button text-button"
                                value="{{ 'Adopt Package' | tr }}"
@@ -131,7 +131,7 @@
             {% else %}
                 {% if request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
                     <li>
-                        <a href="/pkgbase/{{ result.Name }}/disown/">
+                        <a href="/pkgbase/{{ pkgbase.Name }}/disown/">
                             {{ "Disown Package" | tr }}
                         </a>
                     </li>

From 27a6563302cd18823315222d74394a74387ae2f2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 19:11:15 -0700
Subject: [PATCH 422/844] fix(FastAPI): use CRED_PKGBASE_SET_KEYWORDS
 credential properly

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html | 56 ++++++++++++------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 83c6d53b..05dc82c6 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -33,36 +33,34 @@
             </td>
         </tr>
     {% endif %}
-    {% if pkgbase.keywords.scalar() %}
-        <tr>
-            <th>{{ "Keywords" | tr }}:</th>
-            {% if is_maintainer %}
-            <td>
-                <form method="update"
-                      action="/pkgbase/{{ pkgbase.Name }}/keywords/"
+    <tr>
+        <th>{{ "Keywords" | tr }}:</th>
+        {% if request.user.has_credential("CRED_PKGBASE_SET_KEYWORDS", approved=[pkgbase.Maintainer]) %}
+        <td>
+            <form method="update"
+                  action="/pkgbase/{{ pkgbase.Name }}/keywords/"
+            >
+                <div>
+                    <input type="text"
+                           name="keywords"
+                           value="{{ pkgbase.keywords | join(' ', attribute='Keyword') }}"
+                    />
+                    <input type="submit" value="{{ 'Update' | tr }}"/>
+                </div>
+            </form>
+        </td>
+        {% else %}
+        <td>
+            {% for keyword in pkgbase.keywords %}
+                <a class="keyword"
+                   href="/packages/?K={{ keyword.Keyword }}&amp;SB=p"
                 >
-                    <div>
-                        <input type="text"
-                               name="keywords"
-                               value="{{ pkgbase.keywords | join(' ', attribute='Keyword') }}"
-                        />
-                        <input type="submit" value="{{ 'Update' | tr }}"/>
-                    </div>
-                </form>
-            </td>
-            {% else %}
-            <td>
-                {% for keyword in pkgbase.keywords %}
-                    <a class="keyword"
-                       href="/packages/?K={{ keyword.Keyword }}&amp;SB=p"
-                    >
-                        {{ keyword.Keyword }}
-                    </a>
-                {% endfor %}
-            </td>
-            {% endif %}
-        </tr>
-    {% endif %}
+                    {{ keyword.Keyword }}
+                </a>
+            {% endfor %}
+        </td>
+        {% endif %}
+    </tr>
     {% if licenses and licenses.scalar() and show_package_details %}
         <tr>
             <th>{{ "Licenses" | tr }}:</th>

From 7b7e571e93144defbe977d51784c488fcd2f4c7e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 20:16:38 -0700
Subject: [PATCH 423/844] change(FastAPI): run test_initdb.py ahead of time in
 docker

In some cases, when tests fail through Docker, the database
ends up in an invalid state. This causes subsequent runs to
error out with non-sensical DB errors. The `test_initdb.py`
test suite runs tests which setup every modifiable table
in the database, so let's just run it first here to avoid
any invalid test DB state.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/run-pytests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker/scripts/run-pytests.sh b/docker/scripts/run-pytests.sh
index ef8a2318..d992bf06 100755
--- a/docker/scripts/run-pytests.sh
+++ b/docker/scripts/run-pytests.sh
@@ -26,6 +26,11 @@ done
 python -m aurweb.initdb 2>/dev/null || \
     (echo "Error: aurweb.initdb failed; already initialized?" && /bin/true)
 
+# Run test_initdb ahead of time, which clears out the database,
+# in case of previous failures which stopped the test suite before
+# finishing the ends of some test fixtures.
+eatmydata -- pytest test/test_initdb.py
+
 # Run pytest with optional targets in front of it.
 eatmydata -- make -C test "${PARAMS[@]}" pytest
 

From 0c37216626ae6b051f19331ee70e7766168a201f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 15:08:42 -0700
Subject: [PATCH 424/844] change(gitignore): add various exclusions

Three new root directories are ignored by git:

- /personal/
    - Personal tools excluded by git.
- /notes/
    - Personal notes excluded by git.
- /vendor/
    - PHP Composer vendor directory. We don't want to commit this
      to git.

And one specific root file:

- /taskell.md
    - Data file for the `taskell` program, used for task tracking.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 581d5c17..e3201e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,11 @@ __pycache__/
 /build/
 /dist/
 /aurweb.egg-info/
+/personal/
+/notes/
+/vendor/
 /pyrightconfig.json
+/taskell.md
 aur.git/
 aurweb.sqlite3
 conf/config

From 51320ab22a244af16bbbed587a61bb6955ff19ba Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 16:16:44 -0700
Subject: [PATCH 425/844] change(fastapi): unify all model relationship
 behavior

Now, we allow the direct relationships and their foreign keys to
be set in all of our models. Previously, we constrained this to
direct relationships, and this forced users to perform a query
in most situations to satisfy that requirement. Now, IDs can be
passed directly.

Additionally, this change removes the need for extraneous imports
when users which to use relationships. We now import and use models
directly instead of passing string-references to them.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/accepted_term.py        | 26 +++++++---------
 aurweb/models/api_rate_limit.py       |  9 ++----
 aurweb/models/group.py                |  6 ++--
 aurweb/models/license.py              |  5 ++--
 aurweb/models/official_provider.py    | 11 +++----
 aurweb/models/package.py              | 25 +++++-----------
 aurweb/models/package_base.py         | 43 +++++++++++----------------
 aurweb/models/package_blacklist.py    |  5 ++--
 aurweb/models/package_comaintainer.py | 23 ++++++--------
 aurweb/models/package_comment.py      | 26 +++++++---------
 aurweb/models/package_dependency.py   | 35 ++++++++--------------
 aurweb/models/package_group.py        | 21 ++++++-------
 aurweb/models/package_keyword.py      | 17 ++++-------
 aurweb/models/package_license.py      | 21 ++++++-------
 aurweb/models/package_notification.py | 22 ++++++--------
 aurweb/models/package_relation.py     | 30 +++++++------------
 aurweb/models/package_request.py      | 36 +++++++---------------
 aurweb/models/package_source.py       | 14 ++++-----
 aurweb/models/package_vote.py         | 23 ++++++--------
 aurweb/models/session.py              | 18 ++++++-----
 aurweb/models/term.py                 | 10 ++-----
 aurweb/models/tu_vote.py              | 21 ++++++-------
 aurweb/models/tu_voteinfo.py          | 28 ++++++-----------
 aurweb/models/user.py                 |  3 +-
 24 files changed, 181 insertions(+), 297 deletions(-)

diff --git a/aurweb/models/accepted_term.py b/aurweb/models/accepted_term.py
index b46d086b..b4dbb410 100644
--- a/aurweb/models/accepted_term.py
+++ b/aurweb/models/accepted_term.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.term
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.term import Term as _Term
+from aurweb.models.user import User as _User
 
 
 class AcceptedTerm(Base):
@@ -14,33 +13,28 @@ class AcceptedTerm(Base):
     UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
                      nullable=False)
     User = relationship(
-        "User", backref=backref("accepted_terms", lazy="dynamic"),
+        _User, backref=backref("accepted_terms", lazy="dynamic"),
         foreign_keys=[UsersID])
 
     TermsID = Column(Integer, ForeignKey("Terms.ID", ondelete="CASCADE"),
                      nullable=False)
     Term = relationship(
-        "Term", backref=backref("accepted_terms", lazy="dynamic"),
+        _Term, backref=backref("accepted_terms", lazy="dynamic"),
         foreign_keys=[TermsID])
 
     __mapper_args__ = {"primary_key": [TermsID]}
 
-    def __init__(self,
-                 User: aurweb.models.user.User = None,
-                 Term: aurweb.models.term.Term = None,
-                 Revision: int = None):
-        self.User = User
-        if not self.User:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.User and not self.UsersID:
             raise IntegrityError(
-                statement="Foreign key UserID cannot be null.",
+                statement="Foreign key UsersID cannot be null.",
                 orig="AcceptedTerms.UserID",
                 params=("NULL"))
 
-        self.Term = Term
-        if not self.Term:
+        if not self.Term and not self.TermsID:
             raise IntegrityError(
                 statement="Foreign key TermID cannot be null.",
                 orig="AcceptedTerms.TermID",
                 params=("NULL"))
-
-        self.Revision = Revision
diff --git a/aurweb/models/api_rate_limit.py b/aurweb/models/api_rate_limit.py
index f4590553..f8641896 100644
--- a/aurweb/models/api_rate_limit.py
+++ b/aurweb/models/api_rate_limit.py
@@ -11,20 +11,15 @@ class ApiRateLimit(Base):
 
     __mapper_args__ = {"primary_key": [IP]}
 
-    def __init__(self,
-                 IP: str = None,
-                 Requests: int = None,
-                 WindowStart: int = None):
-        self.IP = IP
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
 
-        self.Requests = Requests
         if self.Requests is None:
             raise IntegrityError(
                 statement="Column Requests cannot be null.",
                 orig="ApiRateLimit.Requests",
                 params=("NULL"))
 
-        self.WindowStart = WindowStart
         if self.WindowStart is None:
             raise IntegrityError(
                 statement="Column WindowStart cannot be null.",
diff --git a/aurweb/models/group.py b/aurweb/models/group.py
index 1bd3a402..5493bb7f 100644
--- a/aurweb/models/group.py
+++ b/aurweb/models/group.py
@@ -11,9 +11,9 @@ class Group(Base):
 
     __mapper_args__ = {"primary_key": [ID]}
 
-    def __init__(self, Name: str = None):
-        self.Name = Name
-        if not self.Name:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        if self.Name is None:
             raise IntegrityError(
                 statement="Column Name cannot be null.",
                 orig="Groups.Name",
diff --git a/aurweb/models/license.py b/aurweb/models/license.py
index aef6a619..fa863379 100644
--- a/aurweb/models/license.py
+++ b/aurweb/models/license.py
@@ -11,8 +11,9 @@ class License(Base):
 
     __mapper_args__ = {"primary_key": [ID]}
 
-    def __init__(self, Name: str = None):
-        self.Name = Name
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
         if not self.Name:
             raise IntegrityError(
                 statement="Column Name cannot be null.",
diff --git a/aurweb/models/official_provider.py b/aurweb/models/official_provider.py
index e53556b9..a273dd06 100644
--- a/aurweb/models/official_provider.py
+++ b/aurweb/models/official_provider.py
@@ -3,6 +3,7 @@ from sqlalchemy.exc import IntegrityError
 
 from aurweb.models.declarative import Base
 
+# TODO: Fix this! Official packages aren't from aur.archlinux.org...
 OFFICIAL_BASE = "https://aur.archlinux.org"
 
 
@@ -13,25 +14,21 @@ class OfficialProvider(Base):
 
     __mapper_args__ = {"primary_key": [ID]}
 
-    def __init__(self,
-                 Name: str = None,
-                 Repo: str = None,
-                 Provides: str = None):
-        self.Name = Name
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
         if not self.Name:
             raise IntegrityError(
                 statement="Column Name cannot be null.",
                 orig="OfficialProviders.Name",
                 params=("NULL"))
 
-        self.Repo = Repo
         if not self.Repo:
             raise IntegrityError(
                 statement="Column Repo cannot be null.",
                 orig="OfficialProviders.Repo",
                 params=("NULL"))
 
-        self.Provides = Provides
         if not self.Provides:
             raise IntegrityError(
                 statement="Column Provides cannot be null.",
diff --git a/aurweb/models/package.py b/aurweb/models/package.py
index e8159d85..ef119f3c 100644
--- a/aurweb/models/package.py
+++ b/aurweb/models/package.py
@@ -2,10 +2,8 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.db
-import aurweb.models.package_base
-
 from aurweb.models.declarative import Base
+from aurweb.models.package_base import PackageBase as _PackageBase
 
 
 class Package(Base):
@@ -17,31 +15,22 @@ class Package(Base):
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         nullable=False)
     PackageBase = relationship(
-        "PackageBase", backref=backref("packages", lazy="dynamic"),
+        _PackageBase, backref=backref("packages", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
     __mapper_args__ = {"primary_key": [ID]}
 
-    def __init__(self,
-                 PackageBase: aurweb.models.package_base.PackageBase = None,
-                 Name: str = None,
-                 Version: str = None,
-                 Description: str = None,
-                 URL: str = None):
-        self.PackageBase = PackageBase
-        if not self.PackageBase:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.PackageBase and not self.PackageBaseID:
             raise IntegrityError(
                 statement="Foreign key PackageBaseID cannot be null.",
                 orig="Packages.PackageBaseID",
                 params=("NULL"))
 
-        self.Name = Name
-        if not self.Name:
+        if self.Name is None:
             raise IntegrityError(
                 statement="Column Name cannot be null.",
                 orig="Packages.Name",
                 params=("NULL"))
-
-        self.Version = Version
-        self.Description = Description
-        self.URL = URL
diff --git a/aurweb/models/package_base.py b/aurweb/models/package_base.py
index 9177c422..e6f28050 100644
--- a/aurweb/models/package_base.py
+++ b/aurweb/models/package_base.py
@@ -4,9 +4,8 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.user import User as _User
 
 
 class PackageBase(Base):
@@ -15,56 +14,48 @@ class PackageBase(Base):
     FlaggerUID = Column(Integer,
                         ForeignKey("Users.ID", ondelete="SET NULL"))
     Flagger = relationship(
-        "User", backref=backref("flagged_bases", lazy="dynamic"),
+        _User, backref=backref("flagged_bases", lazy="dynamic"),
         foreign_keys=[FlaggerUID])
 
     SubmitterUID = Column(Integer,
                           ForeignKey("Users.ID", ondelete="SET NULL"))
     Submitter = relationship(
-        "User", backref=backref("submitted_bases", lazy="dynamic"),
+        _User, backref=backref("submitted_bases", lazy="dynamic"),
         foreign_keys=[SubmitterUID])
 
     MaintainerUID = Column(Integer,
                            ForeignKey("Users.ID", ondelete="SET NULL"))
     Maintainer = relationship(
-        "User", backref=backref("maintained_bases", lazy="dynamic"),
+        _User, backref=backref("maintained_bases", lazy="dynamic"),
         foreign_keys=[MaintainerUID])
 
     PackagerUID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     Packager = relationship(
-        "User", backref=backref("package_bases", lazy="dynamic"),
+        _User, backref=backref("package_bases", lazy="dynamic"),
         foreign_keys=[PackagerUID])
 
     # A set used to check for floatable values.
     TO_FLOAT = {"Popularity"}
 
-    def __init__(self, Name: str = None,
-                 Flagger: aurweb.models.user.User = None,
-                 Maintainer: aurweb.models.user.User = None,
-                 Submitter: aurweb.models.user.User = None,
-                 Packager: aurweb.models.user.User = None,
-                 **kwargs):
+    def __init__(self, **kwargs):
         super().__init__(**kwargs)
-        self.Name = Name
-        if not self.Name:
+
+        if self.Name is None:
             raise IntegrityError(
                 statement="Column Name cannot be null.",
                 orig="PackageBases.Name",
                 params=("NULL"))
 
-        self.Flagger = Flagger
-        self.Maintainer = Maintainer
-        self.Submitter = Submitter
-        self.Packager = Packager
+        # If no SubmittedTS/ModifiedTS is provided on creation, set them
+        # here to the current utc timestamp.
+        now = datetime.utcnow().timestamp()
+        if not self.SubmittedTS:
+            self.SubmittedTS = now
+        if not self.ModifiedTS:
+            self.ModifiedTS = now
 
-        self.NumVotes = kwargs.get("NumVotes")
-        self.Popularity = kwargs.get("Popularity")
-        self.OutOfDateTS = kwargs.get("OutOfDateTS")
-        self.FlaggerComment = kwargs.get("FlaggerComment", str())
-        self.SubmittedTS = kwargs.get("SubmittedTS",
-                                      datetime.utcnow().timestamp())
-        self.ModifiedTS = kwargs.get("ModifiedTS",
-                                     datetime.utcnow().timestamp())
+        if not self.FlaggerComment:
+            self.FlaggerComment = str()
 
     def __getattribute__(self, key: str):
         attr = super().__getattribute__(key)
diff --git a/aurweb/models/package_blacklist.py b/aurweb/models/package_blacklist.py
index 7702c877..4ba3f308 100644
--- a/aurweb/models/package_blacklist.py
+++ b/aurweb/models/package_blacklist.py
@@ -11,8 +11,9 @@ class PackageBlacklist(Base):
 
     __mapper_args__ = {"primary_key": [ID]}
 
-    def __init__(self, Name: str = None):
-        self.Name = Name
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
         if not self.Name:
             raise IntegrityError(
                 statement="Column Name cannot be null.",
diff --git a/aurweb/models/package_comaintainer.py b/aurweb/models/package_comaintainer.py
index 88fd58ae..2f77782c 100644
--- a/aurweb/models/package_comaintainer.py
+++ b/aurweb/models/package_comaintainer.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.package_base
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.package_base import PackageBase as _PackageBase
+from aurweb.models.user import User as _User
 
 
 class PackageComaintainer(Base):
@@ -15,37 +14,33 @@ class PackageComaintainer(Base):
         Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
         nullable=False)
     User = relationship(
-        "User", backref=backref("comaintained", lazy="dynamic"),
+        _User, backref=backref("comaintained", lazy="dynamic"),
         foreign_keys=[UsersID])
 
     PackageBaseID = Column(
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         nullable=False)
     PackageBase = relationship(
-        "PackageBase", backref=backref("comaintainers", lazy="dynamic"),
+        _PackageBase, backref=backref("comaintainers", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
     __mapper_args__ = {"primary_key": [UsersID, PackageBaseID]}
 
-    def __init__(self,
-                 User: aurweb.models.user.User = None,
-                 PackageBase: aurweb.models.package_base.PackageBase = None,
-                 Priority: int = None):
-        self.User = User
-        if not self.User:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.User and not self.UsersID:
             raise IntegrityError(
                 statement="Foreign key UsersID cannot be null.",
                 orig="PackageComaintainers.UsersID",
                 params=("NULL"))
 
-        self.PackageBase = PackageBase
-        if not self.PackageBase:
+        if not self.PackageBase and not self.PackageBaseID:
             raise IntegrityError(
                 statement="Foreign key PackageBaseID cannot be null.",
                 orig="PackageComaintainers.PackageBaseID",
                 params=("NULL"))
 
-        self.Priority = Priority
         if not self.Priority:
             raise IntegrityError(
                 statement="Column Priority cannot be null.",
diff --git a/aurweb/models/package_comment.py b/aurweb/models/package_comment.py
index 92ae8911..ffe1300b 100644
--- a/aurweb/models/package_comment.py
+++ b/aurweb/models/package_comment.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.package_base
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.package_base import PackageBase as _PackageBase
+from aurweb.models.user import User as _User
 
 
 class PackageComment(Base):
@@ -17,44 +16,39 @@ class PackageComment(Base):
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         nullable=False)
     PackageBase = relationship(
-        "PackageBase", backref=backref("comments", lazy="dynamic",
-                                       cascade="all,delete"),
+        _PackageBase, backref=backref("comments", lazy="dynamic",
+                                      cascade="all,delete"),
         foreign_keys=[PackageBaseID])
 
     UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     User = relationship(
-        "User", backref=backref("package_comments", lazy="dynamic"),
+        _User, backref=backref("package_comments", lazy="dynamic"),
         foreign_keys=[UsersID])
 
     EditedUsersID = Column(
         Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     Editor = relationship(
-        "User", backref=backref("edited_comments", lazy="dynamic"),
+        _User, backref=backref("edited_comments", lazy="dynamic"),
         foreign_keys=[EditedUsersID])
 
     DelUsersID = Column(
         Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     Deleter = relationship(
-        "User", backref=backref("deleted_comments", lazy="dynamic"),
+        _User, backref=backref("deleted_comments", lazy="dynamic"),
         foreign_keys=[DelUsersID])
 
     __mapper_args__ = {"primary_key": [ID]}
 
-    def __init__(self,
-                 PackageBase: aurweb.models.package_base.PackageBase = None,
-                 User: aurweb.models.user.User = None,
-                 **kwargs):
+    def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self.PackageBase = PackageBase
-        if not self.PackageBase:
+        if not self.PackageBase and not self.PackageBaseID:
             raise IntegrityError(
                 statement="Foreign key PackageBaseID cannot be null.",
                 orig="PackageComments.PackageBaseID",
                 params=("NULL"))
 
-        self.User = User
-        if not self.User:
+        if not self.User and not self.UsersID:
             raise IntegrityError(
                 statement="Foreign key UsersID cannot be null.",
                 orig="PackageComments.UsersID",
diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index fb66c6f2..df6cc6cf 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.package
-
-from aurweb.models import dependency_type
 from aurweb.models.declarative import Base
+from aurweb.models.dependency_type import DependencyType as _DependencyType
+from aurweb.models.package import Package as _Package
 
 
 class PackageDependency(Base):
@@ -15,15 +14,15 @@ class PackageDependency(Base):
         Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
         nullable=False)
     Package = relationship(
-        "Package", backref=backref("package_dependencies", lazy="dynamic",
-                                   cascade="all,delete"),
+        _Package, backref=backref("package_dependencies", lazy="dynamic",
+                                  cascade="all,delete"),
         foreign_keys=[PackageID])
 
     DepTypeID = Column(
         Integer, ForeignKey("DependencyTypes.ID", ondelete="NO ACTION"),
         nullable=False)
     DependencyType = relationship(
-        "DependencyType",
+        _DependencyType,
         backref=backref("package_dependencies", lazy="dynamic"),
         foreign_keys=[DepTypeID])
 
@@ -31,39 +30,29 @@ class PackageDependency(Base):
 
     __mapper_args__ = {"primary_key": [PackageID, DepName]}
 
-    def __init__(self,
-                 Package: aurweb.models.package.Package = None,
-                 DependencyType: dependency_type.DependencyType = None,
-                 DepName: str = None,
-                 DepDesc: str = None,
-                 DepCondition: str = None,
-                 DepArch: str = None):
-        self.Package = Package
-        if not self.Package:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.Package and not self.PackageID:
             raise IntegrityError(
                 statement="Foreign key PackageID cannot be null.",
                 orig="PackageDependencies.PackageID",
                 params=("NULL"))
 
-        self.DependencyType = DependencyType
-        if not self.DependencyType:
+        if not self.DependencyType and not self.DepTypeID:
             raise IntegrityError(
                 statement="Foreign key DepTypeID cannot be null.",
                 orig="PackageDependencies.DepTypeID",
                 params=("NULL"))
 
-        self.DepName = DepName
-        if not self.DepName:
+        if self.DepName is None:
             raise IntegrityError(
                 statement="Column DepName cannot be null.",
                 orig="PackageDependencies.DepName",
                 params=("NULL"))
 
-        self.DepDesc = DepDesc
-        self.DepCondition = DepCondition
-        self.DepArch = DepArch
-
     def is_package(self) -> bool:
+        # TODO: Improve the speed of this query if possible.
         from aurweb import db
         from aurweb.models.official_provider import OfficialProvider
         from aurweb.models.package import Package
diff --git a/aurweb/models/package_group.py b/aurweb/models/package_group.py
index a8031e0d..c1d1e4f8 100644
--- a/aurweb/models/package_group.py
+++ b/aurweb/models/package_group.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.group
-import aurweb.models.package
-
 from aurweb.models.declarative import Base
+from aurweb.models.group import Group as _Group
+from aurweb.models.package import Package as _Package
 
 
 class PackageGroup(Base):
@@ -14,29 +13,27 @@ class PackageGroup(Base):
     PackageID = Column(Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
                        primary_key=True, nullable=True)
     Package = relationship(
-        "Package", backref=backref("package_groups", lazy="dynamic"),
+        _Package, backref=backref("package_groups", lazy="dynamic"),
         foreign_keys=[PackageID])
 
     GroupID = Column(Integer, ForeignKey("Groups.ID", ondelete="CASCADE"),
                      primary_key=True, nullable=True)
     Group = relationship(
-        "Group", backref=backref("package_groups", lazy="dynamic"),
+        _Group, backref=backref("package_groups", lazy="dynamic"),
         foreign_keys=[GroupID])
 
     __mapper_args__ = {"primary_key": [PackageID, GroupID]}
 
-    def __init__(self,
-                 Package: aurweb.models.package.Package = None,
-                 Group: aurweb.models.group.Group = None):
-        self.Package = Package
-        if not self.Package:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.Package and not self.PackageID:
             raise IntegrityError(
                 statement="Primary key PackageID cannot be null.",
                 orig="PackageGroups.PackageID",
                 params=("NULL"))
 
-        self.Group = Group
-        if not self.Group:
+        if not self.Group and not self.GroupID:
             raise IntegrityError(
                 statement="Primary key GroupID cannot be null.",
                 orig="PackageGroups.GroupID",
diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py
index 803e6bca..6c18ac5d 100644
--- a/aurweb/models/package_keyword.py
+++ b/aurweb/models/package_keyword.py
@@ -2,10 +2,8 @@ from sqlalchemy import Column, ForeignKey, Integer, String, text
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.db
-import aurweb.models.package_base
-
 from aurweb.models.declarative import Base
+from aurweb.models.package_base import PackageBase as _PackageBase
 
 
 class PackageKeyword(Base):
@@ -15,7 +13,7 @@ class PackageKeyword(Base):
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         primary_key=True, nullable=True)
     PackageBase = relationship(
-        "PackageBase", backref=backref("keywords", lazy="dynamic"),
+        _PackageBase, backref=backref("keywords", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
     Keyword = Column(
@@ -24,14 +22,11 @@ class PackageKeyword(Base):
 
     __mapper_args__ = {"primary_key": [PackageBaseID, Keyword]}
 
-    def __init__(self,
-                 PackageBase: aurweb.models.package_base.PackageBase = None,
-                 Keyword: str = None):
-        self.PackageBase = PackageBase
-        if not self.PackageBase:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.PackageBase and not self.PackageBaseID:
             raise IntegrityError(
                 statement="Primary key PackageBaseID cannot be null.",
                 orig="PackageKeywords.PackageBaseID",
                 params=("NULL"))
-
-        self.Keyword = Keyword
diff --git a/aurweb/models/package_license.py b/aurweb/models/package_license.py
index 0689562f..ab429fc6 100644
--- a/aurweb/models/package_license.py
+++ b/aurweb/models/package_license.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.license
-import aurweb.models.package
-
 from aurweb.models.declarative import Base
+from aurweb.models.license import License as _License
+from aurweb.models.package import Package as _Package
 
 
 class PackageLicense(Base):
@@ -15,30 +14,28 @@ class PackageLicense(Base):
         Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
         primary_key=True, nullable=True)
     Package = relationship(
-        "Package", backref=backref("package_license", uselist=False),
+        _Package, backref=backref("package_license", uselist=False),
         foreign_keys=[PackageID])
 
     LicenseID = Column(
         Integer, ForeignKey("Licenses.ID", ondelete="CASCADE"),
         primary_key=True, nullable=True)
     License = relationship(
-        "License", backref=backref("package_license", uselist=False),
+        _License, backref=backref("package_license", uselist=False),
         foreign_keys=[LicenseID])
 
     __mapper_args__ = {"primary_key": [PackageID, LicenseID]}
 
-    def __init__(self,
-                 Package: aurweb.models.package.Package = None,
-                 License: aurweb.models.license.License = None):
-        self.Package = Package
-        if not self.Package:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.Package and not self.PackageID:
             raise IntegrityError(
                 statement="Primary key PackageID cannot be null.",
                 orig="PackageLicenses.PackageID",
                 params=("NULL"))
 
-        self.License = License
-        if not self.License:
+        if not self.License and not self.LicenseID:
             raise IntegrityError(
                 statement="Primary key LicenseID cannot be null.",
                 orig="PackageLicenses.LicenseID",
diff --git a/aurweb/models/package_notification.py b/aurweb/models/package_notification.py
index 803c0496..221067e1 100644
--- a/aurweb/models/package_notification.py
+++ b/aurweb/models/package_notification.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.package_base
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.package_base import PackageBase as _PackageBase
+from aurweb.models.user import User as _User
 
 
 class PackageNotification(Base):
@@ -15,32 +14,29 @@ class PackageNotification(Base):
         Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
         nullable=False)
     User = relationship(
-        "User", backref=backref("notifications", lazy="dynamic"),
+        _User, backref=backref("notifications", lazy="dynamic"),
         foreign_keys=[UserID])
 
     PackageBaseID = Column(
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         nullable=False)
     PackageBase = relationship(
-        "PackageBase",
+        _PackageBase,
         backref=backref("notifications", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
     __mapper_args__ = {"primary_key": [UserID, PackageBaseID]}
 
-    def __init__(self,
-                 User: aurweb.models.user.User = None,
-                 PackageBase: aurweb.models.package_base.PackageBase = None,
-                 NotificationTS: int = None):
-        self.User = User
-        if not self.User:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.User and not self.UserID:
             raise IntegrityError(
                 statement="Foreign key UserID cannot be null.",
                 orig="PackageNotifications.UserID",
                 params=("NULL"))
 
-        self.PackageBase = PackageBase
-        if not self.PackageBase:
+        if not self.PackageBase and not self.PackageBaseID:
             raise IntegrityError(
                 statement="Foreign key PackageBaseID cannot be null.",
                 orig="PackageNotifications.PackageBaseID",
diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
index d4921859..a8b495e2 100644
--- a/aurweb/models/package_relation.py
+++ b/aurweb/models/package_relation.py
@@ -2,11 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.db
-import aurweb.models.package
-import aurweb.models.relation_type
-
 from aurweb.models.declarative import Base
+from aurweb.models.package import Package as _Package
+from aurweb.models.relation_type import RelationType as _RelationType
 
 
 class PackageRelation(Base):
@@ -16,46 +14,38 @@ class PackageRelation(Base):
         Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
         nullable=False)
     Package = relationship(
-        "Package", backref=backref("package_relations", lazy="dynamic",
-                                   cascade="all,delete"),
+        _Package, backref=backref("package_relations", lazy="dynamic",
+                                  cascade="all,delete"),
         foreign_keys=[PackageID])
 
     RelTypeID = Column(
         Integer, ForeignKey("RelationTypes.ID", ondelete="CASCADE"),
         nullable=False)
     RelationType = relationship(
-        "RelationType", backref=backref("package_relations", lazy="dynamic"),
+        _RelationType, backref=backref("package_relations", lazy="dynamic"),
         foreign_keys=[RelTypeID])
 
     RelName = Column(String(255), unique=True)
 
     __mapper_args__ = {"primary_key": [PackageID, RelName]}
 
-    def __init__(self,
-                 Package: aurweb.models.package.Package = None,
-                 RelationType: aurweb.models.relation_type.RelationType = None,
-                 RelName: str = None, RelCondition: str = None,
-                 RelArch: str = None):
-        self.Package = Package
-        if not self.Package:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.Package and not self.PackageID:
             raise IntegrityError(
                 statement="Foreign key PackageID cannot be null.",
                 orig="PackageRelations.PackageID",
                 params=("NULL"))
 
-        self.RelationType = RelationType
-        if not self.RelationType:
+        if not self.RelationType and not self.RelTypeID:
             raise IntegrityError(
                 statement="Foreign key RelTypeID cannot be null.",
                 orig="PackageRelations.RelTypeID",
                 params=("NULL"))
 
-        self.RelName = RelName  # nullable=False
         if not self.RelName:
             raise IntegrityError(
                 statement="Column RelName cannot be null.",
                 orig="PackageRelations.RelName",
                 params=("NULL"))
-
-        self.RelCondition = RelCondition
-        self.RelArch = RelArch
diff --git a/aurweb/models/package_request.py b/aurweb/models/package_request.py
index a5125cee..ae0a5b48 100644
--- a/aurweb/models/package_request.py
+++ b/aurweb/models/package_request.py
@@ -2,11 +2,10 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.package_base
-import aurweb.models.request_type
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.package_base import PackageBase as _PackageBase
+from aurweb.models.request_type import RequestType as _RequestType
+from aurweb.models.user import User as _User
 
 PENDING = "Pending"
 CLOSED = "Closed"
@@ -29,24 +28,24 @@ class PackageRequest(Base):
         Integer, ForeignKey("RequestTypes.ID", ondelete="NO ACTION"),
         nullable=False)
     RequestType = relationship(
-        "RequestType", backref=backref("package_requests", lazy="dynamic"),
+        _RequestType, backref=backref("package_requests", lazy="dynamic"),
         foreign_keys=[ReqTypeID])
 
     UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     User = relationship(
-        "User", backref=backref("package_requests", lazy="dynamic"),
+        _User, backref=backref("package_requests", lazy="dynamic"),
         foreign_keys=[UsersID])
 
     PackageBaseID = Column(
         Integer, ForeignKey("PackageBases.ID", ondelete="SET NULL"),
         nullable=False)
     PackageBase = relationship(
-        "PackageBase", backref=backref("requests", lazy="dynamic"),
+        _PackageBase, backref=backref("requests", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
     ClosedUID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     Closer = relationship(
-        "User", backref=backref("closed_requests", lazy="dynamic"),
+        _User, backref=backref("closed_requests", lazy="dynamic"),
         foreign_keys=[ClosedUID])
 
     __mapper_args__ = {"primary_key": [ID]}
@@ -58,52 +57,39 @@ class PackageRequest(Base):
         REJECTED_ID: REJECTED
     }
 
-    def __init__(self,
-                 RequestType: aurweb.models.request_type.RequestType = None,
-                 PackageBase: aurweb.models.package_base.PackageBase = None,
-                 PackageBaseName: str = None,
-                 User: aurweb.models.user.User = None,
-                 Comments: str = None,
-                 ClosureComment: str = None,
-                 **kwargs):
+    def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self.RequestType = RequestType
-        if not self.RequestType:
+        if not self.RequestType and not self.ReqTypeID:
             raise IntegrityError(
                 statement="Foreign key ReqTypeID cannot be null.",
                 orig="PackageRequests.ReqTypeID",
                 params=("NULL"))
 
-        self.PackageBase = PackageBase
-        if not self.PackageBase:
+        if not self.PackageBase and not self.PackageBaseID:
             raise IntegrityError(
                 statement="Foreign key PackageBaseID cannot be null.",
                 orig="PackageRequests.PackageBaseID",
                 params=("NULL"))
 
-        self.PackageBaseName = PackageBaseName
         if not self.PackageBaseName:
             raise IntegrityError(
                 statement="Column PackageBaseName cannot be null.",
                 orig="PackageRequests.PackageBaseName",
                 params=("NULL"))
 
-        self.User = User
-        if not self.User:
+        if not self.User and not self.UsersID:
             raise IntegrityError(
                 statement="Foreign key UsersID cannot be null.",
                 orig="PackageRequests.UsersID",
                 params=("NULL"))
 
-        self.Comments = Comments
         if self.Comments is None:
             raise IntegrityError(
                 statement="Column Comments cannot be null.",
                 orig="PackageRequests.Comments",
                 params=("NULL"))
 
-        self.ClosureComment = ClosureComment
         if self.ClosureComment is None:
             raise IntegrityError(
                 statement="Column ClosureComment cannot be null.",
diff --git a/aurweb/models/package_source.py b/aurweb/models/package_source.py
index f016bee0..edb54f63 100644
--- a/aurweb/models/package_source.py
+++ b/aurweb/models/package_source.py
@@ -2,9 +2,8 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.package
-
 from aurweb.models.declarative import Base
+from aurweb.models.package import Package as _Package
 
 
 class PackageSource(Base):
@@ -13,19 +12,16 @@ class PackageSource(Base):
     PackageID = Column(Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
                        nullable=False)
     Package = relationship(
-        "Package", backref=backref("package_sources", lazy="dynamic",
-                                   cascade="all,delete"),
+        _Package, backref=backref("package_sources", lazy="dynamic",
+                                  cascade="all,delete"),
         foreign_keys=[PackageID])
 
     __mapper_args__ = {"primary_key": [PackageID]}
 
-    def __init__(self,
-                 Package: aurweb.models.package.Package = None,
-                 **kwargs):
+    def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self.Package = Package
-        if not self.Package:
+        if not self.Package and not self.PackageID:
             raise IntegrityError(
                 statement="Foreign key PackageID cannot be null.",
                 orig="PackageSources.PackageID",
diff --git a/aurweb/models/package_vote.py b/aurweb/models/package_vote.py
index 55a9ecbb..2d70be16 100644
--- a/aurweb/models/package_vote.py
+++ b/aurweb/models/package_vote.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.package_base
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.package_base import PackageBase as _PackageBase
+from aurweb.models.user import User as _User
 
 
 class PackageVote(Base):
@@ -15,37 +14,33 @@ class PackageVote(Base):
         Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
         nullable=False)
     User = relationship(
-        "User", backref=backref("package_votes", lazy="dynamic"),
+        _User, backref=backref("package_votes", lazy="dynamic"),
         foreign_keys=[UsersID])
 
     PackageBaseID = Column(
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         nullable=False)
     PackageBase = relationship(
-        "PackageBase", backref=backref("package_votes", lazy="dynamic"),
+        _PackageBase, backref=backref("package_votes", lazy="dynamic"),
         foreign_keys=[PackageBaseID])
 
     __mapper_args__ = {"primary_key": [UsersID, PackageBaseID]}
 
-    def __init__(self,
-                 User: aurweb.models.user.User = None,
-                 PackageBase: aurweb.models.package_base.PackageBase = None,
-                 VoteTS: int = None):
-        self.User = User
-        if not self.User:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.User and not self.UsersID:
             raise IntegrityError(
                 statement="Foreign key UsersID cannot be null.",
                 orig="PackageVotes.UsersID",
                 params=("NULL"))
 
-        self.PackageBase = PackageBase
-        if not self.PackageBase:
+        if not self.PackageBase and not self.PackageBaseID:
             raise IntegrityError(
                 statement="Foreign key PackageBaseID cannot be null.",
                 orig="PackageVotes.PackageBaseID",
                 params=("NULL"))
 
-        self.VoteTS = VoteTS
         if not self.VoteTS:
             raise IntegrityError(
                 statement="Column VoteTS cannot be null.",
diff --git a/aurweb/models/session.py b/aurweb/models/session.py
index 9154178e..a4034678 100644
--- a/aurweb/models/session.py
+++ b/aurweb/models/session.py
@@ -4,7 +4,7 @@ from sqlalchemy.orm import backref, relationship
 
 from aurweb.db import make_random_value, query
 from aurweb.models.declarative import Base
-from aurweb.models.user import User
+from aurweb.models.user import User as _User
 
 
 class Session(Base):
@@ -14,22 +14,24 @@ class Session(Base):
         Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
         nullable=False)
     User = relationship(
-        "User", backref=backref("session", uselist=False),
+        _User, backref=backref("session", uselist=False),
         foreign_keys=[UsersID])
 
     __mapper_args__ = {"primary_key": [UsersID]}
 
     def __init__(self, **kwargs):
-        self.UsersID = kwargs.get("UsersID")
-        if not query(User, User.ID == self.UsersID).first():
+        super().__init__(**kwargs)
+
+        user_exists = query(
+            query(_User).filter(_User.ID == self.UsersID).exists()
+        ).scalar()
+        if not user_exists:
             raise IntegrityError(
-                statement="Foreign key UsersID cannot be null.",
+                statement=("Foreign key UsersID cannot be null and "
+                           "must be a valid user's ID."),
                 orig="Sessions.UsersID",
                 params=("NULL"))
 
-        self.SessionID = kwargs.get("SessionID")
-        self.LastUpdateTS = kwargs.get("LastUpdateTS")
-
 
 def generate_unique_sid():
     return make_random_value(Session, Session.SessionID)
diff --git a/aurweb/models/term.py b/aurweb/models/term.py
index b0da71f7..0985cd76 100644
--- a/aurweb/models/term.py
+++ b/aurweb/models/term.py
@@ -11,21 +11,17 @@ class Term(Base):
 
     __mapper_args__ = {"primary_key": [ID]}
 
-    def __init__(self,
-                 Description: str = None, URL: str = None,
-                 Revision: int = None):
-        self.Description = Description
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
         if not self.Description:
             raise IntegrityError(
                 statement="Column Description cannot be null.",
                 orig="Terms.Description",
                 params=("NULL"))
 
-        self.URL = URL
         if not self.URL:
             raise IntegrityError(
                 statement="Column URL cannot be null.",
                 orig="Terms.URL",
                 params=("NULL"))
-
-        self.Revision = Revision
diff --git a/aurweb/models/tu_vote.py b/aurweb/models/tu_vote.py
index 2b7bf2d0..634c041e 100644
--- a/aurweb/models/tu_vote.py
+++ b/aurweb/models/tu_vote.py
@@ -2,10 +2,9 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.tu_voteinfo
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.tu_voteinfo import TUVoteInfo as _TUVoteInfo
+from aurweb.models.user import User as _User
 
 
 class TUVote(Base):
@@ -14,29 +13,27 @@ class TUVote(Base):
     VoteID = Column(Integer, ForeignKey("TU_VoteInfo.ID", ondelete="CASCADE"),
                     nullable=False)
     VoteInfo = relationship(
-        "TUVoteInfo", backref=backref("tu_votes", lazy="dynamic"),
+        _TUVoteInfo, backref=backref("tu_votes", lazy="dynamic"),
         foreign_keys=[VoteID])
 
     UserID = Column(Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
                     nullable=False)
     User = relationship(
-        "User", backref=backref("tu_votes", lazy="dynamic"),
+        _User, backref=backref("tu_votes", lazy="dynamic"),
         foreign_keys=[UserID])
 
     __mapper_args__ = {"primary_key": [VoteID, UserID]}
 
-    def __init__(self,
-                 VoteInfo: aurweb.models.tu_voteinfo.TUVoteInfo = None,
-                 User: aurweb.models.user.User = None):
-        self.VoteInfo = VoteInfo
-        if self.VoteInfo is None:
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.VoteInfo and not self.VoteID:
             raise IntegrityError(
                 statement="Foreign key VoteID cannot be null.",
                 orig="TU_Votes.VoteID",
                 params=("NULL"))
 
-        self.User = User
-        if self.User is None:
+        if not self.User and not self.UserID:
             raise IntegrityError(
                 statement="Foreign key UserID cannot be null.",
                 orig="TU_Votes.UserID",
diff --git a/aurweb/models/tu_voteinfo.py b/aurweb/models/tu_voteinfo.py
index b80073f4..da43b097 100644
--- a/aurweb/models/tu_voteinfo.py
+++ b/aurweb/models/tu_voteinfo.py
@@ -6,9 +6,8 @@ from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-import aurweb.models.user
-
 from aurweb.models.declarative import Base
+from aurweb.models.user import User as _User
 
 
 class TUVoteInfo(Base):
@@ -20,57 +19,44 @@ class TUVoteInfo(Base):
         Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
         nullable=False)
     Submitter = relationship(
-        "User", backref=backref("tu_voteinfo_set", lazy="dynamic"),
+        _User, backref=backref("tu_voteinfo_set", lazy="dynamic"),
         foreign_keys=[SubmitterID])
 
     __mapper_args__ = {"primary_key": [ID]}
 
-    def __init__(self,
-                 Agenda: str = None,
-                 User: str = None,
-                 Submitted: int = None,
-                 End: int = None,
-                 Quorum: float = None,
-                 Submitter: aurweb.models.user.User = None,
-                 **kwargs):
+    def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self.Agenda = Agenda
         if self.Agenda is None:
             raise IntegrityError(
                 statement="Column Agenda cannot be null.",
                 orig="TU_VoteInfo.Agenda",
                 params=("NULL"))
 
-        self.User = User
         if self.User is None:
             raise IntegrityError(
                 statement="Column User cannot be null.",
                 orig="TU_VoteInfo.User",
                 params=("NULL"))
 
-        self.Submitted = Submitted
         if self.Submitted is None:
             raise IntegrityError(
                 statement="Column Submitted cannot be null.",
                 orig="TU_VoteInfo.Submitted",
                 params=("NULL"))
 
-        self.End = End
         if self.End is None:
             raise IntegrityError(
                 statement="Column End cannot be null.",
                 orig="TU_VoteInfo.End",
                 params=("NULL"))
 
-        if Quorum is None:
+        if self.Quorum is None:
             raise IntegrityError(
                 statement="Column Quorum cannot be null.",
                 orig="TU_VoteInfo.Quorum",
                 params=("NULL"))
-        self.Quorum = Quorum
 
-        self.Submitter = Submitter
         if not self.Submitter:
             raise IntegrityError(
                 statement="Foreign key SubmitterID cannot be null.",
@@ -86,7 +72,11 @@ class TUVoteInfo(Base):
     def __getattribute__(self, key: str):
         """ Customize getattr to floatify any fetched Quorum values. """
         attr = super().__getattribute__(key)
-        return float(attr) if key == "Quorum" else attr
+        if attr is None:
+            return attr
+        elif key == "Quorum":
+            return float(attr)
+        return attr
 
     def is_running(self):
         return self.End > int(datetime.utcnow().timestamp())
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 5f848304..5b0da4ce 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -13,6 +13,7 @@ import aurweb.models.account_type
 import aurweb.schema
 
 from aurweb import db
+from aurweb.models.account_type import AccountType as _AccountType
 from aurweb.models.ban import is_banned
 from aurweb.models.declarative import Base
 
@@ -29,7 +30,7 @@ class User(Base):
         Integer, ForeignKey("AccountTypes.ID", ondelete="NO ACTION"),
         nullable=False, server_default=text("1"))
     AccountType = relationship(
-        "AccountType",
+        _AccountType,
         backref=backref("users", lazy="dynamic"),
         foreign_keys=[AccountTypeID],
         uselist=False)

From 56eefabc6dccedd8f09bd331c5580f4963c3f12f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 16:20:03 -0700
Subject: [PATCH 426/844] change(fastapi): sanitize cascade backref strings

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_comment.py    | 2 +-
 aurweb/models/package_dependency.py | 2 +-
 aurweb/models/package_relation.py   | 2 +-
 aurweb/models/package_source.py     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aurweb/models/package_comment.py b/aurweb/models/package_comment.py
index ffe1300b..a511df9b 100644
--- a/aurweb/models/package_comment.py
+++ b/aurweb/models/package_comment.py
@@ -17,7 +17,7 @@ class PackageComment(Base):
         nullable=False)
     PackageBase = relationship(
         _PackageBase, backref=backref("comments", lazy="dynamic",
-                                      cascade="all,delete"),
+                                      cascade="all, delete"),
         foreign_keys=[PackageBaseID])
 
     UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index df6cc6cf..3f4e2baa 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -15,7 +15,7 @@ class PackageDependency(Base):
         nullable=False)
     Package = relationship(
         _Package, backref=backref("package_dependencies", lazy="dynamic",
-                                  cascade="all,delete"),
+                                  cascade="all, delete"),
         foreign_keys=[PackageID])
 
     DepTypeID = Column(
diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
index a8b495e2..e79a90d6 100644
--- a/aurweb/models/package_relation.py
+++ b/aurweb/models/package_relation.py
@@ -15,7 +15,7 @@ class PackageRelation(Base):
         nullable=False)
     Package = relationship(
         _Package, backref=backref("package_relations", lazy="dynamic",
-                                  cascade="all,delete"),
+                                  cascade="all, delete"),
         foreign_keys=[PackageID])
 
     RelTypeID = Column(
diff --git a/aurweb/models/package_source.py b/aurweb/models/package_source.py
index edb54f63..db983272 100644
--- a/aurweb/models/package_source.py
+++ b/aurweb/models/package_source.py
@@ -13,7 +13,7 @@ class PackageSource(Base):
                        nullable=False)
     Package = relationship(
         _Package, backref=backref("package_sources", lazy="dynamic",
-                                  cascade="all,delete"),
+                                  cascade="all, delete"),
         foreign_keys=[PackageID])
 
     __mapper_args__ = {"primary_key": [PackageID]}

From 6ddf888b67165f0c0c5b536edd437fd4e849688f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 17:33:33 -0700
Subject: [PATCH 427/844] cleanup: remove int(...) casts on HTTPStatus usage

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py        |  6 +--
 aurweb/routers/accounts.py     | 30 ++++++-------
 aurweb/routers/auth.py         |  4 +-
 aurweb/routers/html.py         |  2 +-
 aurweb/routers/packages.py     | 80 +++++++++++++++++-----------------
 aurweb/routers/trusted_user.py |  8 ++--
 aurweb/templates.py            |  2 +-
 7 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 55149127..2ea1155f 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -113,11 +113,11 @@ def get_pkg_or_base(name: str, cls: Union[Package, PackageBase] = PackageBase):
     provider = db.query(OfficialProvider).filter(
         OfficialProvider.Name == name).first()
     if provider:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     instance = db.query(cls).filter(cls.Name == name).first()
     if cls == PackageBase and not instance:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     return instance
 
@@ -125,7 +125,7 @@ def get_pkg_or_base(name: str, cls: Union[Package, PackageBase] = PackageBase):
 def get_pkgbase_comment(pkgbase: PackageBase, id: int) -> PackageComment:
     comment = pkgbase.comments.filter(PackageComment.ID == id).first()
     if not comment:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
     return comment
 
 
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index fc1c5242..030ff651 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -51,7 +51,7 @@ async def passreset_post(request: Request,
     if not user:
         context["errors"] = ["Invalid e-mail."]
         return render_template(request, "passreset.html", context,
-                               status_code=int(HTTPStatus.NOT_FOUND))
+                               status_code=HTTPStatus.NOT_FOUND)
 
     if resetkey:
         context["resetkey"] = resetkey
@@ -59,18 +59,18 @@ async def passreset_post(request: Request,
         if not user.ResetKey or resetkey != user.ResetKey:
             context["errors"] = ["Invalid e-mail."]
             return render_template(request, "passreset.html", context,
-                                   status_code=int(HTTPStatus.NOT_FOUND))
+                                   status_code=HTTPStatus.NOT_FOUND)
 
         if not user or not password:
             context["errors"] = ["Missing a required field."]
             return render_template(request, "passreset.html", context,
-                                   status_code=int(HTTPStatus.BAD_REQUEST))
+                                   status_code=HTTPStatus.BAD_REQUEST)
 
         if password != confirm:
             # If the provided password does not match the provided confirm.
             context["errors"] = ["Password fields do not match."]
             return render_template(request, "passreset.html", context,
-                                   status_code=int(HTTPStatus.BAD_REQUEST))
+                                   status_code=HTTPStatus.BAD_REQUEST)
 
         if len(password) < User.minimum_passwd_length():
             # Translate the error here, which simplifies error output
@@ -80,7 +80,7 @@ async def passreset_post(request: Request,
                 "Your password must be at least %s characters.") % (
                 str(User.minimum_passwd_length()))]
             return render_template(request, "passreset.html", context,
-                                   status_code=int(HTTPStatus.BAD_REQUEST))
+                                   status_code=HTTPStatus.BAD_REQUEST)
 
         # We got to this point; everything matched up. Update the password
         # and remove the ResetKey.
@@ -92,7 +92,7 @@ async def passreset_post(request: Request,
 
         # Render ?step=complete.
         return RedirectResponse(url="/passreset?step=complete",
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
 
     # If we got here, we continue with issuing a resetkey for the user.
     resetkey = db.make_random_value(User, User.ResetKey)
@@ -104,7 +104,7 @@ async def passreset_post(request: Request,
 
     # Render ?step=confirm.
     return RedirectResponse(url="/passreset?step=confirm",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 def process_account_form(request: Request, user: User, args: dict):
@@ -373,12 +373,12 @@ async def account_register_post(request: Request,
         # return HTTP 400 with an error.
         context["errors"] = errors
         return render_template(request, "register.html", context,
-                               status_code=int(HTTPStatus.BAD_REQUEST))
+                               status_code=HTTPStatus.BAD_REQUEST)
 
     if not captcha:
         context["errors"] = ["The CAPTCHA is missing."]
         return render_template(request, "register.html", context,
-                               status_code=int(HTTPStatus.BAD_REQUEST))
+                               status_code=HTTPStatus.BAD_REQUEST)
 
     # Create a user with no password with a resetkey, then send
     # an email off about it.
@@ -427,7 +427,7 @@ def cannot_edit(request, user):
     has_dev_cred = request.user.has_credential("CRED_ACCOUNT_EDIT_DEV",
                                                approved=[user])
     if not has_dev_cred:
-        return HTMLResponse(status_code=int(HTTPStatus.UNAUTHORIZED))
+        return HTMLResponse(status_code=HTTPStatus.UNAUTHORIZED)
     return None
 
 
@@ -488,12 +488,12 @@ async def account_edit_post(request: Request,
     if not passwd:
         context["errors"] = ["Invalid password."]
         return render_template(request, "account/edit.html", context,
-                               status_code=int(HTTPStatus.BAD_REQUEST))
+                               status_code=HTTPStatus.BAD_REQUEST)
 
     if not ok:
         context["errors"] = errors
         return render_template(request, "account/edit.html", context,
-                               status_code=int(HTTPStatus.BAD_REQUEST))
+                               status_code=HTTPStatus.BAD_REQUEST)
 
     # Set all updated fields as needed.
     with db.begin():
@@ -586,7 +586,7 @@ async def account(request: Request, username: str):
 
     user = db.query(User, User.Username == username).first()
     if not user:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     context["user"] = user
 
@@ -682,7 +682,7 @@ def render_terms_of_service(request: Request,
                             context: dict,
                             terms: typing.Iterable):
     if not terms:
-        return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
+        return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
     context["unaccepted_terms"] = terms
     return render_template(request, "tos/index.html", context)
 
@@ -745,4 +745,4 @@ async def terms_of_service_post(request: Request,
             db.create(AcceptedTerm, User=request.user,
                       Term=term, Revision=term.Revision)
 
-    return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
+    return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index a985281e..d94199b5 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -59,7 +59,7 @@ async def login_post(request: Request,
                      + max(cookie_timeout, login_timeout))
 
     response = RedirectResponse(url=next,
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
 
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURSID", sid, expires=expires_at,
@@ -85,7 +85,7 @@ async def logout(request: Request, next: str = "/"):
     # Use 303 since we may be handling a post request, that'll get it
     # to redirect to a get request.
     response = RedirectResponse(url=next,
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
     response.delete_cookie("AURSID")
     response.delete_cookie("AURTZ")
     return response
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 6e7697e4..7bae739b 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -56,7 +56,7 @@ async def language(request: Request,
 
     # In any case, set the response's AURLANG cookie that never expires.
     response = RedirectResponse(url=f"{next}{query_string}",
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURLANG", set_lang,
                         secure=secure_cookies, httponly=True)
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 15d0591c..61081edd 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -273,7 +273,7 @@ async def package_base(request: Request, name: str) -> Response:
     # If this is not a split package, redirect to /packages/{name}.
     if pkgbase.packages.count() == 1:
         return RedirectResponse(f"/packages/{name}",
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
 
     # Add our base information.
     context = await make_single_context(request, pkgbase)
@@ -301,7 +301,7 @@ async def pkgbase_comments_post(
     pkgbase = get_pkg_or_base(name, PackageBase)
 
     if not comment:
-        raise HTTPException(status_code=int(HTTPStatus.EXPECTATION_FAILED))
+        raise HTTPException(status_code=HTTPStatus.EXPECTATION_FAILED)
 
     # If the provided comment is different than the record's version,
     # update the db record.
@@ -320,7 +320,7 @@ async def pkgbase_comments_post(
 
     # Redirect to the pkgbase page.
     return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{comment.ID}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.get("/pkgbase/{name}/comments/{id}/form")
@@ -330,10 +330,10 @@ async def pkgbase_comment_form(request: Request, name: str, id: int):
     pkgbase = get_pkg_or_base(name, PackageBase)
     comment = pkgbase.comments.filter(PackageComment.ID == id).first()
     if not comment:
-        return JSONResponse({}, status_code=int(HTTPStatus.NOT_FOUND))
+        return JSONResponse({}, status_code=HTTPStatus.NOT_FOUND)
 
     if not request.user.is_elevated() and request.user != comment.User:
-        return JSONResponse({}, status_code=int(HTTPStatus.UNAUTHORIZED))
+        return JSONResponse({}, status_code=HTTPStatus.UNAUTHORIZED)
 
     context = await make_single_context(request, pkgbase)
     context["comment"] = comment
@@ -353,7 +353,7 @@ async def pkgbase_comment_post(
     db_comment = get_pkgbase_comment(pkgbase, id)
 
     if not comment:
-        raise HTTPException(status_code=int(HTTPStatus.EXPECTATION_FAILED))
+        raise HTTPException(status_code=HTTPStatus.EXPECTATION_FAILED)
 
     # If the provided comment is different than the record's version,
     # update the db record.
@@ -375,7 +375,7 @@ async def pkgbase_comment_post(
 
     # Redirect to the pkgbase page anchored to the updated comment.
     return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{db_comment.ID}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/comments/{id}/delete")
@@ -389,7 +389,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int):
     if not authorized:
         _ = l10n.get_translator_for_request(request)
         raise HTTPException(
-            status_code=int(HTTPStatus.UNAUTHORIZED),
+            status_code=HTTPStatus.UNAUTHORIZED,
             detail=_("You are not allowed to delete this comment."))
 
     now = int(datetime.utcnow().timestamp())
@@ -398,7 +398,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int):
         comment.DelTS = now
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/comments/{id}/undelete")
@@ -412,7 +412,7 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int):
     if not has_cred:
         _ = l10n.get_translator_for_request(request)
         raise HTTPException(
-            status_code=int(HTTPStatus.UNAUTHORIZED),
+            status_code=HTTPStatus.UNAUTHORIZED,
             detail=_("You are not allowed to undelete this comment."))
 
     with db.begin():
@@ -420,7 +420,7 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int):
         comment.DelTS = None
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/comments/{id}/pin")
@@ -434,7 +434,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int):
     if not has_cred:
         _ = l10n.get_translator_for_request(request)
         raise HTTPException(
-            status_code=int(HTTPStatus.UNAUTHORIZED),
+            status_code=HTTPStatus.UNAUTHORIZED,
             detail=_("You are not allowed to pin this comment."))
 
     now = int(datetime.utcnow().timestamp())
@@ -442,7 +442,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int):
         comment.PinnedTS = now
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/comments/{id}/unpin")
@@ -456,14 +456,14 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int):
     if not has_cred:
         _ = l10n.get_translator_for_request(request)
         raise HTTPException(
-            status_code=int(HTTPStatus.UNAUTHORIZED),
+            status_code=HTTPStatus.UNAUTHORIZED,
             detail=_("You are not allowed to unpin this comment."))
 
     with db.begin():
         comment.PinnedTS = 0
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.get("/pkgbase/{name}/comaintainers")
@@ -478,7 +478,7 @@ async def package_base_comaintainers(request: Request, name: str) -> Response:
                                             approved=[pkgbase.Maintainer])
     if not has_creds:
         return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
 
     # Add our base information.
     context = make_context(request, "Manage Co-maintainers")
@@ -527,7 +527,7 @@ async def package_base_comaintainers_post(
                                             approved=[pkgbase.Maintainer])
     if not has_creds:
         return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
 
     users = set(users.split("\n"))
     users.remove(str())  # Remove any empty strings from the set.
@@ -605,7 +605,7 @@ async def package_base_comaintainers_post(
         return render_template(request, "pkgbase/comaintainers.html", context)
 
     return RedirectResponse(f"/pkgbase/{pkgbase.Name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.get("/requests")
@@ -648,7 +648,7 @@ async def package_request(request: Request, name: str):
     pkgbase = db.query(PackageBase).filter(PackageBase.Name == name).first()
 
     if not pkgbase:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     context["pkgbase"] = pkgbase
     return render_template(request, "pkgbase/request.html", context)
@@ -720,7 +720,7 @@ async def pkgbase_request_post(request: Request, name: str,
 
     # Redirect the submitting user to /packages.
     return RedirectResponse("/packages",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.get("/requests/{id}/close")
@@ -729,7 +729,7 @@ async def requests_close(request: Request, id: int):
     pkgreq = db.query(PackageRequest).filter(PackageRequest.ID == id).first()
     if not request.user.is_elevated() and request.user != pkgreq.User:
         # Request user doesn't have permission here: redirect to '/'.
-        return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
+        return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
 
     context = make_context(request, "Close Request")
     context["pkgreq"] = pkgreq
@@ -744,7 +744,7 @@ async def requests_close_post(request: Request, id: int,
     pkgreq = db.query(PackageRequest).filter(PackageRequest.ID == id).first()
     if not request.user.is_elevated() and request.user != pkgreq.User:
         # Request user doesn't have permission here: redirect to '/'.
-        return RedirectResponse("/", status_code=int(HTTPStatus.SEE_OTHER))
+        return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
 
     context = make_context(request, "Close Request")
     context["pkgreq"] = pkgreq
@@ -770,7 +770,7 @@ async def requests_close_post(request: Request, id: int,
         conn, request.user.ID, pkgreq.ID, pkgreq.status_display())
     notify_.send()
 
-    return RedirectResponse("/requests", status_code=int(HTTPStatus.SEE_OTHER))
+    return RedirectResponse("/requests", status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.get("/pkgbase/{name}/flag")
@@ -781,7 +781,7 @@ async def pkgbase_flag_get(request: Request, name: str):
     has_cred = request.user.has_credential("CRED_PKGBASE_FLAG")
     if not has_cred or pkgbase.Flagger is not None:
         return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
 
     context = make_context(request, "Flag Package Out-Of-Date")
     context["pkgbase"] = pkgbase
@@ -800,7 +800,7 @@ async def pkgbase_flag_post(request: Request, name: str,
         context["errors"] = ["The selected packages have not been flagged, "
                              "please enter a comment."]
         return render_template(request, "packages/flag.html", context,
-                               status_code=int(HTTPStatus.BAD_REQUEST))
+                               status_code=HTTPStatus.BAD_REQUEST)
 
     has_cred = request.user.has_credential("CRED_PKGBASE_FLAG")
     if has_cred and not pkgbase.Flagger:
@@ -811,7 +811,7 @@ async def pkgbase_flag_post(request: Request, name: str,
             pkgbase.FlaggerComment = comments
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/unflag")
@@ -828,7 +828,7 @@ async def pkgbase_unflag(request: Request, name: str):
             pkgbase.FlaggerComment = str()
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/notify")
@@ -847,7 +847,7 @@ async def pkgbase_notify(request: Request, name: str):
                       User=request.user)
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/unnotify")
@@ -864,7 +864,7 @@ async def pkgbase_unnotify(request: Request, name: str):
             db.session.delete(notif)
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/vote")
@@ -889,7 +889,7 @@ async def pkgbase_vote(request: Request, name: str):
         popupdate.run_single(conn, pkgbase)
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/unvote")
@@ -910,7 +910,7 @@ async def pkgbase_unvote(request: Request, name: str):
         popupdate.run_single(conn, pkgbase)
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 def disown_pkgbase(pkgbase: PackageBase, disowner: User):
@@ -944,7 +944,7 @@ async def pkgbase_disown_get(request: Request, name: str):
                                            approved=[pkgbase.Maintainer])
     if not has_cred:
         return RedirectResponse(f"/pkgbase/{name}",
-                                int(HTTPStatus.SEE_OTHER))
+                                HTTPStatus.SEE_OTHER)
 
     context = make_context(request, "Disown Package")
     context["pkgbase"] = pkgbase
@@ -961,7 +961,7 @@ async def pkgbase_disown_post(request: Request, name: str,
                                            approved=[pkgbase.Maintainer])
     if not has_cred:
         return RedirectResponse(f"/pkgbase/{name}",
-                                int(HTTPStatus.SEE_OTHER))
+                                HTTPStatus.SEE_OTHER)
 
     if not confirm:
         context = make_context(request, "Disown Package")
@@ -969,11 +969,11 @@ async def pkgbase_disown_post(request: Request, name: str,
         context["errors"] = [("The selected packages have not been disowned, "
                               "check the confirmation checkbox.")]
         return render_template(request, "packages/disown.html", context,
-                               status_code=int(HTTPStatus.EXPECTATION_FAILED))
+                               status_code=HTTPStatus.EXPECTATION_FAILED)
 
     disown_pkgbase(pkgbase, request.user)
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/adopt")
@@ -990,7 +990,7 @@ async def pkgbase_adopt_post(request: Request, name: str):
             pkgbase.Maintainer = request.user
 
     return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.get("/pkgbase/{name}/delete")
@@ -998,7 +998,7 @@ async def pkgbase_adopt_post(request: Request, name: str):
 async def pkgbase_delete_get(request: Request, name: str):
     if not request.user.has_credential("CRED_PKGBASE_DELETE"):
         return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
 
     context = make_context(request, "Package Deletion")
     context["pkgbase"] = get_pkg_or_base(name, PackageBase)
@@ -1013,7 +1013,7 @@ async def pkgbase_delete_post(request: Request, name: str,
 
     if not request.user.has_credential("CRED_PKGBASE_DELETE"):
         return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=int(HTTPStatus.SEE_OTHER))
+                                status_code=HTTPStatus.SEE_OTHER)
 
     if not confirm:
         context = make_context(request, "Package Deletion")
@@ -1021,10 +1021,10 @@ async def pkgbase_delete_post(request: Request, name: str,
         context["errors"] = [("The selected packages have not been deleted, "
                               "check the confirmation checkbox.")]
         return render_template(request, "packages/delete.html", context,
-                               status_code=int(HTTPStatus.EXPECTATION_FAILED))
+                               status_code=HTTPStatus.EXPECTATION_FAILED)
 
     packages = pkgbase.packages.all()
     for package in packages:
         delete_package(request.user, package)
 
-    return RedirectResponse("/packages", status_code=int(HTTPStatus.SEE_OTHER))
+    return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index b897a635..fdde059a 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -157,7 +157,7 @@ async def trusted_user_proposal(request: Request, proposal: int):
 
     voteinfo = db.query(TUVoteInfo, TUVoteInfo.ID == proposal).first()
     if not voteinfo:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     voters = db.query(User).join(TUVote).filter(TUVote.VoteID == voteinfo.ID)
     vote = db.query(TUVote, and_(TUVote.UserID == request.user.ID,
@@ -185,7 +185,7 @@ async def trusted_user_proposal_post(request: Request,
 
     voteinfo = db.query(TUVoteInfo, TUVoteInfo.ID == proposal).first()
     if not voteinfo:
-        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     voters = db.query(User).join(TUVote).filter(TUVote.VoteID == voteinfo.ID)
     vote = db.query(TUVote, and_(TUVote.UserID == request.user.ID,
@@ -212,7 +212,7 @@ async def trusted_user_proposal_post(request: Request,
         setattr(voteinfo, decision, getattr(voteinfo, decision) + 1)
     else:
         return Response("Invalid 'decision' value.",
-                        status_code=int(HTTPStatus.BAD_REQUEST))
+                        status_code=HTTPStatus.BAD_REQUEST)
 
     with db.begin():
         vote = db.create(TUVote, User=request.user, VoteInfo=voteinfo)
@@ -303,4 +303,4 @@ async def trusted_user_addvote_post(request: Request,
 
     # Redirect to the new proposal.
     return RedirectResponse(f"/tu/{voteinfo.ID}",
-                            status_code=int(HTTPStatus.SEE_OTHER))
+                            status_code=HTTPStatus.SEE_OTHER)
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 2301cfe2..83ce0fbd 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -139,7 +139,7 @@ def render_template(request: Request,
                     status_code: HTTPStatus = HTTPStatus.OK):
     """ Render a template as an HTMLResponse. """
     rendered = render_raw_template(request, path, context)
-    response = HTMLResponse(rendered, status_code=status_code)
+    response = HTMLResponse(rendered, status_code=int(status_code))
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURLANG", context.get("language"),
                         secure=secure_cookies, httponly=True)

From c572a97d1c0db681896ceff51c6896ad91a5cd30 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 17:38:33 -0700
Subject: [PATCH 428/844] fix(fastapi): EXPECTATION_FAILED -> BAD_REQUEST

Usage of EXPECTATION_FAILED in these cases is totally wrong.
EXPECTATION_FAILED is a failure in terms of the HTTP protocol,
not user input. Change all usage of EXPECTATION_FAILED to BAD_REQUEST.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   |  8 ++++----
 test/test_packages_routes.py | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 61081edd..83c796db 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -301,7 +301,7 @@ async def pkgbase_comments_post(
     pkgbase = get_pkg_or_base(name, PackageBase)
 
     if not comment:
-        raise HTTPException(status_code=HTTPStatus.EXPECTATION_FAILED)
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST)
 
     # If the provided comment is different than the record's version,
     # update the db record.
@@ -353,7 +353,7 @@ async def pkgbase_comment_post(
     db_comment = get_pkgbase_comment(pkgbase, id)
 
     if not comment:
-        raise HTTPException(status_code=HTTPStatus.EXPECTATION_FAILED)
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST)
 
     # If the provided comment is different than the record's version,
     # update the db record.
@@ -969,7 +969,7 @@ async def pkgbase_disown_post(request: Request, name: str,
         context["errors"] = [("The selected packages have not been disowned, "
                               "check the confirmation checkbox.")]
         return render_template(request, "packages/disown.html", context,
-                               status_code=HTTPStatus.EXPECTATION_FAILED)
+                               status_code=HTTPStatus.BAD_REQUEST)
 
     disown_pkgbase(pkgbase, request.user)
     return RedirectResponse(f"/pkgbase/{name}",
@@ -1021,7 +1021,7 @@ async def pkgbase_delete_post(request: Request, name: str,
         context["errors"] = [("The selected packages have not been deleted, "
                               "check the confirmation checkbox.")]
         return render_template(request, "packages/delete.html", context,
-                               status_code=HTTPStatus.EXPECTATION_FAILED)
+                               status_code=HTTPStatus.BAD_REQUEST)
 
     packages = pkgbase.packages.all()
     for package in packages:
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 7eb4e532..f29c6c31 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1048,7 +1048,7 @@ def test_pkgbase_comments_missing_comment(client: TestClient, maintainer: User,
     endpoint = f"/pkgbase/{package.PackageBase.Name}/comments"
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
 
 
 def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
@@ -1119,10 +1119,10 @@ def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
     ).first()
     assert db_notif is not None
 
-    # Don't supply a comment; should return EXPECTATION_FAILED.
+    # Don't supply a comment; should return BAD_REQUEST.
     with client as request:
         fail_resp = request.post(endpoint, cookies=cookies)
-    assert fail_resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+    assert fail_resp.status_code == int(HTTPStatus.BAD_REQUEST)
 
     # Now, test the form route, which should return form markup
     # via JSON.
@@ -1902,7 +1902,7 @@ def test_pkgbase_disown(client: TestClient, user: User, maintainer: User,
     # POST as the maintainer without "confirm".
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
 
     # POST as the maintainer with "confirm".
     with client as request:
@@ -1975,7 +1975,7 @@ def test_pkgbase_delete(client: TestClient, tu_user: User, package: Package):
     # Test that POST works and denies us because we haven't confirmed.
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
 
     # Test that we can actually delete the pkgbase.
     with client as request:

From 6d59a97955756fb09d53f4ab8ea0311e852ac92f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 18:24:55 -0700
Subject: [PATCH 429/844] feat(fastapi): include all models in aurweb.models
 package

This gives developers the ability to import models without importing
them directly from their module:

    from aurweb.models import Ban, AccountType

This provides more conciseness:

    from aurweb import models

    def some_func(ban: models.Ban):
        pass

    def some_other_func(user: models.User):
        pass

This more aligns with a Django-style of core model bases.

NOTE: Docker images must be rebuilt with this change, as setup.cfg
has changed. Old Docker images will cause flake8 violation reports.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/__init__.py | 32 +++++++++++++++++++++++++++++++-
 setup.cfg                 |  1 +
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/aurweb/models/__init__.py b/aurweb/models/__init__.py
index ed0532c6..b430acd2 100644
--- a/aurweb/models/__init__.py
+++ b/aurweb/models/__init__.py
@@ -1 +1,31 @@
-# aurweb SQLAlchemy ORM model collection.
+""" Collection of all aurweb SQLAlchemy declarative models. """
+from .accepted_term import AcceptedTerm
+from .account_type import AccountType
+from .api_rate_limit import ApiRateLimit
+from .ban import Ban
+from .dependency_type import DependencyType
+from .group import Group
+from .license import License
+from .official_provider import OfficialProvider
+from .package import Package
+from .package_base import PackageBase
+from .package_blacklist import PackageBlacklist
+from .package_comaintainer import PackageComaintainer
+from .package_comment import PackageComment
+from .package_dependency import PackageDependency
+from .package_group import PackageGroup
+from .package_keyword import PackageKeyword
+from .package_license import PackageLicense
+from .package_notification import PackageNotification
+from .package_relation import PackageRelation
+from .package_request import PackageRequest
+from .package_source import PackageSource
+from .package_vote import PackageVote
+from .relation_type import RelationType
+from .request_type import RequestType
+from .session import Session
+from .ssh_pub_key import SSHPubKey
+from .term import Term
+from .tu_vote import TUVote
+from .tu_voteinfo import TUVoteInfo
+from .user import User
diff --git a/setup.cfg b/setup.cfg
index cec1bcf5..7c64a01f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,7 @@ per-file-ignores =
     aurweb/routers/accounts.py:C901
     test/test_ssh_pub_key.py:E501
     aurweb/routers/packages.py:E741
+    aurweb/models/__init__.py:F401
 
 [isort]
 line_length = 127

From bfdc85d7d6ffae0f661e9eb83746632eb6db75a1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 18:48:05 -0700
Subject: [PATCH 430/844] change(rpc): use simplified models package

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py | 58 ++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 6160bef7..1ddde749 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -1,31 +1,21 @@
 import aurweb.config as config
 
-from aurweb import db
-from aurweb.models.dependency_type import CHECKDEPENDS_ID, DEPENDS_ID, MAKEDEPENDS_ID, OPTDEPENDS_ID
-from aurweb.models.license import License
-from aurweb.models.package import Package
-from aurweb.models.package_base import PackageBase
-from aurweb.models.package_dependency import PackageDependency
-from aurweb.models.package_keyword import PackageKeyword
-from aurweb.models.package_license import PackageLicense
-from aurweb.models.package_relation import PackageRelation
-from aurweb.models.package_vote import PackageVote
-from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
-from aurweb.models.user import User
+from aurweb import db, models
+from aurweb.models import dependency_type, relation_type
 
 # Define dependency types.
 DEP_TYPES = {
-    DEPENDS_ID: "Depends",
-    MAKEDEPENDS_ID: "MakeDepends",
-    CHECKDEPENDS_ID: "CheckDepends",
-    OPTDEPENDS_ID: "OptDepends"
+    dependency_type.DEPENDS_ID: "Depends",
+    dependency_type.MAKEDEPENDS_ID: "MakeDepends",
+    dependency_type.CHECKDEPENDS_ID: "CheckDepends",
+    dependency_type.OPTDEPENDS_ID: "OptDepends"
 }
 
 # Define relationship types.
 REL_TYPES = {
-    CONFLICTS_ID: "Conflicts",
-    PROVIDES_ID: "Provides",
-    REPLACES_ID: "Replaces"
+    relation_type.CONFLICTS_ID: "Conflicts",
+    relation_type.PROVIDES_ID: "Provides",
+    relation_type.REPLACES_ID: "Replaces"
 }
 
 
@@ -84,7 +74,9 @@ def add_rels(current_array, db_rel):
 
 def run_info(returned_data, package_name, snapshot_uri):
     # Get package name.
-    db_package = db.query(Package).filter(Package.Name == package_name)
+    db_package = db.query(models.Package).filter(
+        models.Package.Name == package_name
+    )
 
     if db_package.count() == 0:
         return returned_data
@@ -92,10 +84,14 @@ def run_info(returned_data, package_name, snapshot_uri):
     db_package = db_package.first()
 
     # Get name of package under PackageBaseID.
-    db_package_baseid = db.query(PackageBase).filter(PackageBase.ID == db_package.PackageBaseID).first()
+    db_package_baseid = db.query(models.PackageBase).filter(
+        models.PackageBase.ID == db_package.PackageBaseID
+    ).first()
 
     # Get maintainer info.
-    db_package_maintainer = db.query(User).filter(User.ID == db_package_baseid.MaintainerUID).first()
+    db_package_maintainer = db.query(models.User).filter(
+        models.User.ID == db_package_baseid.MaintainerUID
+    ).first()
 
     current_array = {}
     returned_data["resultcount"] = returned_data["resultcount"] + 1
@@ -126,26 +122,32 @@ def run_info(returned_data, package_name, snapshot_uri):
     current_array["URLPath"] = snapshot_uri.replace("%s", package_name)
 
     # Add package votes.
-    current_array["NumVotes"] = db.query(PackageVote).count()
+    current_array["NumVotes"] = db.query(models.PackageVote).count()
 
     # Generate dependency listing.
-    db_dep = db.query(PackageDependency).filter(PackageDependency.PackageID == db_package.ID)
+    db_dep = db.query(models.PackageDependency).filter(
+        models.PackageDependency.PackageID == db_package.ID)
     current_array = add_deps(current_array, db_dep)
 
     # Generate relationship listing.
-    db_rel = db.query(PackageRelation).filter(PackageRelation.PackageID == db_package.ID)
+    db_rel = db.query(models.PackageRelation).filter(
+        models.PackageRelation.PackageID == db_package.ID)
     current_array = add_rels(current_array, db_rel)
 
     # License table.
     current_array["License"] = []
 
-    for i in db.query(PackageLicense).filter(PackageLicense.PackageID == db_package.ID):
-        current_array["License"] += [db.query(License).first().Name]
+    licenses = db.query(models.PackageLicense).filter(
+        models.PackageLicense.PackageID == db_package.ID)
+    for i in licenses:
+        current_array["License"] += [i.License.Name]
 
     # Keywords table.
     current_array["Keywords"] = []
 
-    for i in db.query(PackageKeyword).filter(PackageKeyword.PackageBaseID == db_package_baseid.ID):
+    keywords = db.query(models.PackageKeyword).filter(
+        models.PackageKeyword.PackageBaseID == db_package_baseid.ID)
+    for i in keywords:
         current_array["Keywords"] += [i.Keyword]
 
     # Add current array to returned results.

From 28c4e9697baa1347d93f40caed569d9ff3565cc5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 19:25:25 -0700
Subject: [PATCH 431/844] change(fastapi): simplify model imports across
 code-base

Closes: #133

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py                 |   3 +-
 aurweb/auth.py                 |   3 +-
 aurweb/captcha.py              |   2 +-
 aurweb/packages/search.py      |  91 +++++++-------
 aurweb/packages/util.py        |  94 +++++++--------
 aurweb/routers/accounts.py     | 139 ++++++++++-----------
 aurweb/routers/auth.py         |   2 +-
 aurweb/routers/html.py         |  61 +++++-----
 aurweb/routers/packages.py     | 212 ++++++++++++++++-----------------
 aurweb/routers/rss.py          |   3 +-
 aurweb/routers/trusted_user.py |  72 ++++++-----
 aurweb/util.py                 |   2 +-
 12 files changed, 341 insertions(+), 343 deletions(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index e892eb19..9b4f6c21 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -16,8 +16,7 @@ import aurweb.logging
 
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
-from aurweb.models.accepted_term import AcceptedTerm
-from aurweb.models.term import Term
+from aurweb.models import AcceptedTerm, Term
 from aurweb.routers import accounts, auth, errors, html, packages, rpc, rss, sso, trusted_user
 
 # Setup the FastAPI app.
diff --git a/aurweb/auth.py b/aurweb/auth.py
index 52a4260c..6544dce2 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -14,9 +14,8 @@ from starlette.requests import HTTPConnection
 import aurweb.config
 
 from aurweb import l10n, util
+from aurweb.models import Session, User
 from aurweb.models.account_type import ACCOUNT_TYPE_ID
-from aurweb.models.session import Session
-from aurweb.models.user import User
 from aurweb.templates import make_variable_context, render_template
 
 
diff --git a/aurweb/captcha.py b/aurweb/captcha.py
index 9451f42c..529b09e1 100644
--- a/aurweb/captcha.py
+++ b/aurweb/captcha.py
@@ -4,7 +4,7 @@ import hashlib
 from jinja2 import pass_context
 
 from aurweb.db import query
-from aurweb.models.user import User
+from aurweb.models import User
 
 
 def get_captcha_salts():
diff --git a/aurweb/packages/search.py b/aurweb/packages/search.py
index 854834ee..e4729d89 100644
--- a/aurweb/packages/search.py
+++ b/aurweb/packages/search.py
@@ -1,13 +1,6 @@
 from sqlalchemy import and_, case, or_, orm
 
-from aurweb import config, db
-from aurweb.models.package import Package
-from aurweb.models.package_base import PackageBase
-from aurweb.models.package_comaintainer import PackageComaintainer
-from aurweb.models.package_keyword import PackageKeyword
-from aurweb.models.package_notification import PackageNotification
-from aurweb.models.package_vote import PackageVote
-from aurweb.models.user import User
+from aurweb import config, db, models
 
 DEFAULT_MAX_RESULTS = 2500
 
@@ -18,22 +11,22 @@ class PackageSearch:
     # A constant mapping of short to full name sort orderings.
     FULL_SORT_ORDER = {"d": "desc", "a": "asc"}
 
-    def __init__(self, user: User):
+    def __init__(self, user: models.User):
         """ Construct an instance of PackageSearch.
 
         This constructors performs several steps during initialization:
             1. Setup self.query: an ORM query of Package joined by PackageBase.
         """
         self.user = user
-        self.query = db.query(Package).join(PackageBase).join(
-            PackageVote,
-            and_(PackageVote.PackageBaseID == PackageBase.ID,
-                 PackageVote.UsersID == self.user.ID),
+        self.query = db.query(models.Package).join(models.PackageBase).join(
+            models.PackageVote,
+            and_(models.PackageVote.PackageBaseID == models.PackageBase.ID,
+                 models.PackageVote.UsersID == self.user.ID),
             isouter=True
         ).join(
-            PackageNotification,
-            and_(PackageNotification.PackageBaseID == PackageBase.ID,
-                 PackageNotification.UserID == self.user.ID),
+            models.PackageNotification,
+            and_(models.PackageNotification.PackageBaseID == models.PackageBase.ID,
+                 models.PackageNotification.UserID == self.user.ID),
             isouter=True
         )
         self.ordering = "d"
@@ -65,59 +58,64 @@ class PackageSearch:
 
     def _search_by_namedesc(self, keywords: str) -> orm.Query:
         self.query = self.query.filter(
-            or_(Package.Name.like(f"%{keywords}%"),
-                Package.Description.like(f"%{keywords}%"))
+            or_(models.Package.Name.like(f"%{keywords}%"),
+                models.Package.Description.like(f"%{keywords}%"))
         )
         return self
 
     def _search_by_name(self, keywords: str) -> orm.Query:
-        self.query = self.query.filter(Package.Name.like(f"%{keywords}%"))
+        self.query = self.query.filter(
+            models.Package.Name.like(f"%{keywords}%"))
         return self
 
     def _search_by_exact_name(self, keywords: str) -> orm.Query:
-        self.query = self.query.filter(Package.Name == keywords)
+        self.query = self.query.filter(
+            models.Package.Name == keywords)
         return self
 
     def _search_by_pkgbase(self, keywords: str) -> orm.Query:
-        self.query = self.query.filter(PackageBase.Name.like(f"%{keywords}%"))
+        self.query = self.query.filter(
+            models.PackageBase.Name.like(f"%{keywords}%"))
         return self
 
     def _search_by_exact_pkgbase(self, keywords: str) -> orm.Query:
-        self.query = self.query.filter(PackageBase.Name == keywords)
+        self.query = self.query.filter(
+            models.PackageBase.Name == keywords)
         return self
 
     def _search_by_keywords(self, keywords: str) -> orm.Query:
-        self.query = self.query.join(PackageKeyword).filter(
-            PackageKeyword.Keyword == keywords
+        self.query = self.query.join(models.PackageKeyword).filter(
+            models.PackageKeyword.Keyword == keywords
         )
         return self
 
     def _search_by_maintainer(self, keywords: str) -> orm.Query:
         self.query = self.query.join(
-            User, User.ID == PackageBase.MaintainerUID
-        ).filter(User.Username == keywords)
+            models.User, models.User.ID == models.PackageBase.MaintainerUID
+        ).filter(models.User.Username == keywords)
         return self
 
     def _search_by_comaintainer(self, keywords: str) -> orm.Query:
-        self.query = self.query.join(PackageComaintainer).join(
-            User, User.ID == PackageComaintainer.UsersID
-        ).filter(User.Username == keywords)
+        self.query = self.query.join(models.PackageComaintainer).join(
+            models.User, models.User.ID == models.PackageComaintainer.UsersID
+        ).filter(models.User.Username == keywords)
         return self
 
     def _search_by_co_or_maintainer(self, keywords: str) -> orm.Query:
         self.query = self.query.join(
-            PackageComaintainer,
+            models.PackageComaintainer,
             isouter=True
         ).join(
-            User, or_(User.ID == PackageBase.MaintainerUID,
-                      User.ID == PackageComaintainer.UsersID)
-        ).filter(User.Username == keywords)
+            models.User,
+            or_(models.User.ID == models.PackageBase.MaintainerUID,
+                models.User.ID == models.PackageComaintainer.UsersID)
+        ).filter(models.User.Username == keywords)
         return self
 
     def _search_by_submitter(self, keywords: str) -> orm.Query:
         self.query = self.query.join(
-            User, User.ID == PackageBase.SubmitterUID
-        ).filter(User.Username == keywords)
+            models.User, models.User.ID == models.PackageBase.SubmitterUID
+        ).filter(models.User.Username == keywords)
         return self
 
     def search_by(self, search_by: str, keywords: str) -> orm.Query:
@@ -128,17 +126,17 @@ class PackageSearch:
         return result
 
     def _sort_by_name(self, order: str):
-        column = getattr(Package.Name, order)
+        column = getattr(models.Package.Name, order)
         self.query = self.query.order_by(column())
         return self
 
     def _sort_by_votes(self, order: str):
-        column = getattr(PackageBase.NumVotes, order)
+        column = getattr(models.PackageBase.NumVotes, order)
         self.query = self.query.order_by(column())
         return self
 
     def _sort_by_popularity(self, order: str):
-        column = getattr(PackageBase.Popularity, order)
+        column = getattr(models.PackageBase.Popularity, order)
         self.query = self.query.order_by(column())
         return self
 
@@ -147,10 +145,10 @@ class PackageSearch:
         # in terms of performance. We should improve this; there's no
         # reason it should take _longer_.
         column = getattr(
-            case([(PackageVote.UsersID == self.user.ID, 1)], else_=0),
+            case([(models.PackageVote.UsersID == self.user.ID, 1)], else_=0),
             order
         )
-        self.query = self.query.order_by(column(), Package.Name.desc())
+        self.query = self.query.order_by(column(), models.Package.Name.desc())
         return self
 
     def _sort_by_notify(self, order: str):
@@ -158,21 +156,24 @@ class PackageSearch:
         # in terms of performance. We should improve this; there's no
         # reason it should take _longer_.
         column = getattr(
-            case([(PackageNotification.UserID == self.user.ID, 1)], else_=0),
+            case([(models.PackageNotification.UserID == self.user.ID, 1)],
+                 else_=0),
             order
         )
-        self.query = self.query.order_by(column(), Package.Name.desc())
+        self.query = self.query.order_by(column(), models.Package.Name.desc())
         return self
 
     def _sort_by_maintainer(self, order: str):
-        column = getattr(User.Username, order)
+        column = getattr(models.User.Username, order)
         self.query = self.query.join(
-            User, User.ID == PackageBase.MaintainerUID, isouter=True
+            models.User,
+            models.User.ID == models.PackageBase.MaintainerUID,
+            isouter=True
         ).order_by(column())
         return self
 
     def _sort_by_last_modified(self, order: str):
-        column = getattr(PackageBase.ModifiedTS, order)
+        column = getattr(models.PackageBase.ModifiedTS, order)
         self.query = self.query.order_by(column())
         return self
 
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 2ea1155f..be351ebe 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -7,43 +7,35 @@ import orjson
 from fastapi import HTTPException
 from sqlalchemy import and_, orm
 
-from aurweb import db
-from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
-from aurweb.models.package import Package
-from aurweb.models.package_base import PackageBase
-from aurweb.models.package_comment import PackageComment
-from aurweb.models.package_dependency import PackageDependency
-from aurweb.models.package_notification import PackageNotification
-from aurweb.models.package_relation import PackageRelation
-from aurweb.models.package_vote import PackageVote
-from aurweb.models.relation_type import PROVIDES_ID, RelationType
-from aurweb.models.user import User
+from aurweb import db, models
+from aurweb.models.official_provider import OFFICIAL_BASE
+from aurweb.models.relation_type import PROVIDES_ID
 from aurweb.redis import redis_connection
 from aurweb.templates import register_filter
 
 
-def dep_depends_extra(dep: PackageDependency) -> str:
+def dep_depends_extra(dep: models.PackageDependency) -> str:
     """ A function used to produce extra text for dependency display. """
     return str()
 
 
-def dep_makedepends_extra(dep: PackageDependency) -> str:
+def dep_makedepends_extra(dep: models.PackageDependency) -> str:
     """ A function used to produce extra text for dependency display. """
     return "(make)"
 
 
-def dep_checkdepends_extra(dep: PackageDependency) -> str:
+def dep_checkdepends_extra(dep: models.PackageDependency) -> str:
     """ A function used to produce extra text for dependency display. """
     return "(check)"
 
 
-def dep_optdepends_extra(dep: PackageDependency) -> str:
+def dep_optdepends_extra(dep: models.PackageDependency) -> str:
     """ A function used to produce extra text for dependency display. """
     return "(optional)"
 
 
 @register_filter("dep_extra")
-def dep_extra(dep: PackageDependency) -> str:
+def dep_extra(dep: models.PackageDependency) -> str:
     """ Some dependency types have extra text added to their
     display. This function provides that output. However, it
     **assumes** that the dep passed is bound to a valid one
@@ -53,7 +45,7 @@ def dep_extra(dep: PackageDependency) -> str:
 
 
 @register_filter("dep_extra_desc")
-def dep_extra_desc(dep: PackageDependency) -> str:
+def dep_extra_desc(dep: models.PackageDependency) -> str:
     extra = dep_extra(dep)
     if not dep.DepDesc:
         return extra
@@ -63,30 +55,30 @@ def dep_extra_desc(dep: PackageDependency) -> str:
 @register_filter("pkgname_link")
 def pkgname_link(pkgname: str) -> str:
     base = "/".join([OFFICIAL_BASE, "packages"])
-    official = db.query(OfficialProvider).filter(
-        OfficialProvider.Name == pkgname)
+    official = db.query(models.OfficialProvider).filter(
+        models.OfficialProvider.Name == pkgname)
     if official.scalar():
         return f"{base}/?q={pkgname}"
     return f"/packages/{pkgname}"
 
 
 @register_filter("package_link")
-def package_link(package: Package) -> str:
+def package_link(package: models.Package) -> str:
     base = "/".join([OFFICIAL_BASE, "packages"])
-    official = db.query(OfficialProvider).filter(
-        OfficialProvider.Name == package.Name)
+    official = db.query(models.OfficialProvider).filter(
+        models.OfficialProvider.Name == package.Name)
     if official.scalar():
         return f"{base}/?q={package.Name}"
     return f"/packages/{package.Name}"
 
 
 @register_filter("provides_list")
-def provides_list(package: Package, depname: str) -> list:
-    providers = db.query(Package).join(
-        PackageRelation).join(RelationType).filter(
+def provides_list(package: models.Package, depname: str) -> list:
+    providers = db.query(models.Package).join(
+        models.PackageRelation).join(models.RelationType).filter(
         and_(
-            PackageRelation.RelName == depname,
-            RelationType.ID == PROVIDES_ID
+            models.PackageRelation.RelName == depname,
+            models.RelationType.ID == PROVIDES_ID
         )
     )
 
@@ -102,7 +94,9 @@ def provides_list(package: Package, depname: str) -> list:
     return string
 
 
-def get_pkg_or_base(name: str, cls: Union[Package, PackageBase] = PackageBase):
+def get_pkg_or_base(
+        name: str,
+        cls: Union[models.Package, models.PackageBase] = models.PackageBase):
     """ Get a PackageBase instance by its name or raise a 404 if
     it can't be found in the database.
 
@@ -110,20 +104,21 @@ def get_pkg_or_base(name: str, cls: Union[Package, PackageBase] = PackageBase):
     :raises HTTPException: With status code 404 if record doesn't exist
     :return: {Package,PackageBase} instance
     """
-    provider = db.query(OfficialProvider).filter(
-        OfficialProvider.Name == name).first()
+    provider = db.query(models.OfficialProvider).filter(
+        models.OfficialProvider.Name == name).first()
     if provider:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     instance = db.query(cls).filter(cls.Name == name).first()
-    if cls == PackageBase and not instance:
+    if cls == models.PackageBase and not instance:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     return instance
 
 
-def get_pkgbase_comment(pkgbase: PackageBase, id: int) -> PackageComment:
-    comment = pkgbase.comments.filter(PackageComment.ID == id).first()
+def get_pkgbase_comment(
+        pkgbase: models.PackageBase, id: int) -> models.PackageComment:
+    comment = pkgbase.comments.filter(models.PackageComment.ID == id).first()
     if not comment:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
     return comment
@@ -131,10 +126,11 @@ def get_pkgbase_comment(pkgbase: PackageBase, id: int) -> PackageComment:
 
 @register_filter("out_of_date")
 def out_of_date(packages: orm.Query) -> orm.Query:
-    return packages.filter(PackageBase.OutOfDateTS.isnot(None))
+    return packages.filter(models.PackageBase.OutOfDateTS.isnot(None))
 
 
-def updated_packages(limit: int = 0, cache_ttl: int = 600) -> List[Package]:
+def updated_packages(limit: int = 0,
+                     cache_ttl: int = 600) -> List[models.Package]:
     """ Return a list of valid Package objects ordered by their
     ModifiedTS column in descending order from cache, after setting
     the cache when no key yet exists.
@@ -149,10 +145,10 @@ def updated_packages(limit: int = 0, cache_ttl: int = 600) -> List[Package]:
         # If we already have a cache, deserialize it and return.
         return orjson.loads(packages)
 
-    query = db.query(Package).join(PackageBase).filter(
-        PackageBase.PackagerUID.isnot(None)
+    query = db.query(models.Package).join(models.PackageBase).filter(
+        models.PackageBase.PackagerUID.isnot(None)
     ).order_by(
-        PackageBase.ModifiedTS.desc()
+        models.PackageBase.ModifiedTS.desc()
     )
 
     if limit:
@@ -178,7 +174,8 @@ def updated_packages(limit: int = 0, cache_ttl: int = 600) -> List[Package]:
     return packages
 
 
-def query_voted(query: List[Package], user: User) -> Dict[int, bool]:
+def query_voted(query: List[models.Package],
+                user: models.User) -> Dict[int, bool]:
     """ Produce a dictionary of package base ID keys to boolean values,
     which indicate whether or not the package base has a vote record
     related to user.
@@ -189,18 +186,19 @@ def query_voted(query: List[Package], user: User) -> Dict[int, bool]:
     """
     output = defaultdict(bool)
     query_set = {pkg.PackageBase.ID for pkg in query}
-    voted = db.query(PackageVote).join(
-        PackageBase,
-        PackageBase.ID.in_(query_set)
+    voted = db.query(models.PackageVote).join(
+        models.PackageBase,
+        models.PackageBase.ID.in_(query_set)
     ).filter(
-        PackageVote.UsersID == user.ID
+        models.PackageVote.UsersID == user.ID
     )
     for vote in voted:
         output[vote.PackageBase.ID] = True
     return output
 
 
-def query_notified(query: List[Package], user: User) -> Dict[int, bool]:
+def query_notified(query: List[models.Package],
+                   user: models.User) -> Dict[int, bool]:
     """ Produce a dictionary of package base ID keys to boolean values,
     which indicate whether or not the package base has a notification
     record related to user.
@@ -211,11 +209,11 @@ def query_notified(query: List[Package], user: User) -> Dict[int, bool]:
     """
     output = defaultdict(bool)
     query_set = {pkg.PackageBase.ID for pkg in query}
-    notified = db.query(PackageNotification).join(
-        PackageBase,
-        PackageBase.ID.in_(query_set)
+    notified = db.query(models.PackageNotification).join(
+        models.PackageBase,
+        models.PackageBase.ID.in_(query_set)
     ).filter(
-        PackageNotification.UserID == user.ID
+        models.PackageNotification.UserID == user.ID
     )
     for notify in notified:
         output[notify.PackageBase.ID] = True
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 030ff651..a9257d3d 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -11,17 +11,12 @@ from sqlalchemy import and_, func, or_
 
 import aurweb.config
 
-from aurweb import db, l10n, time, util
+from aurweb import db, l10n, models, time, util
 from aurweb.auth import account_type_required, auth_required
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.l10n import get_translator_for_request
-from aurweb.models.accepted_term import AcceptedTerm
-from aurweb.models.account_type import (DEVELOPER, DEVELOPER_ID, TRUSTED_USER, TRUSTED_USER_AND_DEV, TRUSTED_USER_AND_DEV_ID,
-                                        TRUSTED_USER_ID, USER_ID, AccountType)
-from aurweb.models.ban import Ban
-from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
-from aurweb.models.term import Term
-from aurweb.models.user import User
+from aurweb.models import account_type
+from aurweb.models.ssh_pub_key import get_fingerprint
 from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
 
@@ -46,8 +41,8 @@ async def passreset_post(request: Request,
     context = await make_variable_context(request, "Password Reset")
 
     # The user parameter being required, we can match against
-    user = db.query(User, or_(User.Username == user,
-                              User.Email == user)).first()
+    user = db.query(models.User, or_(models.User.Username == user,
+                                     models.User.Email == user)).first()
     if not user:
         context["errors"] = ["Invalid e-mail."]
         return render_template(request, "passreset.html", context,
@@ -72,13 +67,13 @@ async def passreset_post(request: Request,
             return render_template(request, "passreset.html", context,
                                    status_code=HTTPStatus.BAD_REQUEST)
 
-        if len(password) < User.minimum_passwd_length():
+        if len(password) < models.User.minimum_passwd_length():
             # Translate the error here, which simplifies error output
             # in the jinja2 template.
             _ = get_translator_for_request(request)
             context["errors"] = [_(
                 "Your password must be at least %s characters.") % (
-                str(User.minimum_passwd_length()))]
+                str(models.User.minimum_passwd_length()))]
             return render_template(request, "passreset.html", context,
                                    status_code=HTTPStatus.BAD_REQUEST)
 
@@ -95,7 +90,7 @@ async def passreset_post(request: Request,
                                 status_code=HTTPStatus.SEE_OTHER)
 
     # If we got here, we continue with issuing a resetkey for the user.
-    resetkey = db.make_random_value(User, User.ResetKey)
+    resetkey = db.make_random_value(models.User, models.User.ResetKey)
     with db.begin():
         user.ResetKey = resetkey
 
@@ -107,7 +102,7 @@ async def passreset_post(request: Request,
                             status_code=HTTPStatus.SEE_OTHER)
 
 
-def process_account_form(request: Request, user: User, args: dict):
+def process_account_form(request: Request, user: models.User, args: dict):
     """ Process an account form. All fields are optional and only checks
     requirements in the case they are present.
 
@@ -129,11 +124,11 @@ def process_account_form(request: Request, user: User, args: dict):
     _ = get_translator_for_request(request)
 
     host = request.client.host
-    ban = db.query(Ban, Ban.IPAddress == host).first()
+    ban = db.query(models.Ban, models.Ban.IPAddress == host).first()
     if ban:
         return False, [
-            "Account registration has been disabled for your " +
-            "IP address, probably due to sustained spam attacks. " +
+            "Account registration has been disabled for your "
+            "IP address, probably due to sustained spam attacks. "
             "Sorry for the inconvenience."
         ]
 
@@ -181,12 +176,12 @@ def process_account_form(request: Request, user: User, args: dict):
     timezone = args.get("TZ", None)
 
     def username_exists(username):
-        return and_(User.ID != user.ID,
-                    func.lower(User.Username) == username.lower())
+        return and_(models.User.ID != user.ID,
+                    func.lower(models.User.Username) == username.lower())
 
     def email_exists(email):
-        return and_(User.ID != user.ID,
-                    func.lower(User.Email) == email.lower())
+        return and_(models.User.ID != user.ID,
+                    func.lower(models.User.Email) == email.lower())
 
     if not util.valid_email(email):
         return False, ["The email address is invalid."]
@@ -203,13 +198,13 @@ def process_account_form(request: Request, user: User, args: dict):
         return False, ["Language is not currently supported."]
     elif timezone and timezone not in time.SUPPORTED_TIMEZONES:
         return False, ["Timezone is not currently supported."]
-    elif db.query(User, username_exists(username)).first():
+    elif db.query(models.User, username_exists(username)).first():
         # If the username already exists...
         return False, [
             _("The username, %s%s%s, is already in use.") % (
                 "<strong>", username, "</strong>")
         ]
-    elif db.query(User, email_exists(email)).first():
+    elif db.query(models.User, email_exists(email)).first():
         # If the email already exists...
         return False, [
             _("The address, %s%s%s, is already in use.") % (
@@ -217,15 +212,16 @@ def process_account_form(request: Request, user: User, args: dict):
         ]
 
     def ssh_fingerprint_exists(fingerprint):
-        return and_(SSHPubKey.UserID != user.ID,
-                    SSHPubKey.Fingerprint == fingerprint)
+        return and_(models.SSHPubKey.UserID != user.ID,
+                    models.SSHPubKey.Fingerprint == fingerprint)
 
     if ssh_pubkey:
         fingerprint = get_fingerprint(ssh_pubkey.strip().rstrip())
         if fingerprint is None:
             return False, ["The SSH public key is invalid."]
 
-        if db.query(SSHPubKey, ssh_fingerprint_exists(fingerprint)).first():
+        if db.query(models.SSHPubKey,
+                    ssh_fingerprint_exists(fingerprint)).first():
             return False, [
                 _("The SSH public key, %s%s%s, is already in use.") % (
                     "<strong>", fingerprint, "</strong>")
@@ -246,7 +242,7 @@ def process_account_form(request: Request, user: User, args: dict):
 
 def make_account_form_context(context: dict,
                               request: Request,
-                              user: User,
+                              user: models.User,
                               args: dict):
     """ Modify a FastAPI context and add attributes for the account form.
 
@@ -382,20 +378,20 @@ async def account_register_post(request: Request,
 
     # Create a user with no password with a resetkey, then send
     # an email off about it.
-    resetkey = db.make_random_value(User, User.ResetKey)
+    resetkey = db.make_random_value(models.User, models.User.ResetKey)
 
     # By default, we grab the User account type to associate with.
-    account_type = db.query(AccountType,
-                            AccountType.AccountType == "User").first()
+    atype = db.query(models.AccountType,
+                     models.AccountType.AccountType == "User").first()
 
     # Create a user given all parameters available.
     with db.begin():
-        user = db.create(User, Username=U,
+        user = db.create(models.User, Username=U,
                          Email=E, HideEmail=H, BackupEmail=BE,
                          RealName=R, Homepage=HP, IRCNick=I, PGPKey=K,
                          LangPreference=L, Timezone=TZ, CommentNotify=CN,
                          UpdateNotify=UN, OwnershipNotify=ON,
-                         ResetKey=resetkey, AccountType=account_type)
+                         ResetKey=resetkey, AccountType=atype)
 
     # If a PK was given and either one does not exist or the given
     # PK mismatches the existing user's SSHPubKey.PubKey.
@@ -408,9 +404,9 @@ async def account_register_post(request: Request,
             pubkey = parts[0] + " " + parts[1]
         fingerprint = get_fingerprint(pubkey)
         with db.begin():
-            user.ssh_pub_key = SSHPubKey(UserID=user.ID,
-                                         PubKey=pubkey,
-                                         Fingerprint=fingerprint)
+            user.ssh_pub_key = models.SSHPubKey(UserID=user.ID,
+                                                PubKey=pubkey,
+                                                Fingerprint=fingerprint)
 
     # Send a reset key notification to the new user.
     executor = db.ConnectionExecutor(db.get_engine().raw_connection())
@@ -435,7 +431,7 @@ def cannot_edit(request, user):
 @auth_required(True, redirect="/account/{username}")
 async def account_edit(request: Request,
                        username: str):
-    user = db.query(User, User.Username == username).first()
+    user = db.query(models.User, models.User.Username == username).first()
     response = cannot_edit(request, user)
     if response:
         return response
@@ -473,7 +469,8 @@ async def account_edit_post(request: Request,
                             passwd: str = Form(default=str())):
     from aurweb.db import session
 
-    user = session.query(User).filter(User.Username == username).first()
+    user = session.query(models.User).filter(
+        models.User.Username == username).first()
     response = cannot_edit(request, user)
     if response:
         return response
@@ -538,9 +535,9 @@ async def account_edit_post(request: Request,
             fingerprint = get_fingerprint(pubkey)
             if not user.ssh_pub_key:
                 # No public key exists, create one.
-                user.ssh_pub_key = SSHPubKey(UserID=user.ID,
-                                             PubKey=pubkey,
-                                             Fingerprint=fingerprint)
+                user.ssh_pub_key = models.SSHPubKey(UserID=user.ID,
+                                                    PubKey=pubkey,
+                                                    Fingerprint=fingerprint)
             elif user.ssh_pub_key.PubKey != pubkey:
                 # A public key already exists, update it.
                 user.ssh_pub_key.PubKey = pubkey
@@ -584,7 +581,7 @@ async def account(request: Request, username: str):
     _ = l10n.get_translator_for_request(request)
     context = await make_variable_context(request, _("Account") + username)
 
-    user = db.query(User, User.Username == username).first()
+    user = db.query(models.User, models.User.Username == username).first()
     if not user:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
@@ -595,7 +592,9 @@ async def account(request: Request, username: str):
 
 @router.get("/accounts/")
 @auth_required(True, redirect="/accounts/")
-@account_type_required({TRUSTED_USER, DEVELOPER, TRUSTED_USER_AND_DEV})
+@account_type_required({account_type.TRUSTED_USER,
+                        account_type.DEVELOPER,
+                        account_type.TRUSTED_USER_AND_DEV})
 async def accounts(request: Request):
     context = make_context(request, "Accounts")
     return render_template(request, "account/search.html", context)
@@ -603,7 +602,9 @@ async def accounts(request: Request):
 
 @router.post("/accounts/")
 @auth_required(True, redirect="/accounts/")
-@account_type_required({TRUSTED_USER, DEVELOPER, TRUSTED_USER_AND_DEV})
+@account_type_required({account_type.TRUSTED_USER,
+                        account_type.DEVELOPER,
+                        account_type.TRUSTED_USER_AND_DEV})
 async def accounts_post(request: Request,
                         O: int = Form(default=0),  # Offset
                         SB: str = Form(default=str()),  # Search By
@@ -626,44 +627,44 @@ async def accounts_post(request: Request,
 
     # Setup order by criteria based on SB.
     order_by_columns = {
-        "t": (AccountType.ID.asc(), User.Username.asc()),
-        "r": (User.RealName.asc(), AccountType.ID.asc()),
-        "i": (User.IRCNick.asc(), AccountType.ID.asc()),
+        "t": (models.AccountType.ID.asc(), models.User.Username.asc()),
+        "r": (models.User.RealName.asc(), models.AccountType.ID.asc()),
+        "i": (models.User.IRCNick.asc(), models.AccountType.ID.asc()),
     }
-    default_order = (User.Username.asc(), AccountType.ID.asc())
+    default_order = (models.User.Username.asc(), models.AccountType.ID.asc())
     order_by = order_by_columns.get(SB, default_order)
 
     # Convert parameter T to an AccountType ID.
     account_types = {
-        "u": USER_ID,
-        "t": TRUSTED_USER_ID,
-        "d": DEVELOPER_ID,
-        "td": TRUSTED_USER_AND_DEV_ID
+        "u": account_type.USER_ID,
+        "t": account_type.TRUSTED_USER_ID,
+        "d": account_type.DEVELOPER_ID,
+        "td": account_type.TRUSTED_USER_AND_DEV_ID
     }
     account_type_id = account_types.get(T, None)
 
     # Get a query handle to users, populate the total user
     # count into a jinja2 context variable.
-    query = db.query(User).join(AccountType)
+    query = db.query(models.User).join(models.AccountType)
     context["total_users"] = query.count()
 
     # Populate this list with any additional statements to
     # be ANDed together.
     statements = []
     if account_type_id is not None:
-        statements.append(AccountType.ID == account_type_id)
+        statements.append(models.AccountType.ID == account_type_id)
     if U:
-        statements.append(User.Username.like(f"%{U}%"))
+        statements.append(models.User.Username.like(f"%{U}%"))
     if S:
-        statements.append(User.Suspended == S)
+        statements.append(models.User.Suspended == S)
     if E:
-        statements.append(User.Email.like(f"%{E}%"))
+        statements.append(models.User.Email.like(f"%{E}%"))
     if R:
-        statements.append(User.RealName.like(f"%{R}%"))
+        statements.append(models.User.RealName.like(f"%{R}%"))
     if I:
-        statements.append(User.IRCNick.like(f"%{I}%"))
+        statements.append(models.User.IRCNick.like(f"%{I}%"))
     if K:
-        statements.append(User.PGPKey.like(f"%{K}%"))
+        statements.append(models.User.PGPKey.like(f"%{K}%"))
 
     # Filter the query by combining all statements added above into
     # an AND statement, unless there's just one statement, which
@@ -692,12 +693,12 @@ def render_terms_of_service(request: Request,
 async def terms_of_service(request: Request):
     # Query the database for terms that were previously accepted,
     # but now have a bumped Revision that needs to be accepted.
-    diffs = db.query(Term).join(AcceptedTerm).filter(
-        AcceptedTerm.Revision < Term.Revision).all()
+    diffs = db.query(models.Term).join(models.AcceptedTerm).filter(
+        models.AcceptedTerm.Revision < models.Term.Revision).all()
 
     # Query the database for any terms that have not yet been accepted.
-    unaccepted = db.query(Term).filter(
-        ~Term.ID.in_(db.query(AcceptedTerm.TermsID))).all()
+    unaccepted = db.query(models.Term).filter(
+        ~models.Term.ID.in_(db.query(models.AcceptedTerm.TermsID))).all()
 
     # Translate the 'Terms of Service' part of our page title.
     _ = l10n.get_translator_for_request(request)
@@ -714,12 +715,12 @@ async def terms_of_service_post(request: Request,
                                 accept: bool = Form(default=False)):
     # Query the database for terms that were previously accepted,
     # but now have a bumped Revision that needs to be accepted.
-    diffs = db.query(Term).join(AcceptedTerm).filter(
-        AcceptedTerm.Revision < Term.Revision).all()
+    diffs = db.query(models.Term).join(models.AcceptedTerm).filter(
+        models.AcceptedTerm.Revision < models.Term.Revision).all()
 
     # Query the database for any terms that have not yet been accepted.
-    unaccepted = db.query(Term).filter(
-        ~Term.ID.in_(db.query(AcceptedTerm.TermsID))).all()
+    unaccepted = db.query(models.Term).filter(
+        ~models.Term.ID.in_(db.query(models.AcceptedTerm.TermsID))).all()
 
     if not accept:
         # Translate the 'Terms of Service' part of our page title.
@@ -737,12 +738,12 @@ async def terms_of_service_post(request: Request,
         # and update its Revision to the term's current Revision.
         for term in diffs:
             accepted_term = request.user.accepted_terms.filter(
-                AcceptedTerm.TermsID == term.ID).first()
+                models.AcceptedTerm.TermsID == term.ID).first()
             accepted_term.Revision = term.Revision
 
         # For each term that was never accepted, accept it!
         for term in unaccepted:
-            db.create(AcceptedTerm, User=request.user,
+            db.create(models.AcceptedTerm, User=request.user,
                       Term=term, Revision=term.Revision)
 
     return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index d94199b5..b3f9cc68 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -8,7 +8,7 @@ import aurweb.config
 
 from aurweb import util
 from aurweb.auth import auth_required
-from aurweb.models.user import User
+from aurweb.models import User
 from aurweb.templates import make_variable_context, render_template
 
 router = APIRouter()
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 7bae739b..86f8d13e 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -11,14 +11,10 @@ from sqlalchemy import and_, case, or_
 import aurweb.config
 import aurweb.models.package_request
 
-from aurweb import db, util
+from aurweb import db, models, util
 from aurweb.cache import db_count_cache
 from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
-from aurweb.models.package import Package
-from aurweb.models.package_base import PackageBase
-from aurweb.models.package_comaintainer import PackageComaintainer
-from aurweb.models.package_request import PENDING_ID, PackageRequest
-from aurweb.models.user import User
+from aurweb.models.package_request import PENDING_ID
 from aurweb.packages.util import query_notified, query_voted, updated_packages
 from aurweb.templates import make_context, render_template
 
@@ -69,31 +65,31 @@ async def index(request: Request):
     context = make_context(request, "Home")
     context['ssh_fingerprints'] = util.get_ssh_fingerprints()
 
-    bases = db.query(PackageBase)
+    bases = db.query(models.PackageBase)
 
     redis = aurweb.redis.redis_connection()
     stats_expire = 300  # Five minutes.
     updates_expire = 600  # Ten minutes.
 
     # Package statistics.
-    query = bases.filter(PackageBase.PackagerUID.isnot(None))
+    query = bases.filter(models.PackageBase.PackagerUID.isnot(None))
     context["package_count"] = await db_count_cache(
         redis, "package_count", query, expire=stats_expire)
 
     query = bases.filter(
-        and_(PackageBase.MaintainerUID.is_(None),
-             PackageBase.PackagerUID.isnot(None))
+        and_(models.PackageBase.MaintainerUID.is_(None),
+             models.PackageBase.PackagerUID.isnot(None))
     )
     context["orphan_count"] = await db_count_cache(
         redis, "orphan_count", query, expire=stats_expire)
 
-    query = db.query(User)
+    query = db.query(models.User)
     context["user_count"] = await db_count_cache(
         redis, "user_count", query, expire=stats_expire)
 
     query = query.filter(
-        or_(User.AccountTypeID == TRUSTED_USER_ID,
-            User.AccountTypeID == TRUSTED_USER_AND_DEV_ID))
+        or_(models.User.AccountTypeID == TRUSTED_USER_ID,
+            models.User.AccountTypeID == TRUSTED_USER_AND_DEV_ID))
     context["trusted_user_count"] = await db_count_cache(
         redis, "trusted_user_count", query, expire=stats_expire)
 
@@ -105,29 +101,29 @@ async def index(request: Request):
 
     one_hour = 3600
     updated = bases.filter(
-        and_(PackageBase.ModifiedTS - PackageBase.SubmittedTS >= one_hour,
-             PackageBase.PackagerUID.isnot(None))
+        and_(models.PackageBase.ModifiedTS - models.PackageBase.SubmittedTS >= one_hour,
+             models.PackageBase.PackagerUID.isnot(None))
     )
 
     query = bases.filter(
-        and_(PackageBase.SubmittedTS >= seven_days_ago,
-             PackageBase.PackagerUID.isnot(None))
+        and_(models.PackageBase.SubmittedTS >= seven_days_ago,
+             models.PackageBase.PackagerUID.isnot(None))
     )
     context["seven_days_old_added"] = await db_count_cache(
         redis, "seven_days_old_added", query, expire=stats_expire)
 
-    query = updated.filter(PackageBase.ModifiedTS >= seven_days_ago)
+    query = updated.filter(models.PackageBase.ModifiedTS >= seven_days_ago)
     context["seven_days_old_updated"] = await db_count_cache(
         redis, "seven_days_old_updated", query, expire=stats_expire)
 
     year = seven_days * 52  # Fifty two weeks worth: one year.
     year_ago = now - year
-    query = updated.filter(PackageBase.ModifiedTS >= year_ago)
+    query = updated.filter(models.PackageBase.ModifiedTS >= year_ago)
     context["year_old_updated"] = await db_count_cache(
         redis, "year_old_updated", query, expire=stats_expire)
 
     query = bases.filter(
-        PackageBase.ModifiedTS - PackageBase.SubmittedTS < 3600)
+        models.PackageBase.ModifiedTS - models.PackageBase.SubmittedTS < 3600)
     context["never_updated"] = await db_count_cache(
         redis, "never_updated", query, expire=stats_expire)
 
@@ -137,19 +133,19 @@ async def index(request: Request):
     if request.user.is_authenticated():
         # Authenticated users get a few extra pieces of data for
         # the dashboard display.
-        packages = db.query(Package).join(PackageBase)
+        packages = db.query(models.Package).join(models.PackageBase)
 
         maintained = packages.join(
-            User, PackageBase.MaintainerUID == User.ID
+            models.User, models.PackageBase.MaintainerUID == models.User.ID
         ).filter(
-            PackageBase.MaintainerUID == request.user.ID
+            models.PackageBase.MaintainerUID == request.user.ID
         )
 
         # Packages maintained by the user that have been flagged.
         context["flagged_packages"] = maintained.filter(
-            PackageBase.OutOfDateTS.isnot(None)
+            models.PackageBase.OutOfDateTS.isnot(None)
         ).order_by(
-            PackageBase.ModifiedTS.desc(), Package.Name.asc()
+            models.PackageBase.ModifiedTS.desc(), models.Package.Name.asc()
         ).limit(50).all()
 
         # Flagged packages that request.user has voted for.
@@ -165,17 +161,18 @@ async def index(request: Request):
 
         # Package requests created by request.user.
         context["package_requests"] = request.user.package_requests.filter(
-            PackageRequest.RequestTS >= start
+            models.PackageRequest.RequestTS >= start
         ).order_by(
             # Order primarily by the Status column being PENDING_ID,
             # and secondarily by RequestTS; both in descending order.
-            case([(PackageRequest.Status == PENDING_ID, 1)], else_=0).desc(),
-            PackageRequest.RequestTS.desc()
+            case([(models.PackageRequest.Status == PENDING_ID, 1)],
+                 else_=0).desc(),
+            models.PackageRequest.RequestTS.desc()
         ).limit(50).all()
 
         # Packages that the request user maintains or comaintains.
         context["packages"] = maintained.order_by(
-            PackageBase.ModifiedTS.desc(), Package.Name.desc()
+            models.PackageBase.ModifiedTS.desc(), models.Package.Name.desc()
         ).limit(50).all()
 
         # Packages that request.user has voted for.
@@ -188,11 +185,11 @@ async def index(request: Request):
 
         # Any packages that the request user comaintains.
         context["comaintained"] = packages.join(
-            PackageComaintainer
+            models.PackageComaintainer
         ).filter(
-            PackageComaintainer.UsersID == request.user.ID
+            models.PackageComaintainer.UsersID == request.user.ID
         ).order_by(
-            PackageBase.ModifiedTS.desc(), Package.Name.desc()
+            models.PackageBase.ModifiedTS.desc(), models.Package.Name.desc()
         ).limit(50).all()
 
         # Comaintained packages that request.user has voted for.
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 83c796db..58c89192 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -7,27 +7,13 @@ from fastapi.responses import JSONResponse, RedirectResponse
 from sqlalchemy import and_, case
 
 import aurweb.filters
-import aurweb.models.package_comment
-import aurweb.models.package_keyword
 import aurweb.packages.util
 
-from aurweb import db, defaults, l10n, util
+from aurweb import db, defaults, l10n, models, util
 from aurweb.auth import auth_required
-from aurweb.models.license import License
-from aurweb.models.package import Package
-from aurweb.models.package_base import PackageBase
-from aurweb.models.package_comaintainer import PackageComaintainer
-from aurweb.models.package_comment import PackageComment
-from aurweb.models.package_dependency import PackageDependency
-from aurweb.models.package_license import PackageLicense
-from aurweb.models.package_notification import PackageNotification
-from aurweb.models.package_relation import PackageRelation
-from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID, PackageRequest
-from aurweb.models.package_source import PackageSource
-from aurweb.models.package_vote import PackageVote
+from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID
-from aurweb.models.request_type import DELETION_ID, RequestType
-from aurweb.models.user import User
+from aurweb.models.request_type import DELETION_ID
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
 from aurweb.scripts import notify, popupdate
@@ -75,9 +61,9 @@ async def packages_get(request: Request, context: Dict[str, Any]):
         # do **not** have OutOfDateTS.
         criteria = None
         if flagged == "on":
-            criteria = PackageBase.OutOfDateTS.isnot
+            criteria = models.PackageBase.OutOfDateTS.isnot
         else:
-            criteria = PackageBase.OutOfDateTS.is_
+            criteria = models.PackageBase.OutOfDateTS.is_
 
         # Apply the flag criteria to our PackageSearch.query.
         search.query = search.query.filter(criteria(None))
@@ -86,7 +72,8 @@ async def packages_get(request: Request, context: Dict[str, Any]):
     if submit == "Orphans":
         # If the user clicked the "Orphans" button, we only want
         # orphaned packages.
-        search.query = search.query.filter(PackageBase.MaintainerUID.is_(None))
+        search.query = search.query.filter(
+            models.PackageBase.MaintainerUID.is_(None))
 
     # Apply user-specified specified sort column and ordering.
     search.sort_by(sort_by, sort_order)
@@ -116,19 +103,19 @@ async def packages(request: Request) -> Response:
     return await packages_get(request, context)
 
 
-def create_request_if_missing(requests: List[PackageRequest],
-                              reqtype: RequestType,
-                              user: User,
-                              package: Package):
+def create_request_if_missing(requests: List[models.PackageRequest],
+                              reqtype: models.RequestType,
+                              user: models.User,
+                              package: models.Package):
     now = int(datetime.utcnow().timestamp())
-    pkgreq = db.query(PackageRequest).filter(
-        PackageRequest.PackageBaseName == package.PackageBase.Name
+    pkgreq = db.query(models.PackageRequest).filter(
+        models.PackageRequest.PackageBaseName == package.PackageBase.Name
     ).first()
     if not pkgreq:
         # No PackageRequest existed. Create one.
         comments = "Automatically generated by aurweb."
         closure_comment = "Deleted by aurweb."
-        pkgreq = db.create(PackageRequest,
+        pkgreq = db.create(models.PackageRequest,
                            RequestType=reqtype,
                            PackageBase=package.PackageBase,
                            PackageBaseName=package.PackageBase.Name,
@@ -141,8 +128,7 @@ def create_request_if_missing(requests: List[PackageRequest],
         requests.append(pkgreq)
 
 
-def delete_package(deleter: User,
-                   package: Package):
+def delete_package(deleter: models.User, package: models.Package):
     notifications = []
     requests = []
     bases_to_delete = []
@@ -150,8 +136,8 @@ def delete_package(deleter: User,
     conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     # In all cases, though, just delete the Package in question.
     if package.PackageBase.packages.count() == 1:
-        reqtype = db.query(RequestType).filter(
-            RequestType.ID == DELETION_ID
+        reqtype = db.query(models.RequestType).filter(
+            models.RequestType.ID == DELETION_ID
         ).first()
 
         with db.begin():
@@ -187,7 +173,7 @@ def delete_package(deleter: User,
 
 
 async def make_single_context(request: Request,
-                              pkgbase: PackageBase) -> Dict[str, Any]:
+                              pkgbase: models.PackageBase) -> Dict[str, Any]:
     """ Make a basic context for package or pkgbase.
 
     :param request: FastAPI request
@@ -203,11 +189,11 @@ async def make_single_context(request: Request,
     context["packages_count"] = pkgbase.packages.count()
     context["keywords"] = pkgbase.keywords
     context["comments"] = pkgbase.comments.order_by(
-        PackageComment.CommentTS.desc()
+        models.PackageComment.CommentTS.desc()
     )
     context["pinned_comments"] = pkgbase.comments.filter(
-        PackageComment.PinnedTS != 0
-    ).order_by(PackageComment.CommentTS.desc())
+        models.PackageComment.PinnedTS != 0
+    ).order_by(models.PackageComment.CommentTS.desc())
 
     context["is_maintainer"] = (request.user.is_authenticated()
                                 and request.user.ID == pkgbase.MaintainerUID)
@@ -216,10 +202,10 @@ async def make_single_context(request: Request,
     context["out_of_date"] = bool(pkgbase.OutOfDateTS)
 
     context["voted"] = request.user.package_votes.filter(
-        PackageVote.PackageBaseID == pkgbase.ID).scalar()
+        models.PackageVote.PackageBaseID == pkgbase.ID).scalar()
 
     context["requests"] = pkgbase.requests.filter(
-        PackageRequest.ClosedTS.is_(None)
+        models.PackageRequest.ClosedTS.is_(None)
     ).count()
 
     return context
@@ -228,8 +214,8 @@ async def make_single_context(request: Request,
 @router.get("/packages/{name}")
 async def package(request: Request, name: str) -> Response:
     # Get the Package.
-    pkg = get_pkg_or_base(name, Package)
-    pkgbase = (get_pkg_or_base(name, PackageBase)
+    pkg = get_pkg_or_base(name, models.Package)
+    pkgbase = (get_pkg_or_base(name, models.PackageBase)
                if not pkg else pkg.PackageBase)
 
     # Add our base information.
@@ -237,28 +223,32 @@ async def package(request: Request, name: str) -> Response:
     context["package"] = pkg
 
     # Package sources.
-    context["sources"] = db.query(PackageSource).join(Package).join(
-        PackageBase).filter(PackageBase.ID == pkgbase.ID)
+    context["sources"] = db.query(models.PackageSource).join(
+        models.Package).join(models.PackageBase).filter(
+        models.PackageBase.ID == pkgbase.ID)
 
     # Package dependencies.
-    dependencies = db.query(PackageDependency).join(Package).join(
-        PackageBase).filter(PackageBase.ID == pkgbase.ID)
+    dependencies = db.query(models.PackageDependency).join(
+        models.Package).join(models.PackageBase).filter(
+        models.PackageBase.ID == pkgbase.ID)
     context["dependencies"] = dependencies
 
     # Package requirements (other packages depend on this one).
-    required_by = db.query(PackageDependency).join(Package).filter(
-        PackageDependency.DepName == pkgbase.Name).order_by(
-        Package.Name.asc())
+    required_by = db.query(models.PackageDependency).join(
+        models.Package).filter(
+        models.PackageDependency.DepName == pkgbase.Name).order_by(
+        models.Package.Name.asc())
     context["required_by"] = required_by
 
-    licenses = db.query(License).join(PackageLicense).join(Package).join(
-        PackageBase).filter(PackageBase.ID == pkgbase.ID)
+    licenses = db.query(models.License).join(models.PackageLicense).join(
+        models.Package).join(models.PackageBase).filter(
+        models.PackageBase.ID == pkgbase.ID)
     context["licenses"] = licenses
 
-    conflicts = db.query(PackageRelation).join(Package).join(
-        PackageBase).filter(
-        and_(PackageRelation.RelTypeID == CONFLICTS_ID,
-             PackageBase.ID == pkgbase.ID)
+    conflicts = db.query(models.PackageRelation).join(models.Package).join(
+        models.PackageBase).filter(
+        and_(models.PackageRelation.RelTypeID == CONFLICTS_ID,
+             models.PackageBase.ID == pkgbase.ID)
     )
     context["conflicts"] = conflicts
 
@@ -268,7 +258,7 @@ async def package(request: Request, name: str) -> Response:
 @router.get("/pkgbase/{name}")
 async def package_base(request: Request, name: str) -> Response:
     # Get the PackageBase.
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     # If this is not a split package, redirect to /packages/{name}.
     if pkgbase.packages.count() == 1:
@@ -285,7 +275,7 @@ async def package_base(request: Request, name: str) -> Response:
 @router.get("/pkgbase/{name}/voters")
 async def package_base_voters(request: Request, name: str) -> Response:
     # Get the PackageBase.
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
     context = make_context(request, "Voters")
     context["pkgbase"] = pkgbase
     return render_template(request, "pkgbase/voters.html", context)
@@ -298,7 +288,7 @@ async def pkgbase_comments_post(
         comment: str = Form(default=str()),
         enable_notifications: bool = Form(default=False)):
     """ Add a new comment. """
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     if not comment:
         raise HTTPException(status_code=HTTPStatus.BAD_REQUEST)
@@ -307,13 +297,13 @@ async def pkgbase_comments_post(
     # update the db record.
     now = int(datetime.utcnow().timestamp())
     with db.begin():
-        comment = db.create(PackageComment, User=request.user,
+        comment = db.create(models.PackageComment, User=request.user,
                             PackageBase=pkgbase,
                             Comments=comment, RenderedComment=str(),
                             CommentTS=now)
 
         if enable_notifications and not request.user.notified(pkgbase):
-            db.create(PackageNotification,
+            db.create(models.PackageNotification,
                       User=request.user,
                       PackageBase=pkgbase)
     update_comment_render(comment.ID)
@@ -327,8 +317,8 @@ async def pkgbase_comments_post(
 @auth_required(True, login=False)
 async def pkgbase_comment_form(request: Request, name: str, id: int):
     """ Produce a comment form for comment {id}. """
-    pkgbase = get_pkg_or_base(name, PackageBase)
-    comment = pkgbase.comments.filter(PackageComment.ID == id).first()
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+    comment = pkgbase.comments.filter(models.PackageComment.ID == id).first()
     if not comment:
         return JSONResponse({}, status_code=HTTPStatus.NOT_FOUND)
 
@@ -349,7 +339,7 @@ async def pkgbase_comment_post(
         request: Request, name: str, id: int,
         comment: str = Form(default=str()),
         enable_notifications: bool = Form(default=False)):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
     db_comment = get_pkgbase_comment(pkgbase, id)
 
     if not comment:
@@ -365,10 +355,10 @@ async def pkgbase_comment_post(
             db_comment.EditedTS = now
 
             db_notif = request.user.notifications.filter(
-                PackageNotification.PackageBaseID == pkgbase.ID
+                models.PackageNotification.PackageBaseID == pkgbase.ID
             ).first()
             if enable_notifications and not db_notif:
-                db.create(PackageNotification,
+                db.create(models.PackageNotification,
                           User=request.user,
                           PackageBase=pkgbase)
     update_comment_render(db_comment.ID)
@@ -381,7 +371,7 @@ async def pkgbase_comment_post(
 @router.post("/pkgbase/{name}/comments/{id}/delete")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/delete")
 async def pkgbase_comment_delete(request: Request, name: str, id: int):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
     authorized = request.user.has_credential("CRED_COMMENT_DELETE",
@@ -404,7 +394,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int):
 @router.post("/pkgbase/{name}/comments/{id}/undelete")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/undelete")
 async def pkgbase_comment_undelete(request: Request, name: str, id: int):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
     has_cred = request.user.has_credential("CRED_COMMENT_UNDELETE",
@@ -426,7 +416,7 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int):
 @router.post("/pkgbase/{name}/comments/{id}/pin")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/pin")
 async def pkgbase_comment_pin(request: Request, name: str, id: int):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
     has_cred = request.user.has_credential("CRED_COMMENT_PIN",
@@ -448,7 +438,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int):
 @router.post("/pkgbase/{name}/comments/{id}/unpin")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/unpin")
 async def pkgbase_comment_unpin(request: Request, name: str, id: int):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
     has_cred = request.user.has_credential("CRED_COMMENT_PIN",
@@ -470,7 +460,7 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int):
 @auth_required(True, redirect="/pkgbase/{name}/comaintainers")
 async def package_base_comaintainers(request: Request, name: str) -> Response:
     # Get the PackageBase.
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
     # get redirected to the package base's page.
@@ -498,8 +488,8 @@ def remove_users(pkgbase, usernames):
         for username in usernames:
             # We know that the users we passed here are in the DB.
             # No need to check for their existence.
-            comaintainer = pkgbase.comaintainers.join(User).filter(
-                User.Username == username
+            comaintainer = pkgbase.comaintainers.join(models.User).filter(
+                models.User.Username == username
             ).first()
             notifications.append(
                 notify.ComaintainerRemoveNotification(
@@ -519,7 +509,7 @@ async def package_base_comaintainers_post(
         request: Request, name: str,
         users: str = Form(default=str())) -> Response:
     # Get the PackageBase.
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
     # get redirected to the package base's page.
@@ -540,7 +530,7 @@ async def package_base_comaintainers_post(
 
     # Get the highest priority in the comaintainer set.
     last_priority = pkgbase.comaintainers.order_by(
-        PackageComaintainer.Priority.desc()
+        models.PackageComaintainer.Priority.desc()
     ).limit(1).first()
 
     # If that record exists, we use a priority which is 1 higher.
@@ -562,7 +552,8 @@ async def package_base_comaintainers_post(
         _ = l10n.get_translator_for_request(request)
         memo = {}
         for username in usernames:
-            user = db.query(User).filter(User.Username == username).first()
+            user = db.query(models.User).filter(
+                models.User.Username == username).first()
             if not user:
                 return _("Invalid user name: %s") % username
             memo[username] = user
@@ -579,7 +570,7 @@ async def package_base_comaintainers_post(
 
                 # If we get here, our user model object is in the memo.
                 comaintainer = db.create(
-                    PackageComaintainer,
+                    models.PackageComaintainer,
                     PackageBase=pkgbase,
                     User=user,
                     Priority=priority)
@@ -620,21 +611,21 @@ async def requests(request: Request,
     context["PP"] = PP
 
     # A PackageRequest query, with left inner joined User and RequestType.
-    query = db.query(PackageRequest).join(
-        User, PackageRequest.UsersID == User.ID
-    ).join(RequestType)
+    query = db.query(models.PackageRequest).join(
+        models.User, models.PackageRequest.UsersID == models.User.ID
+    ).join(models.RequestType)
 
     # If the request user is not elevated (TU or Dev), then
     # filter PackageRequests which are owned by the request user.
     if not request.user.is_elevated():
-        query = query.filter(PackageRequest.UsersID == request.user.ID)
+        query = query.filter(models.PackageRequest.UsersID == request.user.ID)
 
     context["total"] = query.count()
     context["results"] = query.order_by(
         # Order primarily by the Status column being PENDING_ID,
         # and secondarily by RequestTS; both in descending order.
-        case([(PackageRequest.Status == PENDING_ID, 1)], else_=0).desc(),
-        PackageRequest.RequestTS.desc()
+        case([(models.PackageRequest.Status == PENDING_ID, 1)], else_=0).desc(),
+        models.PackageRequest.RequestTS.desc()
     ).limit(PP).offset(O).all()
 
     return render_template(request, "requests.html", context)
@@ -645,7 +636,8 @@ async def requests(request: Request,
 async def package_request(request: Request, name: str):
     context = make_context(request, "Submit Request")
 
-    pkgbase = db.query(PackageBase).filter(PackageBase.Name == name).first()
+    pkgbase = db.query(models.PackageBase).filter(
+        models.PackageBase.Name == name).first()
 
     if not pkgbase:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
@@ -660,7 +652,7 @@ async def pkgbase_request_post(request: Request, name: str,
                                type: str = Form(...),
                                merge_into: str = Form(default=None),
                                comments: str = Form(default=str())):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     # Create our render context.
     context = make_context(request, "Submit Request")
@@ -682,8 +674,8 @@ async def pkgbase_request_post(request: Request, name: str,
             context["errors"] = ['The "Merge into" field must not be empty.']
             return render_template(request, "pkgbase/request.html", context)
 
-        target = db.query(PackageBase).filter(
-            PackageBase.Name == merge_into
+        target = db.query(models.PackageBase).filter(
+            models.PackageBase.Name == merge_into
         ).first()
         if not target:
             # TODO: This error needs to be translated.
@@ -701,12 +693,14 @@ async def pkgbase_request_post(request: Request, name: str,
 
     # All good. Create a new PackageRequest based on the given type.
     now = int(datetime.utcnow().timestamp())
-    reqtype = db.query(RequestType, RequestType.Name == type).first()
+    reqtype = db.query(models.RequestType).filter(
+        models.RequestType.Name == type).first()
     conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     notify_ = None
     with db.begin():
-        pkgreq = db.create(PackageRequest, RequestType=reqtype, RequestTS=now,
-                           PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+        pkgreq = db.create(models.PackageRequest, RequestType=reqtype,
+                           RequestTS=now, PackageBase=pkgbase,
+                           PackageBaseName=pkgbase.Name,
                            MergeBaseName=merge_into, User=request.user,
                            Comments=comments, ClosureComment=str())
 
@@ -726,7 +720,8 @@ async def pkgbase_request_post(request: Request, name: str,
 @router.get("/requests/{id}/close")
 @auth_required(True, redirect="/requests/{id}/close")
 async def requests_close(request: Request, id: int):
-    pkgreq = db.query(PackageRequest).filter(PackageRequest.ID == id).first()
+    pkgreq = db.query(models.PackageRequest).filter(
+        models.PackageRequest.ID == id).first()
     if not request.user.is_elevated() and request.user != pkgreq.User:
         # Request user doesn't have permission here: redirect to '/'.
         return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
@@ -741,7 +736,8 @@ async def requests_close(request: Request, id: int):
 async def requests_close_post(request: Request, id: int,
                               reason: int = Form(default=0),
                               comments: str = Form(default=str())):
-    pkgreq = db.query(PackageRequest).filter(PackageRequest.ID == id).first()
+    pkgreq = db.query(models.PackageRequest).filter(
+        models.PackageRequest.ID == id).first()
     if not request.user.is_elevated() and request.user != pkgreq.User:
         # Request user doesn't have permission here: redirect to '/'.
         return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
@@ -776,7 +772,7 @@ async def requests_close_post(request: Request, id: int,
 @router.get("/pkgbase/{name}/flag")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_flag_get(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     has_cred = request.user.has_credential("CRED_PKGBASE_FLAG")
     if not has_cred or pkgbase.Flagger is not None:
@@ -792,7 +788,7 @@ async def pkgbase_flag_get(request: Request, name: str):
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_flag_post(request: Request, name: str,
                             comments: str = Form(default=str())):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     if not comments:
         context = make_context(request, "Flag Package Out-Of-Date")
@@ -817,7 +813,7 @@ async def pkgbase_flag_post(request: Request, name: str,
 @router.post("/pkgbase/{name}/unflag")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_unflag(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     has_cred = request.user.has_credential(
         "CRED_PKGBASE_UNFLAG", approved=[pkgbase.Flagger, pkgbase.Maintainer])
@@ -834,15 +830,15 @@ async def pkgbase_unflag(request: Request, name: str):
 @router.post("/pkgbase/{name}/notify")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_notify(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     notif = db.query(pkgbase.notifications.filter(
-        PackageNotification.UserID == request.user.ID
+        models.PackageNotification.UserID == request.user.ID
     ).exists()).scalar()
     has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
     if has_cred and not notif:
         with db.begin():
-            db.create(PackageNotification,
+            db.create(models.PackageNotification,
                       PackageBase=pkgbase,
                       User=request.user)
 
@@ -853,10 +849,10 @@ async def pkgbase_notify(request: Request, name: str):
 @router.post("/pkgbase/{name}/unnotify")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_unnotify(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     notif = pkgbase.notifications.filter(
-        PackageNotification.UserID == request.user.ID
+        models.PackageNotification.UserID == request.user.ID
     ).first()
     has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
     if has_cred and notif:
@@ -870,16 +866,16 @@ async def pkgbase_unnotify(request: Request, name: str):
 @router.post("/pkgbase/{name}/vote")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_vote(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     vote = pkgbase.package_votes.filter(
-        PackageVote.UsersID == request.user.ID
+        models.PackageVote.UsersID == request.user.ID
     ).first()
     has_cred = request.user.has_credential("CRED_PKGBASE_VOTE")
     if has_cred and not vote:
         now = int(datetime.utcnow().timestamp())
         with db.begin():
-            db.create(PackageVote,
+            db.create(models.PackageVote,
                       User=request.user,
                       PackageBase=pkgbase,
                       VoteTS=now)
@@ -895,10 +891,10 @@ async def pkgbase_vote(request: Request, name: str):
 @router.post("/pkgbase/{name}/unvote")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_unvote(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     vote = pkgbase.package_votes.filter(
-        PackageVote.UsersID == request.user.ID
+        models.PackageVote.UsersID == request.user.ID
     ).first()
     has_cred = request.user.has_credential("CRED_PKGBASE_VOTE")
     if has_cred and vote:
@@ -913,7 +909,7 @@ async def pkgbase_unvote(request: Request, name: str):
                             status_code=HTTPStatus.SEE_OTHER)
 
 
-def disown_pkgbase(pkgbase: PackageBase, disowner: User):
+def disown_pkgbase(pkgbase: models.PackageBase, disowner: models.User):
     conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     notif = notify.DisownNotification(conn, disowner.ID, pkgbase.ID)
 
@@ -922,7 +918,7 @@ def disown_pkgbase(pkgbase: PackageBase, disowner: User):
             pkgbase.Maintainer = None
     else:
         co = pkgbase.comaintainers.order_by(
-            PackageComaintainer.Priority.asc()
+            models.PackageComaintainer.Priority.asc()
         ).limit(1).first()
 
         if co:
@@ -938,7 +934,7 @@ def disown_pkgbase(pkgbase: PackageBase, disowner: User):
 @router.get("/pkgbase/{name}/disown")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_disown_get(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     has_cred = request.user.has_credential("CRED_PKGBASE_DISOWN",
                                            approved=[pkgbase.Maintainer])
@@ -955,7 +951,7 @@ async def pkgbase_disown_get(request: Request, name: str):
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_disown_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     has_cred = request.user.has_credential("CRED_PKGBASE_DISOWN",
                                            approved=[pkgbase.Maintainer])
@@ -979,7 +975,7 @@ async def pkgbase_disown_post(request: Request, name: str,
 @router.post("/pkgbase/{name}/adopt")
 @auth_required(True)
 async def pkgbase_adopt_post(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     has_cred = request.user.has_credential("CRED_PKGBASE_ADOPT")
     if has_cred or not pkgbase.Maintainer:
@@ -1001,7 +997,7 @@ async def pkgbase_delete_get(request: Request, name: str):
                                 status_code=HTTPStatus.SEE_OTHER)
 
     context = make_context(request, "Package Deletion")
-    context["pkgbase"] = get_pkg_or_base(name, PackageBase)
+    context["pkgbase"] = get_pkg_or_base(name, models.PackageBase)
     return render_template(request, "packages/delete.html", context)
 
 
@@ -1009,7 +1005,7 @@ async def pkgbase_delete_get(request: Request, name: str):
 @auth_required(True)
 async def pkgbase_delete_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
-    pkgbase = get_pkg_or_base(name, PackageBase)
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     if not request.user.has_credential("CRED_PKGBASE_DELETE"):
         return RedirectResponse(f"/pkgbase/{name}",
diff --git a/aurweb/routers/rss.py b/aurweb/routers/rss.py
index 50127dd2..672a47d6 100644
--- a/aurweb/routers/rss.py
+++ b/aurweb/routers/rss.py
@@ -5,8 +5,7 @@ from fastapi.responses import Response
 from feedgen.feed import FeedGenerator
 
 from aurweb import db, util
-from aurweb.models.package import Package
-from aurweb.models.package_base import PackageBase
+from aurweb.models import Package, PackageBase
 
 router = APIRouter()
 
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index fdde059a..5b2a56d3 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -10,12 +10,9 @@ from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import RedirectResponse, Response
 from sqlalchemy import and_, or_
 
-from aurweb import db, l10n
+from aurweb import db, l10n, models
 from aurweb.auth import account_type_required, auth_required
 from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND_DEV
-from aurweb.models.tu_vote import TUVote
-from aurweb.models.tu_voteinfo import TUVoteInfo
-from aurweb.models.user import User
 from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
@@ -72,16 +69,18 @@ async def trusted_user(request: Request,
         past_by = "desc"
     context["past_by"] = past_by
 
-    current_votes = db.query(TUVoteInfo, TUVoteInfo.End > ts).order_by(
-        TUVoteInfo.Submitted.desc())
+    current_votes = db.query(models.TUVoteInfo).filter(
+        models.TUVoteInfo.End > ts).order_by(
+        models.TUVoteInfo.Submitted.desc())
     context["current_votes_count"] = current_votes.count()
     current_votes = current_votes.limit(pp).offset(current_off)
     context["current_votes"] = reversed(current_votes.all()) \
         if current_by == "asc" else current_votes.all()
     context["current_off"] = current_off
 
-    past_votes = db.query(TUVoteInfo, TUVoteInfo.End <= ts).order_by(
-        TUVoteInfo.Submitted.desc())
+    past_votes = db.query(models.TUVoteInfo).filter(
+        models.TUVoteInfo.End <= ts).order_by(
+        models.TUVoteInfo.Submitted.desc())
     context["past_votes_count"] = past_votes.count()
     past_votes = past_votes.limit(pp).offset(past_off)
     context["past_votes"] = reversed(past_votes.all()) \
@@ -92,14 +91,14 @@ async def trusted_user(request: Request,
     # We order last votes by TUVote.VoteID and User.Username.
     # This is really bad. We should add a Created column to
     # TUVote of type Timestamp and order by that instead.
-    last_votes_by_tu = db.query(TUVote).filter(
-        and_(TUVote.VoteID == TUVoteInfo.ID,
-             TUVoteInfo.End <= ts,
-             TUVote.UserID == User.ID,
-             or_(User.AccountTypeID == 2,
-                 User.AccountTypeID == 4))
-    ).group_by(User.ID).order_by(
-        TUVote.VoteID.desc(), User.Username.asc())
+    last_votes_by_tu = db.query(models.TUVote).filter(
+        and_(models.TUVote.VoteID == models.TUVoteInfo.ID,
+             models.TUVoteInfo.End <= ts,
+             models.TUVote.UserID == models.User.ID,
+             or_(models.User.AccountTypeID == 2,
+                 models.User.AccountTypeID == 4))
+    ).group_by(models.User.ID).order_by(
+        models.TUVote.VoteID.desc(), models.User.Username.asc())
     context["last_votes_by_tu"] = last_votes_by_tu.all()
 
     context["current_by_next"] = "asc" if current_by == "desc" else "desc"
@@ -118,9 +117,9 @@ async def trusted_user(request: Request,
 def render_proposal(request: Request,
                     context: dict,
                     proposal: int,
-                    voteinfo: TUVoteInfo,
-                    voters: typing.Iterable[User],
-                    vote: TUVote,
+                    voteinfo: models.TUVoteInfo,
+                    voters: typing.Iterable[models.User],
+                    vote: models.TUVote,
                     status_code: HTTPStatus = HTTPStatus.OK):
     """ Render a single TU proposal. """
     context["proposal"] = proposal
@@ -135,7 +134,7 @@ def render_proposal(request: Request,
         (participation > voteinfo.Quorum and voteinfo.Yes > voteinfo.No)
     context["accepted"] = accepted
 
-    can_vote = voters.filter(TUVote.User == request.user).first() is None
+    can_vote = voters.filter(models.TUVote.User == request.user).first() is None
     context["can_vote"] = can_vote
 
     if not voteinfo.is_running():
@@ -155,13 +154,16 @@ async def trusted_user_proposal(request: Request, proposal: int):
     context = await make_variable_context(request, "Trusted User")
     proposal = int(proposal)
 
-    voteinfo = db.query(TUVoteInfo, TUVoteInfo.ID == proposal).first()
+    voteinfo = db.query(models.TUVoteInfo).filter(
+        models.TUVoteInfo.ID == proposal).first()
     if not voteinfo:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
-    voters = db.query(User).join(TUVote).filter(TUVote.VoteID == voteinfo.ID)
-    vote = db.query(TUVote, and_(TUVote.UserID == request.user.ID,
-                                 TUVote.VoteID == voteinfo.ID)).first()
+    voters = db.query(models.User).join(models.TUVote).filter(
+        models.TUVote.VoteID == voteinfo.ID)
+    vote = db.query(models.TUVote).filter(
+        and_(models.TUVote.UserID == request.user.ID,
+             models.TUVote.VoteID == voteinfo.ID)).first()
 
     if not request.user.is_trusted_user():
         context["error"] = "Only Trusted Users are allowed to vote."
@@ -183,13 +185,16 @@ async def trusted_user_proposal_post(request: Request,
     context = await make_variable_context(request, "Trusted User")
     proposal = int(proposal)  # Make sure it's an int.
 
-    voteinfo = db.query(TUVoteInfo, TUVoteInfo.ID == proposal).first()
+    voteinfo = db.query(models.TUVoteInfo).filter(
+        models.TUVoteInfo.ID == proposal).first()
     if not voteinfo:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
-    voters = db.query(User).join(TUVote).filter(TUVote.VoteID == voteinfo.ID)
-    vote = db.query(TUVote, and_(TUVote.UserID == request.user.ID,
-                                 TUVote.VoteID == voteinfo.ID)).first()
+    voters = db.query(models.User).join(models.TUVote).filter(
+        models.TUVote.VoteID == voteinfo.ID)
+    vote = db.query(models.TUVote).filter(
+        and_(models.TUVote.UserID == request.user.ID,
+             models.TUVote.VoteID == voteinfo.ID)).first()
 
     status_code = HTTPStatus.OK
     if not request.user.is_trusted_user():
@@ -215,7 +220,7 @@ async def trusted_user_proposal_post(request: Request,
                         status_code=HTTPStatus.BAD_REQUEST)
 
     with db.begin():
-        vote = db.create(TUVote, User=request.user, VoteInfo=voteinfo)
+        vote = db.create(models.TUVote, User=request.user, VoteInfo=voteinfo)
         voteinfo.ActiveTUs += 1
 
     context["error"] = "You've already voted for this proposal."
@@ -262,12 +267,14 @@ async def trusted_user_addvote_post(request: Request,
 
     # Alright, get some database records, if we can.
     if type != "bylaws":
-        user_record = db.query(User, User.Username == user).first()
+        user_record = db.query(models.User).filter(
+            models.User.Username == user).first()
         if user_record is None:
             context["error"] = "Username does not exist."
             return render_addvote(context, HTTPStatus.NOT_FOUND)
 
-        voteinfo = db.query(TUVoteInfo, TUVoteInfo.User == user).count()
+        voteinfo = db.query(models.TUVoteInfo).filter(
+            models.TUVoteInfo.User == user).count()
         if voteinfo:
             _ = l10n.get_translator_for_request(request)
             context["error"] = _(
@@ -288,13 +295,14 @@ async def trusted_user_addvote_post(request: Request,
     duration, quorum = ADDVOTE_SPECIFICS.get(type)
     timestamp = int(datetime.utcnow().timestamp())
 
+    # TODO: Review this. Is this even necessary?
     # Remove <script> and <style> tags.
     agenda = re.sub(r'<[/]?script.*>', '', agenda)
     agenda = re.sub(r'<[/]?style.*>', '', agenda)
 
     # Create a new TUVoteInfo (proposal)!
     with db.begin():
-        voteinfo = db.create(TUVoteInfo,
+        voteinfo = db.create(models.TUVoteInfo,
                              User=user,
                              Agenda=agenda,
                              Submitted=timestamp, End=timestamp + duration,
diff --git a/aurweb/util.py b/aurweb/util.py
index 61ed5cfb..cccbe9d8 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -139,7 +139,7 @@ def to_qs(query: Dict[str, Any]) -> str:
 
 
 def get_vote(voteinfo, request: fastapi.Request):
-    from aurweb.models.tu_vote import TUVote
+    from aurweb.models import TUVote
     return voteinfo.tu_votes.filter(TUVote.User == request.user).first()
 
 

From 927f5e85673d25422deaf992f12b40187d5e087a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 16 Oct 2021 21:02:05 -0700
Subject: [PATCH 432/844] feat(docker): add gunicorn support & production
 default

Supply FASTAPI_BACKEND=gunicorn and FASTAPI_WORKERS=<threads_num> to
docker-compose up to use the gunicorn backend.

This is defaulted in production to gunicorn, but FASTAPI_WORKERS
should definitely be configured by any production deployment.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .env                          |  1 +
 docker-compose.prod.yml       |  2 ++
 docker-compose.yml            |  1 +
 docker/scripts/run-fastapi.sh | 24 +++++++++++++++++++++++-
 pyproject.toml                |  1 +
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index f4a585ba..630e856d 100644
--- a/.env
+++ b/.env
@@ -1 +1,2 @@
 FASTAPI_BACKEND="uvicorn"
+FASTAPI_WORKERS=2
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 1addecb2..eb75343b 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -21,6 +21,8 @@ services:
       - cache:/cache
 
   fastapi:
+    environment:
+      - FASTAPI_BACKEND="gunicorn"
     volumes:
       - cache:/cache
 
diff --git a/docker-compose.yml b/docker-compose.yml
index f19485e3..71f3b970 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -166,6 +166,7 @@ services:
     environment:
       - AUR_CONFIG=conf/config
       - DB_HOST=mariadb
+      - FASTAPI_WORKERS=${FASTAPI_WORKERS}
     entrypoint: /docker/fastapi-entrypoint.sh
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index 4dcc1d96..16ae3cb9 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -12,6 +12,15 @@ if [ -f /cache/production.key.pem ]; then
     KEY=/cache/production.key.pem
 fi
 
+# By default, set FASTAPI_WORKERS to 2. In production, this should
+# be configured by the deployer.
+if [ -z "$FASTAPI_WORKERS" ]; then
+    FASTAPI_WORKERS=2
+fi
+
+echo "FASTAPI_BACKEND: $FASTAPI_BACKEND"
+echo "FASTAPI_WORKERS: $FASTAPI_WORKERS"
+
 if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
     exec uvicorn --reload \
         --ssl-certfile "$CERT" \
@@ -20,11 +29,24 @@ if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
         --host "0.0.0.0" \
         --port 8000 \
         aurweb.asgi:app
-else
+elif [ "$1" == "gunicorn" ]; then
+    exec gunicorn \
+        --keyfile="$KEY" \
+        --certfile="$CERT" \
+        --log-config /docker/logging.conf \
+        --bind "0.0.0.0:8000" \
+        -w $FASTAPI_WORKERS \
+        -k uvicorn.workers.UvicornWorker \
+        aurweb.asgi:app
+elif [ "$1" == "hypercorn" ]; then
     exec hypercorn --reload \
         --certfile "$CERT" \
         --keyfile "$KEY" \
         --log-config /docker/logging.conf \
         -b "0.0.0.0:8000" \
         aurweb.asgi:app
+else
+    echo "Error: Invalid \$FASTAPI_BACKEND supplied."
+    echo "Valid backends: 'uvicorn', 'gunicorn', 'hypercorn'."
+    exit 1
 fi
diff --git a/pyproject.toml b/pyproject.toml
index 4b530493..141ec0ed 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -86,6 +86,7 @@ pytest-asyncio = { version = "0.15.1", python = "^3.9" }
 pytest-cov = { version = "2.12.1", python = "^3.9" }
 pytest-tap = { version = "3.2", python = "^3.9" }
 uvicorn = { version = "0.15.0", python = "^3.9" }
+gunicorn = { version = "20.1.0", python = "^3.9" }
 
 [tool.poetry.scripts]
 aurweb-git-auth = "aurweb.git.auth:main"

From 7f72d78dcc5ffe692319ba344b4d34d108bc7f02 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Mon, 18 Oct 2021 14:50:28 -0400
Subject: [PATCH 433/844] fix(FastAPI): correct HTML tags and indentation

Signed-off-by: Steven Guikal <void@fluix.one>
---
 templates/account/show.html              |  1 +
 templates/partials/archdev-navbar.html   |  3 +-
 templates/partials/packages/actions.html | 62 ++++++++++++------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/templates/account/show.html b/templates/account/show.html
index 139ff1f5..9d3c26e5 100644
--- a/templates/account/show.html
+++ b/templates/account/show.html
@@ -89,6 +89,7 @@
                                 </tbody>
                             </table>
                         </td>
+                    </tr>
                 </tbody>
             </table>
         {% endif %}
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 9a3ba780..86f368d0 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -47,7 +47,6 @@
                     {% trans %}Login{% endtrans %}
                 </a>
             </li>
-            {% endif %}
-        </li>
+        {% endif %}
     </ul>
 </div>
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 81536a3d..3ab3f303 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -18,6 +18,7 @@
                 <a href="/cgit/aur.git/snapshot/{{ pkgbase.Name }}.tar.gz">
                     {{ "Download snapshot" | tr }}
                 </a>
+            </li>
             <li>
                 <a href="https://wiki.archlinux.org/title/Special:Search?search={{ pkgbase.Name }}">
                     {{ "Search wiki" | tr }}
@@ -49,43 +50,42 @@
                     </form>
                 </li>
             {% endif %}
-                <li>
-                    {% if not voted %}
-                    <form action="/pkgbase/{{ pkgbase.Name }}/vote/" method="post">
+            <li>
+                {% if not voted %}
+                <form action="/pkgbase/{{ pkgbase.Name }}/vote/" method="post">
+                    <input type="submit"
+                           class="button text-button"
+                           name="do_Vote"
+                           value="{{ 'Vote for this package' | tr }}" />
+                </form>
+                {% else %}
+                <form action="/pkgbase/{{ pkgbase.Name }}/unvote/" method="post">
+                    <input type="submit"
+                           class="button text-button"
+                           name="do_UnVote"
+                           value="{{ 'Remove vote' | tr }}" />
+                </form>
+                {% endif %}
+            </li>
+            <li>
+                {% if notified %}
+                    <form action="/pkgbase/{{ pkgbase.Name }}/unnotify/" method="post">
                         <input type="submit"
                                class="button text-button"
-                               name="do_Vote"
-                               value="{{ 'Vote for this package' | tr }}" />
+                               name="do_UnNotify"
+                               value="{{ 'Disable notifications' | tr }}"
+                        />
                     </form>
-                    {% else %}
-                    <form action="/pkgbase/{{ pkgbase.Name }}/unvote/" method="post">
+                {% else %}
+                    <form action="/pkgbase/{{ pkgbase.Name }}/notify/" method="post">
                         <input type="submit"
                                class="button text-button"
-                               name="do_UnVote"
-                               value="{{ 'Remove vote' | tr }}" />
+                               name="do_Notify"
+                               value="{{ 'Enable notifications' | tr }}"
+                        />
                     </form>
-                    {% endif %}
-                </li>
-                <li>
-                    {% if notified %}
-                        <form action="/pkgbase/{{ pkgbase.Name }}/unnotify/" method="post">
-                            <input type="submit"
-                                   class="button text-button"
-                                   name="do_UnNotify"
-                                   value="{{ 'Disable notifications' | tr }}"
-                            />
-                        </form>
-                    {% else %}
-                        <form action="/pkgbase/{{ pkgbase.Name }}/notify/" method="post">
-                            <input type="submit"
-                                   class="button text-button"
-                                   name="do_Notify"
-                                   value="{{ 'Enable notifications' | tr }}"
-                            />
-                        </form>
-                    {% endif %}
-                </li>
-            </form>
+                {% endif %}
+            </li>
             {% if request.user.has_credential('CRED_PKGBASE_EDIT_COMAINTAINERS', approved=[pkgbase.Maintainer]) %}
                 <li>
                     <a href="/pkgbase/{{ pkgbase.Name }}/comaintainers/">

From db67e83bb8d2bb965a92b5ec49d1acff908e690c Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Mon, 18 Oct 2021 15:07:25 -0400
Subject: [PATCH 434/844] fix(FastAPI): use elif statements where appropriate

Signed-off-by: Steven Guikal <void@fluix.one>
---
 templates/login.html                     | 21 +++++++++------------
 templates/partials/packages/actions.html | 14 ++++++--------
 templates/partials/packages/comment.html |  4 +---
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/templates/login.html b/templates/login.html
index 45fc1645..57b94c5c 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -16,17 +16,16 @@
         | safe
         }}
         </p>
+    {% elif request.user.is_authenticated() %}
+        <p>
+        {{ "Logged-in as: %s"
+        | tr
+        | format("<b>%s</b>" | format(request.user.Username))
+        | safe
+        }}
+        <a href="/logout/?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
+        </p>
     {% else %}
-        {% if request.user.is_authenticated() %}
-            <p>
-            {{ "Logged-in as: %s"
-            | tr
-            | format("<b>%s</b>" | format(request.user.Username))
-            | safe
-            }}
-            <a href="/logout/?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
-            </p>
-        {% else %}
         <form method="post" action="/login?next={{ next }}">
             <fieldset>
                 <legend>{% trans %}Enter login credentials{% endtrans %}</legend>
@@ -81,9 +80,7 @@
 
             </fieldset>
         </form>
-        {% endif %}
     {% endif %}
-
 </div>
 
 {% endblock %}
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 81536a3d..abdf76fb 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -128,14 +128,12 @@
                         />
                     </form>
                 </li>
-            {% else %}
-                {% if request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
-                    <li>
-                        <a href="/pkgbase/{{ pkgbase.Name }}/disown/">
-                            {{ "Disown Package" | tr }}
-                        </a>
-                    </li>
-                {% endif %}
+            {% elif request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
+                <li>
+                    <a href="/pkgbase/{{ pkgbase.Name }}/disown/">
+                        {{ "Disown Package" | tr }}
+                    </a>
+                </li>
             {% endif %}
         </ul>
     </div>
diff --git a/templates/partials/packages/comment.html b/templates/partials/packages/comment.html
index 97f11723..533ac40d 100644
--- a/templates/partials/packages/comment.html
+++ b/templates/partials/packages/comment.html
@@ -82,8 +82,7 @@
                     </form>
                 {% endif %}
 			{% endif %}
-		{% else %}
-			{% if request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
+		{% elif request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
 				<form class="undelete-comment-form"
 					  method="post"
 					  action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/undelete"
@@ -97,7 +96,6 @@
 							   name="submit" value="1" width="11" height="11" />
 					</fieldset>
 				</form>
-			{% endif %}
 		{% endif %}
 	</h4>
 	<div id="comment-{{ comment.ID }}-content" class="{{ article_cls }}">

From c588a4e82ed2559463d050475d485e18b0f680e6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 8 Oct 2021 17:52:13 -0700
Subject: [PATCH 435/844] feat(FastAPI): add /packages (post)

The POST /packages route takes an `action`, `merge_into` and `confirm`
form data arguments. It then routes over to `action`'s callback provided
by `PACKAGE_ACTIONS`. This commit does not implement actions, but
mocks out the flow we would expect from the POST route.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 45 +++++++++++++++++++++++++++++++--
 templates/packages.html      |  7 +++---
 test/test_packages_routes.py | 49 +++++++++++++++++++++++++++++++++++-
 3 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 58c89192..d2002188 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -23,7 +23,8 @@ from aurweb.templates import make_context, render_raw_template, render_template
 router = APIRouter()
 
 
-async def packages_get(request: Request, context: Dict[str, Any]):
+async def packages_get(request: Request, context: Dict[str, Any],
+                       status_code: HTTPStatus = HTTPStatus.OK):
     # Query parameters used in this request.
     context["q"] = dict(request.query_params)
 
@@ -94,7 +95,8 @@ async def packages_get(request: Request, context: Dict[str, Any]):
         context.get("packages"), request.user)
     context["packages_count"] = search.total_count
 
-    return render_template(request, "packages.html", context)
+    return render_template(request, "packages.html", context,
+                           status_code=status_code)
 
 
 @router.get("/packages")
@@ -1024,3 +1026,42 @@ async def pkgbase_delete_post(request: Request, name: str,
         delete_package(request.user, package)
 
     return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
+
+# A mapping of action string -> callback functions used within the
+# `packages_post` route below. We expect any action callback to
+# return a tuple in the format: (succeeded: bool, message: List[str]).
+PACKAGE_ACTIONS = {}
+
+
+@router.post("/packages")
+@auth_required(redirect="/packages")
+async def packages_post(request: Request,
+                        IDs: List[int] = Form(default=[]),
+                        action: str = Form(default=str()),
+                        merge_into: str = Form(default=str()),
+                        confirm: bool = Form(default=False)):
+
+    # If an invalid action is specified, just render GET /packages
+    # with an BAD_REQUEST status_code.
+    if action not in PACKAGE_ACTIONS:
+        context = make_context(request, "Packages")
+        return await packages_get(request, context, HTTPStatus.BAD_REQUEST)
+
+    context = make_context(request, "Packages")
+
+    # We deal with `IDs`, `merge_into` and `confirm` arguments
+    # within action callbacks.
+    callback = PACKAGE_ACTIONS.get(action)
+    retval = await callback(request, package_ids=IDs, merge_into=merge_into,
+                            confirm=confirm)
+    if retval:  # If *anything* was returned:
+        success, messages = retval
+        if not success:
+            # If the first element was False:
+            context["errors"] = messages
+            return await packages_get(request, context, HTTPStatus.BAD_REQUEST)
+        else:
+            # Otherwise:
+            context["success"] = messages
+
+    return await packages_get(request, context)
diff --git a/templates/packages.html b/templates/packages.html
index 8b5b06d1..40a4414b 100644
--- a/templates/packages.html
+++ b/templates/packages.html
@@ -55,11 +55,10 @@
                 {% include "partials/widgets/pager.html" %}
             {% endwith %}
 
-            {# Package action form #}
+            {# Package action form: persists query parameters. #}
             <form id="pkglist-results-form"
-                  action="/packages/?{{ q | urlencode }}"
-                  method="post">
-
+                  action="/packages?{{ q | urlencode }}" method="post"
+            >
                 {# Search results #}
                 {% with voted = packages_voted, notified = packages_notified %}
                     {% include "partials/packages/search_results.html" %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index f29c6c31..032f2571 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -3,6 +3,7 @@ import re
 from datetime import datetime
 from http import HTTPStatus
 from typing import List
+from unittest import mock
 
 import pytest
 
@@ -26,7 +27,7 @@ from aurweb.models.relation_type import PROVIDES_ID, RelationType
 from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
-from aurweb.testing.html import parse_root
+from aurweb.testing.html import get_errors, get_successes, parse_root
 from aurweb.testing.requests import Request
 
 
@@ -1987,3 +1988,49 @@ def test_pkgbase_delete(client: TestClient, tu_user: User, package: Package):
         PackageBase.Name == pkgbase.Name
     ).first()
     assert record is None
+
+
+def test_packages_post_unknown_action(client: TestClient, user: User,
+                                      package: Package):
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={"action": "unknown"},
+                            cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_packages_post_error(client: TestClient, user: User, package: Package):
+
+    async def stub_action(request: Request, **kwargs):
+        return (False, ["Some error."])
+
+    actions = {"stub": stub_action}
+    with mock.patch.dict("aurweb.routers.packages.PACKAGE_ACTIONS", actions):
+        cookies = {"AURSID": user.login(Request(), "testPassword")}
+        with client as request:
+            resp = request.post("/packages", data={"action": "stub"},
+                                cookies=cookies, allow_redirects=False)
+        assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+        errors = get_errors(resp.text)
+        expected = "Some error."
+        assert errors[0].text.strip() == expected
+
+
+def test_packages_post(client: TestClient, user: User, package: Package):
+
+    async def stub_action(request: Request, **kwargs):
+        return (True, ["Some success."])
+
+    actions = {"stub": stub_action}
+    with mock.patch.dict("aurweb.routers.packages.PACKAGE_ACTIONS", actions):
+        cookies = {"AURSID": user.login(Request(), "testPassword")}
+        with client as request:
+            resp = request.post("/packages", data={"action": "stub"},
+                                cookies=cookies, allow_redirects=False)
+        assert resp.status_code == int(HTTPStatus.OK)
+
+        errors = get_successes(resp.text)
+        expected = "Some success."
+        assert errors[0].text.strip() == expected

From 267f2cb2c4e0a8cf69269f445acc7ccf49fa8faa Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 18 Oct 2021 22:25:40 -0700
Subject: [PATCH 436/844] fix(fastapi): remove trailing slashes from
 fastapi-driven links

With our FastAPI server, trailing slashes causes a 307 redirect
which ends up redirecting users to routes which do not contain
trailing slashes. This removes trailing slashes from our templates
where FastAPI is concerned to avoid unnecessary redirects.

There may still be links or usages around which have unnecessary
usages of a trailing slash; please keep a look out for these and
remove them where possible.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py                    |  8 +--
 templates/account/search.html                 |  2 +-
 templates/addvote.html                        |  2 +-
 templates/login.html                          |  6 +--
 templates/partials/account/results.html       |  4 +-
 templates/partials/archdev-navbar.html        | 10 ++--
 templates/partials/head.html                  |  2 +-
 templates/partials/packages/actions.html      | 20 +++----
 templates/partials/packages/details.html      |  2 +-
 .../partials/packages/pkgbase_metadata.html   |  2 +-
 .../partials/packages/widgets/search.html     |  2 +-
 .../partials/packages/widgets/updates.html    |  2 +-
 templates/partials/tu/proposals.html          |  2 +-
 test/test_accounts_routes.py                  | 52 +++++++++----------
 14 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index a9257d3d..4c4ce849 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -590,8 +590,8 @@ async def account(request: Request, username: str):
     return render_template(request, "account/show.html", context)
 
 
-@router.get("/accounts/")
-@auth_required(True, redirect="/accounts/")
+@router.get("/accounts")
+@auth_required(True, redirect="/accounts")
 @account_type_required({account_type.TRUSTED_USER,
                         account_type.DEVELOPER,
                         account_type.TRUSTED_USER_AND_DEV})
@@ -600,8 +600,8 @@ async def accounts(request: Request):
     return render_template(request, "account/search.html", context)
 
 
-@router.post("/accounts/")
-@auth_required(True, redirect="/accounts/")
+@router.post("/accounts")
+@auth_required(True, redirect="/accounts")
 @account_type_required({account_type.TRUSTED_USER,
                         account_type.DEVELOPER,
                         account_type.TRUSTED_USER_AND_DEV})
diff --git a/templates/account/search.html b/templates/account/search.html
index 3f83d25b..d28d4169 100644
--- a/templates/account/search.html
+++ b/templates/account/search.html
@@ -6,7 +6,7 @@
         {{ "Use this form to search existing accounts." | tr }}
         <br />
         <br />
-        <form class="account-search-form" action="/accounts/" method="post">
+        <form class="account-search-form" action="/accounts" method="post">
             <fieldset>
                 <p>
                     <label for="id_username">{{ "Username" | tr }}:</label>
diff --git a/templates/addvote.html b/templates/addvote.html
index eebae06f..4d2b0292 100644
--- a/templates/addvote.html
+++ b/templates/addvote.html
@@ -8,7 +8,7 @@
     <div class="box">
         <h2>{{ "Submit a proposal to vote on." | tr }}</h2>
 
-        <form action="/addvote/" method="post">
+        <form action="/addvote" method="post">
 
             <p class="vote-applicant">
                 <label for="id_user">{{ "Applicant/TU" | tr }}</label>
diff --git a/templates/login.html b/templates/login.html
index 57b94c5c..2c028936 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -6,7 +6,7 @@
     <h2>AUR {% trans %}Login{% endtrans %}</h2>
 
     {% if request.url.scheme == "http" and config.getboolean("options", "disable_http_login") %}
-        {% set https_login = url_base.replace("http://", "https://") + "/login/" %}
+        {% set https_login = url_base.replace("http://", "https://") + "/login" %}
         <p>
         {{ "HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
         | tr
@@ -23,7 +23,7 @@
         | format("<b>%s</b>" | format(request.user.Username))
         | safe
         }}
-        <a href="/logout/?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
+        <a href="/logout?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
         </p>
     {% else %}
         <form method="post" action="/login?next={{ next }}">
@@ -70,7 +70,7 @@
                 <p>
                     <input class="button" type="submit"
                            value="{% trans %}Login{% endtrans %}">
-                    <a href="/passreset/">
+                    <a href="/passreset">
                         [{% trans %}Forgot Password{% endtrans %}]
                     </a>
                     <input id="id_referer" type="hidden" name="referer"
diff --git a/templates/partials/account/results.html b/templates/partials/account/results.html
index 910ae637..ec2f269c 100644
--- a/templates/partials/account/results.html
+++ b/templates/partials/account/results.html
@@ -40,7 +40,7 @@
 <table class="results">
     <tr>
         <td align="left">
-            <form action="/accounts/" method="post">
+            <form action="/accounts" method="post">
                 <fieldset>
                     <input type="hidden" name="O"
                            value="{{ offset - pp }}" />
@@ -59,7 +59,7 @@
             </form>
         </td>
         <td align="right">
-            <form action="/accounts/" method="post">
+            <form action="/accounts" method="post">
                 <fieldset>
                     <input type="hidden" name="O"
                            value="{{ offset + pp }}" />
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 86f368d0..072fa54d 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -5,16 +5,16 @@
         {% else %}
             <li><a href="/">AUR {% trans %}Home{% endtrans %}</a></li>
         {% endif %}
-        <li><a href="/packages/">{% trans %}Packages{% endtrans %}</a></li>
+        <li><a href="/packages">{% trans %}Packages{% endtrans %}</a></li>
         {% if request.user.is_authenticated() %}
             <li>
-                <a href="/requests/">
+                <a href="/requests">
                     {% trans %}Requests{% endtrans %}
                 </a>
             </li>
             {% if request.user.is_trusted_user() or request.user.is_developer() %}
                 <li>
-                    <a href="/accounts/">
+                    <a href="/accounts">
                         {% trans %}Accounts{% endtrans %}
                     </a>
                 </li>
@@ -32,7 +32,7 @@
             {% endif %}
 
             <li>
-                <a href="/logout/?next={{ next }}">
+                <a href="/logout?next={{ next }}">
                     {% trans %}Logout{% endtrans %}
                 </a>
             </li>
@@ -43,7 +43,7 @@
                 </a>
             </li>
             <li>
-                <a href="/login/?next={{ next }}">
+                <a href="/login?next={{ next }}">
                     {% trans %}Login{% endtrans %}
                 </a>
             </li>
diff --git a/templates/partials/head.html b/templates/partials/head.html
index 9b438255..8bfde020 100644
--- a/templates/partials/head.html
+++ b/templates/partials/head.html
@@ -10,7 +10,7 @@
 
     <!-- Alternate resources -->
     <link rel="alternate" type="application/rss+xml"
-          title="Newest Packages RSS" href="/rss/">
+          title="Newest Packages RSS" href="/rss">
 
     <!-- Include local typeahead -->
     <script type="text/javascript" src="/static/js/typeahead.js"></script>
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 2a4efb5d..486356b6 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -26,7 +26,7 @@
             </li>
             {% if not out_of_date %}
                 <li>
-                    <a href="/pkgbase/{{ pkgbase.Name }}/flag/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/flag">
                         {{ "Flag package out-of-date" | tr }}
                     </a>
                 </li>
@@ -52,14 +52,14 @@
             {% endif %}
             <li>
                 {% if not voted %}
-                <form action="/pkgbase/{{ pkgbase.Name }}/vote/" method="post">
+                <form action="/pkgbase/{{ pkgbase.Name }}/vote" method="post">
                     <input type="submit"
                            class="button text-button"
                            name="do_Vote"
                            value="{{ 'Vote for this package' | tr }}" />
                 </form>
                 {% else %}
-                <form action="/pkgbase/{{ pkgbase.Name }}/unvote/" method="post">
+                <form action="/pkgbase/{{ pkgbase.Name }}/unvote" method="post">
                     <input type="submit"
                            class="button text-button"
                            name="do_UnVote"
@@ -69,7 +69,7 @@
             </li>
             <li>
                 {% if notified %}
-                    <form action="/pkgbase/{{ pkgbase.Name }}/unnotify/" method="post">
+                    <form action="/pkgbase/{{ pkgbase.Name }}/unnotify" method="post">
                         <input type="submit"
                                class="button text-button"
                                name="do_UnNotify"
@@ -77,7 +77,7 @@
                         />
                     </form>
                 {% else %}
-                    <form action="/pkgbase/{{ pkgbase.Name }}/notify/" method="post">
+                    <form action="/pkgbase/{{ pkgbase.Name }}/notify" method="post">
                         <input type="submit"
                                class="button text-button"
                                name="do_Notify"
@@ -88,7 +88,7 @@
             </li>
             {% if request.user.has_credential('CRED_PKGBASE_EDIT_COMAINTAINERS', approved=[pkgbase.Maintainer]) %}
                 <li>
-                    <a href="/pkgbase/{{ pkgbase.Name }}/comaintainers/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/comaintainers">
                         {{ "Manage Co-Maintainers" | tr }}
                     </a>
                 </li>
@@ -101,20 +101,20 @@
                 </li>
             {% endif %}
             <li>
-                <a href="/pkgbase/{{ pkgbase.Name }}/request/">
+                <a href="/pkgbase/{{ pkgbase.Name }}/request">
                     {{ "Submit Request" | tr }}
                 </a>
             </li>
             {% if request.user.has_credential("CRED_PKGBASE_DELETE") %}
                 <li>
-                    <a href="/pkgbase/{{ pkgbase.Name }}/delete/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/delete">
                         {{ "Delete Package" | tr }}
                     </a>
                 </li>
             {% endif %}
             {% if request.user.has_credential("CRED_PKGBASE_MERGE") %}
                 <li>
-                    <a href="/pkgbase/{{ pkgbase.Name }}/merge/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/merge">
                         {{ "Merge Package" | tr }}
                     </a>
                 </li>
@@ -130,7 +130,7 @@
                 </li>
             {% elif request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
                 <li>
-                    <a href="/pkgbase/{{ pkgbase.Name }}/disown/">
+                    <a href="/pkgbase/{{ pkgbase.Name }}/disown">
                         {{ "Disown Package" | tr }}
                     </a>
                 </li>
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 05dc82c6..e8414bf4 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -38,7 +38,7 @@
         {% if request.user.has_credential("CRED_PKGBASE_SET_KEYWORDS", approved=[pkgbase.Maintainer]) %}
         <td>
             <form method="update"
-                  action="/pkgbase/{{ pkgbase.Name }}/keywords/"
+                  action="/pkgbase/{{ pkgbase.Name }}/keywords"
             >
                 <div>
                     <input type="text"
diff --git a/templates/partials/packages/pkgbase_metadata.html b/templates/partials/packages/pkgbase_metadata.html
index ba27fda5..d4916029 100644
--- a/templates/partials/packages/pkgbase_metadata.html
+++ b/templates/partials/packages/pkgbase_metadata.html
@@ -3,7 +3,7 @@
     <ul>
         {% for result in packages %}
             <li>
-                <a href="/packages/{{ result.Name }}/"
+                <a href="/packages/{{ result.Name }}"
                    title="{{ 'View packages details for' | tr }} {{ result.Name }}">
                     {{ result.Name }}
                 </a>
diff --git a/templates/partials/packages/widgets/search.html b/templates/partials/packages/widgets/search.html
index 106b93ea..048e1aa9 100644
--- a/templates/partials/packages/widgets/search.html
+++ b/templates/partials/packages/widgets/search.html
@@ -1,5 +1,5 @@
 <div id="pkgsearch" class="widget">
-    <form id="pkgsearch-form" method="get" action="/packages/">
+    <form id="pkgsearch-form" method="get" action="/packages">
         <fieldset>
             <label for="pkgsearch-field">{{ "Package Search" | tr }}:</label>
             <input type="hidden" name="O" value="0" />
diff --git a/templates/partials/packages/widgets/updates.html b/templates/partials/packages/widgets/updates.html
index 3ee1b98e..9b1996e9 100644
--- a/templates/partials/packages/widgets/updates.html
+++ b/templates/partials/packages/widgets/updates.html
@@ -5,7 +5,7 @@
             (<a href="/packages/?SB=l&SO=d">{{ "more" | tr }}</a>)
         </span>
     </h3>
-    <a class="rss-icon latest" href="/rss/"
+    <a class="rss-icon latest" href="/rss"
        title="AUR Latest Packages RSS Feed">
         <img src="/static/images/rss.svg" alt="RSS Feed" />
     </a>
diff --git a/templates/partials/tu/proposals.html b/templates/partials/tu/proposals.html
index 40eba22b..9e3c67e1 100644
--- a/templates/partials/tu/proposals.html
+++ b/templates/partials/tu/proposals.html
@@ -4,7 +4,7 @@
     {% if title == "Current Votes" %}
         <ul class="admin-actions">
             <li>
-                <a href="/addvote/">
+                <a href="/addvote">
                     {% trans %}Add Proposal{% endtrans %}
                 </a>
             </li>
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 9120f23f..9252e5bf 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -942,13 +942,13 @@ def test_get_account_unauthenticated():
 
 
 def test_get_accounts(tu_user):
-    """ Test that we can GET request /accounts/ and receive
-    a form which can be used to POST /accounts/. """
+    """ Test that we can GET request /accounts and receive
+    a form which can be used to POST /accounts. """
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
 
     with client as request:
-        response = request.get("/accounts/", cookies=cookies)
+        response = request.get("/accounts", cookies=cookies)
     assert response.status_code == int(HTTPStatus.OK)
 
     parser = lxml.etree.HTMLParser()
@@ -961,7 +961,7 @@ def test_get_accounts(tu_user):
     assert len(form) == 1
     form = next(iter(form))
     assert form.attrib.get("method") == "post"
-    assert form.attrib.get("action") == "/accounts/"
+    assert form.attrib.get("action") == "/accounts"
 
     def field(element):
         """ Return the given element string as a valid
@@ -1020,7 +1020,7 @@ def test_post_accounts(tu_user):
     cookies = {"AURSID": sid}
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies)
+        response = request.post("/accounts", cookies=cookies)
     assert response.status_code == int(HTTPStatus.OK)
 
     rows = get_rows(response.text)
@@ -1061,7 +1061,7 @@ def test_post_accounts_username(tu_user):
     cookies = {"AURSID": sid}
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"U": user.Username})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1093,14 +1093,14 @@ def test_post_accounts_account_type(tu_user):
 
     # Expect no entries; we marked our only user as a User type.
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"T": "t"})
     assert response.status_code == int(HTTPStatus.OK)
     assert len(get_rows(response.text)) == 0
 
     # So, let's also ensure that specifying "u" returns our user.
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"T": "u"})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1119,7 +1119,7 @@ def test_post_accounts_account_type(tu_user):
         ).first()
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"T": "t"})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1137,7 +1137,7 @@ def test_post_accounts_account_type(tu_user):
         ).first()
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"T": "d"})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1155,7 +1155,7 @@ def test_post_accounts_account_type(tu_user):
         ).first()
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"T": "td"})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1174,7 +1174,7 @@ def test_post_accounts_status(tu_user):
     cookies = {"AURSID": sid}
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies)
+        response = request.post("/accounts", cookies=cookies)
     assert response.status_code == int(HTTPStatus.OK)
 
     rows = get_rows(response.text)
@@ -1188,7 +1188,7 @@ def test_post_accounts_status(tu_user):
         user.Suspended = True
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"S": True})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1206,7 +1206,7 @@ def test_post_accounts_email(tu_user):
 
     # Search via email.
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"E": user.Email})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1220,7 +1220,7 @@ def test_post_accounts_realname(tu_user):
     cookies = {"AURSID": sid}
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"R": user.RealName})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1234,7 +1234,7 @@ def test_post_accounts_irc(tu_user):
     cookies = {"AURSID": sid}
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"I": user.IRCNick})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1259,14 +1259,14 @@ def test_post_accounts_sortby(tu_user):
 
     # Show that "u" is the default search order, by username.
     with client as request:
-        response = request.post("/accounts/", cookies=cookies)
+        response = request.post("/accounts", cookies=cookies)
     assert response.status_code == int(HTTPStatus.OK)
     rows = get_rows(response.text)
     assert len(rows) == 2
     first_rows = rows
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"SB": "u"})
     assert response.status_code == int(HTTPStatus.OK)
     rows = get_rows(response.text)
@@ -1280,7 +1280,7 @@ def test_post_accounts_sortby(tu_user):
     assert compare_text_values(0, first_rows, rows) is True
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"SB": "i"})
     assert response.status_code == int(HTTPStatus.OK)
     rows = get_rows(response.text)
@@ -1291,7 +1291,7 @@ def test_post_accounts_sortby(tu_user):
 
     # Sort by "i" -> RealName.
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"SB": "r"})
     assert response.status_code == int(HTTPStatus.OK)
     rows = get_rows(response.text)
@@ -1307,7 +1307,7 @@ def test_post_accounts_sortby(tu_user):
 
     # Fetch first_rows again with our new AccountType ordering.
     with client as request:
-        response = request.post("/accounts/", cookies=cookies)
+        response = request.post("/accounts", cookies=cookies)
     assert response.status_code == int(HTTPStatus.OK)
     rows = get_rows(response.text)
     assert len(rows) == 2
@@ -1315,7 +1315,7 @@ def test_post_accounts_sortby(tu_user):
 
     # Sort by "t" -> AccountType.
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"SB": "t"})
     assert response.status_code == int(HTTPStatus.OK)
     rows = get_rows(response.text)
@@ -1334,7 +1334,7 @@ def test_post_accounts_pgp_key(tu_user):
 
     # Search via PGPKey.
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"K": user.PGPKey})
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1360,7 +1360,7 @@ def test_post_accounts_paged(tu_user):
     cookies = {"AURSID": sid}
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies)
+        response = request.post("/accounts", cookies=cookies)
     assert response.status_code == int(HTTPStatus.OK)
 
     rows = get_rows(response.text)
@@ -1386,7 +1386,7 @@ def test_post_accounts_paged(tu_user):
     assert "disabled" not in page_next.attrib
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"O": 50})  # +50 offset.
     assert response.status_code == int(HTTPStatus.OK)
 
@@ -1401,7 +1401,7 @@ def test_post_accounts_paged(tu_user):
         assert username.text.strip() == _user.Username
 
     with client as request:
-        response = request.post("/accounts/", cookies=cookies,
+        response = request.post("/accounts", cookies=cookies,
                                 data={"O": 101})  # Last page.
     assert response.status_code == int(HTTPStatus.OK)
 

From d22580fa747664f6771b2a3f3919e0658b5a647c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 19 Oct 2021 07:35:27 -0700
Subject: [PATCH 437/844] fix(docker): add aurweb-image service

The new `aurweb-image` service does not perform any purpose
other than providing a build definition for 'aurweb:latest'.
With this, `docker-compose build` now just runs once for the
`aurweb-image` service, which builds the image used by all
other services.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 71f3b970..6f8e0d25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,15 +21,17 @@
 version: "3.8"
 
 services:
-  ca:
+  aurweb-image:
     build: .
     image: aurweb:latest
+
+  ca:
+    image: aurweb:latest
     init: true
     entrypoint: /docker/ca-entrypoint.sh
     command: echo
 
   memcached:
-    build: .
     image: aurweb:latest
     init: true
     command: /docker/scripts/run-memcached.sh
@@ -37,7 +39,6 @@ services:
       test: "bash /docker/health/memcached.sh"
 
   redis:
-    build: .
     image: aurweb:latest
     init: true
     entrypoint: /docker/redis-entrypoint.sh
@@ -48,7 +49,6 @@ services:
       - "16379:6379"
 
   mariadb:
-    build: .
     image: aurweb:latest
     init: true
     entrypoint: /docker/mariadb-entrypoint.sh
@@ -64,7 +64,6 @@ services:
       test: "bash /docker/health/mariadb.sh"
 
   mariadb_init:
-    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -76,7 +75,6 @@ services:
         condition: service_healthy
 
   git:
-    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -93,7 +91,6 @@ services:
         condition: service_started
 
   smartgit:
-    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -107,7 +104,6 @@ services:
         condition: service_healthy
 
   cgit-php:
-    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -123,7 +119,6 @@ services:
       - git_data:/aurweb/aur.git
 
   cgit-fastapi:
-    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -139,7 +134,6 @@ services:
       - git_data:/aurweb/aur.git
 
   php-fpm:
-    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -160,7 +154,6 @@ services:
       - "19000:9000"
 
   fastapi:
-    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -182,7 +175,6 @@ services:
       - "18000:8000"
 
   nginx:
-    build: .
     image: aurweb:latest
     init: true
     environment:
@@ -207,7 +199,6 @@ services:
         condition: service_healthy
 
   sharness:
-    build: .
     image: aurweb:latest
     profiles: ["dev"]
     init: true
@@ -232,7 +223,6 @@ services:
       - ./templates:/aurweb/templates
 
   pytest-mysql:
-    build: .
     image: aurweb:latest
     profiles: ["dev"]
     init: true
@@ -258,7 +248,6 @@ services:
       - ./templates:/aurweb/templates
 
   pytest-sqlite:
-    build: .
     image: aurweb:latest
     profiles: ["dev"]
     init: true
@@ -280,7 +269,6 @@ services:
       - ./templates:/aurweb/templates
 
   test:
-    build: .
     image: aurweb:latest
     profiles: ["dev"]
     init: true

From 37232f71ee7207bb521e7e6a7e7d6088cf27c744 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 19 Oct 2021 08:57:43 -0700
Subject: [PATCH 438/844] feat: add git-cliff configuration

git-cliff is a tool which allows us to generate changelog
based off of conventional commits in the repository.

This commit provides an initial cliff.toml configuration
file which formats changelog output with tables and branch
state metadata.

Upstream: https://github.com/orhun/git-cliff

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 cliff.toml | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 cliff.toml

diff --git a/cliff.toml b/cliff.toml
new file mode 100644
index 00000000..b71ea672
--- /dev/null
+++ b/cliff.toml
@@ -0,0 +1,75 @@
+# configuration file for git-cliff (0.1.0)
+
+[changelog]
+# changelog header
+header = """
+# Changelog
+All notable feature additions, bug fixes and changes to this project will be \
+documented in this file.\n
+"""
+# template for the changelog body
+# https://tera.netlify.app/docs/#introduction
+body = """
+{% if version %}\
+    #### Release [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    {% set head = commits | last %}\
+    | Branch | HEAD | Status | Coverage |
+    |--------|------|--------|----------|
+    | [pu](https://gitlab.archlinux.org/archlinux/aurweb/-/tree/pu) | [{{ head.id | truncate(length=8, end="") }}](https://gitlab.archlinux.org/archlinux/aurweb/-/commits/{{ head.id }}) | ![pipeline](https://gitlab.archlinux.org/archlinux/aurweb/badges/pu/pipeline.svg?key_text=build) | ![coverage](https://gitlab.archlinux.org/archlinux/aurweb/badges/pu/coverage.svg) | 
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | lower }}
+    | Commit | Message |
+    |--------|---------| \
+    {% for commit in commits %}
+        | [{{ commit.id | truncate(length=8, end="") }}](https://gitlab.archlinux.org/archlinux/aurweb/-/commit/{{ commit.id }}) | {{ commit.message }} |\
+    {% endfor %}
+{% endfor %}\n
+"""
+# remove the leading and trailing whitespaces from the template
+trim = true
+# changelog footer
+footer = """
+## Notes
+
+See a general project status overview at \
+https://gitlab.archlinux.org/archlinux/aurweb/-/wikis/Home.
+
+To contribute with testing of the modern aurweb FastAPI port development, visit \
+https://gitlab.archlinux.org/archlinux/aurweb/-/wikis/Testing-Guide.
+
+To file a bug, create an issue using the Bug template by following the link: \
+https://gitlab.archlinux.org/archlinux/aurweb/-/issues/new?issuable_template=Bug.
+
+To provide feedback, create an issue using the Feedback template by following
+the link: \
+https://gitlab.archlinux.org/archlinux/aurweb/-/issues/new?issuable_template=Feedback.
+
+<!-- generated by git-cliff -->
+"""
+
+[git]
+# allow only conventional commits
+# https://www.conventionalcommits.org
+conventional_commits = true
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat", group = "Features"},
+    { message = "^fix", group = "Bug Fixes"},
+    { message = "^doc", group = "Documentation"},
+    { message = "^perf", group = "Performance"},
+    { message = "^change", group = "Changes" },
+    { message = "^refactor", group = "Refactor"},
+    { message = "^style", group = "Styling"},
+    { message = "^test", group = "Testing"},
+    { message = "^chore\\(release\\): prepare for", skip = true},
+    { message = "^chore", group = "Miscellaneous Tasks"},
+    { body = ".*security", group = "Security"},
+]
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+# glob pattern for matching git tags
+tag_pattern = "v[0-9]*"
+# regex for skipping tags
+skip_tags = "v0.1.0-beta.1"

From be64ca7b0e88bf913e31a1f51b2f5ef0620df220 Mon Sep 17 00:00:00 2001
From: Bert Peters via aur-dev <aur-dev@lists.archlinux.org>
Date: Sun, 11 Jul 2021 20:29:17 +0200
Subject: [PATCH 439/844] Send request notifications to co-maintainers

This is in addition to the current recipients. Co-maintainers should
also be made aware when their package has pending requests.
---
 aurweb/scripts/notify.py |  6 ++++++
 test/t2500-notify.t      | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index 7f8e7168..1fb4707b 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -435,9 +435,12 @@ class RequestOpenNotification(Notification):
         cur = conn.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' +
                            'INNER JOIN PackageBases ' +
                            'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
+                           'LEFT JOIN PackageComaintainers ' +
+                           'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +
                            'INNER JOIN Users ' +
                            'ON Users.ID = PackageRequests.UsersID ' +
                            'OR Users.ID = PackageBases.MaintainerUID ' +
+                           'OR Users.ID = PackageComaintainers.UsersID ' +
                            'WHERE PackageRequests.ID = ? AND ' +
                            'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
@@ -492,9 +495,12 @@ class RequestCloseNotification(Notification):
         cur = conn.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' +
                            'INNER JOIN PackageBases ' +
                            'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
+                           'LEFT JOIN PackageComaintainers ' +
+                           'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +
                            'INNER JOIN Users ' +
                            'ON Users.ID = PackageRequests.UsersID ' +
                            'OR Users.ID = PackageBases.MaintainerUID ' +
+                           'OR Users.ID = PackageComaintainers.UsersID ' +
                            'WHERE PackageRequests.ID = ? AND ' +
                            'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
diff --git a/test/t2500-notify.t b/test/t2500-notify.t
index 713b31e3..c0592c91 100755
--- a/test/t2500-notify.t
+++ b/test/t2500-notify.t
@@ -369,6 +369,23 @@ test_expect_success 'Test subject and body of request close notifications (auto-
 	test_cmp actual expected
 '
 
+test_expect_success 'Test Cc of request close notification with co-maintainer.' '
+	cat <<-EOD | sqlite3 aur.db &&
+	/* Use package base IDs which can be distinguished from user IDs. */
+	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1001, 3, 1);
+	EOD
+	>sendmail.out &&
+	"$NOTIFY" request-close 0 3001 accepted &&
+	grep ^Cc: sendmail.out >actual &&
+	cat <<-EOD >expected &&
+	Cc: user@localhost, tu@localhost, dev@localhost
+	EOD
+	test_cmp actual expected &&
+	cat <<-EOD | sqlite3 aur.db
+	DELETE FROM PackageComaintainers;
+	EOD
+'
+
 test_expect_success 'Test subject and body of request close notifications with closure comment.' '
 	cat <<-EOD | sqlite3 aur.db &&
 	UPDATE PackageRequests SET ClosureComment = "This is a test closure comment." WHERE ID = 3001;

From 36c1ee35a70d70fbf362292516026ac4197f0346 Mon Sep 17 00:00:00 2001
From: Bert Peters via aur-dev <aur-dev@lists.archlinux.org>
Date: Sun, 11 Jul 2021 20:29:17 +0200
Subject: [PATCH 440/844] Send request notifications to co-maintainers

This is in addition to the current recipients. Co-maintainers should
also be made aware when their package has pending requests.

NOTE: This commit was slightly modified to resolve cherry-pick
conflicts in `pu`.
---
 aurweb/scripts/notify.py |  7 +++++++
 test/t2500-notify.t      | 17 +++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index 1df0175a..ba4ec9eb 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -445,9 +445,12 @@ class RequestOpenNotification(Notification):
             'SELECT DISTINCT Users.Email FROM PackageRequests ' +
             'INNER JOIN PackageBases ' +
             'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
+            'LEFT JOIN PackageComaintainers ' +
+            'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +
             'INNER JOIN Users ' +
             'ON Users.ID = PackageRequests.UsersID ' +
             'OR Users.ID = PackageBases.MaintainerUID ' +
+            'OR Users.ID = PackageComaintainers.UsersID ' +
             'WHERE PackageRequests.ID = ? AND ' +
             'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
@@ -499,13 +502,17 @@ class RequestOpenNotification(Notification):
 class RequestCloseNotification(Notification):
     def __init__(self, conn, uid, reqid, reason):
         self._user = username_from_id(conn, uid) if int(uid) else None
+
         cur = conn.execute(
             'SELECT DISTINCT Users.Email FROM PackageRequests ' +
             'INNER JOIN PackageBases ' +
             'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
+            'LEFT JOIN PackageComaintainers ' +
+            'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +
             'INNER JOIN Users ' +
             'ON Users.ID = PackageRequests.UsersID ' +
             'OR Users.ID = PackageBases.MaintainerUID ' +
+            'OR Users.ID = PackageComaintainers.UsersID ' +
             'WHERE PackageRequests.ID = ? AND ' +
             'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
diff --git a/test/t2500-notify.t b/test/t2500-notify.t
index 3514357a..a908f125 100755
--- a/test/t2500-notify.t
+++ b/test/t2500-notify.t
@@ -369,6 +369,23 @@ test_expect_success 'Test subject and body of request close notifications (auto-
 	test_cmp actual expected
 '
 
+test_expect_success 'Test Cc of request close notification with co-maintainer.' '
+	cat <<-EOD | sqlite3 aur.db &&
+	/* Use package base IDs which can be distinguished from user IDs. */
+	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1001, 3, 1);
+	EOD
+	>sendmail.out &&
+	"$NOTIFY" request-close 0 3001 accepted &&
+	grep ^Cc: sendmail.out >actual &&
+	cat <<-EOD >expected &&
+	Cc: user@localhost, tu@localhost, dev@localhost
+	EOD
+	test_cmp actual expected &&
+	cat <<-EOD | sqlite3 aur.db
+	DELETE FROM PackageComaintainers;
+	EOD
+'
+
 test_expect_success 'Test subject and body of request close notifications with closure comment.' '
 	cat <<-EOD | sqlite3 aur.db &&
 	UPDATE PackageRequests SET ClosureComment = "This is a test closure comment." WHERE ID = 3001;

From 4e3cc1dfe2a405fab2227aab032f7457468a4f44 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Tue, 19 Oct 2021 14:55:43 -0400
Subject: [PATCH 441/844] feat(docker): only use mariadb socket for connections

---
 conf/config.dev                   |  6 +++---
 docker-compose.yml                | 17 ++++++++++-------
 docker/fastapi-entrypoint.sh      | 10 ----------
 docker/git-entrypoint.sh          |  9 ---------
 docker/mariadb-init-entrypoint.sh | 10 ----------
 docker/php-entrypoint.sh          | 10 ----------
 docker/test-mysql-entrypoint.sh   |  7 -------
 7 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/conf/config.dev b/conf/config.dev
index ec0b33dc..b8bd5bdb 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -10,12 +10,12 @@
 backend = mysql
 
 ; If using sqlite, set name to the database file path.
-name = aurweb_test
+name = aurweb
 
 ; MySQL database information. User defaults to root for containerized
 ; testing with mysqldb. This should be set to a non-root user.
-user = root
-;password = non-root-user-password
+user = aur
+password = aur
 host = localhost
 ;port = 3306
 socket = /var/run/mysqld/mysqld.sock
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f8e0d25..55c3527d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -66,20 +66,19 @@ services:
   mariadb_init:
     image: aurweb:latest
     init: true
-    environment:
-      - DB_HOST=mariadb
     entrypoint: /docker/mariadb-init-entrypoint.sh
     command: echo "MariaDB tables initialized."
     depends_on:
       mariadb:
         condition: service_healthy
+    volumes:
+      - mariadb_run:/var/run/mysqld
 
   git:
     image: aurweb:latest
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
-      - DB_HOST=mariadb
     entrypoint: /docker/git-entrypoint.sh
     command: /docker/scripts/run-sshd.sh
     ports:
@@ -89,6 +88,8 @@ services:
     depends_on:
       mariadb_init:
         condition: service_started
+    volumes:
+      - mariadb_run:/var/run/mysqld
 
   smartgit:
     image: aurweb:latest
@@ -138,7 +139,6 @@ services:
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
-      - DB_HOST=mariadb
     entrypoint: /docker/php-entrypoint.sh
     command: /docker/scripts/run-php.sh
     healthcheck:
@@ -150,6 +150,8 @@ services:
         condition: service_healthy
       memcached:
         condition: service_healthy
+    volumes:
+      - mariadb_run:/var/run/mysqld
     ports:
       - "19000:9000"
 
@@ -158,7 +160,6 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
-      - DB_HOST=mariadb
       - FASTAPI_WORKERS=${FASTAPI_WORKERS}
     entrypoint: /docker/fastapi-entrypoint.sh
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
@@ -171,6 +172,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+    volumes:
+      - mariadb_run:/var/run/mysqld
     ports:
       - "18000:8000"
 
@@ -228,7 +231,6 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
-      - DB_HOST=mariadb
     entrypoint: /docker/test-mysql-entrypoint.sh
     command: /docker/scripts/run-pytests.sh clean
     stdin_open: true
@@ -237,6 +239,7 @@ services:
       mariadb_init:
         condition: service_started
     volumes:
+      - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
@@ -274,7 +277,6 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
-      - DB_HOST=mariadb
     entrypoint: /docker/tests-entrypoint.sh
     command: setup-sqlite.sh run-tests.sh
     stdin_open: true
@@ -283,6 +285,7 @@ services:
       mariadb_init:
         condition: service_started
     volumes:
+      - mariadb_run:/var/run/mysqld
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 3829b0bf..9dba5562 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -1,19 +1,9 @@
 #!/bin/bash
 set -eou pipefail
 
-[[ -z "$DB_HOST" ]] && echo 'Error: $DB_HOST required but missing.' && exit 1
-
-DB_NAME="aurweb"
-DB_USER="aur"
-DB_PASS="aur"
-
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
-sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" conf/config
-sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" conf/config
-sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" conf/config
 
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8444;" conf/config
 
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index f07a5577..3fee426a 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -38,18 +38,9 @@ Match User aur
     AcceptEnv AUR_OVERWRITE
 EOF
 
-DB_NAME="aurweb"
-DB_HOST="mariadb"
-DB_USER="aur"
-DB_PASS="aur"
-
 # Setup a config for our mysql db.
 cp -vf conf/config.dev $AUR_CONFIG
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" $AUR_CONFIG
-sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" $AUR_CONFIG
-sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" $AUR_CONFIG
-sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" $AUR_CONFIG
-sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" $AUR_CONFIG
 
 AUR_CONFIG_DEFAULTS="${AUR_CONFIG}.defaults"
 
diff --git a/docker/mariadb-init-entrypoint.sh b/docker/mariadb-init-entrypoint.sh
index 4cd6f46c..413227b9 100755
--- a/docker/mariadb-init-entrypoint.sh
+++ b/docker/mariadb-init-entrypoint.sh
@@ -1,19 +1,9 @@
 #!/bin/bash
 set -eou pipefail
 
-[[ -z "$DB_HOST" ]] && echo 'Error: $DB_HOST required but missing.' && exit 1
-
-DB_NAME="aurweb"
-DB_USER="aur"
-DB_PASS="aur"
-
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
-sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" conf/config
-sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" conf/config
-sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" conf/config
 
 python -m aurweb.initdb 2>/dev/null || /bin/true
 
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 8fda1830..5292fa93 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -1,19 +1,9 @@
 #!/bin/bash
 set -eou pipefail
 
-[[ -z "$DB_HOST" ]] && echo 'Error: $DB_HOST required but missing.' && exit 1
-
-DB_NAME="aurweb"
-DB_USER="aur"
-DB_PASS="aur"
-
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
-sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" conf/config
-sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" conf/config
-sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" conf/config
 
 sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8443;" conf/config
 
diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
index 9594318f..7be3626b 100755
--- a/docker/test-mysql-entrypoint.sh
+++ b/docker/test-mysql-entrypoint.sh
@@ -1,19 +1,12 @@
 #!/bin/bash
 set -eou pipefail
 
-[[ -z "$DB_HOST" ]] && echo 'Error: $DB_HOST required but missing.' && exit 1
-
 DB_NAME="aurweb_test"
-DB_USER="aur"
-DB_PASS="aur"
 
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
 sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
-sed -ri "s/^(host) = .+/\1 = ${DB_HOST}/" conf/config
-sed -ri "s/^(user) = .+/\1 = ${DB_USER}/" conf/config
-sed -ri "s/^;?(password) = .+/\1 = ${DB_PASS}/" conf/config
 
 # The port can be excluded from use if properly using
 # volumes to share the mysql socket from the mariadb service.

From 37f0c352f639a9dbe9b280618b54a8b8144f563f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 18:38:10 -0700
Subject: [PATCH 442/844] feat(FastAPI): add /pkgbase/{name}/flag-comment (get)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 13 +++++++
 templates/packages/flag-comment.html     | 46 ++++++++++++++++++++++++
 templates/partials/packages/actions.html | 12 ++++---
 test/test_packages_routes.py             | 15 ++++++++
 4 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 templates/packages/flag-comment.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index d2002188..8e81f087 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -812,6 +812,19 @@ async def pkgbase_flag_post(request: Request, name: str,
                             status_code=HTTPStatus.SEE_OTHER)
 
 
+@router.get("/pkgbase/{name}/flag-comment")
+async def pkgbase_flag_comment(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+
+    if pkgbase.Flagger is None:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
+    context = make_context(request, "Flag Comment")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "packages/flag-comment.html", context)
+
+
 @router.post("/pkgbase/{name}/unflag")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_unflag(request: Request, name: str):
diff --git a/templates/packages/flag-comment.html b/templates/packages/flag-comment.html
new file mode 100644
index 00000000..4df6ee4b
--- /dev/null
+++ b/templates/packages/flag-comment.html
@@ -0,0 +1,46 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Flagged Out-of-Date Comment: %s" | tr | format(pkgbase.Name) }}</h2>
+
+        {# Prepare wrapping for the username. #}
+        {% set wrap = ["", ""] %}
+        {% if request.user.is_authenticated() %}
+            {# When logged in, we wrap it with a link to the account. #}
+            {% set wrap = ['<a href="/account/%s">' | format(pkgbase.Flagger.Username), "</a>"] %}
+        {% endif %}
+
+        {# Prepare OutOfDateTS as a datetime object in the request user's timezone. #}
+        {% set flagged_at = pkgbase.OutOfDateTS | dt | as_timezone(timezone) %}
+        {% set username = "%s%s%s" | format(wrap[0], pkgbase.Flagger.Username, wrap[1]) %}
+
+        <p>
+            {{
+                "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the "
+                "following reason:"
+                | tr | format("<strong>", username, "</strong>",
+                              "<strong>", pkgbase.Name, "</strong>",
+                              "<strong>", flagged_at.strftime("%Y-%m-%d"), "</strong>")
+                | safe
+            }}
+        </p>
+
+        {# Padding #}
+        <p></p>
+
+        <div class="article-content">
+            <blockquote>
+                <p>{{ pkgbase.FlaggerComment }}</p>
+            </blockquote>
+        </div>
+
+        <form action="/pkgbase/{{ pkgbase.Name }}">
+            <input type="submit" value="{{ 'Return to Details' | tr }}" />
+        </form>
+
+        {# Padding #}
+        <p></p>
+
+    </div>
+{% endblock %}
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 2a4efb5d..3c5a046c 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -33,11 +33,13 @@
             {% else %}
                 <li>
                     <span class="flagged">
-                        {% set ood_ts = pkgbase.OutOfDateTS | dt | as_timezone(timezone) %}
-                        {{
-                        "Flagged out-of-date (%s)"
-                        | tr | format(ood_ts.strftime("%Y-%m-%d"))
-                        }}
+                        <a href="/pkgbase/{{ pkgbase.Name }}/flag-comment">
+                            {% set ood_ts = pkgbase.OutOfDateTS | dt | as_timezone(timezone) %}
+                            {{
+                            "Flagged out-of-date (%s)"
+                            | tr | format(ood_ts.strftime("%Y-%m-%d"))
+                            }}
+                        </a>
                     </span>
                 </li>
                 <li>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 032f2571..0a9761aa 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1707,6 +1707,14 @@ def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
         resp = request.get(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.OK)
 
+    # Now, let's check the /pkgbase/{name}/flag-comment route.
+    flag_comment_endpoint = f"/pkgbase/{pkgbase.Name}/flag-comment"
+    with client as request:
+        resp = request.get(flag_comment_endpoint, cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
     # Try to flag it without a comment.
     with client as request:
         resp = request.post(endpoint, cookies=cookies)
@@ -1721,6 +1729,13 @@ def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
     assert pkgbase.Flagger == user
     assert pkgbase.FlaggerComment == "Test"
 
+    # Now, let's check the /pkgbase/{name}/flag-comment route.
+    flag_comment_endpoint = f"/pkgbase/{pkgbase.Name}/flag-comment"
+    with client as request:
+        resp = request.get(flag_comment_endpoint, cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
     # Now try to perform a get; we should be redirected because
     # it's already flagged.
     with client as request:

From 1cb1ce0d9947b3459024fcb31115080810b01d25 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Tue, 19 Oct 2021 15:23:00 -0400
Subject: [PATCH 443/844] feat(docker): allow production docker setup to use
 dedicated mariadb

Signed-off-by: Steven Guikal <void@fluix.one>
---
 .env                        |  1 +
 docker-compose.override.yml | 23 +++++++++++++++++++++++
 docker-compose.prod.yml     |  9 ++++++++-
 docker-compose.yml          | 21 ---------------------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/.env b/.env
index 630e856d..92b6bbd2 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,3 @@
 FASTAPI_BACKEND="uvicorn"
 FASTAPI_WORKERS=2
+MARIADB_SOCKET_DIR="/var/run/mysqld/"
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index c0bee88c..26718ac6 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,4 +1,24 @@
 services:
+  mariadb:
+    image: aurweb:latest
+    init: true
+    entrypoint: /docker/mariadb-entrypoint.sh
+    command: /usr/bin/mysqld_safe --datadir=/var/lib/mysql
+    ports:
+      # This will expose mariadbd on 127.0.0.1:13306 in the host.
+      # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
+      - "13306:3306"
+    volumes:
+      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
+      - mariadb_data:/var/lib/mysql
+    healthcheck:
+      test: "bash /docker/health/mariadb.sh"
+
+  mariadb_init:
+    depends_on:
+      mariadb:
+        condition: service_healthy
+
   ca:
     volumes:
       - ./cache:/cache
@@ -13,6 +33,9 @@ services:
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - smartgit_run:/var/run/smartgit
+    depends_on:
+      mariadb:
+        condition: service_healthy
 
   php-fpm:
     volumes:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index eb75343b..c63d63f5 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -9,6 +9,7 @@ services:
     volumes:
       - git_data:/aurweb/aur.git
       - cache:/cache
+      - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   smartgit:
     volumes:
@@ -19,12 +20,18 @@ services:
   php-fpm:
     volumes:
       - cache:/cache
+      - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   fastapi:
     environment:
       - FASTAPI_BACKEND="gunicorn"
     volumes:
       - cache:/cache
+      - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
+
+  mariadb_init:
+    volumes:
+      - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   nginx:
     volumes:
@@ -34,7 +41,7 @@ services:
       - smartgit_run:/var/run/smartgit
 
 volumes:
-  mariadb_run: {} # Share /var/run/mysqld/mysqld.sock
+  mariadb_run: {} # Share /var/run/mysqld
   mariadb_data: {} # Share /var/lib/mysql
   git_data: {} # Share aurweb/aur.git
   smartgit_run: {}
diff --git a/docker-compose.yml b/docker-compose.yml
index 55c3527d..3d1da263 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,29 +48,11 @@ services:
     ports:
       - "16379:6379"
 
-  mariadb:
-    image: aurweb:latest
-    init: true
-    entrypoint: /docker/mariadb-entrypoint.sh
-    command: /usr/bin/mysqld_safe --datadir=/var/lib/mysql
-    ports:
-      # This will expose mariadbd on 127.0.0.1:13306 in the host.
-      # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
-      - "13306:3306"
-    volumes:
-      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
-      - mariadb_data:/var/lib/mysql
-    healthcheck:
-      test: "bash /docker/health/mariadb.sh"
-
   mariadb_init:
     image: aurweb:latest
     init: true
     entrypoint: /docker/mariadb-init-entrypoint.sh
     command: echo "MariaDB tables initialized."
-    depends_on:
-      mariadb:
-        condition: service_healthy
     volumes:
       - mariadb_run:/var/run/mysqld
 
@@ -100,9 +82,6 @@ services:
     command: /docker/scripts/run-smartgit.sh
     healthcheck:
       test: "bash /docker/health/smartgit.sh"
-    depends_on:
-      mariadb:
-        condition: service_healthy
 
   cgit-php:
     image: aurweb:latest

From 4f505ca6c10bf805f19a2bfecc6b24a7221459ff Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 19 Oct 2021 14:25:59 -0700
Subject: [PATCH 444/844] feat(docker): support for host-mounted mariadb socket

A new configurable env var has been introduced to production Docker:
MARIADB_SOCKET_DIR, which should contain a path to a directory
containing `mysqld.sock` on the Docker host.

Note: The database name, user and password can be configured by
modifying `conf/config.dev` before building the Docker image.

This feature only works in production mode, when specifying:

    $ export MARIADB_SOCKET_DIR=/var/run/mysqld
    $ docker-compose -f docker-compose.yml -f docker-compose.prod.yml ...

Signed-off-by: Kevin Morris <kevr@0cost.org>

From b4092fe77dceb5a0ca2aa5558d851bed37a7a585 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 18 Oct 2021 20:12:06 -0700
Subject: [PATCH 445/844] fix(fastapi): pass request type's name to
 Request*Notification

Previously, we passed the straight up request type instance from
SQLAlchemy and had a .title() function that was transparently
treating the instance the same as the instance's Name in terms
of notify.py's use of it.

This commit removes that transparent behavior; it was not actually
intended.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/request_type.py |  9 +--------
 aurweb/routers/packages.py    | 14 ++++++++------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/aurweb/models/request_type.py b/aurweb/models/request_type.py
index 48ace3a3..4578464c 100644
--- a/aurweb/models/request_type.py
+++ b/aurweb/models/request_type.py
@@ -17,14 +17,7 @@ class RequestType(Base):
 
     def name_display(self) -> str:
         """ Return the Name column with its first char capitalized. """
-        name = self.Name
-        return name[0].upper() + name[1:]
-
-    def title(self) -> str:
-        return self.name_display()
-
-    def __getitem__(self, n: int) -> str:
-        return self.Name[n]
+        return self.Name.title()
 
 
 DELETION_ID = db.query(RequestType, RequestType.Name == DELETION).first().ID
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 8e81f087..fef17389 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -697,18 +697,20 @@ async def pkgbase_request_post(request: Request, name: str,
     now = int(datetime.utcnow().timestamp())
     reqtype = db.query(models.RequestType).filter(
         models.RequestType.Name == type).first()
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-    notify_ = None
     with db.begin():
-        pkgreq = db.create(models.PackageRequest, RequestType=reqtype,
-                           RequestTS=now, PackageBase=pkgbase,
+        pkgreq = db.create(models.PackageRequest,
+                           RequestType=reqtype,
+                           User=request.user,
+                           RequestTS=now,
+                           PackageBase=pkgbase,
                            PackageBaseName=pkgbase.Name,
-                           MergeBaseName=merge_into, User=request.user,
+                           MergeBaseName=merge_into,
                            Comments=comments, ClosureComment=str())
 
     # Prepare notification object.
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     notify_ = notify.RequestOpenNotification(
-        conn, request.user.ID, pkgreq.ID, reqtype,
+        conn, request.user.ID, pkgreq.ID, reqtype.Name,
         pkgreq.PackageBase.ID, merge_into=merge_into or None)
 
     # Send the notification now that we're out of the DB scope.

From beed64e0017ebb21adc8eb3196896db6d5a03c2f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 19 Oct 2021 11:22:59 -0700
Subject: [PATCH 446/844] fix(fastapi): persist package request form inputs

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py     |  6 +++---
 templates/pkgbase/request.html | 22 +++++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index fef17389..b897c2d9 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -18,7 +18,7 @@ from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
 from aurweb.scripts import notify, popupdate
 from aurweb.scripts.rendercomment import update_comment_render
-from aurweb.templates import make_context, render_raw_template, render_template
+from aurweb.templates import make_context, make_variable_context, render_raw_template, render_template
 
 router = APIRouter()
 
@@ -636,7 +636,7 @@ async def requests(request: Request,
 @router.get("/pkgbase/{name}/request")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def package_request(request: Request, name: str):
-    context = make_context(request, "Submit Request")
+    context = await make_variable_context(request, "Submit Request")
 
     pkgbase = db.query(models.PackageBase).filter(
         models.PackageBase.Name == name).first()
@@ -657,7 +657,7 @@ async def pkgbase_request_post(request: Request, name: str,
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     # Create our render context.
-    context = make_context(request, "Submit Request")
+    context = await make_variable_context(request, "Submit Request")
     context["pkgbase"] = pkgbase
     if type not in {"deletion", "merge", "orphan"}:
         # In the case that someone crafted a POST request with an invalid
diff --git a/templates/pkgbase/request.html b/templates/pkgbase/request.html
index bb9b5aba..79d47ce4 100644
--- a/templates/pkgbase/request.html
+++ b/templates/pkgbase/request.html
@@ -30,9 +30,21 @@
                 <p>
                     <label for="id_type">{{ "Request type" | tr }}:</label>
                     <select id="id_type" name="type">
-                        <option value="deletion">{{ "Deletion" | tr }}</option>
-                        <option value="merge">{{ "Merge" | tr }}</option>
-                        <option value="orphan">{{ "Orphan" | tr }}</option>
+                        <option value="deletion"
+                            {% if type == "deletion" %}
+                                selected
+                            {% endif %}
+                        >{{ "Deletion" | tr }}</option>
+                        <option value="merge"
+                            {% if type == "merge" %}
+                                selected
+                            {% endif %}
+                        >{{ "Merge" | tr }}</option>
+                        <option value="orphan"
+                            {% if type == "orphan" %}
+                                selected
+                            {% endif %}
+                        >{{ "Orphan" | tr }}</option>
                     </select>
                 </p>
 
@@ -44,13 +56,13 @@
                 <p id="merge_section" style="display: none">
                     <label for="id_merge_into">{{ "Merge into" | tr }}:</label>
                     <input id="id_merge_into" type="text" name="merge_into"
-                           autocomplete="off" />
+                           autocomplete="off" value="{{ merge_into or '' }}" />
                 </p>
 
                 <p>
                     <label for="id_comments">{{ "Comments" | tr }}:</label>
                     <textarea id="id_comments" name="comments"
-                              rows="5" cols="50"></textarea>
+                              rows="5" cols="50">{{ comments or '' }}</textarea>
                 </p>
 
                 <p id="deletion_hint">

From 4cb0994feed6271a3f0204a858587059c1706fe8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 19 Oct 2021 11:26:22 -0700
Subject: [PATCH 447/844] fix(fastapi): correct unauthorized request creation
 redirect

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index b897c2d9..d56a8259 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -634,7 +634,7 @@ async def requests(request: Request,
 
 
 @router.get("/pkgbase/{name}/request")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True, redirect="/pkgbase/{name}/request")
 async def package_request(request: Request, name: str):
     context = await make_variable_context(request, "Submit Request")
 

From fd58e4df045624eadfc6e7119fa7b04bbee8e8c3 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Tue, 19 Oct 2021 19:01:40 -0400
Subject: [PATCH 448/844] fix(FastAPI): unify tuple return style

Closes #134

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/auth.py                  |  6 ++--
 aurweb/routers/accounts.py      | 56 ++++++++++++++++-----------------
 aurweb/scripts/rendercomment.py |  6 ++--
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 6544dce2..5e45ee83 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -99,7 +99,7 @@ class BasicAuthBackend(AuthenticationBackend):
 
         sid = conn.cookies.get("AURSID")
         if not sid:
-            return None, AnonymousUser()
+            return (None, AnonymousUser())
 
         now_ts = datetime.utcnow().timestamp()
         record = session.query(Session).filter(
@@ -108,7 +108,7 @@ class BasicAuthBackend(AuthenticationBackend):
 
         # If no session with sid and a LastUpdateTS now or later exists.
         if not record:
-            return None, AnonymousUser()
+            return (None, AnonymousUser())
 
         # At this point, we cannot have an invalid user if the record
         # exists, due to ForeignKey constraints in the schema upheld
@@ -117,7 +117,7 @@ class BasicAuthBackend(AuthenticationBackend):
         user.nonce = util.make_nonce()
         user.authenticated = True
 
-        return AuthCredentials(["authenticated"]), user
+        return (AuthCredentials(["authenticated"]), user)
 
 
 def auth_required(is_required: bool = True,
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index a9257d3d..62e849d5 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -126,26 +126,26 @@ def process_account_form(request: Request, user: models.User, args: dict):
     host = request.client.host
     ban = db.query(models.Ban, models.Ban.IPAddress == host).first()
     if ban:
-        return False, [
+        return (False, [
             "Account registration has been disabled for your "
             "IP address, probably due to sustained spam attacks. "
             "Sorry for the inconvenience."
-        ]
+        ])
 
     if request.user.is_authenticated():
         if not request.user.valid_password(args.get("passwd", None)):
-            return False, ["Invalid password."]
+            return (False, ["Invalid password."])
 
     email = args.get("E", None)
     username = args.get("U", None)
 
     if not email or not username:
-        return False, ["Missing a required field."]
+        return (False, ["Missing a required field."])
 
     username_min_len = aurweb.config.getint("options", "username_min_len")
     username_max_len = aurweb.config.getint("options", "username_max_len")
     if not util.valid_username(args.get("U")):
-        return False, [
+        return (False, [
             "The username is invalid.",
             [
                 _("It must be between %s and %s characters long") % (
@@ -153,20 +153,20 @@ def process_account_form(request: Request, user: models.User, args: dict):
                 "Start and end with a letter or number",
                 "Can contain only one period, underscore or hyphen.",
             ]
-        ]
+        ])
 
     password = args.get("P", None)
     if password:
         confirmation = args.get("C", None)
         if not util.valid_password(password):
-            return False, [
+            return (False, [
                 _("Your password must be at least %s characters.") % (
                     username_min_len)
-            ]
+            ])
         elif not confirmation:
-            return False, ["Please confirm your new password."]
+            return (False, ["Please confirm your new password."])
         elif password != confirmation:
-            return False, ["Password fields do not match."]
+            return (False, ["Password fields do not match."])
 
     backup_email = args.get("BE", None)
     homepage = args.get("HP", None)
@@ -184,32 +184,32 @@ def process_account_form(request: Request, user: models.User, args: dict):
                     func.lower(models.User.Email) == email.lower())
 
     if not util.valid_email(email):
-        return False, ["The email address is invalid."]
+        return (False, ["The email address is invalid."])
     elif backup_email and not util.valid_email(backup_email):
-        return False, ["The backup email address is invalid."]
+        return (False, ["The backup email address is invalid."])
     elif homepage and not util.valid_homepage(homepage):
-        return False, [
-            "The home page is invalid, please specify the full HTTP(s) URL."]
+        return (False, [
+            "The home page is invalid, please specify the full HTTP(s) URL."])
     elif pgp_key and not util.valid_pgp_fingerprint(pgp_key):
-        return False, ["The PGP key fingerprint is invalid."]
+        return (False, ["The PGP key fingerprint is invalid."])
     elif ssh_pubkey and not util.valid_ssh_pubkey(ssh_pubkey):
-        return False, ["The SSH public key is invalid."]
+        return (False, ["The SSH public key is invalid."])
     elif language and language not in l10n.SUPPORTED_LANGUAGES:
-        return False, ["Language is not currently supported."]
+        return (False, ["Language is not currently supported."])
     elif timezone and timezone not in time.SUPPORTED_TIMEZONES:
-        return False, ["Timezone is not currently supported."]
+        return (False, ["Timezone is not currently supported."])
     elif db.query(models.User, username_exists(username)).first():
         # If the username already exists...
-        return False, [
+        return (False, [
             _("The username, %s%s%s, is already in use.") % (
                 "<strong>", username, "</strong>")
-        ]
+        ])
     elif db.query(models.User, email_exists(email)).first():
         # If the email already exists...
-        return False, [
+        return (False, [
             _("The address, %s%s%s, is already in use.") % (
                 "<strong>", email, "</strong>")
-        ]
+        ])
 
     def ssh_fingerprint_exists(fingerprint):
         return and_(models.SSHPubKey.UserID != user.ID,
@@ -218,26 +218,26 @@ def process_account_form(request: Request, user: models.User, args: dict):
     if ssh_pubkey:
         fingerprint = get_fingerprint(ssh_pubkey.strip().rstrip())
         if fingerprint is None:
-            return False, ["The SSH public key is invalid."]
+            return (False, ["The SSH public key is invalid."])
 
         if db.query(models.SSHPubKey,
                     ssh_fingerprint_exists(fingerprint)).first():
-            return False, [
+            return (False, [
                 _("The SSH public key, %s%s%s, is already in use.") % (
                     "<strong>", fingerprint, "</strong>")
-            ]
+            ])
 
     captcha_salt = args.get("captcha_salt", None)
     if captcha_salt and captcha_salt not in get_captcha_salts():
-        return False, ["This CAPTCHA has expired. Please try again."]
+        return (False, ["This CAPTCHA has expired. Please try again."])
 
     captcha = args.get("captcha", None)
     if captcha:
         answer = get_captcha_answer(get_captcha_token(captcha_salt))
         if captcha != answer:
-            return False, ["The entered CAPTCHA answer is invalid."]
+            return (False, ["The entered CAPTCHA answer is invalid."])
 
-    return True, []
+    return (True, [])
 
 
 def make_account_form_context(context: dict,
diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index dd5da4f9..355ca050 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -44,7 +44,7 @@ class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor):
         el = markdown.util.etree.Element('a')
         el.set('href', f'https://bugs.archlinux.org/task/{m.group(1)}')
         el.text = markdown.util.AtomicString(m.group(0))
-        return el, m.start(0), m.end(0)
+        return (el, m.start(0), m.end(0))
 
 
 class FlysprayLinksExtension(markdown.extensions.Extension):
@@ -71,7 +71,7 @@ class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor):
         oid = m.group(1)
         if oid not in self._repo:
             # Unkwown OID; preserve the orginal text.
-            return None, None, None
+            return (None, None, None)
 
         prefixlen = 12
         while prefixlen < 40:
@@ -82,7 +82,7 @@ class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor):
         el = markdown.util.etree.Element('a')
         el.set('href', commit_uri % (self._head, oid[:prefixlen]))
         el.text = markdown.util.AtomicString(oid[:prefixlen])
-        return el, m.start(0), m.end(0)
+        return (el, m.start(0), m.end(0))
 
 
 class GitCommitsExtension(markdown.extensions.Extension):

From c8f3ea2eba227d5d7bb6f9a22805f58202e04df3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 20 Oct 2021 20:20:59 -0700
Subject: [PATCH 449/844] fix(fastapi): fix various pkgbase-wise auth redirects

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index d56a8259..592661da 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -774,7 +774,7 @@ async def requests_close_post(request: Request, id: int,
 
 
 @router.get("/pkgbase/{name}/flag")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True, redirect="/pkgbase/{name}/flag")
 async def pkgbase_flag_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -789,7 +789,7 @@ async def pkgbase_flag_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/flag")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True, redirect="/pkgbase/{name}/flag")
 async def pkgbase_flag_post(request: Request, name: str,
                             comments: str = Form(default=str())):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -949,7 +949,7 @@ def disown_pkgbase(pkgbase: models.PackageBase, disowner: models.User):
 
 
 @router.get("/pkgbase/{name}/disown")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True, redirect="/pkgbase/{name}/disown")
 async def pkgbase_disown_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -965,7 +965,7 @@ async def pkgbase_disown_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/disown")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True, redirect="/pkgbase/{name}/disown")
 async def pkgbase_disown_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -990,7 +990,7 @@ async def pkgbase_disown_post(request: Request, name: str,
 
 
 @router.post("/pkgbase/{name}/adopt")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_adopt_post(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -1007,7 +1007,7 @@ async def pkgbase_adopt_post(request: Request, name: str):
 
 
 @router.get("/pkgbase/{name}/delete")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/delete")
 async def pkgbase_delete_get(request: Request, name: str):
     if not request.user.has_credential("CRED_PKGBASE_DELETE"):
         return RedirectResponse(f"/pkgbase/{name}",
@@ -1019,7 +1019,7 @@ async def pkgbase_delete_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/delete")
-@auth_required(True)
+@auth_required(True, redirect="/pkgbase/{name}/delete")
 async def pkgbase_delete_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)

From 990f4d182b73ae30e4f17a83349ad3b5ad4b917d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 18 Oct 2021 18:43:50 -0700
Subject: [PATCH 450/844] feat(rpc): add 'suggest-pkgbase' type

This feature of RPC is required to take advantage of
javascript typeahead.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py            | 17 +++++++++++++++--
 test/test_rpc.py         | 24 ++++++++++++++++++++----
 web/html/js/typeahead.js |  2 +-
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 1ddde749..faa8ca60 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -1,3 +1,5 @@
+from sqlalchemy import and_
+
 import aurweb.config as config
 
 from aurweb import db, models
@@ -155,11 +157,21 @@ def run_info(returned_data, package_name, snapshot_uri):
     return returned_data
 
 
+def run_suggest_pkgbase(returned_data, arg, snapshot_uri):
+    results = db.query(models.PackageBase).filter(
+        and_(models.PackageBase.PackagerUID.isnot(None),
+             models.PackageBase.Name.like(f"%{arg}%"))
+    ).order_by(models.PackageBase.Name.asc()).limit(20)
+    return [result.Name for result in results]
+
+
 def RPC(**function_args):
     # Get arguments.
     #
     # We'll use 'v' in the future when we add v6.
-    # v = function_args.get("v")
+    # v = function_args.gea name used for an individual person, place, or
+    # organization, spelled with initial capital letters, e.g., Larry,
+    # Mexico, and Boston Red Sox.t("v")
     type = function_args.get("type")
     args = function_args.get("argument_list")
     returned_data = function_args.get("returned_data")
@@ -170,7 +182,8 @@ def RPC(**function_args):
     # Set request type to run.
     type_actions = {
         "info": run_info,
-        "multiinfo": run_info
+        "multiinfo": run_info,
+        "suggest-pkgbase": run_suggest_pkgbase
     }
 
     # This if statement should always be executed, as we checked if the
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 21817b45..601536a4 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -68,7 +68,9 @@ def setup():
                        Passwd="testPassword",
                        AccountType=account_type)
 
-        pkgbase1 = create(PackageBase, Name="big-chungus", Maintainer=user1)
+        pkgbase1 = create(PackageBase, Name="big-chungus",
+                          Maintainer=user1,
+                          Packager=user1)
 
         pkgname1 = create(Package,
                           PackageBase=pkgbase1,
@@ -76,7 +78,9 @@ def setup():
                           Description="Bunny bunny around bunny",
                           URL="https://example.com/")
 
-        pkgbase2 = create(PackageBase, Name="chungy-chungus", Maintainer=user1)
+        pkgbase2 = create(PackageBase, Name="chungy-chungus",
+                          Maintainer=user1,
+                          Packager=user1)
 
         pkgname2 = create(Package,
                           PackageBase=pkgbase2,
@@ -84,7 +88,9 @@ def setup():
                           Description="Wubby wubby on wobba wuubu",
                           URL="https://example.com/")
 
-        pkgbase3 = create(PackageBase, Name="gluggly-chungus", Maintainer=user1)
+        pkgbase3 = create(PackageBase, Name="gluggly-chungus",
+                          Maintainer=user1,
+                          Packager=user1)
 
         create(Package,
                PackageBase=pkgbase3,
@@ -92,7 +98,7 @@ def setup():
                Description="glurrba glurrba gur globba",
                URL="https://example.com/")
 
-        pkgbase4 = create(PackageBase, Name="woogly-chungus", Maintainer=None)
+        pkgbase4 = create(PackageBase, Name="woogly-chungus")
 
         create(Package,
                PackageBase=pkgbase4,
@@ -412,3 +418,13 @@ def test_rpc_no_maintainer():
 
     # Validate data.
     assert response_data["results"][0]["Maintainer"] is None
+
+
+def test_rpc_suggest_pkgbase():
+    response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+    data = response.json()
+    assert data == ["big-chungus"]
+
+    response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=chungy")
+    data = response.json()
+    assert data == ["chungy-chungus"]
diff --git a/web/html/js/typeahead.js b/web/html/js/typeahead.js
index 1b7252d7..bfd3d156 100644
--- a/web/html/js/typeahead.js
+++ b/web/html/js/typeahead.js
@@ -67,7 +67,7 @@ const typeahead = (function() {
   }
 
   function fetchData(letter) {
-    const url = '/rpc?type=' + suggest_type + '&arg=' + letter;
+    const url = '/rpc?v=5&type=' + suggest_type + '&arg=' + letter;
     fetch(url).then(function(response) {
       return response.json();
     }).then(function(data) {

From 2b9840149ebb16ac4512f168fcbb1b389cfdb37e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 11 Oct 2021 23:17:54 -0700
Subject: [PATCH 451/844] feat(fastapi): add /pkgbase/{name}/merge (get)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py             | 31 ++++++++++++
 templates/pkgbase/merge.html           | 65 ++++++++++++++++++++++++++
 test/test_packages_routes.py           | 18 +++++++
 web/html/js/typeahead-pkgbase-merge.js |  6 +++
 4 files changed, 120 insertions(+)
 create mode 100644 templates/pkgbase/merge.html
 create mode 100644 web/html/js/typeahead-pkgbase-merge.js

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index d56a8259..a81c8004 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -1080,3 +1080,34 @@ async def packages_post(request: Request,
             context["success"] = messages
 
     return await packages_get(request, context)
+
+
+@router.get("/pkgbase/{name}/merge")
+@auth_required(redirect="/pkgbase/{name}/merge")
+async def pkgbase_merge_get(request: Request, name: str,
+                            into: str = Query(default=str()),
+                            next: str = Query(default=str())):
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+
+    if not next:
+        next = f"/pkgbase/{pkgbase.Name}"
+
+    context = make_context(request, "Package Merging")
+    context.update({
+        "pkgbase": pkgbase,
+        "into": into,
+        "next": next
+    })
+
+    status_code = HTTPStatus.OK
+    # TODO: Lookup errors from credential instead of hardcoding them.
+    # Idea: Something like credential_errors("CRED_PKGBASE_MERGE").
+    # Perhaps additionally: bad_credential_status_code("CRED_PKGBASE_MERGE").
+    # Don't take these examples verbatim. We should find good naming.
+    if not request.user.has_credential("CRED_PKGBASE_MERGE"):
+        context["errors"] = [
+            "Only Trusted Users and Developers can merge packages."]
+        status_code = HTTPStatus.UNAUTHORIZED
+
+    return render_template(request, "pkgbase/merge.html", context,
+                           status_code=status_code)
diff --git a/templates/pkgbase/merge.html b/templates/pkgbase/merge.html
new file mode 100644
index 00000000..d0a50332
--- /dev/null
+++ b/templates/pkgbase/merge.html
@@ -0,0 +1,65 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Merge Package" | tr }}: {{ pkgbase.Name }}</h2>
+
+        <p>
+            {{
+                "Use this form to merge the package base %s%s%s into "
+                "another package."
+                | tr | format("<strong>", pkgbase.Name, "</strong>") | safe
+            }}
+            {{ "The following packages will be deleted: " | tr }}
+        </p>
+
+        <ul>
+            {% for package in pkgbase.packages.all() %}
+                <li>{{ package.Name }}</li>
+            {% endfor %}
+        </ul>
+
+        <p>
+            {{ "Once the package has been merged it cannot be reversed. " | tr }}
+            {{ "Enter the package name you wish to merge the package into. " | tr }}
+            {{ "Select the checkbox to confirm action." | tr }}
+        </p>
+
+        <form id="merge-form" action="/pkgbase/{{ pkgbase.Name }}/merge" method="post">
+            <fieldset>
+                <input type="hidden" name="next" value="{{ next }}" />
+                <p>
+                    <label id="merge-into" for="merge_into">
+                        {{ "Merge into:" | tr }}
+                    </label>
+                    <input id="merge_into"
+                           type="text"
+                           name="into"
+                           value="{{ into }}"
+                           autocomplete="off"
+                    />
+                </p>
+
+                <p>
+                    <label class="confirmation">
+                        <input type="checkbox" name="confirm" />
+                        {{ "Confirm package merge" | tr }}
+                    </label>
+                </p>
+
+                <p>
+                    <input class="button"
+                           type="submit"
+                           value="{{ 'Merge' | tr }}"
+                    />
+                </p>
+            </fieldset>
+        </form>
+
+		{# Bootstrap typeahead-pkgbase-merge.js #}
+		<script type="text/javascript"
+				src="/static/js/typeahead-pkgbase-merge.js"></script>
+
+    </div>
+
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 0a9761aa..93d994a2 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2049,3 +2049,21 @@ def test_packages_post(client: TestClient, user: User, package: Package):
         errors = get_successes(resp.text)
         expected = "Some success."
         assert errors[0].text.strip() == expected
+
+
+def test_pkgbase_merge_unauthorized(client: TestClient, user: User,
+                                    package: Package):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_merge(client: TestClient, tu_user: User, package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert not get_errors(resp.text)
diff --git a/web/html/js/typeahead-pkgbase-merge.js b/web/html/js/typeahead-pkgbase-merge.js
new file mode 100644
index 00000000..a8c87e4f
--- /dev/null
+++ b/web/html/js/typeahead-pkgbase-merge.js
@@ -0,0 +1,6 @@
+document.addEventListener('DOMContentLoaded', function() {
+	const input = document.getElementById('merge_into');
+	const form = document.getElementById('merge-form');
+	const type = "suggest-pkgbase";
+	typeahead.init(type, input, form, false);
+});

From 30ab45f4597f23e62922752140c5e0eedb4fd733 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 19 Oct 2021 18:02:47 -0700
Subject: [PATCH 452/844] fix(fastapi): add backref cascade to
 Package{Keyword,License}

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_keyword.py | 3 ++-
 aurweb/models/package_license.py | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py
index 6c18ac5d..25bd340b 100644
--- a/aurweb/models/package_keyword.py
+++ b/aurweb/models/package_keyword.py
@@ -13,7 +13,8 @@ class PackageKeyword(Base):
         Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
         primary_key=True, nullable=True)
     PackageBase = relationship(
-        _PackageBase, backref=backref("keywords", lazy="dynamic"),
+        _PackageBase, backref=backref("keywords", lazy="dynamic",
+                                      cascade="all, delete"),
         foreign_keys=[PackageBaseID])
 
     Keyword = Column(
diff --git a/aurweb/models/package_license.py b/aurweb/models/package_license.py
index ab429fc6..db12a7c3 100644
--- a/aurweb/models/package_license.py
+++ b/aurweb/models/package_license.py
@@ -14,14 +14,16 @@ class PackageLicense(Base):
         Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
         primary_key=True, nullable=True)
     Package = relationship(
-        _Package, backref=backref("package_license", uselist=False),
+        _Package, backref=backref("package_licenses", lazy="dynamic",
+                                  cascade="all, delete"),
         foreign_keys=[PackageID])
 
     LicenseID = Column(
         Integer, ForeignKey("Licenses.ID", ondelete="CASCADE"),
         primary_key=True, nullable=True)
     License = relationship(
-        _License, backref=backref("package_license", uselist=False),
+        _License, backref=backref("package_licenses", lazy="dynamic",
+                                  cascade="all, delete"),
         foreign_keys=[LicenseID])
 
     __mapper_args__ = {"primary_key": [PackageID, LicenseID]}

From 7c4fb539d8d88375d66dd7466bbc6e058f64c3a1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 19 Oct 2021 18:27:03 -0700
Subject: [PATCH 453/844] change(fastapi): rework /rpc (get)

This reworks the base implementation of the RPC to use a
class called RPC for handling of requests. Took a bit of
a different approach than PHP in terms of exposed methods,
but it does end up achieving the same goal, with one additional
error: "Request type '{type}' is not yet implemented."

For FastAPI development, we'll stick with:

- If the supplied 'type' argument has an alias mapping in
  RPC.ALIASES, we convert the type argument over to its alias
  before doing anything. Example: 'info' is aliased to 'multiinfo',
  so when a user requests type=info, it is converted to type=multiinfo.
- If the type does not exist in RPC.EXPOSED_TYPES, the following
  error is produced: "No request type/data specified."
- If the type **does** exist in RPC.EXPOSED_TYPES, but does not
  have an implemented `RPC._handle_{type}_type` function, the
  following error is produced: "Request type '{type}' is not yet
  implemented."

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/rpc.py | 117 +++++---------
 aurweb/rpc.py         | 350 +++++++++++++++++++++---------------------
 test/test_rpc.py      |  15 +-
 3 files changed, 227 insertions(+), 255 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index f12dfc2e..91e7feb6 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -1,48 +1,57 @@
 from typing import List, Optional
+from urllib.parse import unquote
 
 from fastapi import APIRouter, Query, Request
+from fastapi.responses import JSONResponse
 
 from aurweb.rpc import RPC
 
 router = APIRouter()
 
 
-def arg_legacy_gen(request):
-    # '[]' characters in the path randomly kept getting transformed to (what
-    # appears to be) their HTML-formatted variants, so we keep that behavior
-    # just in case.
-    arguments = request.url.query.replace("%5B%5D", "[]").split("&")
-    arguments.reverse()
+def parse_args(request: Request):
+    """ Handle legacy logic of 'arg' and 'arg[]' query parameter handling.
 
-    temp_args = []
+    When 'arg' appears as the last argument given to the query string,
+    that argument is used by itself as one single argument, regardless
+    of any more 'arg' or 'arg[]' parameters supplied before it.
 
-    for i in arguments:
-        # We only want to deal with 'arg' and 'arg[]' strings, so only take those.
-        if i.split("=")[0] in ("arg", "arg[]"):
-            temp_args += [i]
+    When 'arg[]' appears as the last argument given to the query string,
+    we iterate from last to first and build a list of arguments until
+    we hit an 'arg'.
 
-    returned_arguments = []
-    argument_bracketed = False
+    TODO: This handling should be addressed in v6 of the RPC API. This
+    was most likely a bi-product of legacy handling of versions 1-4
+    which we no longer support.
 
-    for i in temp_args:
-        # Split argument on first occurance of '='.
-        current_argument = i.split("=")
+    :param request: FastAPI request
+    :returns: List of deduced arguments
+    """
+    # Create a list of (key, value) pairs of the given 'arg' and 'arg[]'
+    # query parameters from last to first.
+    query = list(reversed(unquote(request.url.query).split("&")))
+    parts = [
+        e.split("=", 1) for e in query if e.startswith(("arg=", "arg[]="))
+    ]
 
-        argument_name = current_argument[0]
-        argument_value = "".join(current_argument[1:])
+    args = []
+    if parts:
+        # If we found 'arg' and/or 'arg[]' arguments, we begin processing
+        # the set of arguments depending on the last key found.
+        last = parts[0][0]
 
-        # Process argument.
-        if argument_name == "arg[]":
-            returned_arguments += [argument_value]
-            argument_bracketed = True
+        if last == "arg":
+            # If the last key was 'arg', then it is our sole argument.
+            args.append(parts[0][1])
+        else:
+            # Otherwise, it must be 'arg[]', so traverse backward
+            # until we reach a non-'arg[]' key.
+            for key, value in parts:
+                if key != last:
+                    break
+                args.append(value)
 
-        elif argument_name == "arg":
-            # Only set this argument if 'arg[]' hasen't previously been found.
-            if not argument_bracketed:
-                returned_arguments = [argument_value]
-            break
-
-    return returned_arguments
+    return args
 
 
 @router.get("/rpc")
@@ -51,51 +60,7 @@ async def rpc(request: Request,
               type: Optional[str] = Query(None),
               arg: Optional[str] = Query(None),
               args: Optional[List[str]] = Query(None, alias="arg[]")):
-    # Defaults for returned data
-    returned_data = {}
 
-    returned_data["version"] = v
-    returned_data["results"] = []
-    returned_data["resultcount"] = 0
-
-    # Default the type field to "error", until we determine that
-    # we're not erroneous (below).
-    returned_data["type"] = "error"
-
-    # Ensure valid version was passed
-    if v is None:
-        returned_data["error"] = "Please specify an API version."
-        return returned_data
-    elif v != 5:
-        returned_data["error"] = "Invalid version specified."
-        return returned_data
-    else:
-        # We got past initial error cases; set the type to what
-        # the user gave us.
-        returned_data["type"] = type
-
-    # Take arguments from either 'args' or 'args[]' and put them into 'argument_list'.
-    argument_list = []
-
-    # In the PHP implementation, aurweb uses the last 'arg' value or all the
-    # last 'arg[]' values when both 'arg' and 'arg[]' are part of the query
-    # request. We thus preserve that behavior here for legacy purposes.
-    if arg is not None and args is not None:
-        argument_list = arg_legacy_gen(request)
-    elif arg is not None:
-        argument_list = [arg]
-    elif args is not None:
-        argument_list = args
-    else:
-        # Abort because no package arguments were passed.
-        returned_data["type"] = "error"
-        returned_data["error"] = "No request type/data specified."
-        return returned_data
-
-    # Process and return data
-    returned_data = RPC(v=v,
-                        type=type,
-                        argument_list=argument_list,
-                        returned_data=returned_data)
-
-    return returned_data
+    # Prepare output list of arguments.
+    arguments = parse_args(request)
+    return JSONResponse(RPC().handle(v=v, type=type, args=arguments))
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index faa8ca60..b60c9028 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -1,11 +1,14 @@
+from collections import defaultdict
+from typing import List
+
 from sqlalchemy import and_
 
 import aurweb.config as config
 
-from aurweb import db, models
+from aurweb import db, models, util
 from aurweb.models import dependency_type, relation_type
 
-# Define dependency types.
+# Define dependency type mappings from ID to RPC-compatible keys.
 DEP_TYPES = {
     dependency_type.DEPENDS_ID: "Depends",
     dependency_type.MAKEDEPENDS_ID: "MakeDepends",
@@ -13,7 +16,7 @@ DEP_TYPES = {
     dependency_type.OPTDEPENDS_ID: "OptDepends"
 }
 
-# Define relationship types.
+# Define relationship type mappings from ID to RPC-compatible keys.
 REL_TYPES = {
     relation_type.CONFLICTS_ID: "Conflicts",
     relation_type.PROVIDES_ID: "Provides",
@@ -21,195 +24,186 @@ REL_TYPES = {
 }
 
 
-# Define functions for request types.
-def add_deps(current_array, db_dep):
-    if db_dep.count() > 0:
-        # Create lists for all dependency types.
-        for i in DEP_TYPES.values():
-            current_array[i] = []
-
-        # Generate each dependency item in list.
-        for i in db_dep.all():
-            dep_string = i.DepName
-
-            # Add relationship version restrictor (i.e. '<=5') if it exists.
-            if i.DepCondition is not None:
-                dep_string += i.DepCondition
-
-            # Add item to list.
-            current_deptype = DEP_TYPES.get(i.DepTypeID)
-            current_array[current_deptype] += [dep_string]
-
-        # Remove any dependency lists that are empty.
-        for i in DEP_TYPES.values():
-            if current_array[i] == []:
-                current_array.pop(i)
-
-    return current_array
+class RPCError(Exception):
+    pass
 
 
-def add_rels(current_array, db_rel):
-    if db_rel.count() > 0:
-        # Create lists for all relationship types.
-        for i in REL_TYPES.values():
-            current_array[i] = []
+class RPC:
+    """ RPC API handler class.
 
-        # Generate each relationship item in list.
-        for i in db_rel.all():
-            rel_string = i.RelName
+    There are various pieces to RPC's process, and encapsulating them
+    inside of a class means that external users do not abuse the
+    RPC implementation to achieve goals. We call type handlers
+    by taking a reference to the callback named "_handle_{type}_type(...)",
+    and if the handler does not exist, we return a not implemented
+    error to the API user.
 
-            # Add relationship version restrictor (i.e. '<=5') if it exists.
-            if i.RelCondition is not None:
-                rel_string += i.RelCondition
+    EXPOSED_VERSIONS holds the set of versions that the API
+    officially supports.
 
-            # Add item to list.
-            current_reltype = REL_TYPES.get(i.RelTypeID)
-            current_array[current_reltype] += [rel_string]
+    EXPOSED_TYPES holds the set of types that the API officially
+    supports.
 
-        # Remove any relationship lists that are empty.
-        for i in REL_TYPES.values():
-            if current_array[i] == []:
-                current_array.pop(i)
+    ALIASES holds an alias mapping of type -> type strings.
 
-    return current_array
+    We should focus on privatizing implementation helpers and
+    focusing on performance in the code used.
+    """
 
+    # A set of RPC versions supported by this API.
+    EXPOSED_VERSIONS = {5}
 
-def run_info(returned_data, package_name, snapshot_uri):
-    # Get package name.
-    db_package = db.query(models.Package).filter(
-        models.Package.Name == package_name
-    )
-
-    if db_package.count() == 0:
-        return returned_data
-
-    db_package = db_package.first()
-
-    # Get name of package under PackageBaseID.
-    db_package_baseid = db.query(models.PackageBase).filter(
-        models.PackageBase.ID == db_package.PackageBaseID
-    ).first()
-
-    # Get maintainer info.
-    db_package_maintainer = db.query(models.User).filter(
-        models.User.ID == db_package_baseid.MaintainerUID
-    ).first()
-
-    current_array = {}
-    returned_data["resultcount"] = returned_data["resultcount"] + 1
-
-    # Data from the Packages table.
-    current_array["ID"] = db_package.ID
-    current_array["Name"] = db_package.Name
-    current_array["PackageBaseID"] = db_package.PackageBaseID
-    current_array["Version"] = db_package.Version
-    current_array["Description"] = db_package.Description
-    current_array["URL"] = db_package.URL
-
-    # PackageBase table.
-    current_array["PackageBase"] = db_package_baseid.Name
-    current_array["NumVotes"] = db_package_baseid.NumVotes
-    current_array["Popularity"] = db_package_baseid.Popularity
-    current_array["OutOfDate"] = db_package_baseid.OutOfDateTS
-    current_array["FirstSubmitted"] = db_package_baseid.SubmittedTS
-    current_array["LastModified"] = db_package_baseid.ModifiedTS
-
-    # User table.
-    try:
-        current_array["Maintainer"] = db_package_maintainer.Username
-    except AttributeError:
-        current_array["Maintainer"] = None
-
-    # Generate and add snapshot_uri.
-    current_array["URLPath"] = snapshot_uri.replace("%s", package_name)
-
-    # Add package votes.
-    current_array["NumVotes"] = db.query(models.PackageVote).count()
-
-    # Generate dependency listing.
-    db_dep = db.query(models.PackageDependency).filter(
-        models.PackageDependency.PackageID == db_package.ID)
-    current_array = add_deps(current_array, db_dep)
-
-    # Generate relationship listing.
-    db_rel = db.query(models.PackageRelation).filter(
-        models.PackageRelation.PackageID == db_package.ID)
-    current_array = add_rels(current_array, db_rel)
-
-    # License table.
-    current_array["License"] = []
-
-    licenses = db.query(models.PackageLicense).filter(
-        models.PackageLicense.PackageID == db_package.ID)
-    for i in licenses:
-        current_array["License"] += [i.License.Name]
-
-    # Keywords table.
-    current_array["Keywords"] = []
-
-    keywords = db.query(models.PackageKeyword).filter(
-        models.PackageKeyword.PackageBaseID == db_package_baseid.ID)
-    for i in keywords:
-        current_array["Keywords"] += [i.Keyword]
-
-    # Add current array to returned results.
-    returned_data["results"] += [current_array]
-    return returned_data
-
-
-def run_suggest_pkgbase(returned_data, arg, snapshot_uri):
-    results = db.query(models.PackageBase).filter(
-        and_(models.PackageBase.PackagerUID.isnot(None),
-             models.PackageBase.Name.like(f"%{arg}%"))
-    ).order_by(models.PackageBase.Name.asc()).limit(20)
-    return [result.Name for result in results]
-
-
-def RPC(**function_args):
-    # Get arguments.
-    #
-    # We'll use 'v' in the future when we add v6.
-    # v = function_args.gea name used for an individual person, place, or
-    # organization, spelled with initial capital letters, e.g., Larry,
-    # Mexico, and Boston Red Sox.t("v")
-    type = function_args.get("type")
-    args = function_args.get("argument_list")
-    returned_data = function_args.get("returned_data")
-
-    # Get Snapshot URI
-    snapshot_uri = config.get("options", "snapshot_uri")
-
-    # Set request type to run.
-    type_actions = {
-        "info": run_info,
-        "multiinfo": run_info,
-        "suggest-pkgbase": run_suggest_pkgbase
+    # A set of RPC types supported by this API.
+    EXPOSED_TYPES = {
+        "info", "multiinfo",
+        "search", "msearch",
+        "suggest", "suggest-pkgbase"
     }
 
-    # This if statement should always be executed, as we checked if the
-    # specified type was valid in aurweb/routers/rpc.py.
-    if type in type_actions:
-        run_request = type_actions.get(type)
+    # A mapping of aliases.
+    ALIASES = {"info": "multiinfo"}
 
-        # If type is 'info', overwrite type to 'multiinfo' to match the
-        # behavior of the PHP implementation.
-        if type == "info":
-            returned_data["type"] = "multiinfo"
+    def _verify_inputs(self, v: int, type: str, args: List[str] = []):
+        if v is None:
+            raise RPCError("Please specify an API version.")
 
-        # Remove duplicate arguments if type is 'multiinfo' so we don't
-        # fetch results for a package multiple times.
-        if returned_data["type"] == "multiinfo":
-            args = set(args)
+        if v not in RPC.EXPOSED_VERSIONS:
+            raise RPCError("Invalid version specified.")
 
-        for i in args:
-            returned_data = run_request(returned_data, i, snapshot_uri)
+        if type is None or not len(args):
+            raise RPCError("No request type/data specified.")
 
-    elif type is None:
-        returned_data["type"] = "error"
-        returned_data["error"] = "No request type/data specified."
+        if type not in RPC.EXPOSED_TYPES:
+            raise RPCError("Incorrect request type specified.")
 
-    else:
-        returned_data["type"] = "error"
-        returned_data["error"] = "Incorrect request type specified."
+        try:
+            getattr(self, f"_handle_{type.replace('-', '_')}_type")
+        except AttributeError:
+            raise RPCError(f"Request type '{type}' is not yet implemented.")
 
-    return returned_data
+    def _get_json_data(self, package: models.Package):
+        """ Produce dictionary data of one Package that can be JSON-serialized.
+
+        :param package: Package instance
+        :returns: JSON-serializable dictionary
+        """
+
+        # Produce RPC API compatible Popularity: If zero, it's an integer
+        # 0, otherwise, it's formatted to the 6th decimal place.
+        pop = package.PackageBase.Popularity
+        pop = 0 if not pop else float(util.number_format(pop, 6))
+
+        snapshot_uri = config.get("options", "snapshot_uri")
+        data = defaultdict(list)
+        data.update({
+            "ID": package.ID,
+            "Name": package.Name,
+            "PackageBaseID": package.PackageBaseID,
+            "PackageBase": package.PackageBase.Name,
+            # Maintainer should be set following this update if one exists.
+            "Maintainer": None,
+            "Version": package.Version,
+            "Description": package.Description,
+            "URL": package.URL,
+            "URLPath": snapshot_uri % package.Name,
+            "NumVotes": package.PackageBase.NumVotes,
+            "Popularity": pop,
+            "OutOfDate": package.PackageBase.OutOfDateTS,
+            "FirstSubmitted": package.PackageBase.SubmittedTS,
+            "LastModified": package.PackageBase.ModifiedTS,
+            "License": [
+                lic.License.Name for lic in package.package_licenses
+            ],
+            "Keywords": [
+                keyword.Keyword for keyword in package.PackageBase.keywords
+            ]
+        })
+
+        if package.PackageBase.Maintainer is not None:
+            # We do have a maintainer: set the Maintainer key.
+            data["Maintainer"] = package.PackageBase.Maintainer.Username
+
+        # Walk through all related PackageDependencies and produce
+        # the appropriate dict entries.
+        if depends := package.package_dependencies:
+            for dep in depends:
+                if dep.DepTypeID in DEP_TYPES:
+                    key = DEP_TYPES.get(dep.DepTypeID)
+
+                    display = dep.DepName
+                    if dep.DepCondition:
+                        display += dep.DepCondition
+
+                    data[key].append(display)
+
+        # Walk through all related PackageRelations and produce
+        # the appropriate dict entries.
+        if relations := package.package_relations:
+            for rel in relations:
+                if rel.RelTypeID in REL_TYPES:
+                    key = REL_TYPES.get(rel.RelTypeID)
+
+                    display = rel.RelName
+                    if rel.RelCondition:
+                        display += rel.RelCondition
+
+                    data[key].append(display)
+
+        return data
+
+    def _handle_multiinfo_type(self, args: List[str] = []):
+        args = set(args)
+        packages = db.query(models.Package).filter(
+            models.Package.Name.in_(args))
+        return [self._get_json_data(pkg) for pkg in packages]
+
+    def _handle_suggest_pkgbase_type(self, args: List[str] = []):
+        records = db.query(models.PackageBase).filter(
+            and_(models.PackageBase.PackagerUID.isnot(None),
+                 models.PackageBase.Name.like(f"%{args[0]}%"))
+        ).order_by(models.PackageBase.Name.asc()).limit(20)
+        return [record.Name for record in records]
+
+    def handle(self, v: int = 0, type: str = None, args: List[str] = []):
+        """ Request entrypoint. A router should pass v, type and args
+        to this function and expect an output dictionary to be returned.
+
+        :param v: RPC version argument
+        :param type: RPC type argument
+        :param args: Deciphered list of arguments based on arg/arg[] inputs
+        """
+        # Convert type aliased types.
+        if type in RPC.ALIASES:
+            type = RPC.ALIASES.get(type)
+
+        # Prepare our output data dictionary with some basic keys.
+        data = {"version": v, "type": type}
+
+        # Run some verification on our given arguments.
+        try:
+            self._verify_inputs(v, type, args)
+        except RPCError as exc:
+            data.update({
+                "results": [],
+                "resultcount": 0,
+                "type": "error",
+                "error": str(exc)
+            })
+            return data
+
+        # Get a handle to our callback and trap an RPCError with
+        # an empty list of results based on callback's execution.
+        callback = getattr(self, f"_handle_{type.replace('-', '_')}_type")
+        results = callback(args)
+
+        # These types are special: we produce a different kind of
+        # successful JSON output: a list of results.
+        if type in ("suggest", "suggest-pkgbase"):
+            return results
+
+        # Return JSON output.
+        data.update({
+            "resultcount": len(results),
+            "results": results
+        })
+        return data
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 601536a4..38cee0eb 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -3,6 +3,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
+from aurweb import db, scripts
 from aurweb.asgi import app
 from aurweb.db import begin, create, query
 from aurweb.models.account_type import AccountType
@@ -173,6 +174,9 @@ def setup():
                    PackageBase=pkgbase1,
                    VoteTS=5000)
 
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    scripts.popupdate.run_single(conn, pkgbase1)
+
 
 def test_rpc_singular_info():
     # Define expected response.
@@ -284,7 +288,7 @@ def test_rpc_no_dependencies():
             'Description': 'Wubby wubby on wobba wuubu',
             'URL': 'https://example.com/',
             'PackageBase': 'chungy-chungus',
-            'NumVotes': 3,
+            'NumVotes': 0,
             'Popularity': 0.0,
             'OutOfDate': None,
             'Maintainer': 'user1',
@@ -428,3 +432,12 @@ def test_rpc_suggest_pkgbase():
     response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=chungy")
     data = response.json()
     assert data == ["chungy-chungus"]
+
+
+def test_rpc_unimplemented_types():
+    unimplemented = ["search", "msearch", "suggest"]
+    for type in unimplemented:
+        response = make_request(f"/rpc?v=5&type={type}&arg=big")
+        data = response.json()
+        expected = f"Request type '{type}' is not yet implemented."
+        assert data.get("error") == expected

From 5ae9d09e983db6269240eb5d24dbdf792dfadedb Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 20 Oct 2021 23:27:07 -0700
Subject: [PATCH 454/844] fix: remove unused "Merge into" input from /packages

When using this input on `live` as a TU, the field is not
taken into account. Tried with no action and with the
Delete Packages action, which ended up deleting the packages
but not merging into the given target.

So, this commit removes that input from the page.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py                      | 4 +---
 templates/partials/packages/search_actions.html | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 40a65933..20d34c86 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -1053,7 +1053,6 @@ PACKAGE_ACTIONS = {}
 async def packages_post(request: Request,
                         IDs: List[int] = Form(default=[]),
                         action: str = Form(default=str()),
-                        merge_into: str = Form(default=str()),
                         confirm: bool = Form(default=False)):
 
     # If an invalid action is specified, just render GET /packages
@@ -1067,8 +1066,7 @@ async def packages_post(request: Request,
     # We deal with `IDs`, `merge_into` and `confirm` arguments
     # within action callbacks.
     callback = PACKAGE_ACTIONS.get(action)
-    retval = await callback(request, package_ids=IDs, merge_into=merge_into,
-                            confirm=confirm)
+    retval = await callback(request, package_ids=IDs, confirm=confirm)
     if retval:  # If *anything* was returned:
         success, messages = retval
         if not success:
diff --git a/templates/partials/packages/search_actions.html b/templates/partials/packages/search_actions.html
index 221189fb..f28e27a9 100644
--- a/templates/partials/packages/search_actions.html
+++ b/templates/partials/packages/search_actions.html
@@ -11,11 +11,6 @@
         <option value="unnotify">{{ "UnNotify" | tr }}</option>
     </select>
 
-    {% if request.user.is_trusted_user() or request.user.is_developer() %}
-        <label for="merge_into">{{ "Merge into" | tr }}</label>
-        <input id="merge_into" type="text" name="merge_into" />
-    {% endif %}
-
     <label class="confirmation">
         <input type="checkbox" name="confirm" />
         {{ "Confirm" | tr }}

From a06f4ec19c559c836fac7e65abd1e44a08175154 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 21 Oct 2021 10:08:45 -0700
Subject: [PATCH 455/844] fix(fastapi): centralize logging initialization

With this change, we provide a wrapper to `logging.getLogger`
in the `aurweb.logging` module. Modules wishing to log using
logging.conf should get their module-local loggers by calling
`aurweb.logging.getLogger(__name__)`, similar to `logging.getLogger`,
this way initialization with logging.conf is guaranteed.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/logging.py               | 12 +++++++++++-
 aurweb/redis.py                 |  6 +++---
 aurweb/routers/accounts.py      |  5 ++---
 aurweb/routers/trusted_user.py  |  5 ++---
 aurweb/scripts/rendercomment.py |  5 +++--
 aurweb/util.py                  |  5 +++--
 logging.conf                    |  4 ++--
 test/test_accounts_routes.py    |  5 ++---
 test/test_logging.py            | 16 ++++++++++++++++
 test/test_rss.py                |  6 ++----
 10 files changed, 46 insertions(+), 23 deletions(-)
 create mode 100644 test/test_logging.py

diff --git a/aurweb/logging.py b/aurweb/logging.py
index d0154634..5c4a7b6a 100644
--- a/aurweb/logging.py
+++ b/aurweb/logging.py
@@ -8,4 +8,14 @@ aurwebdir = aurweb.config.get("options", "aurwebdir")
 config_path = os.path.join(aurwebdir, "logging.conf")
 
 logging.config.fileConfig(config_path, disable_existing_loggers=False)
-logger = logging.getLogger(__name__)
+
+
+def get_logger(name: str) -> logging.Logger:
+    """ A logging.getLogger wrapper. Importing this function and
+    using it to get a module-local logger ensures that logging.conf
+    initialization is performed wherever loggers are used.
+
+    :param name: Logger name; typically `__name__`
+    :returns: name's logging.Logger
+    """
+    return logging.getLogger(name)
diff --git a/aurweb/redis.py b/aurweb/redis.py
index 6d3cff38..e29b8e37 100644
--- a/aurweb/redis.py
+++ b/aurweb/redis.py
@@ -1,12 +1,12 @@
-import logging
-
 import fakeredis
 
 from redis import ConnectionPool, Redis
 
 import aurweb.config
 
-logger = logging.getLogger(__name__)
+from aurweb import logging
+
+logger = logging.get_logger(__name__)
 pool = None
 
 
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 3e134e7a..a4f6dc56 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -1,5 +1,4 @@
 import copy
-import logging
 import typing
 
 from datetime import datetime
@@ -11,7 +10,7 @@ from sqlalchemy import and_, func, or_
 
 import aurweb.config
 
-from aurweb import db, l10n, models, time, util
+from aurweb import db, l10n, logging, models, time, util
 from aurweb.auth import account_type_required, auth_required
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.l10n import get_translator_for_request
@@ -21,7 +20,7 @@ from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
-logger = logging.getLogger(__name__)
+logger = logging.get_logger(__name__)
 
 
 @router.get("/passreset", response_class=HTMLResponse)
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index 5b2a56d3..7c0a0404 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -1,5 +1,4 @@
 import html
-import logging
 import re
 import typing
 
@@ -10,13 +9,13 @@ from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import RedirectResponse, Response
 from sqlalchemy import and_, or_
 
-from aurweb import db, l10n, models
+from aurweb import db, l10n, logging, models
 from aurweb.auth import account_type_required, auth_required
 from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND_DEV
 from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
-logger = logging.getLogger(__name__)
+logger = logging.get_logger(__name__)
 
 # Some TU route specific constants.
 ITEMS_PER_PAGE = 10  # Paged table size.
diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index 355ca050..a00448d8 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-import logging
 import sys
 
 import bleach
@@ -10,7 +9,9 @@ import pygit2
 import aurweb.config
 import aurweb.db
 
-logger = logging.getLogger(__name__)
+from aurweb import logging
+
+logger = logging.get_logger(__name__)
 repo_path = aurweb.config.get('serve', 'repo-path')
 commit_uri = aurweb.config.get('options', 'commit_uri')
 
diff --git a/aurweb/util.py b/aurweb/util.py
index cccbe9d8..f3048efe 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -1,6 +1,5 @@
 import base64
 import copy
-import logging
 import math
 import random
 import re
@@ -20,7 +19,9 @@ from jinja2 import pass_context
 
 import aurweb.config
 
-logger = logging.getLogger(__name__)
+from aurweb import logging
+
+logger = logging.get_logger(__name__)
 
 
 def make_random_string(length):
diff --git a/logging.conf b/logging.conf
index e0959916..ba41fb7b 100644
--- a/logging.conf
+++ b/logging.conf
@@ -15,13 +15,13 @@ handlers=simpleHandler
 level=DEBUG
 handlers=detailedHandler
 qualname=aurweb
-propagate=0
+propagate=1
 
 [logger_test]
 level=DEBUG
 handlers=detailedHandler
 qualname=test
-propagate=0
+propagate=1
 
 [logger_uvicorn]
 level=DEBUG
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 9252e5bf..d5d92112 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -1,4 +1,3 @@
-import logging
 import re
 import tempfile
 
@@ -11,7 +10,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import captcha, db
+from aurweb import captcha, db, logging
 from aurweb.asgi import app
 from aurweb.db import create, query
 from aurweb.models.accepted_term import AcceptedTerm
@@ -32,7 +31,7 @@ TEST_EMAIL = "test@example.org"
 client = TestClient(app)
 user = None
 
-logger = logging.getLogger(__name__)
+logger = logging.get_logger(__name__)
 
 
 def make_ssh_pubkey():
diff --git a/test/test_logging.py b/test/test_logging.py
new file mode 100644
index 00000000..63092d07
--- /dev/null
+++ b/test/test_logging.py
@@ -0,0 +1,16 @@
+from aurweb import logging
+
+logger = logging.get_logger(__name__)
+
+
+def test_logging(caplog):
+    logger.info("Test log.")
+
+    # Test that we logged once.
+    assert len(caplog.records) == 1
+
+    # Test that our log record was of INFO level.
+    assert caplog.records[0].levelname == "INFO"
+
+    # Test that our message got logged.
+    assert "Test log." in caplog.text
diff --git a/test/test_rss.py b/test/test_rss.py
index ce3bc71f..40607ade 100644
--- a/test/test_rss.py
+++ b/test/test_rss.py
@@ -1,5 +1,3 @@
-import logging
-
 from datetime import datetime
 from http import HTTPStatus
 
@@ -8,7 +6,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import db
+from aurweb import db, logging
 from aurweb.asgi import app
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
@@ -16,7 +14,7 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
 
-logger = logging.getLogger(__name__)
+logger = logging.get_logger(__name__)
 
 
 @pytest.fixture(autouse=True)

From 6662975005113c2070db966115668dc3848139e4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 21 Oct 2021 10:13:25 -0700
Subject: [PATCH 456/844] change(rpc): handle 'version' and 'type' arguments in
 constructor

Additionally, added RPC.error, which produces an RPC-compatible
error based on the version passed during construction.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/rpc.py |  8 +++++--
 aurweb/rpc.py         | 50 +++++++++++++++++++++++++------------------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index 91e7feb6..feb355c8 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -61,6 +61,10 @@ async def rpc(request: Request,
               arg: Optional[str] = Query(None),
               args: Optional[List[str]] = Query(None, alias="arg[]")):
 
-    # Prepare output list of arguments.
+    # Create a handle to our RPC class.
+    rpc = RPC(version=v, type=type)
+
+    # Prepare list of arguments for input. If 'arg' was given, it'll
+    # be a list with one element.
     arguments = parse_args(request)
-    return JSONResponse(RPC().handle(v=v, type=type, args=arguments))
+    return JSONResponse(rpc.handle(arguments))
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index b60c9028..84bae53c 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -63,23 +63,37 @@ class RPC:
     # A mapping of aliases.
     ALIASES = {"info": "multiinfo"}
 
-    def _verify_inputs(self, v: int, type: str, args: List[str] = []):
-        if v is None:
+    def __init__(self, version: int = 0, type: str = None):
+        self.version = version
+        self.type = type
+
+    def error(self, message: str) -> dict:
+        return {
+            "version": self.version,
+            "results": [],
+            "resultcount": 0,
+            "type": "error",
+            "error": message
+        }
+
+    def _verify_inputs(self, args: List[str] = []):
+        if self.version is None:
             raise RPCError("Please specify an API version.")
 
-        if v not in RPC.EXPOSED_VERSIONS:
+        if self.version not in RPC.EXPOSED_VERSIONS:
             raise RPCError("Invalid version specified.")
 
-        if type is None or not len(args):
+        if self.type is None or not len(args):
             raise RPCError("No request type/data specified.")
 
-        if type not in RPC.EXPOSED_TYPES:
+        if self.type not in RPC.EXPOSED_TYPES:
             raise RPCError("Incorrect request type specified.")
 
         try:
-            getattr(self, f"_handle_{type.replace('-', '_')}_type")
+            getattr(self, f"_handle_{self.type.replace('-', '_')}_type")
         except AttributeError:
-            raise RPCError(f"Request type '{type}' is not yet implemented.")
+            raise RPCError(
+                f"Request type '{self.type}' is not yet implemented.")
 
     def _get_json_data(self, package: models.Package):
         """ Produce dictionary data of one Package that can be JSON-serialized.
@@ -164,7 +178,7 @@ class RPC:
         ).order_by(models.PackageBase.Name.asc()).limit(20)
         return [record.Name for record in records]
 
-    def handle(self, v: int = 0, type: str = None, args: List[str] = []):
+    def handle(self, args: List[str] = []):
         """ Request entrypoint. A router should pass v, type and args
         to this function and expect an output dictionary to be returned.
 
@@ -173,32 +187,26 @@ class RPC:
         :param args: Deciphered list of arguments based on arg/arg[] inputs
         """
         # Convert type aliased types.
-        if type in RPC.ALIASES:
-            type = RPC.ALIASES.get(type)
+        if self.type in RPC.ALIASES:
+            self.type = RPC.ALIASES.get(self.type)
 
         # Prepare our output data dictionary with some basic keys.
-        data = {"version": v, "type": type}
+        data = {"version": self.version, "type": self.type}
 
         # Run some verification on our given arguments.
         try:
-            self._verify_inputs(v, type, args)
+            self._verify_inputs(args)
         except RPCError as exc:
-            data.update({
-                "results": [],
-                "resultcount": 0,
-                "type": "error",
-                "error": str(exc)
-            })
-            return data
+            return self.error(str(exc))
 
         # Get a handle to our callback and trap an RPCError with
         # an empty list of results based on callback's execution.
-        callback = getattr(self, f"_handle_{type.replace('-', '_')}_type")
+        callback = getattr(self, f"_handle_{self.type.replace('-', '_')}_type")
         results = callback(args)
 
         # These types are special: we produce a different kind of
         # successful JSON output: a list of results.
-        if type in ("suggest", "suggest-pkgbase"):
+        if self.type in ("suggest", "suggest-pkgbase"):
             return results
 
         # Return JSON output.

From 65240c8343eb01401a5ed44185d4201fc8739721 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 21 Oct 2021 10:17:34 -0700
Subject: [PATCH 457/844] feat(rpc): enforce ratelimiting

New configuration options:

- `[ratelimit] cache`
    - A boolean indicating whether we should use configured cache (1)
      or database (0) for ratelimiting.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/ratelimit.py    | 110 +++++++++++++++++++++++++++++++++++++++++
 aurweb/routers/rpc.py  |   7 +++
 conf/config.defaults   |   5 ++
 test/test_ratelimit.py | 109 ++++++++++++++++++++++++++++++++++++++++
 test/test_rpc.py       |  51 ++++++++++++++++++-
 5 files changed, 280 insertions(+), 2 deletions(-)
 create mode 100644 aurweb/ratelimit.py
 create mode 100644 test/test_ratelimit.py

diff --git a/aurweb/ratelimit.py b/aurweb/ratelimit.py
new file mode 100644
index 00000000..e306f7a7
--- /dev/null
+++ b/aurweb/ratelimit.py
@@ -0,0 +1,110 @@
+from datetime import datetime
+
+from fastapi import Request
+from redis.client import Pipeline
+
+from aurweb import config, db, logging
+from aurweb.models import ApiRateLimit
+from aurweb.redis import redis_connection
+
+logger = logging.get_logger(__name__)
+
+
+def _update_ratelimit_redis(request: Request, pipeline: Pipeline):
+    window_length = config.getint("ratelimit", "window_length")
+    now = int(datetime.utcnow().timestamp())
+    time_to_delete = now - window_length
+
+    host = request.client.host
+    window_key = f"ratelimit-ws:{host}"
+    requests_key = f"ratelimit:{host}"
+
+    pipeline.get(window_key)
+    window = pipeline.execute()[0]
+
+    if not window or int(window.decode()) < time_to_delete:
+        pipeline.set(window_key, now)
+        pipeline.expire(window_key, window_length)
+
+        pipeline.set(requests_key, 1)
+        pipeline.expire(requests_key, window_length)
+
+        pipeline.execute()
+    else:
+        pipeline.incr(requests_key)
+        pipeline.execute()
+
+
+def _update_ratelimit_db(request: Request):
+    window_length = config.getint("ratelimit", "window_length")
+    now = int(datetime.utcnow().timestamp())
+    time_to_delete = now - window_length
+
+    with db.begin():
+        db.delete(ApiRateLimit, ApiRateLimit.WindowStart < time_to_delete)
+
+    host = request.client.host
+    record = db.query(ApiRateLimit, ApiRateLimit.IP == host).first()
+    with db.begin():
+        if not record:
+            record = db.create(ApiRateLimit,
+                               WindowStart=now,
+                               IP=host, Requests=1)
+        else:
+            record.Requests += 1
+
+    logger.debug(record.Requests)
+    return record
+
+
+def update_ratelimit(request: Request, pipeline: Pipeline):
+    """ Update the ratelimit stored in Redis or the database depending
+    on AUR_CONFIG's [options] cache setting.
+
+    This Redis-capable function is slightly different than most. If Redis
+    is not configured to use a real server, this function instead uses
+    the database to persist tracking of a particular host.
+
+    :param request: FastAPI request
+    :param pipeline: redis.client.Pipeline
+    :returns: ApiRateLimit record when Redis cache is not configured, else None
+    """
+    if config.getboolean("ratelimit", "cache"):
+        return _update_ratelimit_redis(request, pipeline)
+    return _update_ratelimit_db(request)
+
+
+def check_ratelimit(request: Request):
+    """ Increment and check to see if request has exceeded their rate limit.
+
+    :param request: FastAPI request
+    :returns: True if the request host has exceeded the rate limit else False
+    """
+    redis = redis_connection()
+    pipeline = redis.pipeline()
+
+    record = update_ratelimit(request, pipeline)
+
+    # Get cache value, else None.
+    host = request.client.host
+    pipeline.get(f"ratelimit:{host}")
+    requests = pipeline.execute()[0]
+
+    # Take into account the split paths. When Redis is used, a
+    # valid cache value will be returned which must be converted
+    # to an int. Otherwise, use the database record returned
+    # by update_ratelimit.
+    if not config.getboolean("ratelimit", "cache"):
+        # If we got nothing from pipeline.get, we did not use
+        # the Redis path of logic: use the DB record's count.
+        requests = record.Requests
+    else:
+        # Otherwise, just case Redis results over to an int.
+        requests = int(requests.decode())
+
+    limit = config.getint("ratelimit", "request_limit")
+    exceeded_ratelimit = requests > limit
+    if exceeded_ratelimit:
+        logger.debug(f"{host} has exceeded the ratelimit.")
+
+    return exceeded_ratelimit
diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index feb355c8..0616326b 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -1,9 +1,11 @@
+from http import HTTPStatus
 from typing import List, Optional
 from urllib.parse import unquote
 
 from fastapi import APIRouter, Query, Request
 from fastapi.responses import JSONResponse
 
+from aurweb.ratelimit import check_ratelimit
 from aurweb.rpc import RPC
 
 router = APIRouter()
@@ -64,6 +66,11 @@ async def rpc(request: Request,
     # Create a handle to our RPC class.
     rpc = RPC(version=v, type=type)
 
+    # If ratelimit was exceeded, return a 429 Too Many Requests.
+    if check_ratelimit(request):
+        return JSONResponse(rpc.error("Rate limit reached"),
+                            status_code=int(HTTPStatus.TOO_MANY_REQUESTS))
+
     # Prepare list of arguments for input. If 'arg' was given, it'll
     # be a list with one element.
     arguments = parse_args(request)
diff --git a/conf/config.defaults b/conf/config.defaults
index 988859a0..da969343 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -48,6 +48,11 @@ redis_address = redis://localhost
 [ratelimit]
 request_limit = 4000
 window_length = 86400
+; Force-utilize cache for ratelimiting. In FastAPI, forced cache (1)
+; will cause the ratelimit path to use a real or fake Redis instance
+; depending on the configured options.cache setting. Otherwise,
+; cache will be ignored and the database will be used.
+cache = 1
 
 [notifications]
 notify-cmd = /usr/bin/aurweb-notify
diff --git a/test/test_ratelimit.py b/test/test_ratelimit.py
new file mode 100644
index 00000000..2634b714
--- /dev/null
+++ b/test/test_ratelimit.py
@@ -0,0 +1,109 @@
+from unittest import mock
+
+import pytest
+
+from redis.client import Pipeline
+
+from aurweb import config, db, logging
+from aurweb.models import ApiRateLimit
+from aurweb.ratelimit import check_ratelimit
+from aurweb.redis import redis_connection
+from aurweb.testing import setup_test_db
+from aurweb.testing.requests import Request
+
+logger = logging.get_logger(__name__)
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    setup_test_db(ApiRateLimit.__tablename__)
+
+
+@pytest.fixture
+def pipeline():
+    redis = redis_connection()
+    pipeline = redis.pipeline()
+
+    pipeline.delete("ratelimit-ws:127.0.0.1")
+    pipeline.delete("ratelimit:127.0.0.1")
+    pipeline.execute()
+
+    yield pipeline
+
+
+def mock_config_getint(section: str, key: str):
+    if key == "request_limit":
+        return 4
+    elif key == "window_length":
+        return 100
+    return config.getint(section, key)
+
+
+def mock_config_getboolean(return_value: int = 0):
+    def fn(section: str, key: str):
+        if section == "ratelimit" and key == "cache":
+            return return_value
+        return config.getboolean(section, key)
+    return fn
+
+
+def mock_config_get(return_value: str = "none"):
+    def fn(section: str, key: str):
+        if section == "options" and key == "cache":
+            return return_value
+        return config.get(section, key)
+    return fn
+
+
+@mock.patch("aurweb.config.getint", side_effect=mock_config_getint)
+@mock.patch("aurweb.config.getboolean", side_effect=mock_config_getboolean(1))
+@mock.patch("aurweb.config.get", side_effect=mock_config_get("none"))
+def test_ratelimit_redis(get: mock.MagicMock, getboolean: mock.MagicMock,
+                         getint: mock.MagicMock, pipeline: Pipeline):
+    """ This test will only cover aurweb.ratelimit's Redis
+    path if a real Redis server is configured. Otherwise,
+    it'll use the database. """
+
+    # We'll need a Request for everything here.
+    request = Request()
+
+    # Run check_ratelimit for our request_limit. These should succeed.
+    for i in range(4):
+        assert not check_ratelimit(request)
+
+    # This check_ratelimit should fail, being the 4001th request.
+    assert check_ratelimit(request)
+
+    # Delete the Redis keys.
+    host = request.client.host
+    pipeline.delete(f"ratelimit-ws:{host}")
+    pipeline.delete(f"ratelimit:{host}")
+    one, two = pipeline.execute()
+    assert one and two
+
+    # Should be good to go again!
+    assert not check_ratelimit(request)
+
+
+@mock.patch("aurweb.config.getint", side_effect=mock_config_getint)
+@mock.patch("aurweb.config.getboolean", side_effect=mock_config_getboolean(0))
+@mock.patch("aurweb.config.get", side_effect=mock_config_get("none"))
+def test_ratelimit_db(get: mock.MagicMock, getboolean: mock.MagicMock,
+                      getint: mock.MagicMock, pipeline: Pipeline):
+
+    # We'll need a Request for everything here.
+    request = Request()
+
+    # Run check_ratelimit for our request_limit. These should succeed.
+    for i in range(4):
+        assert not check_ratelimit(request)
+
+    # This check_ratelimit should fail, being the 4001th request.
+    assert check_ratelimit(request)
+
+    # Delete the ApiRateLimit record.
+    with db.begin():
+        db.delete(ApiRateLimit)
+
+    # Should be good to go again!
+    assert not check_ratelimit(request)
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 38cee0eb..9400ee06 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -1,9 +1,13 @@
+from http import HTTPStatus
+from unittest import mock
+
 import orjson
 import pytest
 
 from fastapi.testclient import TestClient
+from redis.client import Pipeline
 
-from aurweb import db, scripts
+from aurweb import config, db, scripts
 from aurweb.asgi import app
 from aurweb.db import begin, create, query
 from aurweb.models.account_type import AccountType
@@ -18,6 +22,7 @@ from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import RelationType
 from aurweb.models.user import User
+from aurweb.redis import redis_connection
 from aurweb.testing import setup_test_db
 
 
@@ -31,7 +36,7 @@ def setup():
     # Set up tables.
     setup_test_db("Users", "PackageBases", "Packages", "Licenses",
                   "PackageDepends", "PackageRelations", "PackageLicenses",
-                  "PackageKeywords", "PackageVotes")
+                  "PackageKeywords", "PackageVotes", "ApiRateLimit")
 
     # Create test package details.
     with begin():
@@ -178,6 +183,18 @@ def setup():
     scripts.popupdate.run_single(conn, pkgbase1)
 
 
+@pytest.fixture
+def pipeline():
+    redis = redis_connection()
+    pipeline = redis.pipeline()
+
+    pipeline.delete("ratelimit-ws:testclient")
+    pipeline.delete("ratelimit:testclient")
+    one, two = pipeline.execute()
+
+    yield pipeline
+
+
 def test_rpc_singular_info():
     # Define expected response.
     expected_data = {
@@ -441,3 +458,33 @@ def test_rpc_unimplemented_types():
         data = response.json()
         expected = f"Request type '{type}' is not yet implemented."
         assert data.get("error") == expected
+
+
+def mock_config_getint(section: str, key: str):
+    if key == "request_limit":
+        return 4
+    elif key == "window_length":
+        return 100
+    return config.getint(section, key)
+
+
+@mock.patch("aurweb.config.getint", side_effect=mock_config_getint)
+def test_rpc_ratelimit(getint: mock.MagicMock, pipeline: Pipeline):
+    for i in range(4):
+        # The first 4 requests should be good.
+        response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+        assert response.status_code == int(HTTPStatus.OK)
+
+    # The fifth request should be banned.
+    response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+    assert response.status_code == int(HTTPStatus.TOO_MANY_REQUESTS)
+
+    # Delete the cached records.
+    pipeline.delete("ratelimit-ws:testclient")
+    pipeline.delete("ratelimit:testclient")
+    one, two = pipeline.execute()
+    assert one and two
+
+    # The new first request should be good.
+    response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+    assert response.status_code == int(HTTPStatus.OK)

From c4163547f643b0f033cd40432b1dc1f760c72a18 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 20 Oct 2021 17:31:27 -0700
Subject: [PATCH 458/844] fix(docker): swap package cgit -> cgit-aurweb

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/install-deps.sh | 2 +-
 docker/scripts/run-cgit.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index fc068b06..52ad6747 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -6,7 +6,7 @@ set -eou pipefail
 
 pacman -Syu --noconfirm --noprogressbar \
     --cachedir .pkg-cache git gpgme nginx redis openssh \
-      mariadb mariadb-libs cgit uwsgi uwsgi-plugin-cgi \
+      mariadb mariadb-libs cgit-aurweb uwsgi uwsgi-plugin-cgi \
       php php-fpm memcached php-memcached python-pip pyalpm \
       python-srcinfo curl libeatmydata
 
diff --git a/docker/scripts/run-cgit.sh b/docker/scripts/run-cgit.sh
index 67bdc079..5551a568 100755
--- a/docker/scripts/run-cgit.sh
+++ b/docker/scripts/run-cgit.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 exec uwsgi --socket 0.0.0.0:${1} \
     --plugins cgi \
-    --cgi /usr/share/webapps/cgit/cgit.cgi
+    --cgi /usr/share/webapps/cgit-aurweb/cgit.cgi

From db730ad8cbd3944f42fac6941137b4070c794a18 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 20 Oct 2021 17:31:52 -0700
Subject: [PATCH 459/844] fix(docker): fix cgit clone-prefix

Additionally, clone-prefix is now configurable via environment variables:

- CGIT_CLONE_PREFIX_PHP
- CGIT_CLONE_PREFIX_FASTAPI

These vars can be used by production to customize the clone prefix.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .env                      | 2 ++
 docker-compose.yml        | 6 ++++--
 docker/cgit-entrypoint.sh | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 92b6bbd2..1162359f 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,5 @@
 FASTAPI_BACKEND="uvicorn"
 FASTAPI_WORKERS=2
 MARIADB_SOCKET_DIR="/var/run/mysqld/"
+CGIT_CLONE_PREFIX_PHP=https://localhost:8443
+CGIT_CLONE_PREFIX_FASTAPI=https://localhost:8444
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d1da263..7503bad3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -88,8 +88,9 @@ services:
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
+      - CGIT_CLONE_PREFIX=$CGIT_CLONE_PREFIX_PHP
     entrypoint: /docker/cgit-entrypoint.sh
-    command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8443/cgit"
+    command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
       test: "bash /docker/health/cgit.sh 3000"
     depends_on:
@@ -103,8 +104,9 @@ services:
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
+      - CGIT_CLONE_PREFIX=$CGIT_CLONE_PREFIX_FASTAPI
     entrypoint: /docker/cgit-entrypoint.sh
-    command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8444/cgit"
+    command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
       test: "bash /docker/health/cgit.sh 3000"
     depends_on:
diff --git a/docker/cgit-entrypoint.sh b/docker/cgit-entrypoint.sh
index 9abc5091..3615ade5 100755
--- a/docker/cgit-entrypoint.sh
+++ b/docker/cgit-entrypoint.sh
@@ -4,7 +4,7 @@ set -eou pipefail
 mkdir -p /var/cache/cgit
 
 cp -vf conf/cgitrc.proto /etc/cgitrc
-sed -ri "s|clone-prefix=.*|clone-prefix=${2}|" /etc/cgitrc
+sed -ri "s|clone-prefix=.*|clone-prefix=${CGIT_CLONE_PREFIX}|" /etc/cgitrc
 sed -ri 's|header=.*|header=/aurweb/web/template/cgit/header.html|' /etc/cgitrc
 sed -ri 's|footer=.*|footer=/aurweb/web/template/cgit/footer.html|' /etc/cgitrc
 sed -ri 's|repo\.path=.*|repo.path=/aurweb/aur.git|' /etc/cgitrc

From 0b1c3ea539c8c67788eb9e947b7cd8499620fe0c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 20 Oct 2021 17:33:25 -0700
Subject: [PATCH 460/844] feat(docker): expose cgit-{php,fastapi} on
 {13000,13001}

This change exposes the uwsgi daemon we use for cgit on:

- PHP: docker-host:13000
- FastAPI: docker-host:13001

These ports can then be used to take advantage of cgit on
a production server that hosts nginx in front of Docker.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7503bad3..e86d8671 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,6 +96,8 @@ services:
     depends_on:
       git:
         condition: service_healthy
+    ports:
+      - "13000:3000"
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -112,6 +114,8 @@ services:
     depends_on:
       git:
         condition: service_healthy
+    ports:
+      - "13001:3000"
     volumes:
       - git_data:/aurweb/aur.git
 

From fb85cb60a0ffc75b2b16083ebf46111a8082e46e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 9 Oct 2021 15:02:49 -0700
Subject: [PATCH 461/844] feat(FastAPI): add /packages (post) action: 'unflag'

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 42 +++++++++++++++++++++++++++-----
 test/test_packages_routes.py | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 20d34c86..d65cc344 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -827,11 +827,7 @@ async def pkgbase_flag_comment(request: Request, name: str):
     return render_template(request, "packages/flag-comment.html", context)
 
 
-@router.post("/pkgbase/{name}/unflag")
-@auth_required(True, redirect="/pkgbase/{name}")
-async def pkgbase_unflag(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
+def pkgbase_unflag_instance(request: Request, pkgbase: models.PackageBase):
     has_cred = request.user.has_credential(
         "CRED_PKGBASE_UNFLAG", approved=[pkgbase.Flagger, pkgbase.Maintainer])
     if has_cred:
@@ -840,6 +836,12 @@ async def pkgbase_unflag(request: Request, name: str):
             pkgbase.Flagger = None
             pkgbase.FlaggerComment = str()
 
+
+@router.post("/pkgbase/{name}/unflag")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_unflag(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+    pkgbase_unflag_instance(request, pkgbase)
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=HTTPStatus.SEE_OTHER)
 
@@ -1042,10 +1044,38 @@ async def pkgbase_delete_post(request: Request, name: str,
 
     return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
 
+
+async def packages_unflag(request: Request, package_ids: List[int] = [],
+                          **kwargs):
+    if not package_ids:
+        return (False, ["You did not select any packages to unflag."])
+
+    # Holds the set of package bases we're looking to unflag.
+    # Constructed below via looping through the packages query.
+    bases = set()
+
+    package_ids = set(package_ids)  # Convert this to a set for O(1).
+    packages = db.query(models.Package).filter(
+        models.Package.ID.in_(package_ids)).all()
+    for pkg in packages:
+        has_cred = request.user.has_credential(
+            "CRED_PKGBASE_UNFLAG", approved=[pkg.PackageBase.Flagger])
+        if not has_cred:
+            return (False, ["You did not select any packages to unflag."])
+
+        if pkg.PackageBase not in bases:
+            bases.update({pkg.PackageBase})
+
+    for pkgbase in bases:
+        pkgbase_unflag_instance(request, pkgbase)
+    return (True, ["The selected packages have been unflagged."])
+
 # A mapping of action string -> callback functions used within the
 # `packages_post` route below. We expect any action callback to
 # return a tuple in the format: (succeeded: bool, message: List[str]).
-PACKAGE_ACTIONS = {}
+PACKAGE_ACTIONS = {
+    "unflag": packages_unflag,
+}
 
 
 @router.post("/packages")
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 93d994a2..b35cb377 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2067,3 +2067,49 @@ def test_pkgbase_merge(client: TestClient, tu_user: User, package: Package):
         resp = request.get(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.OK)
     assert not get_errors(resp.text)
+
+
+def test_packages_post_unflag(client: TestClient, user: User,
+                              maintainer: User, package: Package):
+    # Flag `package` as `user`.
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        package.PackageBase.Flagger = user
+        package.PackageBase.OutOfDateTS = now
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+
+    # Don't supply any packages.
+    post_data = {"action": "unflag", "IDs": []}
+    with client as request:
+        resp = request.post("/packages", data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You did not select any packages to unflag."
+    assert errors[0].text.strip() == expected
+
+    # Unflag the package as `user`.
+    post_data = {"action": "unflag", "IDs": [package.ID]}
+    with client as request:
+        resp = request.post("/packages", data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert package.PackageBase.Flagger is None
+    successes = get_successes(resp.text)
+    expected = "The selected packages have been unflagged."
+    assert successes[0].text.strip() == expected
+
+    # Re-flag `package` as `user`.
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        package.PackageBase.Flagger = user
+        package.PackageBase.OutOfDateTS = now
+
+    # Try to unflag the package as `maintainer`, which is not allowed.
+    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    post_data = {"action": "unflag", "IDs": [package.ID]}
+    with client as request:
+        resp = request.post("/packages", data=post_data, cookies=maint_cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You did not select any packages to unflag."
+    assert errors[0].text.strip() == expected

From e9fc27a33b1583f307920e7085f91e1bc401d13e Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Tue, 19 Oct 2021 18:20:52 -0400
Subject: [PATCH 462/844] feat(docker): make git data directory
 host-configurable

Signed-off-by: Steven Guikal <void@fluix.one>
---
 .env                    |  1 +
 docker-compose.prod.yml | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 1162359f..6a383e6d 100644
--- a/.env
+++ b/.env
@@ -3,3 +3,4 @@ FASTAPI_WORKERS=2
 MARIADB_SOCKET_DIR="/var/run/mysqld/"
 CGIT_CLONE_PREFIX_PHP=https://localhost:8443
 CGIT_CLONE_PREFIX_FASTAPI=https://localhost:8444
+GIT_DATA_DIR="./aur.git/"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index c63d63f5..9ea26663 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -7,16 +7,24 @@ services:
 
   git:
     volumes:
-      - git_data:/aurweb/aur.git
+      - ${GIT_DATA_DIR}:/aurweb/aur.git
       - cache:/cache
       - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   smartgit:
     volumes:
-      - git_data:/aurweb/aur.git
+      - ${GIT_DATA_DIR}:/aurweb/aur.git
       - cache:/cache
       - smartgit_run:/var/run/smartgit
 
+  cgit-php:
+    volumes:
+      - ${GIT_DATA_DIR}:/aurweb/aur.git
+
+  cgit-fastapi:
+    volumes:
+      - ${GIT_DATA_DIR}:/aurweb/aur.git
+
   php-fpm:
     volumes:
       - cache:/cache
@@ -35,7 +43,7 @@ services:
 
   nginx:
     volumes:
-      - git_data:/aurweb/aur.git
+      - ${GIT_DATA_DIR}:/aurweb/aur.git
       - cache:/cache
       - logs:/var/log/nginx
       - smartgit_run:/var/run/smartgit

From b277d94e0b9b71217559552f476cfa67e80c9f45 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 9 Oct 2021 22:29:05 -0700
Subject: [PATCH 463/844] feat(FastAPI): add /packages (post) action: 'notify'

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 52 ++++++++++++++++++++++++++++++++----
 po/aurweb.pot                |  8 ++++++
 test/test_packages_routes.py | 41 ++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index d65cc344..c74a5ba3 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -846,11 +846,7 @@ async def pkgbase_unflag(request: Request, name: str):
                             status_code=HTTPStatus.SEE_OTHER)
 
 
-@router.post("/pkgbase/{name}/notify")
-@auth_required(True, redirect="/pkgbase/{name}")
-async def pkgbase_notify(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
+def pkgbase_notify_instance(request: Request, pkgbase: models.PackageBase):
     notif = db.query(pkgbase.notifications.filter(
         models.PackageNotification.UserID == request.user.ID
     ).exists()).scalar()
@@ -861,6 +857,12 @@ async def pkgbase_notify(request: Request, name: str):
                       PackageBase=pkgbase,
                       User=request.user)
 
+
+@router.post("/pkgbase/{name}/notify")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_notify(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+    pkgbase_notify_instance(request, pkgbase)
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=HTTPStatus.SEE_OTHER)
 
@@ -1070,11 +1072,51 @@ async def packages_unflag(request: Request, package_ids: List[int] = [],
         pkgbase_unflag_instance(request, pkgbase)
     return (True, ["The selected packages have been unflagged."])
 
+
+async def packages_notify(request: Request, package_ids: List[int] = [],
+                          **kwargs):
+    # In cases where we encounter errors with the request, we'll
+    # use this error tuple as a return value.
+    # TODO: This error does not yet have a translation.
+    error_tuple = (False,
+                   ["You did not select any packages to be notified about."])
+    if not package_ids:
+        return error_tuple
+
+    bases = set()
+    package_ids = set(package_ids)
+    packages = db.query(models.Package).filter(
+        models.Package.ID.in_(package_ids)).all()
+
+    for pkg in packages:
+        if pkg.PackageBase not in bases:
+            bases.update({pkg.PackageBase})
+
+    # Perform some checks on what the user selected for notify.
+    for pkgbase in bases:
+        notif = db.query(pkgbase.notifications.filter(
+            models.PackageNotification.UserID == request.user.ID
+        ).exists()).scalar()
+        has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
+
+        # If the request user either does not have credentials
+        # or the notification already exists:
+        if not (has_cred and not notif):
+            return error_tuple
+
+    # If we get here, user input is good.
+    for pkgbase in bases:
+        pkgbase_notify_instance(request, pkgbase)
+
+    # TODO: This message does not yet have a translation.
+    return (True, ["The selected packages' notifications have been enabled."])
+
 # A mapping of action string -> callback functions used within the
 # `packages_post` route below. We expect any action callback to
 # return a tuple in the format: (succeeded: bool, message: List[str]).
 PACKAGE_ACTIONS = {
     "unflag": packages_unflag,
+    "notify": packages_notify,
 }
 
 
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 1f7e8784..699a6aef 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -958,6 +958,14 @@ msgstr ""
 msgid "Package details could not be found."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr ""
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index b35cb377..f86bb805 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2113,3 +2113,44 @@ def test_packages_post_unflag(client: TestClient, user: User,
     errors = get_errors(resp.text)
     expected = "You did not select any packages to unflag."
     assert errors[0].text.strip() == expected
+
+
+def test_packages_post_notify(client: TestClient, user: User, package: Package):
+    notif = package.PackageBase.notifications.filter(
+        PackageNotification.UserID == user.ID
+    ).first()
+    assert notif is None
+
+    # Try to enable notifications but supply no packages, causing
+    # an error to be rendered.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={"action": "notify"},
+                            cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You did not select any packages to be notified about."
+    assert errors[0].text.strip() == expected
+
+    # Now let's actually enable notifications on `package`.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "notify",
+            "IDs": [package.ID]
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    expected = "The selected packages' notifications have been enabled."
+    successes = get_successes(resp.text)
+    assert successes[0].text.strip() == expected
+
+    # Try to enable notifications when they're already enabled,
+    # causing an error to be rendered.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "notify",
+            "IDs": [package.ID]
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You did not select any packages to be notified about."
+    assert errors[0].text.strip() == expected

From d5520c9ed2ff7e48d97d799fb8142f123b7c1257 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 9 Oct 2021 23:06:37 -0700
Subject: [PATCH 464/844] feat(FastAPI): add /packages (post) action:
 'unnotify'

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 51 ++++++++++++++++++++++++++++++++----
 po/aurweb.pot                | 12 +++++++++
 test/test_packages_routes.py | 49 ++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index c74a5ba3..0ce4f60f 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -867,11 +867,7 @@ async def pkgbase_notify(request: Request, name: str):
                             status_code=HTTPStatus.SEE_OTHER)
 
 
-@router.post("/pkgbase/{name}/unnotify")
-@auth_required(True, redirect="/pkgbase/{name}")
-async def pkgbase_unnotify(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
+def pkgbase_unnotify_instance(request: Request, pkgbase: models.PackageBase):
     notif = pkgbase.notifications.filter(
         models.PackageNotification.UserID == request.user.ID
     ).first()
@@ -880,6 +876,12 @@ async def pkgbase_unnotify(request: Request, name: str):
         with db.begin():
             db.session.delete(notif)
 
+
+@router.post("/pkgbase/{name}/unnotify")
+@auth_required(True, redirect="/pkgbase/{name}")
+async def pkgbase_unnotify(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+    pkgbase_unnotify_instance(request, pkgbase)
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=HTTPStatus.SEE_OTHER)
 
@@ -1111,12 +1113,51 @@ async def packages_notify(request: Request, package_ids: List[int] = [],
     # TODO: This message does not yet have a translation.
     return (True, ["The selected packages' notifications have been enabled."])
 
+
+async def packages_unnotify(request: Request, package_ids: List[int] = [],
+                            **kwargs):
+    if not package_ids:
+        # TODO: This error does not yet have a translation.
+        return (False,
+                ["You did not select any packages for notification removal."])
+
+    # TODO: This error does not yet have a translation.
+    error_tuple = (
+        False,
+        ["A package you selected does not have notifications enabled."]
+    )
+
+    bases = set()
+    package_ids = set(package_ids)
+    packages = db.query(models.Package).filter(
+        models.Package.ID.in_(package_ids)).all()
+
+    for pkg in packages:
+        if pkg.PackageBase not in bases:
+            bases.update({pkg.PackageBase})
+
+    # Perform some checks on what the user selected for notify.
+    for pkgbase in bases:
+        notif = db.query(pkgbase.notifications.filter(
+            models.PackageNotification.UserID == request.user.ID
+        ).exists()).scalar()
+        if not notif:
+            return error_tuple
+
+    for pkgbase in bases:
+        pkgbase_unnotify_instance(request, pkgbase)
+
+    # TODO: This message does not yet have a translation.
+    return (True, ["The selected packages' notifications have been removed."])
+
+
 # A mapping of action string -> callback functions used within the
 # `packages_post` route below. We expect any action callback to
 # return a tuple in the format: (succeeded: bool, message: List[str]).
 PACKAGE_ACTIONS = {
     "unflag": packages_unflag,
     "notify": packages_notify,
+    "unnotify": packages_unnotify,
 }
 
 
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 699a6aef..05505e8b 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -966,6 +966,18 @@ msgstr ""
 msgid "The selected packages' notifications have been enabled."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr ""
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index f86bb805..f663da49 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2154,3 +2154,52 @@ def test_packages_post_notify(client: TestClient, user: User, package: Package):
     errors = get_errors(resp.text)
     expected = "You did not select any packages to be notified about."
     assert errors[0].text.strip() == expected
+
+
+def test_packages_post_unnotify(client: TestClient, user: User,
+                                package: Package):
+    # Create a notification record.
+    with db.begin():
+        notif = db.create(PackageNotification,
+                          PackageBase=package.PackageBase,
+                          User=user)
+    assert notif is not None
+
+    # Request removal of the notification without any IDs.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "unnotify"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You did not select any packages for notification removal."
+    assert errors[0].text.strip() == expected
+
+    # Request removal of the notification; really.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "unnotify",
+            "IDs": [package.ID]
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    successes = get_successes(resp.text)
+    expected = "The selected packages' notifications have been removed."
+    assert successes[0].text.strip() == expected
+
+    # Let's ensure the record got removed.
+    notif = package.PackageBase.notifications.filter(
+        PackageNotification.UserID == user.ID
+    ).first()
+    assert notif is None
+
+    # Try it again. The notif no longer exists.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "unnotify",
+            "IDs": [package.ID]
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "A package you selected does not have notifications enabled."
+    assert errors[0].text.strip() == expected

From d4210c53cf74715df42c70e0c5ba90c8dfe7ba29 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 22 Oct 2021 17:39:59 -0700
Subject: [PATCH 465/844] fix: update poetry dependencies

There were some test failures caused by problematic
dependency versioning, most likely to to the seriously
braindead pyproject.toml config for deps that previously
existed.

This commit defines python version >=3.9<3.10 for our working
Python version and provides updated deps (to latest).

I believe the bug was originally caused by the fact that
we had no python dependency defined, allowing poetry to
resolve dependencies incorrectly for what we intended.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 804 ++++++++++++++++++++++++++-----------------------
 pyproject.toml |  76 ++---
 2 files changed, 474 insertions(+), 406 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 322e250f..eefec89b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -8,21 +8,22 @@ python-versions = ">=3.6,<4.0"
 
 [[package]]
 name = "alembic"
-version = "1.6.5"
+version = "1.7.4"
 description = "A database migration tool for SQLAlchemy."
 category = "main"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
+python-versions = ">=3.6"
 
 [package.dependencies]
 Mako = "*"
-python-dateutil = "*"
-python-editor = ">=0.3"
 SQLAlchemy = ">=1.3.0"
 
+[package.extras]
+tz = ["python-dateutil"]
+
 [[package]]
 name = "anyio"
-version = "3.3.0"
+version = "3.3.4"
 description = "High level compatibility layer for multiple asynchronous event loop implementations"
 category = "main"
 optional = false
@@ -72,7 +73,7 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>
 
 [[package]]
 name = "authlib"
-version = "0.15.2"
+version = "0.15.5"
 description = "The ultimate Python library in building OAuth and OpenID Connect servers."
 category = "main"
 optional = false
@@ -102,11 +103,11 @@ typecheck = ["mypy"]
 
 [[package]]
 name = "bleach"
-version = "3.3.1"
+version = "4.1.0"
 description = "An easy safelist-based HTML-sanitizing tool."
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.6"
 
 [package.dependencies]
 packaging = "*"
@@ -115,7 +116,7 @@ webencodings = "*"
 
 [[package]]
 name = "certifi"
-version = "2021.5.30"
+version = "2021.10.8"
 description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
@@ -123,7 +124,7 @@ python-versions = "*"
 
 [[package]]
 name = "cffi"
-version = "1.14.6"
+version = "1.15.0"
 description = "Foreign Function Interface for Python calling C code."
 category = "main"
 optional = false
@@ -134,7 +135,7 @@ pycparser = "*"
 
 [[package]]
 name = "charset-normalizer"
-version = "2.0.4"
+version = "2.0.7"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
@@ -145,9 +146,9 @@ unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
-version = "8.0.1"
+version = "8.0.3"
 description = "Composable command line interface toolkit"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 
@@ -158,24 +159,27 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 name = "colorama"
 version = "0.4.4"
 description = "Cross-platform colored terminal text."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "coverage"
-version = "5.5"
+version = "6.0.2"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+python-versions = ">=3.6"
+
+[package.dependencies]
+tomli = {version = "*", optional = true, markers = "extra == \"toml\""}
 
 [package.extras]
-toml = ["toml"]
+toml = ["tomli"]
 
 [[package]]
 name = "cryptography"
-version = "3.4.8"
+version = "35.0.0"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 category = "main"
 optional = false
@@ -188,9 +192,9 @@ cffi = ">=1.12"
 docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
 docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
 pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
-sdist = ["setuptools-rust (>=0.11.4)"]
+sdist = ["setuptools_rust (>=0.11.4)"]
 ssh = ["bcrypt (>=3.1.5)"]
-test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
+test = ["pytest (>=6.2.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
 
 [[package]]
 name = "dnspython"
@@ -229,13 +233,14 @@ idna = ">=2.0.0"
 
 [[package]]
 name = "fakeredis"
-version = "1.6.0"
+version = "1.6.1"
 description = "Fake implementation of redis API for testing purposes."
 category = "main"
 optional = false
 python-versions = ">=3.5"
 
 [package.dependencies]
+packaging = "*"
 redis = "<3.6.0"
 six = ">=1.12"
 sortedcontainers = "*"
@@ -246,21 +251,21 @@ lua = ["lupa"]
 
 [[package]]
 name = "fastapi"
-version = "0.66.0"
+version = "0.70.0"
 description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"
 category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.6.1"
 
 [package.dependencies]
 pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0"
-starlette = "0.14.2"
+starlette = "0.16.0"
 
 [package.extras]
-all = ["requests (>=2.24.0,<3.0.0)", "aiofiles (>=0.5.0,<0.6.0)", "jinja2 (>=2.11.2,<3.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<2.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "graphene (>=2.1.8,<3.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)"]
-dev = ["python-jose[cryptography] (>=3.1.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "graphene (>=2.1.8,<3.0.0)"]
-doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "markdown-include (>=0.6.0,<0.7.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"]
-test = ["pytest (==5.4.3)", "pytest-cov (==2.10.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (==0.812)", "flake8 (>=3.8.3,<4.0.0)", "black (==20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.4.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"]
+all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"]
+dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"]
+doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"]
+test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"]
 
 [[package]]
 name = "feedgen"
@@ -276,16 +281,41 @@ python-dateutil = "*"
 
 [[package]]
 name = "flake8"
-version = "3.9.2"
+version = "4.0.1"
 description = "the modular source code checker: pep8 pyflakes and co"
 category = "dev"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+python-versions = ">=3.6"
 
 [package.dependencies]
 mccabe = ">=0.6.0,<0.7.0"
-pycodestyle = ">=2.7.0,<2.8.0"
-pyflakes = ">=2.3.0,<2.4.0"
+pycodestyle = ">=2.8.0,<2.9.0"
+pyflakes = ">=2.4.0,<2.5.0"
+
+[[package]]
+name = "greenlet"
+version = "1.1.2"
+description = "Lightweight in-process concurrent programming"
+category = "main"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
+
+[package.extras]
+docs = ["sphinx"]
+
+[[package]]
+name = "gunicorn"
+version = "20.1.0"
+description = "WSGI HTTP Server for UNIX"
+category = "main"
+optional = false
+python-versions = ">=3.5"
+
+[package.extras]
+eventlet = ["eventlet (>=0.24.1)"]
+gevent = ["gevent (>=1.4.0)"]
+setproctitle = ["setproctitle"]
+tornado = ["tornado (>=0.2)"]
 
 [[package]]
 name = "h11"
@@ -297,7 +327,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "h2"
-version = "4.0.0"
+version = "4.1.0"
 description = "HTTP/2 State-Machine based protocol implementation"
 category = "main"
 optional = false
@@ -317,7 +347,7 @@ python-versions = ">=3.6.1"
 
 [[package]]
 name = "httpcore"
-version = "0.13.6"
+version = "0.13.7"
 description = "A minimal low-level HTTP client."
 category = "main"
 optional = false
@@ -333,7 +363,7 @@ http2 = ["h2 (>=3,<5)"]
 
 [[package]]
 name = "httpx"
-version = "0.18.2"
+version = "0.20.0"
 description = "The next generation HTTP client."
 category = "main"
 optional = false
@@ -341,13 +371,15 @@ python-versions = ">=3.6"
 
 [package.dependencies]
 certifi = "*"
+charset-normalizer = "*"
 httpcore = ">=0.13.3,<0.14.0"
 rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]}
 sniffio = "*"
 
 [package.extras]
-brotli = ["brotlicffi (>=1.0.0,<2.0.0)"]
-http2 = ["h2 (>=3.0.0,<4.0.0)"]
+brotli = ["brotlicffi", "brotli"]
+cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"]
+http2 = ["h2 (>=3,<5)"]
 
 [[package]]
 name = "hypercorn"
@@ -380,7 +412,7 @@ python-versions = ">=3.6.1"
 
 [[package]]
 name = "idna"
-version = "3.2"
+version = "3.3"
 description = "Internationalized Domain Names in Applications (IDNA)"
 category = "main"
 optional = false
@@ -418,7 +450,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "jinja2"
-version = "3.0.1"
+version = "3.0.2"
 description = "A very fast and expressive template engine."
 category = "main"
 optional = false
@@ -496,7 +528,7 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "orjson"
-version = "3.6.3"
+version = "3.6.4"
 description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 category = "main"
 optional = false
@@ -523,14 +555,15 @@ python-versions = "*"
 
 [[package]]
 name = "pluggy"
-version = "0.13.1"
+version = "1.0.0"
 description = "plugin and hook calling mechanisms for python"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=3.6"
 
 [package.extras]
 dev = ["pre-commit", "tox"]
+testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "poetry-dynamic-versioning"
@@ -555,14 +588,11 @@ python-versions = ">=3.6.1"
 
 [[package]]
 name = "protobuf"
-version = "3.17.3"
+version = "3.19.0"
 description = "Protocol Buffers"
 category = "main"
 optional = false
-python-versions = "*"
-
-[package.dependencies]
-six = ">=1.9"
+python-versions = ">=3.5"
 
 [[package]]
 name = "py"
@@ -574,11 +604,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pycodestyle"
-version = "2.7.0"
+version = "2.8.0"
 description = "Python style guide checker"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "pycparser"
@@ -605,7 +635,7 @@ email = ["email-validator (>=1.0.3)"]
 
 [[package]]
 name = "pyflakes"
-version = "2.3.1"
+version = "2.4.0"
 description = "passive checker of Python programs"
 category = "dev"
 optional = false
@@ -613,7 +643,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pygit2"
-version = "1.6.1"
+version = "1.7.0"
 description = "Python bindings for libgit2."
 category = "main"
 optional = false
@@ -632,7 +662,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "pytest"
-version = "6.2.4"
+version = "6.2.5"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
@@ -644,7 +674,7 @@ attrs = ">=19.2.0"
 colorama = {version = "*", markers = "sys_platform == \"win32\""}
 iniconfig = "*"
 packaging = "*"
-pluggy = ">=0.12,<1.0.0a1"
+pluggy = ">=0.12,<2.0"
 py = ">=1.8.2"
 toml = "*"
 
@@ -653,7 +683,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm
 
 [[package]]
 name = "pytest-asyncio"
-version = "0.15.1"
+version = "0.16.0"
 description = "Pytest support for asyncio."
 category = "dev"
 optional = false
@@ -667,16 +697,15 @@ testing = ["coverage", "hypothesis (>=5.7.1)"]
 
 [[package]]
 name = "pytest-cov"
-version = "2.12.1"
+version = "3.0.0"
 description = "Pytest plugin for measuring coverage."
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.6"
 
 [package.dependencies]
-coverage = ">=5.2.1"
+coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
-toml = "*"
 
 [package.extras]
 testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
@@ -704,14 +733,6 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
 [package.dependencies]
 six = ">=1.5"
 
-[[package]]
-name = "python-editor"
-version = "1.0.4"
-description = "Programmatically open an editor, capture the result."
-category = "main"
-optional = false
-python-versions = "*"
-
 [[package]]
 name = "python-multipart"
 version = "0.0.5"
@@ -792,34 +813,49 @@ python-versions = "*"
 
 [[package]]
 name = "sqlalchemy"
-version = "1.3.23"
+version = "1.4.26"
 description = "Database Abstraction Library"
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
+
+[package.dependencies]
+greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"aarch64\" or platform_machine == \"ppc64le\" or platform_machine == \"x86_64\" or platform_machine == \"amd64\" or platform_machine == \"AMD64\" or platform_machine == \"win32\" or platform_machine == \"WIN32\")"}
 
 [package.extras]
+aiomysql = ["greenlet (!=0.4.17)", "aiomysql"]
+aiosqlite = ["typing_extensions (!=3.10.0.1)", "greenlet (!=0.4.17)", "aiosqlite"]
+asyncio = ["greenlet (!=0.4.17)"]
+asyncmy = ["greenlet (!=0.4.17)", "asyncmy (>=0.2.3)"]
+mariadb_connector = ["mariadb (>=1.0.1)"]
 mssql = ["pyodbc"]
 mssql_pymssql = ["pymssql"]
 mssql_pyodbc = ["pyodbc"]
-mysql = ["mysqlclient"]
-oracle = ["cx-oracle"]
-postgresql = ["psycopg2"]
-postgresql_pg8000 = ["pg8000 (<1.16.6)"]
+mypy = ["sqlalchemy2-stubs", "mypy (>=0.910)"]
+mysql = ["mysqlclient (>=1.4.0,<2)", "mysqlclient (>=1.4.0)"]
+mysql_connector = ["mysql-connector-python"]
+oracle = ["cx_oracle (>=7,<8)", "cx_oracle (>=7)"]
+postgresql = ["psycopg2 (>=2.7)"]
+postgresql_asyncpg = ["greenlet (!=0.4.17)", "asyncpg"]
+postgresql_pg8000 = ["pg8000 (>=1.16.6)"]
 postgresql_psycopg2binary = ["psycopg2-binary"]
 postgresql_psycopg2cffi = ["psycopg2cffi"]
 pymysql = ["pymysql (<1)", "pymysql"]
+sqlcipher = ["sqlcipher3-binary"]
 
 [[package]]
 name = "starlette"
-version = "0.14.2"
+version = "0.16.0"
 description = "The little ASGI library that shines."
 category = "main"
 optional = false
 python-versions = ">=3.6"
 
+[package.dependencies]
+anyio = ">=3.0.0,<4"
+
 [package.extras]
-full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"]
+full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"]
 
 [[package]]
 name = "tap.py"
@@ -840,6 +876,14 @@ category = "main"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
+[[package]]
+name = "tomli"
+version = "1.2.1"
+description = "A lil' TOML parser"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "tomlkit"
 version = "0.7.2"
@@ -848,17 +892,6 @@ category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
-[package.dependencies]
-typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\""}
-
-[[package]]
-name = "typing"
-version = "3.7.4.3"
-description = "Type Hints for Python"
-category = "main"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-
 [[package]]
 name = "typing-extensions"
 version = "3.10.0.2"
@@ -869,7 +902,7 @@ python-versions = "*"
 
 [[package]]
 name = "urllib3"
-version = "1.26.6"
+version = "1.26.7"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "main"
 optional = false
@@ -884,7 +917,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 name = "uvicorn"
 version = "0.15.0"
 description = "The lightning-fast ASGI server."
-category = "dev"
+category = "main"
 optional = false
 python-versions = "*"
 
@@ -906,7 +939,7 @@ python-versions = "*"
 
 [[package]]
 name = "werkzeug"
-version = "2.0.1"
+version = "2.0.2"
 description = "The comprehensive WSGI web application library."
 category = "main"
 optional = false
@@ -928,8 +961,8 @@ h11 = ">=0.9.0,<1"
 
 [metadata]
 lock-version = "1.1"
-python-versions = "*"
-content-hash = "c262ac1160b83593377fb7520d35c4b8ad81e5acff9d0a2060b2b048e3865b78"
+python-versions = ">=3.9,<3.10"
+content-hash = "eb5ec82957f9fb964ca6f3852e353da51542982923dc6169658bd4bccfa78513"
 
 [metadata.files]
 aiofiles = [
@@ -937,12 +970,12 @@ aiofiles = [
     {file = "aiofiles-0.7.0.tar.gz", hash = "sha256:a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"},
 ]
 alembic = [
-    {file = "alembic-1.6.5-py2.py3-none-any.whl", hash = "sha256:e78be5b919f5bb184e3e0e2dd1ca986f2362e29a2bc933c446fe89f39dbe4e9c"},
-    {file = "alembic-1.6.5.tar.gz", hash = "sha256:a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"},
+    {file = "alembic-1.7.4-py3-none-any.whl", hash = "sha256:e3cab9e59778b3b6726bb2da9ced451c6622d558199fd3ef914f3b1e8f4ef704"},
+    {file = "alembic-1.7.4.tar.gz", hash = "sha256:9d33f3ff1488c4bfab1e1a6dfebbf085e8a8e1a3e047a43ad29ad1f67f012a1d"},
 ]
 anyio = [
-    {file = "anyio-3.3.0-py3-none-any.whl", hash = "sha256:929a6852074397afe1d989002aa96d457e3e1e5441357c60d03e7eea0e65e1b0"},
-    {file = "anyio-3.3.0.tar.gz", hash = "sha256:ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374"},
+    {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"},
+    {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"},
 ]
 asgiref = [
     {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"},
@@ -957,8 +990,8 @@ attrs = [
     {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"},
 ]
 authlib = [
-    {file = "Authlib-0.15.2-py2.py3-none-any.whl", hash = "sha256:078b900fa9fbebf9f8dae1d5dc1ca857b6a742493093ef9b0b36ad926f36e41f"},
-    {file = "Authlib-0.15.2.tar.gz", hash = "sha256:21b34625c83ca48150684bbeca8f7c884cd281913c72d146dbf0e9d2fbfdec4e"},
+    {file = "Authlib-0.15.5-py2.py3-none-any.whl", hash = "sha256:ecf4a7a9f2508c0bb07e93a752dd3c495cfaffc20e864ef0ffc95e3f40d2abaf"},
+    {file = "Authlib-0.15.5.tar.gz", hash = "sha256:b83cf6360c8e92b0e9df0d1f32d675790bcc4e3c03977499b1eed24dcdef4252"},
 ]
 bcrypt = [
     {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6"},
@@ -970,144 +1003,133 @@ bcrypt = [
     {file = "bcrypt-3.2.0.tar.gz", hash = "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"},
 ]
 bleach = [
-    {file = "bleach-3.3.1-py2.py3-none-any.whl", hash = "sha256:ae976d7174bba988c0b632def82fdc94235756edfb14e6558a9c5be555c9fb78"},
-    {file = "bleach-3.3.1.tar.gz", hash = "sha256:306483a5a9795474160ad57fce3ddd1b50551e981eed8e15a582d34cef28aafa"},
+    {file = "bleach-4.1.0-py2.py3-none-any.whl", hash = "sha256:4d2651ab93271d1129ac9cbc679f524565cc8a1b791909c4a51eac4446a15994"},
+    {file = "bleach-4.1.0.tar.gz", hash = "sha256:0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da"},
 ]
 certifi = [
-    {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"},
-    {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"},
+    {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
+    {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
 ]
 cffi = [
-    {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"},
-    {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"},
-    {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"},
-    {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"},
-    {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"},
-    {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"},
-    {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"},
-    {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"},
-    {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"},
-    {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"},
-    {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"},
-    {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"},
-    {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"},
-    {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"},
-    {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"},
-    {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"},
-    {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"},
-    {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"},
-    {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"},
-    {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"},
-    {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"},
-    {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"},
-    {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"},
-    {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"},
-    {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"},
-    {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"},
-    {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"},
-    {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"},
-    {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"},
-    {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"},
-    {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"},
-    {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"},
-    {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"},
-    {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"},
-    {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"},
-    {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"},
-    {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"},
-    {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"},
-    {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"},
-    {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"},
-    {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"},
-    {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"},
-    {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"},
-    {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"},
-    {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"},
+    {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"},
+    {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"},
+    {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"},
+    {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"},
+    {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"},
+    {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"},
+    {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"},
+    {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"},
+    {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"},
+    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"},
+    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"},
+    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"},
+    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"},
+    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"},
+    {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"},
+    {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"},
+    {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"},
+    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"},
+    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"},
+    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"},
+    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"},
+    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"},
+    {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"},
+    {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"},
+    {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"},
+    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"},
+    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"},
+    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"},
+    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"},
+    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"},
+    {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"},
+    {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"},
+    {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"},
+    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"},
+    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"},
+    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"},
+    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"},
+    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"},
+    {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"},
+    {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"},
+    {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"},
+    {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"},
+    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"},
+    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"},
+    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"},
+    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"},
+    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"},
+    {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"},
+    {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"},
+    {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"},
 ]
 charset-normalizer = [
-    {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"},
-    {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"},
+    {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"},
+    {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"},
 ]
 click = [
-    {file = "click-8.0.1-py3-none-any.whl", hash = "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"},
-    {file = "click-8.0.1.tar.gz", hash = "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a"},
+    {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
+    {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
     {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
 ]
 coverage = [
-    {file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"},
-    {file = "coverage-5.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b"},
-    {file = "coverage-5.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669"},
-    {file = "coverage-5.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90"},
-    {file = "coverage-5.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c"},
-    {file = "coverage-5.5-cp27-cp27m-win32.whl", hash = "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a"},
-    {file = "coverage-5.5-cp27-cp27m-win_amd64.whl", hash = "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82"},
-    {file = "coverage-5.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905"},
-    {file = "coverage-5.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083"},
-    {file = "coverage-5.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5"},
-    {file = "coverage-5.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81"},
-    {file = "coverage-5.5-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6"},
-    {file = "coverage-5.5-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0"},
-    {file = "coverage-5.5-cp310-cp310-win_amd64.whl", hash = "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae"},
-    {file = "coverage-5.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb"},
-    {file = "coverage-5.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160"},
-    {file = "coverage-5.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6"},
-    {file = "coverage-5.5-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701"},
-    {file = "coverage-5.5-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793"},
-    {file = "coverage-5.5-cp35-cp35m-win32.whl", hash = "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e"},
-    {file = "coverage-5.5-cp35-cp35m-win_amd64.whl", hash = "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3"},
-    {file = "coverage-5.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066"},
-    {file = "coverage-5.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a"},
-    {file = "coverage-5.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465"},
-    {file = "coverage-5.5-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb"},
-    {file = "coverage-5.5-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821"},
-    {file = "coverage-5.5-cp36-cp36m-win32.whl", hash = "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45"},
-    {file = "coverage-5.5-cp36-cp36m-win_amd64.whl", hash = "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184"},
-    {file = "coverage-5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a"},
-    {file = "coverage-5.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53"},
-    {file = "coverage-5.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d"},
-    {file = "coverage-5.5-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638"},
-    {file = "coverage-5.5-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3"},
-    {file = "coverage-5.5-cp37-cp37m-win32.whl", hash = "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a"},
-    {file = "coverage-5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a"},
-    {file = "coverage-5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6"},
-    {file = "coverage-5.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2"},
-    {file = "coverage-5.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759"},
-    {file = "coverage-5.5-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873"},
-    {file = "coverage-5.5-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a"},
-    {file = "coverage-5.5-cp38-cp38-win32.whl", hash = "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6"},
-    {file = "coverage-5.5-cp38-cp38-win_amd64.whl", hash = "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502"},
-    {file = "coverage-5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b"},
-    {file = "coverage-5.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529"},
-    {file = "coverage-5.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b"},
-    {file = "coverage-5.5-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff"},
-    {file = "coverage-5.5-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b"},
-    {file = "coverage-5.5-cp39-cp39-win32.whl", hash = "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6"},
-    {file = "coverage-5.5-cp39-cp39-win_amd64.whl", hash = "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03"},
-    {file = "coverage-5.5-pp36-none-any.whl", hash = "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079"},
-    {file = "coverage-5.5-pp37-none-any.whl", hash = "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4"},
-    {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"},
+    {file = "coverage-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1549e1d08ce38259de2bc3e9a0d5f3642ff4a8f500ffc1b2df73fd621a6cdfc0"},
+    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bcae10fccb27ca2a5f456bf64d84110a5a74144be3136a5e598f9d9fb48c0caa"},
+    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:53a294dc53cfb39c74758edaa6305193fb4258a30b1f6af24b360a6c8bd0ffa7"},
+    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8251b37be1f2cd9c0e5ccd9ae0380909c24d2a5ed2162a41fcdbafaf59a85ebd"},
+    {file = "coverage-6.0.2-cp310-cp310-win32.whl", hash = "sha256:db42baa892cba723326284490283a68d4de516bfb5aaba369b4e3b2787a778b7"},
+    {file = "coverage-6.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:bbffde2a68398682623d9dd8c0ca3f46fda074709b26fcf08ae7a4c431a6ab2d"},
+    {file = "coverage-6.0.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:60e51a3dd55540bec686d7fff61b05048ca31e804c1f32cbb44533e6372d9cc3"},
+    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a6a9409223a27d5ef3cca57dd7cd4dfcb64aadf2fad5c3b787830ac9223e01a"},
+    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4b34ae4f51bbfa5f96b758b55a163d502be3dcb24f505d0227858c2b3f94f5b9"},
+    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3bbda1b550e70fa6ac40533d3f23acd4f4e9cb4e6e77251ce77fdf41b3309fb2"},
+    {file = "coverage-6.0.2-cp36-cp36m-win32.whl", hash = "sha256:4e28d2a195c533b58fc94a12826f4431726d8eb029ac21d874345f943530c122"},
+    {file = "coverage-6.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a82d79586a0a4f5fd1cf153e647464ced402938fbccb3ffc358c7babd4da1dd9"},
+    {file = "coverage-6.0.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3be1206dc09fb6298de3fce70593e27436862331a85daee36270b6d0e1c251c4"},
+    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9cd3828bbe1a40070c11fe16a51df733fd2f0cb0d745fb83b7b5c1f05967df7"},
+    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d036dc1ed8e1388e995833c62325df3f996675779541f682677efc6af71e96cc"},
+    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04560539c19ec26995ecfb3d9307ff154fbb9a172cb57e3b3cfc4ced673103d1"},
+    {file = "coverage-6.0.2-cp37-cp37m-win32.whl", hash = "sha256:e4fb7ced4d9dec77d6cf533acfbf8e1415fe799430366affb18d69ee8a3c6330"},
+    {file = "coverage-6.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:77b1da5767ed2f44611bc9bc019bc93c03fa495728ec389759b6e9e5039ac6b1"},
+    {file = "coverage-6.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:61b598cbdbaae22d9e34e3f675997194342f866bb1d781da5d0be54783dce1ff"},
+    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36e9040a43d2017f2787b28d365a4bb33fcd792c7ff46a047a04094dc0e2a30d"},
+    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9f1627e162e3864a596486774876415a7410021f4b67fd2d9efdf93ade681afc"},
+    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e7a0b42db2a47ecb488cde14e0f6c7679a2c5a9f44814393b162ff6397fcdfbb"},
+    {file = "coverage-6.0.2-cp38-cp38-win32.whl", hash = "sha256:a1b73c7c4d2a42b9d37dd43199c5711d91424ff3c6c22681bc132db4a4afec6f"},
+    {file = "coverage-6.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:1db67c497688fd4ba85b373b37cc52c50d437fd7267520ecd77bddbd89ea22c9"},
+    {file = "coverage-6.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f2f184bf38e74f152eed7f87e345b51f3ab0b703842f447c22efe35e59942c24"},
+    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd1cf1deb3d5544bd942356364a2fdc8959bad2b6cf6eb17f47d301ea34ae822"},
+    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ad9b8c1206ae41d46ec7380b78ba735ebb77758a650643e841dd3894966c31d0"},
+    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:381d773d896cc7f8ba4ff3b92dee4ed740fb88dfe33b6e42efc5e8ab6dfa1cfe"},
+    {file = "coverage-6.0.2-cp39-cp39-win32.whl", hash = "sha256:424c44f65e8be58b54e2b0bd1515e434b940679624b1b72726147cfc6a9fc7ce"},
+    {file = "coverage-6.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:abbff240f77347d17306d3201e14431519bf64495648ca5a49571f988f88dee9"},
+    {file = "coverage-6.0.2-pp36-none-any.whl", hash = "sha256:7092eab374346121805fb637572483270324407bf150c30a3b161fc0c4ca5164"},
+    {file = "coverage-6.0.2-pp37-none-any.whl", hash = "sha256:30922626ce6f7a5a30bdba984ad21021529d3d05a68b4f71ea3b16bda35b8895"},
+    {file = "coverage-6.0.2.tar.gz", hash = "sha256:6807947a09510dc31fa86f43595bf3a14017cd60bf633cc746d52141bfa6b149"},
 ]
 cryptography = [
-    {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"},
-    {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"},
-    {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"},
-    {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"},
-    {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"},
-    {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"},
-    {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"},
-    {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"},
-    {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"},
-    {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af"},
-    {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a"},
-    {file = "cryptography-3.4.8-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06"},
-    {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498"},
-    {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7"},
-    {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9"},
-    {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"},
-    {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"},
+    {file = "cryptography-35.0.0-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:d57e0cdc1b44b6cdf8af1d01807db06886f10177469312fbde8f44ccbb284bc9"},
+    {file = "cryptography-35.0.0-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:ced40344e811d6abba00295ced98c01aecf0c2de39481792d87af4fa58b7b4d6"},
+    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:54b2605e5475944e2213258e0ab8696f4f357a31371e538ef21e8d61c843c28d"},
+    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:7b7ceeff114c31f285528ba8b390d3e9cfa2da17b56f11d366769a807f17cbaa"},
+    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d69645f535f4b2c722cfb07a8eab916265545b3475fdb34e0be2f4ee8b0b15e"},
+    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a2d0e0acc20ede0f06ef7aa58546eee96d2592c00f450c9acb89c5879b61992"},
+    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:07bb7fbfb5de0980590ddfc7f13081520def06dc9ed214000ad4372fb4e3c7f6"},
+    {file = "cryptography-35.0.0-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:7eba2cebca600a7806b893cb1d541a6e910afa87e97acf2021a22b32da1df52d"},
+    {file = "cryptography-35.0.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:18d90f4711bf63e2fb21e8c8e51ed8189438e6b35a6d996201ebd98a26abbbe6"},
+    {file = "cryptography-35.0.0-cp36-abi3-win32.whl", hash = "sha256:c10c797ac89c746e488d2ee92bd4abd593615694ee17b2500578b63cad6b93a8"},
+    {file = "cryptography-35.0.0-cp36-abi3-win_amd64.whl", hash = "sha256:7075b304cd567694dc692ffc9747f3e9cb393cc4aa4fb7b9f3abd6f5c4e43588"},
+    {file = "cryptography-35.0.0-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a688ebcd08250eab5bb5bca318cc05a8c66de5e4171a65ca51db6bd753ff8953"},
+    {file = "cryptography-35.0.0-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d99915d6ab265c22873f1b4d6ea5ef462ef797b4140be4c9d8b179915e0985c6"},
+    {file = "cryptography-35.0.0-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:928185a6d1ccdb816e883f56ebe92e975a262d31cc536429041921f8cb5a62fd"},
+    {file = "cryptography-35.0.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:ebeddd119f526bcf323a89f853afb12e225902a24d29b55fe18dd6fcb2838a76"},
+    {file = "cryptography-35.0.0-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:22a38e96118a4ce3b97509443feace1d1011d0571fae81fc3ad35f25ba3ea999"},
+    {file = "cryptography-35.0.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eb80e8a1f91e4b7ef8b33041591e6d89b2b8e122d787e87eeb2b08da71bb16ad"},
+    {file = "cryptography-35.0.0-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:abb5a361d2585bb95012a19ed9b2c8f412c5d723a9836418fab7aaa0243e67d2"},
+    {file = "cryptography-35.0.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:1ed82abf16df40a60942a8c211251ae72858b25b7421ce2497c2eb7a1cee817c"},
+    {file = "cryptography-35.0.0.tar.gz", hash = "sha256:9933f28f70d0517686bd7de36166dda42094eac49415459d9bdf5e7df3e0086d"},
 ]
 dnspython = [
     {file = "dnspython-2.1.0-py3-none-any.whl", hash = "sha256:95d12f6ef0317118d2a1a6fc49aac65ffec7eb8087474158f42f26a639135216"},
@@ -1122,39 +1144,95 @@ email-validator = [
     {file = "email_validator-1.1.3.tar.gz", hash = "sha256:aa237a65f6f4da067119b7df3f13e89c25c051327b2b5b66dc075f33d62480d7"},
 ]
 fakeredis = [
-    {file = "fakeredis-1.6.0-py3-none-any.whl", hash = "sha256:3449b306f3a85102b28f8180c24722ef966fcb1e3c744758b6f635ec80321a5c"},
-    {file = "fakeredis-1.6.0.tar.gz", hash = "sha256:11ccfc9769d718d37e45b382e64a6ba02586b622afa0371a6bd85766d72255f3"},
+    {file = "fakeredis-1.6.1-py3-none-any.whl", hash = "sha256:5eb1516f1fe1813e9da8f6c482178fc067af09f53de587ae03887ef5d9d13024"},
+    {file = "fakeredis-1.6.1.tar.gz", hash = "sha256:0d06a9384fb79da9f2164ce96e34eb9d4e2ea46215070805ea6fd3c174590b47"},
 ]
 fastapi = [
-    {file = "fastapi-0.66.0-py3-none-any.whl", hash = "sha256:85d8aee8c3c46171f4cb7bb3651425a42c07cb9183345d100ef55d88ca2ce15f"},
-    {file = "fastapi-0.66.0.tar.gz", hash = "sha256:6ea4225448786f3d6fae737713789f87631a7455f65580de0a4a2e50471060d9"},
+    {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"},
+    {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"},
 ]
 feedgen = [
     {file = "feedgen-0.9.0.tar.gz", hash = "sha256:8e811bdbbed6570034950db23a4388453628a70e689a6e8303ccec430f5a804a"},
 ]
 flake8 = [
-    {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"},
-    {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"},
+    {file = "flake8-4.0.1-py2.py3-none-any.whl", hash = "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d"},
+    {file = "flake8-4.0.1.tar.gz", hash = "sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d"},
+]
+greenlet = [
+    {file = "greenlet-1.1.2-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:58df5c2a0e293bf665a51f8a100d3e9956febfbf1d9aaf8c0677cf70218910c6"},
+    {file = "greenlet-1.1.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:aec52725173bd3a7b56fe91bc56eccb26fbdff1386ef123abb63c84c5b43b63a"},
+    {file = "greenlet-1.1.2-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:833e1551925ed51e6b44c800e71e77dacd7e49181fdc9ac9a0bf3714d515785d"},
+    {file = "greenlet-1.1.2-cp27-cp27m-win32.whl", hash = "sha256:aa5b467f15e78b82257319aebc78dd2915e4c1436c3c0d1ad6f53e47ba6e2713"},
+    {file = "greenlet-1.1.2-cp27-cp27m-win_amd64.whl", hash = "sha256:40b951f601af999a8bf2ce8c71e8aaa4e8c6f78ff8afae7b808aae2dc50d4c40"},
+    {file = "greenlet-1.1.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:95e69877983ea39b7303570fa6760f81a3eec23d0e3ab2021b7144b94d06202d"},
+    {file = "greenlet-1.1.2-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:356b3576ad078c89a6107caa9c50cc14e98e3a6c4874a37c3e0273e4baf33de8"},
+    {file = "greenlet-1.1.2-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:8639cadfda96737427330a094476d4c7a56ac03de7265622fcf4cfe57c8ae18d"},
+    {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97e5306482182170ade15c4b0d8386ded995a07d7cc2ca8f27958d34d6736497"},
+    {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e6a36bb9474218c7a5b27ae476035497a6990e21d04c279884eb10d9b290f1b1"},
+    {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:abb7a75ed8b968f3061327c433a0fbd17b729947b400747c334a9c29a9af6c58"},
+    {file = "greenlet-1.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:14d4f3cd4e8b524ae9b8aa567858beed70c392fdec26dbdb0a8a418392e71708"},
+    {file = "greenlet-1.1.2-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:17ff94e7a83aa8671a25bf5b59326ec26da379ace2ebc4411d690d80a7fbcf23"},
+    {file = "greenlet-1.1.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9f3cba480d3deb69f6ee2c1825060177a22c7826431458c697df88e6aeb3caee"},
+    {file = "greenlet-1.1.2-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:fa877ca7f6b48054f847b61d6fa7bed5cebb663ebc55e018fda12db09dcc664c"},
+    {file = "greenlet-1.1.2-cp35-cp35m-win32.whl", hash = "sha256:7cbd7574ce8e138bda9df4efc6bf2ab8572c9aff640d8ecfece1b006b68da963"},
+    {file = "greenlet-1.1.2-cp35-cp35m-win_amd64.whl", hash = "sha256:903bbd302a2378f984aef528f76d4c9b1748f318fe1294961c072bdc7f2ffa3e"},
+    {file = "greenlet-1.1.2-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:049fe7579230e44daef03a259faa24511d10ebfa44f69411d99e6a184fe68073"},
+    {file = "greenlet-1.1.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:dd0b1e9e891f69e7675ba5c92e28b90eaa045f6ab134ffe70b52e948aa175b3c"},
+    {file = "greenlet-1.1.2-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:7418b6bfc7fe3331541b84bb2141c9baf1ec7132a7ecd9f375912eca810e714e"},
+    {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9d29ca8a77117315101425ec7ec2a47a22ccf59f5593378fc4077ac5b754fce"},
+    {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:21915eb821a6b3d9d8eefdaf57d6c345b970ad722f856cd71739493ce003ad08"},
+    {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eff9d20417ff9dcb0d25e2defc2574d10b491bf2e693b4e491914738b7908168"},
+    {file = "greenlet-1.1.2-cp36-cp36m-win32.whl", hash = "sha256:32ca72bbc673adbcfecb935bb3fb1b74e663d10a4b241aaa2f5a75fe1d1f90aa"},
+    {file = "greenlet-1.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:f0214eb2a23b85528310dad848ad2ac58e735612929c8072f6093f3585fd342d"},
+    {file = "greenlet-1.1.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:b92e29e58bef6d9cfd340c72b04d74c4b4e9f70c9fa7c78b674d1fec18896dc4"},
+    {file = "greenlet-1.1.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fdcec0b8399108577ec290f55551d926d9a1fa6cad45882093a7a07ac5ec147b"},
+    {file = "greenlet-1.1.2-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:93f81b134a165cc17123626ab8da2e30c0455441d4ab5576eed73a64c025b25c"},
+    {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e12bdc622676ce47ae9abbf455c189e442afdde8818d9da983085df6312e7a1"},
+    {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8c790abda465726cfb8bb08bd4ca9a5d0a7bd77c7ac1ca1b839ad823b948ea28"},
+    {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f276df9830dba7a333544bd41070e8175762a7ac20350786b322b714b0e654f5"},
+    {file = "greenlet-1.1.2-cp37-cp37m-win32.whl", hash = "sha256:64e6175c2e53195278d7388c454e0b30997573f3f4bd63697f88d855f7a6a1fc"},
+    {file = "greenlet-1.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b11548073a2213d950c3f671aa88e6f83cda6e2fb97a8b6317b1b5b33d850e06"},
+    {file = "greenlet-1.1.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:9633b3034d3d901f0a46b7939f8c4d64427dfba6bbc5a36b1a67364cf148a1b0"},
+    {file = "greenlet-1.1.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:eb6ea6da4c787111adf40f697b4e58732ee0942b5d3bd8f435277643329ba627"},
+    {file = "greenlet-1.1.2-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:f3acda1924472472ddd60c29e5b9db0cec629fbe3c5c5accb74d6d6d14773478"},
+    {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e859fcb4cbe93504ea18008d1df98dee4f7766db66c435e4882ab35cf70cac43"},
+    {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00e44c8afdbe5467e4f7b5851be223be68adb4272f44696ee71fe46b7036a711"},
+    {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec8c433b3ab0419100bd45b47c9c8551248a5aee30ca5e9d399a0b57ac04651b"},
+    {file = "greenlet-1.1.2-cp38-cp38-win32.whl", hash = "sha256:288c6a76705dc54fba69fbcb59904ae4ad768b4c768839b8ca5fdadec6dd8cfd"},
+    {file = "greenlet-1.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:8d2f1fb53a421b410751887eb4ff21386d119ef9cde3797bf5e7ed49fb51a3b3"},
+    {file = "greenlet-1.1.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:166eac03e48784a6a6e0e5f041cfebb1ab400b394db188c48b3a84737f505b67"},
+    {file = "greenlet-1.1.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:572e1787d1460da79590bf44304abbc0a2da944ea64ec549188fa84d89bba7ab"},
+    {file = "greenlet-1.1.2-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:be5f425ff1f5f4b3c1e33ad64ab994eed12fc284a6ea71c5243fd564502ecbe5"},
+    {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1692f7d6bc45e3200844be0dba153612103db241691088626a33ff1f24a0d88"},
+    {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7227b47e73dedaa513cdebb98469705ef0d66eb5a1250144468e9c3097d6b59b"},
+    {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ff61ff178250f9bb3cd89752df0f1dd0e27316a8bd1465351652b1b4a4cdfd3"},
+    {file = "greenlet-1.1.2-cp39-cp39-win32.whl", hash = "sha256:f70a9e237bb792c7cc7e44c531fd48f5897961701cdaa06cf22fc14965c496cf"},
+    {file = "greenlet-1.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:013d61294b6cd8fe3242932c1c5e36e5d1db2c8afb58606c5a67efce62c1f5fd"},
+    {file = "greenlet-1.1.2.tar.gz", hash = "sha256:e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a"},
+]
+gunicorn = [
+    {file = "gunicorn-20.1.0-py3-none-any.whl", hash = "sha256:9dcc4547dbb1cb284accfb15ab5667a0e5d1881cc443e0677b4882a4067a807e"},
+    {file = "gunicorn-20.1.0.tar.gz", hash = "sha256:e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8"},
 ]
 h11 = [
     {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"},
     {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
 ]
 h2 = [
-    {file = "h2-4.0.0-py3-none-any.whl", hash = "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25"},
-    {file = "h2-4.0.0.tar.gz", hash = "sha256:bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"},
+    {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"},
+    {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"},
 ]
 hpack = [
     {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"},
     {file = "hpack-4.0.0.tar.gz", hash = "sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"},
 ]
 httpcore = [
-    {file = "httpcore-0.13.6-py3-none-any.whl", hash = "sha256:db4c0dcb8323494d01b8c6d812d80091a31e520033e7b0120883d6f52da649ff"},
-    {file = "httpcore-0.13.6.tar.gz", hash = "sha256:b0d16f0012ec88d8cc848f5a55f8a03158405f4bca02ee49bc4ca2c1fda49f3e"},
+    {file = "httpcore-0.13.7-py3-none-any.whl", hash = "sha256:369aa481b014cf046f7067fddd67d00560f2f00426e79569d99cb11245134af0"},
+    {file = "httpcore-0.13.7.tar.gz", hash = "sha256:036f960468759e633574d7c121afba48af6419615d36ab8ede979f1ad6276fa3"},
 ]
 httpx = [
-    {file = "httpx-0.18.2-py3-none-any.whl", hash = "sha256:979afafecb7d22a1d10340bafb403cf2cb75aff214426ff206521fc79d26408c"},
-    {file = "httpx-0.18.2.tar.gz", hash = "sha256:9f99c15d33642d38bce8405df088c1c4cfd940284b4290cacbfb02e64f4877c6"},
+    {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"},
+    {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"},
 ]
 hypercorn = [
     {file = "Hypercorn-0.11.2-py3-none-any.whl", hash = "sha256:8007c10f81566920f8ae12c0e26e146f94ca70506da964b5a727ad610aa1d821"},
@@ -1165,8 +1243,8 @@ hyperframe = [
     {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"},
 ]
 idna = [
-    {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"},
-    {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"},
+    {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
+    {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
 ]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
@@ -1181,8 +1259,8 @@ itsdangerous = [
     {file = "itsdangerous-2.0.1.tar.gz", hash = "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0"},
 ]
 jinja2 = [
-    {file = "Jinja2-3.0.1-py3-none-any.whl", hash = "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4"},
-    {file = "Jinja2-3.0.1.tar.gz", hash = "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4"},
+    {file = "Jinja2-3.0.2-py3-none-any.whl", hash = "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"},
+    {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"},
 ]
 lxml = [
     {file = "lxml-4.6.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:df7c53783a46febb0e70f6b05df2ba104610f2fb0d27023409734a3ecbb78fb2"},
@@ -1310,27 +1388,27 @@ mysqlclient = [
     {file = "mysqlclient-2.0.3.tar.gz", hash = "sha256:f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432"},
 ]
 orjson = [
-    {file = "orjson-3.6.3-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:5f78ed46b179585272a5670537f2203dbb7b3e2f8e4db1be72839cc423e2daef"},
-    {file = "orjson-3.6.3-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:a99f310960e3acdda72ba1e98df8bf8c9145d90a0f72719786f43f4ea6937846"},
-    {file = "orjson-3.6.3-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:8a5e46418f51f03060f91d743b59aed70c8d02a5012428365cfa20b7f670e903"},
-    {file = "orjson-3.6.3-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:084de43ca9b19ad58c618c9f1ff93784e0190df2d88a02ae24c3cdebe9f2e9f7"},
-    {file = "orjson-3.6.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b68a601f49c0328bf16498309e56ab87c1d6c2bb0287abf70329eb958d565c62"},
-    {file = "orjson-3.6.3-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:9e4a26212851ea8ff81dee7e4e0da7e1e63b5b4f4330a8b4f27e99f1ba3f758b"},
-    {file = "orjson-3.6.3-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:5eb9d7f2f45e12cbc7500da4176f2d3221a73891b4be505fe79c52cbb800e872"},
-    {file = "orjson-3.6.3-cp37-none-win_amd64.whl", hash = "sha256:39aa7d42c9760fba36c37adb1d9c6752696ce9443c5dcb65222dd0994b5735e1"},
-    {file = "orjson-3.6.3-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:8d4430e0cc390c1d745aea3827fd0c6fd7aa5f0690de30a2fe25c406aa5efa20"},
-    {file = "orjson-3.6.3-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:be79e0ddea7f3a47332ec9573365c0b8a8cce4357e9682050f53c1bc75c1571f"},
-    {file = "orjson-3.6.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fce5ada0f8dd7c9e16c675626a29dfc5cc766e1eb67d8021b1e77d0861e4e850"},
-    {file = "orjson-3.6.3-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:1014a6f514b39dc414fce60568c9e7f635de97a1f1f5972ebc38f88a6160944a"},
-    {file = "orjson-3.6.3-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:c3beff02a339f194274ec1fcf03e2c1563e84f297b568eb3d45751722454a52e"},
-    {file = "orjson-3.6.3-cp38-none-win_amd64.whl", hash = "sha256:8f105e9290f901a618a0ced87f785fce2fcf6ab753699de081d82ee05c90f038"},
-    {file = "orjson-3.6.3-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:7936bef5589c9955ebee3423df51709d5f3b37ef54b830239bddb9fa5ead99f4"},
-    {file = "orjson-3.6.3-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:82e3afbf404cb91774f894ed7bf52fd83bb1cc6bd72221711f4ce4e7774f0560"},
-    {file = "orjson-3.6.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c702c78c33416fc8a138c5ec36eef5166ecfe8990c8f99c97551cd37c396e4d"},
-    {file = "orjson-3.6.3-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:4606907b9aaec9fea6159ac14f838dbd2851f18b05fb414c4b3143bff9f2bb0d"},
-    {file = "orjson-3.6.3-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:4ebb464b8b557a1401a03da6f41761544886db95b52280e60d25549da7427453"},
-    {file = "orjson-3.6.3-cp39-none-win_amd64.whl", hash = "sha256:720a7d7ba1dcf32bbd8fb380370b1fdd06ed916caea48403edd64f2ccf7883c1"},
-    {file = "orjson-3.6.3.tar.gz", hash = "sha256:353cc079cedfe990ea2d2186306f766e0d47bba63acd072e22d6df96c67be993"},
+    {file = "orjson-3.6.4-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:48a69fed90f551bf9e9bb7a63e363fed4f67fc7c6e6bfb057054dc78f6721e9e"},
+    {file = "orjson-3.6.4-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:3722f02f50861d5e2a6be9d50bfe8da27a5155bb60043118a4e1ceb8c7040cf7"},
+    {file = "orjson-3.6.4-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:6cd300421b41f7e84e388b1792a18c3fc4c440ae3039434b9320956be05f0102"},
+    {file = "orjson-3.6.4-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:e55ef66ee1d35b1c43db275aff3a1ba7e0408b31e624912a612bd799df14e73e"},
+    {file = "orjson-3.6.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef8d332af8e6f7d6d2c1f3b5384c8d239800c1405b136da5f1710e802918d57"},
+    {file = "orjson-3.6.4-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:8896e242a92733e454378e22711bd43a55fda4e80604fcefcc064ca977623673"},
+    {file = "orjson-3.6.4-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:bdfa6f29f7b6aad70ce14591b99fba651008afa6bc3759f158887bcdc568b452"},
+    {file = "orjson-3.6.4-cp37-none-win_amd64.whl", hash = "sha256:7c16c44872d33da0b97050a9ea8f7bc04e930c56e8185657bc200e1875a671da"},
+    {file = "orjson-3.6.4-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:b467551f3be1dd08aff70c261cc883b63483eb0e31861ffe2cd8dac4fec7cfa9"},
+    {file = "orjson-3.6.4-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:7bf61afef12f6416db3ea377f3491ca8ac677d3cac6db1ebffb7a5fe92cce3ca"},
+    {file = "orjson-3.6.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:014ea74d4a5dd6a7e98540768072d5bd8c2fedbcbbedcbbaecbb614e66080e81"},
+    {file = "orjson-3.6.4-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:705cb90c536b4b9336c06b4a62c3c62e50354ddf20a2e48eb62bf34fb93d5b1f"},
+    {file = "orjson-3.6.4-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:159e2240fc36720a5cb51a1cbc9905dcb8758aad50b3e7f14f6178ce2e842004"},
+    {file = "orjson-3.6.4-cp38-none-win_amd64.whl", hash = "sha256:d2ae087866a1050de83c2a28490850badb41aeeb8a4605c84dd6004d4e58b5a4"},
+    {file = "orjson-3.6.4-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b4a7efe039b1154b23e5df8787ac01e4621213aed303b6304a5f8ad89c01455d"},
+    {file = "orjson-3.6.4-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:7b24f97ed76005f447e152b0e493abce8c60f010131998295175446312a71caf"},
+    {file = "orjson-3.6.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1121187e2a721864b52e5dbb3cf8dd4a4546519a5fef1e13fa777347fb8884a2"},
+    {file = "orjson-3.6.4-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:4edffd9e2298ff4f4f939aa67248eba043dc65c9e7d940c28a62c5502c6f2aa8"},
+    {file = "orjson-3.6.4-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:e236fe94d8a77532f0065870fe265bd53e229012f39af99f79f5f1d4a8b0067c"},
+    {file = "orjson-3.6.4-cp39-none-win_amd64.whl", hash = "sha256:5448cc1edd4c4bafc968404f92f0e9a582b4326ca442346bd1d1179a6faf52d9"},
+    {file = "orjson-3.6.4.tar.gz", hash = "sha256:f8dbc428fc6d7420f231a7133d8dff4c882e64acb585dcf2fda74bdcfe1a6d9d"},
 ]
 packaging = [
     {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"},
@@ -1340,8 +1418,8 @@ paginate = [
     {file = "paginate-0.5.6.tar.gz", hash = "sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d"},
 ]
 pluggy = [
-    {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},
-    {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
+    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
+    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
 poetry-dynamic-versioning = [
     {file = "poetry-dynamic-versioning-0.13.1.tar.gz", hash = "sha256:5c0e7b22560db76812057ef95dadad662ecc63eb270145787eabe73da7c222f9"},
@@ -1352,41 +1430,38 @@ priority = [
     {file = "priority-2.0.0.tar.gz", hash = "sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"},
 ]
 protobuf = [
-    {file = "protobuf-3.17.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ab6bb0e270c6c58e7ff4345b3a803cc59dbee19ddf77a4719c5b635f1d547aa8"},
-    {file = "protobuf-3.17.3-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:13ee7be3c2d9a5d2b42a1030976f760f28755fcf5863c55b1460fd205e6cd637"},
-    {file = "protobuf-3.17.3-cp35-cp35m-macosx_10_9_intel.whl", hash = "sha256:1556a1049ccec58c7855a78d27e5c6e70e95103b32de9142bae0576e9200a1b0"},
-    {file = "protobuf-3.17.3-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:f0e59430ee953184a703a324b8ec52f571c6c4259d496a19d1cabcdc19dabc62"},
-    {file = "protobuf-3.17.3-cp35-cp35m-win32.whl", hash = "sha256:a981222367fb4210a10a929ad5983ae93bd5a050a0824fc35d6371c07b78caf6"},
-    {file = "protobuf-3.17.3-cp35-cp35m-win_amd64.whl", hash = "sha256:6d847c59963c03fd7a0cd7c488cadfa10cda4fff34d8bc8cba92935a91b7a037"},
-    {file = "protobuf-3.17.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:145ce0af55c4259ca74993ddab3479c78af064002ec8227beb3d944405123c71"},
-    {file = "protobuf-3.17.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6ce4d8bf0321e7b2d4395e253f8002a1a5ffbcfd7bcc0a6ba46712c07d47d0b4"},
-    {file = "protobuf-3.17.3-cp36-cp36m-win32.whl", hash = "sha256:7a4c97961e9e5b03a56f9a6c82742ed55375c4a25f2692b625d4087d02ed31b9"},
-    {file = "protobuf-3.17.3-cp36-cp36m-win_amd64.whl", hash = "sha256:a22b3a0dbac6544dacbafd4c5f6a29e389a50e3b193e2c70dae6bbf7930f651d"},
-    {file = "protobuf-3.17.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ffea251f5cd3c0b9b43c7a7a912777e0bc86263436a87c2555242a348817221b"},
-    {file = "protobuf-3.17.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:9b7a5c1022e0fa0dbde7fd03682d07d14624ad870ae52054849d8960f04bc764"},
-    {file = "protobuf-3.17.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:8727ee027157516e2c311f218ebf2260a18088ffb2d29473e82add217d196b1c"},
-    {file = "protobuf-3.17.3-cp37-cp37m-win32.whl", hash = "sha256:14c1c9377a7ffbeaccd4722ab0aa900091f52b516ad89c4b0c3bb0a4af903ba5"},
-    {file = "protobuf-3.17.3-cp37-cp37m-win_amd64.whl", hash = "sha256:c56c050a947186ba51de4f94ab441d7f04fcd44c56df6e922369cc2e1a92d683"},
-    {file = "protobuf-3.17.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2ae692bb6d1992afb6b74348e7bb648a75bb0d3565a3f5eea5bec8f62bd06d87"},
-    {file = "protobuf-3.17.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:99938f2a2d7ca6563c0ade0c5ca8982264c484fdecf418bd68e880a7ab5730b1"},
-    {file = "protobuf-3.17.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6902a1e4b7a319ec611a7345ff81b6b004b36b0d2196ce7a748b3493da3d226d"},
-    {file = "protobuf-3.17.3-cp38-cp38-win32.whl", hash = "sha256:59e5cf6b737c3a376932fbfb869043415f7c16a0cf176ab30a5bbc419cd709c1"},
-    {file = "protobuf-3.17.3-cp38-cp38-win_amd64.whl", hash = "sha256:ebcb546f10069b56dc2e3da35e003a02076aaa377caf8530fe9789570984a8d2"},
-    {file = "protobuf-3.17.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4ffbd23640bb7403574f7aff8368e2aeb2ec9a5c6306580be48ac59a6bac8bde"},
-    {file = "protobuf-3.17.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:26010f693b675ff5a1d0e1bdb17689b8b716a18709113288fead438703d45539"},
-    {file = "protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e76d9686e088fece2450dbc7ee905f9be904e427341d289acbe9ad00b78ebd47"},
-    {file = "protobuf-3.17.3-cp39-cp39-win32.whl", hash = "sha256:a38bac25f51c93e4be4092c88b2568b9f407c27217d3dd23c7a57fa522a17554"},
-    {file = "protobuf-3.17.3-cp39-cp39-win_amd64.whl", hash = "sha256:85d6303e4adade2827e43c2b54114d9a6ea547b671cb63fafd5011dc47d0e13d"},
-    {file = "protobuf-3.17.3-py2.py3-none-any.whl", hash = "sha256:2bfb815216a9cd9faec52b16fd2bfa68437a44b67c56bee59bc3926522ecb04e"},
-    {file = "protobuf-3.17.3.tar.gz", hash = "sha256:72804ea5eaa9c22a090d2803813e280fb273b62d5ae497aaf3553d141c4fdd7b"},
+    {file = "protobuf-3.19.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:01a0645ef3acddfbc90237e1cdfae1086130fc7cb480b5874656193afd657083"},
+    {file = "protobuf-3.19.0-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:d3861c9721a90ba83ee0936a9cfcc4fa1c4b4144ac9658fb6f6343b38558e9b4"},
+    {file = "protobuf-3.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b64be5d7270cf5e76375bac049846e8a9543a2d4368b69afe78ab725380a7487"},
+    {file = "protobuf-3.19.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:2f6046b9e2feee0dce994493186e8715b4392ed5f50f356280ad9c2f9f93080a"},
+    {file = "protobuf-3.19.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac2f8ec942d414609aba0331952ae12bb823e8f424bbb6b8c422f1cef32dc842"},
+    {file = "protobuf-3.19.0-cp36-cp36m-win32.whl", hash = "sha256:3fea09aa04ef2f8b01fcc9bb87f19509934f8a35d177c865b8f9ee5c32b60c1b"},
+    {file = "protobuf-3.19.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d1f4277d321f60456845ca9b882c4845736f1f5c1c69eb778eba22a97977d8af"},
+    {file = "protobuf-3.19.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8488c2276f14f294e890cc1260ab342a13e90cd20dcc03319d2eea258f1fd321"},
+    {file = "protobuf-3.19.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:36bf292f44966c67080e535321501717f4f1eba30faef8f2cd4b0c745a027211"},
+    {file = "protobuf-3.19.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c99af73ae34c93e0e2ace57ea2e70243f34fc015c8c23fd39ee93652e726f7e7"},
+    {file = "protobuf-3.19.0-cp37-cp37m-win32.whl", hash = "sha256:f7a031cf8e2fc14acc0ba694f6dff0a01e06b70d817eba6edc72ee6cc20517ac"},
+    {file = "protobuf-3.19.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d4ca5f0c7bc8d2e6966ca3bbd85e9ebe7191b6e21f067896d4af6b28ecff29fe"},
+    {file = "protobuf-3.19.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9a8a880593015ef2c83f7af797fa4fbf583b2c98b4bd94e46c5b61fee319d84b"},
+    {file = "protobuf-3.19.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:6f16925f5c977dd7787973a50c242e60c22b1d1182aba6bec7bd02862579c10f"},
+    {file = "protobuf-3.19.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9097327d277b0aa4a3224e61cd6850aef3269172397715299bcffc9f90293c9"},
+    {file = "protobuf-3.19.0-cp38-cp38-win32.whl", hash = "sha256:708d04394a63ee9bdc797938b6e15ed5bf24a1cb37743eb3886fd74a5a67a234"},
+    {file = "protobuf-3.19.0-cp38-cp38-win_amd64.whl", hash = "sha256:ee4d07d596357f51316b6ecf1cc1927660e9d5e418385bb1c51fd2496cd9bee7"},
+    {file = "protobuf-3.19.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:34a77b8fafdeb8f89fee2b7108ae60d8958d72e33478680cc1e05517892ecc46"},
+    {file = "protobuf-3.19.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:4f93e0f6af796ddd1502225ff8ea25340ced186ca05b601c44d5c88b45ba80a0"},
+    {file = "protobuf-3.19.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:942dd6bc8bd2a3c6a156d8ab0f80bd45313f22b78e1176283270054dcc8ca4c2"},
+    {file = "protobuf-3.19.0-cp39-cp39-win32.whl", hash = "sha256:7b3867795708ac88fde8d6f34f0d9a50af56087e41f624bdb2e9ff808ea5dda7"},
+    {file = "protobuf-3.19.0-cp39-cp39-win_amd64.whl", hash = "sha256:a74432e9d28a6072a2359a0f49f81eb14dd718e7dbbfb6c0789b456c49e1f130"},
+    {file = "protobuf-3.19.0-py2.py3-none-any.whl", hash = "sha256:c96e94d3e523a82caa3e5f74b35dd1c4884199358d01c950d95c341255ff48bc"},
+    {file = "protobuf-3.19.0.tar.gz", hash = "sha256:6a1dc6584d24ef86f5b104bcad64fa0fe06ed36e5687f426e0445d363a041d18"},
 ]
 py = [
     {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
     {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
 ]
 pycodestyle = [
-    {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"},
-    {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"},
+    {file = "pycodestyle-2.8.0-py2.py3-none-any.whl", hash = "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20"},
+    {file = "pycodestyle-2.8.0.tar.gz", hash = "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"},
 ]
 pycparser = [
     {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
@@ -1417,47 +1492,45 @@ pydantic = [
     {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"},
 ]
 pyflakes = [
-    {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"},
-    {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"},
+    {file = "pyflakes-2.4.0-py2.py3-none-any.whl", hash = "sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e"},
+    {file = "pyflakes-2.4.0.tar.gz", hash = "sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"},
 ]
 pygit2 = [
-    {file = "pygit2-1.6.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:547429774c11f5bc9d20a49aa86e4bd13c90a55140504ef05f55cf424470ee34"},
-    {file = "pygit2-1.6.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e75865d7b6fc161d93b16f10365eaad353cd546e302a98f2de2097ddea1066b"},
-    {file = "pygit2-1.6.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4a64b6090308ffd1c82e2dd4316cb79483715387b13818156d516134a5b17c"},
-    {file = "pygit2-1.6.1-cp36-cp36m-win32.whl", hash = "sha256:2666a3970b2ea1222a9f0463b466f98c8d564f29ec84cf0a58d9b0d3865dbaaf"},
-    {file = "pygit2-1.6.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2de12ca2d3b7eb86106223b40b2edc0c61103c71e7962e53092c6ddef71a194"},
-    {file = "pygit2-1.6.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:9c1d96c66fb6e69ec710078a73c19edff420bc1db430caa9e03a825eede3f25c"},
-    {file = "pygit2-1.6.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:454d42550fa6a6cd0e6a6ad9ab3f3262135fd157f57bad245ce156c36ee93370"},
-    {file = "pygit2-1.6.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce0827b77dd2f8a3465bdc181c4e65f27dd12dbd92635c038e58030cc90c2de0"},
-    {file = "pygit2-1.6.1-cp37-cp37m-win32.whl", hash = "sha256:b0161a141888d450eb821472fdcdadd14a072ddeda841fee9984956d34d3e19d"},
-    {file = "pygit2-1.6.1-cp37-cp37m-win_amd64.whl", hash = "sha256:af2fa259b6f7899227611ab978c600695724e85965836cb607d8b1e70cfea9b3"},
-    {file = "pygit2-1.6.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0e1e02c28983ddc004c0f54063f3e46fca388225d468e32e16689cfb750e0bd6"},
-    {file = "pygit2-1.6.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5dadc4844feb76cde5cc9a37656326a361dd8b5c8e8f8674dcd4a5ecf395db3"},
-    {file = "pygit2-1.6.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ef07458e4172a31318663295083b43f957d611145738ff56aa76db593542a6e8"},
-    {file = "pygit2-1.6.1-cp38-cp38-win32.whl", hash = "sha256:7a0c0a1f11fd41f57e8c6c64d903cc7fa4ec95d15592270be3217ed7f78eb023"},
-    {file = "pygit2-1.6.1-cp38-cp38-win_amd64.whl", hash = "sha256:2fd5c1b2d84dc6084f1bda836607afe37e95186a53a5a827a69083415e57fe4f"},
-    {file = "pygit2-1.6.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b9b88b7e9a5286a71be0b6c307f0523c9606aeedff6b61eb9c440e18817fa641"},
-    {file = "pygit2-1.6.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac12d32b714c3383ebccffee5eb6aff0b69a2542a40a664fd5ad370afcb28ee7"},
-    {file = "pygit2-1.6.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe682ed6afd2ab31127f6a502cf3e002dc1cc8d26c36a5d49dfd180250351eb6"},
-    {file = "pygit2-1.6.1-cp39-cp39-win32.whl", hash = "sha256:dbbf66a23860aa899949068ac9b503b4bc21e6063e8f53870440adbdc909405e"},
-    {file = "pygit2-1.6.1-cp39-cp39-win_amd64.whl", hash = "sha256:f90775afb11f69376e2af21ab56fcfbb52f6bc84117059ddf0355f81e5e36352"},
-    {file = "pygit2-1.6.1.tar.gz", hash = "sha256:c3303776f774d3e0115c1c4f6e1fc35470d15f113a7ae9401a0b90acfa1661ac"},
+    {file = "pygit2-1.7.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ca4c0e445efa0144082a385e83316abea92c749a95368397a64bc988aedc088e"},
+    {file = "pygit2-1.7.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ef6da92eb3be2a5342759a194be7d7f8b1997ef6023eed75f7a97d7cf7ec191"},
+    {file = "pygit2-1.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb91e8ba783e79111805595155a2177fbb2efedd796673c4b5daba0e50cb24"},
+    {file = "pygit2-1.7.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2e6fc9cb4213d501f7dd11c23b02d9e6206e1a5615e23cfbc95aaeb300a0f5d6"},
+    {file = "pygit2-1.7.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2ec6c77194e337c133c4a40c11992597a8c55ac91219cd03ec054de9d20b486"},
+    {file = "pygit2-1.7.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc6758852a3969b7feb2f6395c3d6b90bc7c337f574134c1ed718216009aef98"},
+    {file = "pygit2-1.7.0-cp37-cp37m-win32.whl", hash = "sha256:4d6b8742fd30931e85bbc792237a9ec23a84548707d0f59312b59a96583565b1"},
+    {file = "pygit2-1.7.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ddbba54869e0ed7878a3ef9ffebc756f47f1609294130c04b83a08896bff0b18"},
+    {file = "pygit2-1.7.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d3cbc2d212ea1c0c802a0f8141b3a4b6690ceb8c858731cb10cb60a41c6bc188"},
+    {file = "pygit2-1.7.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9817105a3c116d3eb678b0289d6fae04668904018d5a08f61adc4f64707fb2ed"},
+    {file = "pygit2-1.7.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3475d8a0171314e32e8559e689a573e4d6cf5fc6e4c9067c3b4e3e96fbec501b"},
+    {file = "pygit2-1.7.0-cp38-cp38-win32.whl", hash = "sha256:e550bd9e8e20dcfd2593a60ff95225ad615419cfad4b66c50f40de64cb48bcf7"},
+    {file = "pygit2-1.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:2a012222743ecdd8f1e676e9bb9afc2e6b69abb3f350b8012b87d83749b85bb1"},
+    {file = "pygit2-1.7.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:85c570305bf2c694e1224124e608cd72d4c2d6b92b0c677164cc015634dca17a"},
+    {file = "pygit2-1.7.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:352a249778ea944d69bb58a0b43c715ba6e88b472f50583c6fbbfd0ce52540fc"},
+    {file = "pygit2-1.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:422c588e6f00d1b3c13480afcd2776a835b442b89720e7f55f2212f8c292afae"},
+    {file = "pygit2-1.7.0-cp39-cp39-win32.whl", hash = "sha256:61bfec915ae4f6dc885127978d041996ed9702a7c7ae55f1476f620ca33f561d"},
+    {file = "pygit2-1.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:542aa9b855eb542b5fbe3b4e49fb29852775cc61959bca83eff03d8638e905c9"},
+    {file = "pygit2-1.7.0.tar.gz", hash = "sha256:602bffa8b4dbc185a6c7f36515563b600e0ee9002583c97ae3150eedaf340edb"},
 ]
 pyparsing = [
     {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
     {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
 ]
 pytest = [
-    {file = "pytest-6.2.4-py3-none-any.whl", hash = "sha256:91ef2131a9bd6be8f76f1f08eac5c5317221d6ad1e143ae03894b862e8976890"},
-    {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"},
+    {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"},
+    {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"},
 ]
 pytest-asyncio = [
-    {file = "pytest-asyncio-0.15.1.tar.gz", hash = "sha256:2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f"},
-    {file = "pytest_asyncio-0.15.1-py3-none-any.whl", hash = "sha256:3042bcdf1c5d978f6b74d96a151c4cfb9dcece65006198389ccd7e6c60eb1eea"},
+    {file = "pytest-asyncio-0.16.0.tar.gz", hash = "sha256:7496c5977ce88c34379df64a66459fe395cd05543f0a2f837016e7144391fcfb"},
+    {file = "pytest_asyncio-0.16.0-py3-none-any.whl", hash = "sha256:5f2a21273c47b331ae6aa5b36087047b4899e40f03f18397c0e65fa5cca54e9b"},
 ]
 pytest-cov = [
-    {file = "pytest-cov-2.12.1.tar.gz", hash = "sha256:261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7"},
-    {file = "pytest_cov-2.12.1-py2.py3-none-any.whl", hash = "sha256:261bb9e47e65bd099c89c3edf92972865210c36813f80ede5277dceb77a4a62a"},
+    {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
+    {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"},
 ]
 pytest-tap = [
     {file = "pytest-tap-3.2.tar.gz", hash = "sha256:1b585c4a636458dbd958d136381bbabb1752c5877d05fac7d6a6001a8a9ddc29"},
@@ -1467,13 +1540,6 @@ python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-editor = [
-    {file = "python-editor-1.0.4.tar.gz", hash = "sha256:51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b"},
-    {file = "python_editor-1.0.4-py2-none-any.whl", hash = "sha256:5f98b069316ea1c2ed3f67e7f5df6c0d8f10b689964a4a811ff64f0106819ec8"},
-    {file = "python_editor-1.0.4-py2.7.egg", hash = "sha256:ea87e17f6ec459e780e4221f295411462e0d0810858e055fc514684350a2f522"},
-    {file = "python_editor-1.0.4-py3-none-any.whl", hash = "sha256:1bf6e860a8ad52a14c3ee1252d5dc25b2030618ed80c022598f00176adc8367d"},
-    {file = "python_editor-1.0.4-py3.5.egg", hash = "sha256:c3da2053dbab6b29c94e43c486ff67206eafbe7eb52dbec7390b5e2fb05aac77"},
-]
 python-multipart = [
     {file = "python-multipart-0.0.5.tar.gz", hash = "sha256:f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"},
 ]
@@ -1502,48 +1568,46 @@ sortedcontainers = [
     {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"},
 ]
 sqlalchemy = [
-    {file = "SQLAlchemy-1.3.23-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:fd3b96f8c705af8e938eaa99cbd8fd1450f632d38cad55e7367c33b263bf98ec"},
-    {file = "SQLAlchemy-1.3.23-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:29cccc9606750fe10c5d0e8bd847f17a97f3850b8682aef1f56f5d5e1a5a64b1"},
-    {file = "SQLAlchemy-1.3.23-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:927ce09e49bff3104459e1451ce82983b0a3062437a07d883a4c66f0b344c9b5"},
-    {file = "SQLAlchemy-1.3.23-cp27-cp27m-win32.whl", hash = "sha256:b4b0e44d586cd64b65b507fa116a3814a1a53d55dce4836d7c1a6eb2823ff8d1"},
-    {file = "SQLAlchemy-1.3.23-cp27-cp27m-win_amd64.whl", hash = "sha256:6b8b8c80c7f384f06825612dd078e4a31f0185e8f1f6b8c19e188ff246334205"},
-    {file = "SQLAlchemy-1.3.23-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:9e9c25522933e569e8b53ccc644dc993cab87e922fb7e142894653880fdd419d"},
-    {file = "SQLAlchemy-1.3.23-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:a0e306e9bb76fd93b29ae3a5155298e4c1b504c7cbc620c09c20858d32d16234"},
-    {file = "SQLAlchemy-1.3.23-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:6c9e6cc9237de5660bcddea63f332428bb83c8e2015c26777281f7ffbd2efb84"},
-    {file = "SQLAlchemy-1.3.23-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:94f667d86be82dd4cb17d08de0c3622e77ca865320e0b95eae6153faa7b4ecaf"},
-    {file = "SQLAlchemy-1.3.23-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:751934967f5336a3e26fc5993ccad1e4fee982029f9317eb6153bc0bc3d2d2da"},
-    {file = "SQLAlchemy-1.3.23-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:63677d0c08524af4c5893c18dbe42141de7178001360b3de0b86217502ed3601"},
-    {file = "SQLAlchemy-1.3.23-cp35-cp35m-win32.whl", hash = "sha256:ddfb511e76d016c3a160910642d57f4587dc542ce5ee823b0d415134790eeeb9"},
-    {file = "SQLAlchemy-1.3.23-cp35-cp35m-win_amd64.whl", hash = "sha256:040bdfc1d76a9074717a3f43455685f781c581f94472b010cd6c4754754e1862"},
-    {file = "SQLAlchemy-1.3.23-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:d1a85dfc5dee741bf49cb9b6b6b8d2725a268e4992507cf151cba26b17d97c37"},
-    {file = "SQLAlchemy-1.3.23-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:639940bbe1108ac667dcffc79925db2966826c270112e9159439ab6bb14f8d80"},
-    {file = "SQLAlchemy-1.3.23-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:e8a1750b44ad6422ace82bf3466638f1aa0862dbb9689690d5f2f48cce3476c8"},
-    {file = "SQLAlchemy-1.3.23-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:e5bb3463df697279e5459a7316ad5a60b04b0107f9392e88674d0ece70e9cf70"},
-    {file = "SQLAlchemy-1.3.23-cp36-cp36m-win32.whl", hash = "sha256:e273367f4076bd7b9a8dc2e771978ef2bfd6b82526e80775a7db52bff8ca01dd"},
-    {file = "SQLAlchemy-1.3.23-cp36-cp36m-win_amd64.whl", hash = "sha256:ac2244e64485c3778f012951fdc869969a736cd61375fde6096d08850d8be729"},
-    {file = "SQLAlchemy-1.3.23-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:23927c3981d1ec6b4ea71eb99d28424b874d9c696a21e5fbd9fa322718be3708"},
-    {file = "SQLAlchemy-1.3.23-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d90010304abb4102123d10cbad2cdf2c25a9f2e66a50974199b24b468509bad5"},
-    {file = "SQLAlchemy-1.3.23-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:a8bfc1e1afe523e94974132d7230b82ca7fa2511aedde1f537ec54db0399541a"},
-    {file = "SQLAlchemy-1.3.23-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:269990b3ab53cb035d662dcde51df0943c1417bdab707dc4a7e4114a710504b4"},
-    {file = "SQLAlchemy-1.3.23-cp37-cp37m-win32.whl", hash = "sha256:fdd2ed7395df8ac2dbb10cefc44737b66c6a5cd7755c92524733d7a443e5b7e2"},
-    {file = "SQLAlchemy-1.3.23-cp37-cp37m-win_amd64.whl", hash = "sha256:6a939a868fdaa4b504e8b9d4a61f21aac11e3fecc8a8214455e144939e3d2aea"},
-    {file = "SQLAlchemy-1.3.23-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:24f9569e82a009a09ce2d263559acb3466eba2617203170e4a0af91e75b4f075"},
-    {file = "SQLAlchemy-1.3.23-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:2578dbdbe4dbb0e5126fb37ffcd9793a25dcad769a95f171a2161030bea850ff"},
-    {file = "SQLAlchemy-1.3.23-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:1fe5d8d39118c2b018c215c37b73fd6893c3e1d4895be745ca8ff6eb83333ed3"},
-    {file = "SQLAlchemy-1.3.23-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:c7dc052432cd5d060d7437e217dd33c97025287f99a69a50e2dc1478dd610d64"},
-    {file = "SQLAlchemy-1.3.23-cp38-cp38-win32.whl", hash = "sha256:ecce8c021894a77d89808222b1ff9687ad84db54d18e4bd0500ca766737faaf6"},
-    {file = "SQLAlchemy-1.3.23-cp38-cp38-win_amd64.whl", hash = "sha256:37b83bf81b4b85dda273aaaed5f35ea20ad80606f672d94d2218afc565fb0173"},
-    {file = "SQLAlchemy-1.3.23-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:8be835aac18ec85351385e17b8665bd4d63083a7160a017bef3d640e8e65cadb"},
-    {file = "SQLAlchemy-1.3.23-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6ec1044908414013ebfe363450c22f14698803ce97fbb47e53284d55c5165848"},
-    {file = "SQLAlchemy-1.3.23-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:eab063a70cca4a587c28824e18be41d8ecc4457f8f15b2933584c6c6cccd30f0"},
-    {file = "SQLAlchemy-1.3.23-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:baeb451ee23e264de3f577fee5283c73d9bbaa8cb921d0305c0bbf700094b65b"},
-    {file = "SQLAlchemy-1.3.23-cp39-cp39-win32.whl", hash = "sha256:94208867f34e60f54a33a37f1c117251be91a47e3bfdb9ab8a7847f20886ad06"},
-    {file = "SQLAlchemy-1.3.23-cp39-cp39-win_amd64.whl", hash = "sha256:f4d972139d5000105fcda9539a76452039434013570d6059993120dc2a65e447"},
-    {file = "SQLAlchemy-1.3.23.tar.gz", hash = "sha256:6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b"},
+    {file = "SQLAlchemy-1.4.26-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:c2f2114b0968a280f94deeeaa31cfbac9175e6ac7bd3058b3ce6e054ecd762b3"},
+    {file = "SQLAlchemy-1.4.26-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:91efbda4e6d311812f23996242bad7665c1392209554f8a31ec6db757456db5c"},
+    {file = "SQLAlchemy-1.4.26-cp27-cp27m-win32.whl", hash = "sha256:de996756d894a2d52c132742e3b6d64ecd37e0919ddadf4dc3981818777c7e67"},
+    {file = "SQLAlchemy-1.4.26-cp27-cp27m-win_amd64.whl", hash = "sha256:463ef692259ff8189be42223e433542347ae17e33f91c1013e9c5c64e2798088"},
+    {file = "SQLAlchemy-1.4.26-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c757ba1279b85b3460e72e8b92239dae6f8b060a75fb24b3d9be984dd78cfa55"},
+    {file = "SQLAlchemy-1.4.26-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:c24c01dcd03426a5fe5ee7af735906bec6084977b9027a3605d11d949a565c01"},
+    {file = "SQLAlchemy-1.4.26-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c46f013ff31b80cbe36410281675e1fb4eaf3e25c284fd8a69981c73f6fa4cb4"},
+    {file = "SQLAlchemy-1.4.26-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fb2aa74a6e3c2cebea38dd21633671841fbe70ea486053cba33d68e3e22ccc0a"},
+    {file = "SQLAlchemy-1.4.26-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad7e403fc1e3cb76e802872694e30d6ca6129b9bc6ad4e7caa48ca35f8a144f8"},
+    {file = "SQLAlchemy-1.4.26-cp310-cp310-win32.whl", hash = "sha256:7ef421c3887b39c6f352e5022a53ac18de8387de331130481cb956b2d029cad6"},
+    {file = "SQLAlchemy-1.4.26-cp310-cp310-win_amd64.whl", hash = "sha256:908fad32c53b17aad12d722379150c3c5317c422437e44032256a77df1746292"},
+    {file = "SQLAlchemy-1.4.26-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:1ef37c9ec2015ce2f0dc1084514e197f2f199d3dc3514190db7620b78e6004c8"},
+    {file = "SQLAlchemy-1.4.26-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:090536fd23bf49077ee94ff97142bc5ee8bad24294c3d7c8d5284267c885dde7"},
+    {file = "SQLAlchemy-1.4.26-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e700d48056475d077f867e6a36e58546de71bdb6fdc3d34b879e3240827fefab"},
+    {file = "SQLAlchemy-1.4.26-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:295b90efef1278f27fe27d94a45460ae3c17f5c5c2b32c163e29c359740a1599"},
+    {file = "SQLAlchemy-1.4.26-cp36-cp36m-win32.whl", hash = "sha256:cc6b21f19bc9d4cd77cbcba5f3b260436ce033f1053cea225b6efea2603d201e"},
+    {file = "SQLAlchemy-1.4.26-cp36-cp36m-win_amd64.whl", hash = "sha256:ba84026e84379326bbf2f0c50792f2ae56ab9c01937df5597b6893810b8ca369"},
+    {file = "SQLAlchemy-1.4.26-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:f1e97c5f36b94542f72917b62f3a2f92be914b2cf33b80fa69cede7529241d2a"},
+    {file = "SQLAlchemy-1.4.26-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c185c928e2638af9bae13acc3f70e0096eac76471a1101a10f96b80666b8270"},
+    {file = "SQLAlchemy-1.4.26-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bca660b76672e15d70a7dba5e703e1ce451a0257b6bd2028e62b0487885e8ae9"},
+    {file = "SQLAlchemy-1.4.26-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff8f91a7b1c4a1c7772caa9efe640f2768828897044748f2458b708f1026e2d4"},
+    {file = "SQLAlchemy-1.4.26-cp37-cp37m-win32.whl", hash = "sha256:a95bf9c725012dcd7ea3cac16bf647054e0d62b31d67467d228338e6a163e4ff"},
+    {file = "SQLAlchemy-1.4.26-cp37-cp37m-win_amd64.whl", hash = "sha256:07ac4461a1116b317519ddf6f34bcb00b011b5c1370ebeaaf56595504ffc7e84"},
+    {file = "SQLAlchemy-1.4.26-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:5039faa365e7522a8eb4736a54afd24a7e75dcc33b81ab2f0e6c456140f1ad64"},
+    {file = "SQLAlchemy-1.4.26-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7e8ef103eaa72a857746fd57dda5b8b5961e8e82a528a3f8b7e2884d8506f0b7"},
+    {file = "SQLAlchemy-1.4.26-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:31f4426cfad19b5a50d07153146b2bcb372a279975d5fa39f98883c0ef0f3313"},
+    {file = "SQLAlchemy-1.4.26-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2feb028dc75e13ba93456a42ac042b255bf94dbd692bf80b47b22653bb25ccf8"},
+    {file = "SQLAlchemy-1.4.26-cp38-cp38-win32.whl", hash = "sha256:2ce42ad1f59eb85c55c44fb505f8854081ee23748f76b62a7f569cfa9b6d0604"},
+    {file = "SQLAlchemy-1.4.26-cp38-cp38-win_amd64.whl", hash = "sha256:dbf588ab09e522ac2cbd010919a592c6aae2f15ccc3cd9a96d01c42fbc13f63e"},
+    {file = "SQLAlchemy-1.4.26-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:a6506c17b0b6016656783232d0bdd03fd333f1f654d51a14d93223f953903646"},
+    {file = "SQLAlchemy-1.4.26-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a882dedb9dfa6f33524953c3e3d72bcf518a5defd6d5863150a821928b19ad3"},
+    {file = "SQLAlchemy-1.4.26-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1dee515578d04bc80c4f9a8c8cfe93f455db725059e885f1b1da174d91c4d077"},
+    {file = "SQLAlchemy-1.4.26-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c0c5f54560a92691d54b0768d67b4d3159e514b426cfcb1258af8c195577e8f"},
+    {file = "SQLAlchemy-1.4.26-cp39-cp39-win32.whl", hash = "sha256:b86f762cee3709722ab4691981958cbec475ea43406a6916a7ec375db9cbd9e9"},
+    {file = "SQLAlchemy-1.4.26-cp39-cp39-win_amd64.whl", hash = "sha256:5c6774b34782116ad9bdec61c2dbce9faaca4b166a0bc8e7b03c2b870b121d94"},
+    {file = "SQLAlchemy-1.4.26.tar.gz", hash = "sha256:6bc7f9d7d90ef55e8c6db1308a8619cd8f40e24a34f759119b95e7284dca351a"},
 ]
 starlette = [
-    {file = "starlette-0.14.2-py3-none-any.whl", hash = "sha256:3c8e48e52736b3161e34c9f0e8153b4f32ec5d8995a3ee1d59410d92f75162ed"},
-    {file = "starlette-0.14.2.tar.gz", hash = "sha256:7d49f4a27f8742262ef1470608c59ddbc66baf37c148e938c7038e6bc7a998aa"},
+    {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"},
+    {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"},
 ]
 "tap.py" = [
     {file = "tap.py-3.0-py2.py3-none-any.whl", hash = "sha256:a598bfaa2e224d71f2e86147c2ef822c18ff2e1b8ef006397e5056b08f92f699"},
@@ -1553,22 +1617,22 @@ toml = [
     {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
+tomli = [
+    {file = "tomli-1.2.1-py3-none-any.whl", hash = "sha256:8dd0e9524d6f386271a36b41dbf6c57d8e32fd96fd22b6584679dc569d20899f"},
+    {file = "tomli-1.2.1.tar.gz", hash = "sha256:a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442"},
+]
 tomlkit = [
     {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"},
     {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"},
 ]
-typing = [
-    {file = "typing-3.7.4.3-py2-none-any.whl", hash = "sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5"},
-    {file = "typing-3.7.4.3.tar.gz", hash = "sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9"},
-]
 typing-extensions = [
     {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
     {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"},
     {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"},
 ]
 urllib3 = [
-    {file = "urllib3-1.26.6-py2.py3-none-any.whl", hash = "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4"},
-    {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"},
+    {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
+    {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"},
 ]
 uvicorn = [
     {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"},
@@ -1579,8 +1643,8 @@ webencodings = [
     {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"},
 ]
 werkzeug = [
-    {file = "Werkzeug-2.0.1-py3-none-any.whl", hash = "sha256:6c1ec500dcdba0baa27600f6a22f6333d8b662d22027ff9f6202e3367413caa8"},
-    {file = "Werkzeug-2.0.1.tar.gz", hash = "sha256:1de1db30d010ff1af14a009224ec49ab2329ad2cde454c8a708130642d579c42"},
+    {file = "Werkzeug-2.0.2-py3-none-any.whl", hash = "sha256:63d3dc1cf60e7b7e35e97fa9861f7397283b75d765afcaefd993d6046899de8f"},
+    {file = "Werkzeug-2.0.2.tar.gz", hash = "sha256:aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a"},
 ]
 wsproto = [
     {file = "wsproto-1.0.0-py3-none-any.whl", hash = "sha256:d8345d1808dd599b5ffb352c25a367adb6157e664e140dbecba3f9bc007edb9f"},
diff --git a/pyproject.toml b/pyproject.toml
index 141ec0ed..12812bc8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,50 +43,54 @@ build-backend = "poetry.masonry.api"
 "Request Mailing List" = "https://lists.archlinux.org/listinfo/aur-requests"
 
 [tool.poetry.dependencies]
+python = ">=3.9,<3.10"
+
 # poetry-dynamic-versioning is used to produce tool.poetry.version
 # based on git tags.
-poetry-dynamic-versioning = { version = "0.13.1", python = "^3.9" }
+poetry-dynamic-versioning = "^0.13.1"
 
 # General
-authlib = { version = "0.15.2", python = "^3.9" }
-aiofiles = { version = "0.7.0", python = "^3.9" }
-asgiref = { version = "3.4.1", python = "^3.9" }
-bcrypt = { version = "3.2.0", python = "^3.9" }
-bleach = { version = "3.3.1", python = "^3.9" }
-email-validator = { version = "1.1.3", python = "^3.9" }
-fakeredis = { version = "1.6.0", python = "^3.9" }
-fastapi = { version = "0.66.0", python = "^3.9" }
-feedgen = { version = "0.9.0", python = "^3.9" }
-httpx = { version = "0.18.2", python = "^3.9" }
-hypercorn = { version = "0.11.2", python = "^3.9" }
-itsdangerous = { version = "2.0.1", python = "^3.9" }
-jinja2 = { version = "3.0.1", python = "^3.9" }
-lxml = { version = "4.6.3", python = "^3.9" }
-markdown = { version = "3.3.4", python = "^3.9" }
-orjson = { version = "3.6.3", python = "^3.9" }
-protobuf = { version = "3.17.3", python = "^3.9" }
-pygit2 = { version = "1.6.1", python = "^3.9" }
-python-multipart = { version = "0.0.5", python = "^3.9" }
-redis = { version = "3.5.3", python = "^3.9" }
-requests = { version = "2.26.0", python = "^3.9" }
-werkzeug = { version = "2.0.1", python = "^3.9" }
-paginate = { version = "0.5.6", python = "^3.9" }
+aiofiles = "^0.7.0"
+asgiref = "^3.4.1"
+bcrypt = "^3.2.0"
+bleach = "^4.1.0"
+email-validator = "^1.1.3"
+fakeredis = "^1.6.1"
+fastapi = "^0.70.0"
+feedgen = "^0.9.0"
+httpx = "^0.20.0"
+itsdangerous = "^2.0.1"
+lxml = "^4.6.3"
+orjson = "^3.6.4"
+protobuf = "^3.19.0"
+pygit2 = "^1.7.0"
+python-multipart = "^0.0.5"
+redis = "^3.5.3"
+requests = "^2.26.0"
+paginate = "^0.5.6"
 
 # SQL
-alembic = { version = "1.6.5", python = "^3.9" }
-sqlalchemy = { version = "1.3.23", python = "^3.9" }
-mysqlclient = { version = "2.0.3", python = "^3.9" }
+alembic = "^1.7.4"
+mysqlclient = "^2.0.3"
+Authlib = "^0.15.5"
+Jinja2 = "^3.0.2"
+Markdown = "^3.3.4"
+Werkzeug = "^2.0.2"
+SQLAlchemy = "^1.4.26"
+
+# ASGI
+uvicorn = "^0.15.0"
+gunicorn = "^20.1.0"
+Hypercorn = "^0.11.2"
 
 [tool.poetry.dev-dependencies]
-flake8 = { version = "3.9.2", python = "^3.9" }
-isort = { version = "5.9.3", python = "^3.9" }
-coverage = { version = "5.5", python = "^3.9" }
-pytest = { version = "6.2.4", python = "^3.9" }
-pytest-asyncio = { version = "0.15.1", python = "^3.9" }
-pytest-cov = { version = "2.12.1", python = "^3.9" }
-pytest-tap = { version = "3.2", python = "^3.9" }
-uvicorn = { version = "0.15.0", python = "^3.9" }
-gunicorn = { version = "20.1.0", python = "^3.9" }
+flake8 = "^4.0.1"
+isort = "^5.9.3"
+coverage = "^6.0.2"
+pytest = "^6.2.5"
+pytest-asyncio = "^0.16.0"
+pytest-cov = "^3.0.0"
+pytest-tap = "^3.2"
 
 [tool.poetry.scripts]
 aurweb-git-auth = "aurweb.git.auth:main"

From 4ae3fbd5d11c3c3414add10d33a95c5a07832384 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 22 Oct 2021 17:43:00 -0700
Subject: [PATCH 466/844] change(docker): depend on provided poetry.lock for
 dep resolution

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/install-python-deps.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/scripts/install-python-deps.sh b/docker/scripts/install-python-deps.sh
index df9b5997..3ab87742 100755
--- a/docker/scripts/install-python-deps.sh
+++ b/docker/scripts/install-python-deps.sh
@@ -6,7 +6,6 @@ pip install --upgrade pip
 
 # Install the aurweb package and deps system-wide via poetry.
 poetry config virtualenvs.create false
-poetry lock
 poetry update
 poetry build
 poetry install --no-interaction --no-ansi

From 9b5eeb765228fbaba092215ef5a1183c2510a653 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 22 Oct 2021 18:51:20 -0700
Subject: [PATCH 467/844] fix(pytest): ignore asyncio.base_events deprecation
 warnings

This deprecation warning is not fixed in a tagged release yet.
Ignoring it for now; it has nothing to do with user code.

Upstream bug at https://bugs.python.org/issue45097

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 pytest.ini | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 pytest.ini

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..510447c9
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,10 @@
+[pytest]
+# Ignore the following DeprecationWarning(s):
+#   - asyncio.base_events
+#       - DeprecationWarning speaking about internal asyncio
+#         using the loop= argument being deprecated starting
+#         with python 3.8, before python 3.10.
+#       - Note: This is a bug in upstream filed at
+#         https://bugs.python.org/issue45097
+filterwarnings =
+    ignore::DeprecationWarning:asyncio.base_events

From f1ad1b9aede7f0120c1dd9b24d983f1f7ae450aa Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 10 Oct 2021 00:58:34 -0700
Subject: [PATCH 468/844] feat(FastAPI): add /packages (post) action: 'adopt'

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 45 +++++++++++++++++++++++++++--
 po/aurweb.pot                | 10 +++++++
 test/test_packages_routes.py | 56 ++++++++++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 0ce4f60f..f8ac764a 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -995,6 +995,15 @@ async def pkgbase_disown_post(request: Request, name: str,
                             status_code=HTTPStatus.SEE_OTHER)
 
 
+def pkgbase_adopt_instance(request: Request, pkgbase: models.PackageBase):
+    with db.begin():
+        pkgbase.Maintainer = request.user
+
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    notif = notify.AdoptNotification(conn, request.user.ID, pkgbase.ID)
+    notif.send()
+
+
 @router.post("/pkgbase/{name}/adopt")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def pkgbase_adopt_post(request: Request, name: str):
@@ -1005,8 +1014,7 @@ async def pkgbase_adopt_post(request: Request, name: str):
         # If the user has credentials, they'll adopt the package regardless
         # of maintainership. Otherwise, we'll promote the user to maintainer
         # if no maintainer currently exists.
-        with db.begin():
-            pkgbase.Maintainer = request.user
+        pkgbase_adopt_instance(request, pkgbase)
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=HTTPStatus.SEE_OTHER)
@@ -1151,6 +1159,38 @@ async def packages_unnotify(request: Request, package_ids: List[int] = [],
     return (True, ["The selected packages' notifications have been removed."])
 
 
+async def packages_adopt(request: Request, package_ids: List[int] = [],
+                         confirm: bool = False, **kwargs):
+    if not package_ids:
+        return (False, ["You did not select any packages to adopt."])
+
+    if not confirm:
+        return (False, ["The selected packages have not been adopted, "
+                        "check the confirmation checkbox."])
+
+    bases = set()
+    package_ids = set(package_ids)
+    packages = db.query(models.Package).filter(
+        models.Package.ID.in_(package_ids)).all()
+
+    for pkg in packages:
+        if pkg.PackageBase not in bases:
+            bases.update({pkg.PackageBase})
+
+    # Check that the user has credentials for every package they selected.
+    for pkgbase in bases:
+        has_cred = request.user.has_credential("CRED_PKGBASE_ADOPT")
+        if not (has_cred or not pkgbase.Maintainer):
+            # TODO: This error needs to be translated.
+            return (False, ["You are not allowed to adopt one of the "
+                            "packages you selected."])
+
+    # Now, really adopt the bases.
+    for pkgbase in bases:
+        pkgbase_adopt_instance(request, pkgbase)
+
+    return (True, ["The selected packages have been adopted."])
+
 # A mapping of action string -> callback functions used within the
 # `packages_post` route below. We expect any action callback to
 # return a tuple in the format: (succeeded: bool, message: List[str]).
@@ -1158,6 +1198,7 @@ PACKAGE_ACTIONS = {
     "unflag": packages_unflag,
     "notify": packages_notify,
     "unnotify": packages_unnotify,
+    "adopt": packages_adopt,
 }
 
 
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 05505e8b..83e884b8 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -471,6 +471,12 @@ msgid ""
 "checkbox."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr ""
@@ -1022,6 +1028,10 @@ msgstr ""
 msgid "You must be logged in before you can adopt packages."
 msgstr ""
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr ""
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index f663da49..37827e46 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2203,3 +2203,59 @@ def test_packages_post_unnotify(client: TestClient, user: User,
     errors = get_errors(resp.text)
     expected = "A package you selected does not have notifications enabled."
     assert errors[0].text.strip() == expected
+
+
+def test_packages_post_adopt(client: TestClient, user: User,
+                             package: Package):
+
+    # Try to adopt an empty list of packages.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "adopt"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You did not select any packages to adopt."
+    assert errors[0].text.strip() == expected
+
+    # Now, let's try to adopt a package that's already maintained.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "adopt",
+            "IDs": [package.ID],
+            "confirm": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You are not allowed to adopt one of the packages you selected."
+    assert errors[0].text.strip() == expected
+
+    # Remove the maintainer from the DB.
+    with db.begin():
+        package.PackageBase.Maintainer = None
+    assert package.PackageBase.Maintainer is None
+
+    # Now, let's try to adopt without confirming.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "adopt",
+            "IDs": [package.ID]
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = ("The selected packages have not been adopted, "
+                "check the confirmation checkbox.")
+    assert errors[0].text.strip() == expected
+
+    # Let's do it again now that there is no maintainer.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "adopt",
+            "IDs": [package.ID],
+            "confirm": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    successes = get_successes(resp.text)
+    expected = "The selected packages have been adopted."
+    assert successes[0].text.strip() == expected

From 13b344d2389b46238ea3ae5312e4e69421137034 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 10 Oct 2021 00:08:06 -0700
Subject: [PATCH 469/844] feat(FastAPI): add /packages (post) action: 'disown'

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 41 +++++++++++++++++++++++--
 po/aurweb.pot                |  4 +++
 test/test_packages_routes.py | 59 ++++++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index f8ac764a..2de82aaa 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -932,7 +932,9 @@ async def pkgbase_unvote(request: Request, name: str):
                             status_code=HTTPStatus.SEE_OTHER)
 
 
-def disown_pkgbase(pkgbase: models.PackageBase, disowner: models.User):
+def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
+    disowner = request.user
+
     conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     notif = notify.DisownNotification(conn, disowner.ID, pkgbase.ID)
 
@@ -990,7 +992,7 @@ async def pkgbase_disown_post(request: Request, name: str,
         return render_template(request, "packages/disown.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
-    disown_pkgbase(pkgbase, request.user)
+    pkgbase_disown_instance(request, pkgbase)
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=HTTPStatus.SEE_OTHER)
 
@@ -1191,6 +1193,40 @@ async def packages_adopt(request: Request, package_ids: List[int] = [],
 
     return (True, ["The selected packages have been adopted."])
 
+
+async def packages_disown(request: Request, package_ids: List[int] = [],
+                          confirm: bool = False, **kwargs):
+    if not package_ids:
+        return (False, ["You did not select any packages to disown."])
+
+    if not confirm:
+        return (False, ["The selected packages have not been disowned, "
+                        "check the confirmation checkbox."])
+
+    bases = set()
+    package_ids = set(package_ids)
+    packages = db.query(models.Package).filter(
+        models.Package.ID.in_(package_ids)).all()
+
+    for pkg in packages:
+        if pkg.PackageBase not in bases:
+            bases.update({pkg.PackageBase})
+
+    # Check that the user has credentials for every package they selected.
+    for pkgbase in bases:
+        has_cred = request.user.has_credential("CRED_PKGBASE_DISOWN",
+                                               approved=[pkgbase.Maintainer])
+        if not has_cred:
+            # TODO: This error needs to be translated.
+            return (False, ["You are not allowed to disown one "
+                            "of the packages you selected."])
+
+    # Now, really disown the bases.
+    for pkgbase in bases:
+        pkgbase_disown_instance(request, pkgbase)
+
+    return (True, ["The selected packages have been disowned."])
+
 # A mapping of action string -> callback functions used within the
 # `packages_post` route below. We expect any action callback to
 # return a tuple in the format: (succeeded: bool, message: List[str]).
@@ -1199,6 +1235,7 @@ PACKAGE_ACTIONS = {
     "notify": packages_notify,
     "unnotify": packages_unnotify,
     "adopt": packages_adopt,
+    "disown": packages_disown,
 }
 
 
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 83e884b8..849cae75 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -1036,6 +1036,10 @@ msgstr ""
 msgid "You must be logged in before you can disown packages."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr ""
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 37827e46..df028430 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2259,3 +2259,62 @@ def test_packages_post_adopt(client: TestClient, user: User,
     successes = get_successes(resp.text)
     expected = "The selected packages have been adopted."
     assert successes[0].text.strip() == expected
+
+
+def test_packages_post_disown(client: TestClient, user: User,
+                              maintainer: User, package: Package):
+    # Initially prove that we have a maintainer: `maintainer`.
+    assert package.PackageBase.Maintainer is not None
+    assert package.PackageBase.Maintainer == maintainer
+
+    # Try to run the disown action with no IDs; get an error.
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "disown"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You did not select any packages to disown."
+    assert errors[0].text.strip() == expected
+    assert package.PackageBase.Maintainer is not None
+
+    # Try to disown `package` without giving the confirm argument.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "disown",
+            "IDs": [package.ID]
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    assert package.PackageBase.Maintainer is not None
+    errors = get_errors(resp.text)
+    expected = ("The selected packages have not been disowned, "
+                "check the confirmation checkbox.")
+    assert errors[0].text.strip() == expected
+
+    # Now, try to disown `package` without credentials (as `user`).
+    user_cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "disown",
+            "IDs": [package.ID],
+            "confirm": True
+        }, cookies=user_cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    assert package.PackageBase.Maintainer is not None
+    errors = get_errors(resp.text)
+    expected = "You are not allowed to disown one of the packages you selected."
+    assert errors[0].text.strip() == expected
+
+    # Now, let's really disown `package` as `maintainer`.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "disown",
+            "IDs": [package.ID],
+            "confirm": True
+        }, cookies=cookies)
+
+    assert package.PackageBase.Maintainer is None
+    successes = get_successes(resp.text)
+    expected = "The selected packages have been disowned."
+    assert successes[0].text.strip() == expected

From 60bffa4fb6b2d4374548c325df4018d83461d74e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 10 Oct 2021 20:10:45 -0700
Subject: [PATCH 470/844] feat(FastAPI): add /packages (post) action: 'delete'

Improvements:

- Package deletion now creates a PackageRequest on behalf of
  the deleter if one does not yet exist.
- All package deletions are now logged to keep track of who did what.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 45 +++++++++++++++++++++-
 po/aurweb.pot                |  4 ++
 test/test_packages_routes.py | 73 ++++++++++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 2de82aaa..59b691ba 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -9,7 +9,7 @@ from sqlalchemy import and_, case
 import aurweb.filters
 import aurweb.packages.util
 
-from aurweb import db, defaults, l10n, models, util
+from aurweb import db, defaults, l10n, logging, models, util
 from aurweb.auth import auth_required
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID
@@ -20,6 +20,7 @@ from aurweb.scripts import notify, popupdate
 from aurweb.scripts.rendercomment import update_comment_render
 from aurweb.templates import make_context, make_variable_context, render_raw_template, render_template
 
+logger = logging.get_logger(__name__)
 router = APIRouter()
 
 
@@ -1227,6 +1228,47 @@ async def packages_disown(request: Request, package_ids: List[int] = [],
 
     return (True, ["The selected packages have been disowned."])
 
+
+async def packages_delete(request: Request, package_ids: List[int] = [],
+                          confirm: bool = False, merge_into: str = str(),
+                          **kwargs):
+    if not package_ids:
+        return (False, ["You did not select any packages to delete."])
+
+    if not confirm:
+        return (False, ["The selected packages have not been deleted, "
+                        "check the confirmation checkbox."])
+
+    if not request.user.has_credential("CRED_PKGBASE_DELETE"):
+        return (False, ["You do not have permission to delete packages."])
+
+    # A "memo" used to store names of packages that we delete.
+    # We'll use this to log out a message about the deletions that occurred.
+    deleted_pkgs = []
+
+    # set-ify package_ids and query the database for related records.
+    package_ids = set(package_ids)
+    packages = db.query(models.Package).filter(
+        models.Package.ID.in_(package_ids)).all()
+
+    if len(packages) != len(package_ids):
+        # Let the user know there was an issue with their input: they have
+        # provided at least one package_id which does not exist in the DB.
+        # TODO: This error has not yet been translated.
+        return (False, ["One of the packages you selected does not exist."])
+
+    # Now let's actually walk through and delete all of the packages,
+    # using the same method we use in our /pkgbase/{name}/delete route.
+    for pkg in packages:
+        deleted_pkgs.append(pkg.Name)
+        delete_package(request.user, pkg)
+
+    # Log out the fact that this happened for accountability.
+    logger.info(f"Privileged user '{request.user.Username}' deleted the "
+                f"following packages: {str(deleted_pkgs)}.")
+
+    return (True, ["The selected packages have been deleted."])
+
 # A mapping of action string -> callback functions used within the
 # `packages_post` route below. We expect any action callback to
 # return a tuple in the format: (succeeded: bool, message: List[str]).
@@ -1236,6 +1278,7 @@ PACKAGE_ACTIONS = {
     "unnotify": packages_unnotify,
     "adopt": packages_adopt,
     "disown": packages_disown,
+    "delete": packages_delete,
 }
 
 
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 849cae75..0e30b366 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -1020,6 +1020,10 @@ msgstr ""
 msgid "You did not select any packages to delete."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr ""
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index df028430..f7f30330 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2318,3 +2318,76 @@ def test_packages_post_disown(client: TestClient, user: User,
     successes = get_successes(resp.text)
     expected = "The selected packages have been disowned."
     assert successes[0].text.strip() == expected
+
+
+def test_packages_post_delete(caplog: pytest.fixture, client: TestClient,
+                              user: User, tu_user: User, package: Package):
+
+    # First, let's try to use the delete action with no packages IDs.
+    user_cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "delete"
+        }, cookies=user_cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You did not select any packages to delete."
+    assert errors[0].text.strip() == expected
+
+    # Now, let's try to delete real packages without supplying "confirm".
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "delete",
+            "IDs": [package.ID]
+        }, cookies=user_cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = ("The selected packages have not been deleted, "
+                "check the confirmation checkbox.")
+    assert errors[0].text.strip() == expected
+
+    # And again, with everything, but `user` doesn't have permissions.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "delete",
+            "IDs": [package.ID],
+            "confirm": True
+        }, cookies=user_cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You do not have permission to delete packages."
+    assert errors[0].text.strip() == expected
+
+    # Now, let's switch over to making the requests as a TU.
+    # However, this next request will be rejected due to supplying
+    # an invalid package ID.
+    tu_cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "delete",
+            "IDs": [0],
+            "confirm": True
+        }, cookies=tu_cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "One of the packages you selected does not exist."
+    assert errors[0].text.strip() == expected
+
+    # Whoo. Now, let's finally make a valid request as `tu_user`
+    # to delete `package`.
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "delete",
+            "IDs": [package.ID],
+            "confirm": True
+        }, cookies=tu_cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    successes = get_successes(resp.text)
+    expected = "The selected packages have been deleted."
+    assert successes[0].text.strip() == expected
+
+    # Expect that the package deletion was logged.
+    packages = [package.Name]
+    expected = (f"Privileged user '{tu_user.Username}' deleted the "
+                f"following packages: {str(packages)}.")
+    assert expected in caplog.text

From c6c04f4952ca153cedee34a22f2defc15bccbd8f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 23 Oct 2021 18:47:59 -0700
Subject: [PATCH 471/844] fix(docker): add missing version for
 docker-compose.override.yml

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.override.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 26718ac6..e702659e 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,3 +1,5 @@
+version: "3.8"
+
 services:
   mariadb:
     image: aurweb:latest

From bc9bb045ed37911608f949cc4b63fbabfaa94734 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 22:50:30 -0700
Subject: [PATCH 472/844] fix(fastapi): PackageRequest's PackageBase
 relationship should not required

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_request.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aurweb/models/package_request.py b/aurweb/models/package_request.py
index ae0a5b48..f600566c 100644
--- a/aurweb/models/package_request.py
+++ b/aurweb/models/package_request.py
@@ -37,8 +37,7 @@ class PackageRequest(Base):
         foreign_keys=[UsersID])
 
     PackageBaseID = Column(
-        Integer, ForeignKey("PackageBases.ID", ondelete="SET NULL"),
-        nullable=False)
+        Integer, ForeignKey("PackageBases.ID", ondelete="SET NULL"))
     PackageBase = relationship(
         _PackageBase, backref=backref("requests", lazy="dynamic"),
         foreign_keys=[PackageBaseID])

From 5fb75b9614e57b63215f1bf27f044881acfef2b8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 15 Oct 2021 22:52:08 -0700
Subject: [PATCH 473/844] feat(fastapi): add /pkgbase/{name}/merge (post)

Changes:

- `via` is not required in FastAPI. We deduce the involved
  requests via their PackageBaseName / MergeBaseName columns
  and set them to Accepted when merged.
- When erroneous input is given, the error is now presented
  on the merge page instead of sending the user to the pkgbase
  page.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 137 ++++++++++++++++++++++++++++++++++-
 templates/pkgbase/merge.html |   9 +++
 test/test_packages_routes.py | 134 +++++++++++++++++++++++++++++++++-
 3 files changed, 278 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 59b691ba..27a30205 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -13,7 +13,7 @@ from aurweb import db, defaults, l10n, logging, models, util
 from aurweb.auth import auth_required
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID
-from aurweb.models.request_type import DELETION_ID
+from aurweb.models.request_type import DELETION_ID, MERGE, MERGE_ID
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
 from aurweb.scripts import notify, popupdate
@@ -1053,6 +1053,7 @@ async def pkgbase_delete_post(request: Request, name: str,
         return render_template(request, "packages/delete.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
+    # Obtain deletion locks and delete the packages.
     packages = pkgbase.packages.all()
     for package in packages:
         delete_package(request.user, package)
@@ -1343,3 +1344,137 @@ async def pkgbase_merge_get(request: Request, name: str,
 
     return render_template(request, "pkgbase/merge.html", context,
                            status_code=status_code)
+
+
+def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
+                           target: models.PackageBase):
+    pkgbasename = str(pkgbase.Name)
+
+    # Collect requests related to this merge.
+    query = pkgbase.requests.filter(
+        models.PackageRequest.ReqTypeID == MERGE_ID
+    )
+
+    requests = query.filter(
+        models.PackageRequest.MergeBaseName == target.Name).all()
+    reject_requests = query.filter(
+        models.PackageRequest.MergeBaseName != target.Name).all()
+
+    notifs = []  # Used to keep track of notifications over the function.
+    closure_comment = (f"Merged into package base {target.Name} by "
+                       f"{request.user.Username}.")
+    rejected_closure_comment = ("Rejected because another merge request "
+                                "for the same package base was accepted.")
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    if not requests:
+        # If there are no requests, create one owned by request.user.
+        with db.begin():
+            pkgreq = db.create(models.PackageRequest,
+                               ReqTypeID=MERGE_ID,
+                               User=request.user,
+                               PackageBase=pkgbase,
+                               PackageBaseName=pkgbasename,
+                               MergeBaseName=target.Name,
+                               Comments="Generated by aurweb.",
+                               Status=ACCEPTED_ID,
+                               ClosureComment=closure_comment)
+            requests.append(pkgreq)
+
+        # Add a notification about the opening to our notifs array.
+        notif = notify.RequestOpenNotification(
+            conn, request.user.ID, pkgreq.ID, MERGE,
+            pkgbase.ID, merge_into=target.Name)
+        notifs.append(notif)
+
+        with db.begin():
+            # Merge pkgbase's comments, notifications and votes into target.
+            for comment in pkgbase.comments:
+                comment.PackageBase = target
+            for notif in pkgbase.notifications:
+                notif.PackageBase = target
+            for vote in pkgbase.package_votes:
+                vote.PackageBase = target
+
+        with db.begin():
+            # Delete pkgbase and its packages now that everything's merged.
+            for pkg in pkgbase.packages:
+                db.session.delete(pkg)
+            db.session.delete(pkgbase)
+
+            # Accept merge requests related to this pkgbase and target.
+            for pkgreq in requests:
+                pkgreq.Status = ACCEPTED_ID
+                pkgreq.ClosureComment = closure_comment
+                pkgreq.Closer = request.user
+
+            for pkgreq in reject_requests:
+                pkgreq.Status = REJECTED_ID
+                pkgreq.ClosureComment = rejected_closure_comment
+                pkgreq.Closer = request.user
+
+    all_requests = requests + reject_requests
+    for pkgreq in all_requests:
+        # Create notifications for request closure.
+        notif = notify.RequestCloseNotification(
+            conn, request.user.ID, pkgreq.ID, pkgreq.status_display())
+        notifs.append(notif)
+
+    conn.close()
+
+    # Log this out for accountability purposes.
+    logger.info(f"Trusted User '{request.user.Username}' merged "
+                f"'{pkgbasename}' into '{target.Name}'.")
+
+    # Send our notifications array.
+    util.apply_all(notifs, lambda n: n.send())
+
+
+@router.post("/pkgbase/{name}/merge")
+@auth_required(redirect="/pkgbase/{name}/merge")
+async def pkgbase_merge_post(request: Request, name: str,
+                             into: str = Form(default=str()),
+                             confirm: bool = Form(default=False),
+                             next: str = Form(default=str())):
+
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+    context = await make_variable_context(request, "Package Merging")
+    context["pkgbase"] = pkgbase
+
+    # TODO: Lookup errors from credential instead of hardcoding them.
+    if not request.user.has_credential("CRED_PKGBASE_MERGE"):
+        context["errors"] = [
+            "Only Trusted Users and Developers can merge packages."]
+        return render_template(request, "pkgbase/merge.html", context,
+                               status_code=HTTPStatus.UNAUTHORIZED)
+
+    if not confirm:
+        context["errors"] = ["The selected packages have not been deleted, "
+                             "check the confirmation checkbox."]
+        return render_template(request, "pkgbase/merge.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    try:
+        target = get_pkg_or_base(into, models.PackageBase)
+    except HTTPException:
+        context["errors"] = [
+            "Cannot find package to merge votes and comments into."]
+        return render_template(request, "pkgbase/merge.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    if pkgbase == target:
+        context["errors"] = ["Cannot merge a package base with itself."]
+        return render_template(request, "pkgbase/merge.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    # Merge pkgbase into target.
+    pkgbase_merge_instance(request, pkgbase, target)
+
+    # Run popupdate on the target.
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    popupdate.run_single(conn, target)
+
+    if not next:
+        next = f"/pkgbase/{target.Name}"
+
+    # Redirect to the newly merged into package.
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
diff --git a/templates/pkgbase/merge.html b/templates/pkgbase/merge.html
index d0a50332..41f69916 100644
--- a/templates/pkgbase/merge.html
+++ b/templates/pkgbase/merge.html
@@ -1,6 +1,15 @@
 {% extends "partials/layout.html" %}
 
 {% block pageContent %}
+
+    {% if errors %}
+        <ul class="errorlist">
+            {% for error in errors %}
+                <li>{{ error | tr }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+
     <div class="box">
         <h2>{{ "Merge Package" | tr }}: {{ pkgbase.Name }}</h2>
 
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index f7f30330..7e67775a 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -8,6 +8,7 @@ from unittest import mock
 import pytest
 
 from fastapi.testclient import TestClient
+from sqlalchemy import and_
 
 from aurweb import asgi, db, defaults
 from aurweb.models.account_type import USER_ID, AccountType
@@ -24,7 +25,7 @@ from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_request import ACCEPTED_ID, REJECTED_ID, PackageRequest
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import PROVIDES_ID, RelationType
-from aurweb.models.request_type import DELETION_ID, RequestType
+from aurweb.models.request_type import DELETION_ID, MERGE_ID, RequestType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
 from aurweb.testing.html import get_errors, get_successes, parse_root
@@ -2391,3 +2392,134 @@ def test_packages_post_delete(caplog: pytest.fixture, client: TestClient,
     expected = (f"Privileged user '{tu_user.Username}' deleted the "
                 f"following packages: {str(packages)}.")
     assert expected in caplog.text
+
+
+def test_pkgbase_merge_post_unauthorized(client: TestClient, user: User,
+                                         package: Package):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_merge_post_unconfirmed(client: TestClient, tu_user: User,
+                                        package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = ("The selected packages have not been deleted, "
+                "check the confirmation checkbox.")
+    assert errors[0].text.strip() == expected
+
+
+def test_pkgbase_merge_post_invalid_into(client: TestClient, tu_user: User,
+                                         package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "into": "not_real",
+            "confirm": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "Cannot find package to merge votes and comments into."
+    assert errors[0].text.strip() == expected
+
+
+def test_pkgbase_merge_post_self_invalid(client: TestClient, tu_user: User,
+                                         package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "into": package.PackageBase.Name,
+            "confirm": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "Cannot merge a package base with itself."
+    assert errors[0].text.strip() == expected
+
+
+def test_pkgbase_merge_post(client: TestClient, tu_user: User,
+                            packages: List[Package]):
+    package, target = packages[:2]
+    pkgname = package.Name
+    pkgbasename = package.PackageBase.Name
+
+    # Create a merge request destined for another target.
+    # This will allow our test code to exercise closing
+    # such a request after merging the pkgbase in question.
+    with db.begin():
+        pkgreq = db.create(PackageRequest,
+                           User=tu_user,
+                           ReqTypeID=MERGE_ID,
+                           PackageBase=package.PackageBase,
+                           PackageBaseName=pkgbasename,
+                           MergeBaseName="test",
+                           Comments="Test comment.",
+                           ClosureComment="Test closure.")
+
+    # Vote for the package.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/vote"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Enable notifications.
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/notify"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Comment on the package.
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comment": "Test comment."
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Save these relationships for later comparison.
+    comments = package.PackageBase.comments.all()
+    notifs = package.PackageBase.notifications.all()
+    votes = package.PackageBase.package_votes.all()
+
+    # Merge the package into target.
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "into": target.PackageBase.Name,
+            "confirm": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    loc = resp.headers.get("location")
+    assert loc == f"/pkgbase/{target.PackageBase.Name}"
+
+    # Assert that the original comments, notifs and votes we setup
+    # got migrated to target as intended.
+    assert comments == target.PackageBase.comments.all()
+    assert notifs == target.PackageBase.notifications.all()
+    assert votes == target.PackageBase.package_votes.all()
+
+    # ...and that the package got deleted.
+    package = db.query(Package).filter(Package.Name == pkgname).first()
+    assert package is None
+
+    # Our fake target request should have gotten rejected.
+    assert pkgreq.Status == REJECTED_ID
+    assert pkgreq.Closer is not None
+
+    # A PackageRequest is always created when merging this way.
+    pkgreq = db.query(PackageRequest).filter(
+        and_(PackageRequest.ReqTypeID == MERGE_ID,
+             PackageRequest.PackageBaseName == pkgbasename,
+             PackageRequest.MergeBaseName == target.PackageBase.Name)
+    ).first()
+    assert pkgreq is not None

From 94d494866f39c321075080c62df9bd9e10de14ea Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 23 Oct 2021 20:06:00 -0700
Subject: [PATCH 474/844] fix(fastapi): increase recursion limit during tests

The default recursion limit used by Docker's archlinux:base-devel
Python package becomes problematic in some cases when running tests
against our FastAPI application using starlette.testclient.TestClient
(aliased to fastapi.testclient.TestClient). starlette ends up with
test failures because it exceeds the recursion limit, but this only
happens when using the `TestClient`. When the ASGI servers are run,
this is not an issue and so in that case, the recursion limit has
not been touched.

This change uses a `TEST_RECURSION_LIMIT` environment variable to
modify the recursion limit of the FastAPI application. This variable
is, by default, only supplied when running pytests in Docker, but
can be force-supplied by the user.

TEST_RECURSION_LIMIT=10000 has been added to `.env` and `.gitlab-ci.yml`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .env               |  1 +
 .gitlab-ci.yml     |  1 +
 aurweb/asgi.py     | 15 +++++++++++++++
 docker-compose.yml |  3 +++
 4 files changed, 20 insertions(+)

diff --git a/.env b/.env
index 6a383e6d..06e862c1 100644
--- a/.env
+++ b/.env
@@ -4,3 +4,4 @@ MARIADB_SOCKET_DIR="/var/run/mysqld/"
 CGIT_CLONE_PREFIX_PHP=https://localhost:8443
 CGIT_CLONE_PREFIX_FASTAPI=https://localhost:8444
 GIT_DATA_DIR="./aur.git/"
+TEST_RECURSION_LIMIT=10000
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8ddf08f..17b666d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ cache:
 variables:
   AUR_CONFIG: conf/config # Default MySQL config setup in before_script.
   DB_HOST: localhost
+  TEST_RECURSION_LIMIT: 10000
 
 before_script:
   - export PATH="$HOME/.poetry/bin:${PATH}"
diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 9b4f6c21..8ebeef29 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,5 +1,7 @@
 import asyncio
 import http
+import os
+import sys
 import typing
 
 from urllib.parse import quote_plus
@@ -25,6 +27,19 @@ app = FastAPI(exception_handlers=errors.exceptions)
 
 @app.on_event("startup")
 async def app_startup():
+    # https://stackoverflow.com/questions/67054759/about-the-maximum-recursion-error-in-fastapi
+    # Test failures have been observed by internal starlette code when
+    # using starlette.testclient.TestClient. Looking around in regards
+    # to the recursion error has really not recommended a course of action
+    # other than increasing the recursion limit. For now, that is how
+    # we handle the issue: an optional TEST_RECURSION_LIMIT env var
+    # provided by the user. Docker uses .env's TEST_RECURSION_LIMIT
+    # when running test suites.
+    # TODO: Find a proper fix to this issue.
+    recursion_limit = int(os.environ.get(
+        "TEST_RECURSION_LIMIT", sys.getrecursionlimit()))
+    sys.setrecursionlimit(recursion_limit)
+
     session_secret = aurweb.config.get("fastapi", "session_secret")
     if not session_secret:
         raise Exception("[fastapi] session_secret must not be empty")
diff --git a/docker-compose.yml b/docker-compose.yml
index e86d8671..e19c8fb7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -216,6 +216,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
+      - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
     entrypoint: /docker/test-mysql-entrypoint.sh
     command: /docker/scripts/run-pytests.sh clean
     stdin_open: true
@@ -241,6 +242,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config.sqlite
+      - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
     entrypoint: /docker/test-sqlite-entrypoint.sh
     command: setup-sqlite.sh run-pytests.sh clean
     stdin_open: true
@@ -262,6 +264,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
+      - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
     entrypoint: /docker/tests-entrypoint.sh
     command: setup-sqlite.sh run-tests.sh
     stdin_open: true

From da55aa6491ba3e9a5fdd1ddb872ff84321b9f5bd Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 23 Oct 2021 20:57:43 -0700
Subject: [PATCH 475/844] fix(fastapi): use more credentials in
 archdev-navbar.html

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/archdev-navbar.html | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 072fa54d..ead0d8e2 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -1,47 +1,62 @@
 <div id="archdev-navbar">
     <ul>
         {% if request.user.is_authenticated() %}
+            {# Only authenticated users get Dashboard #}
             <li><a href="/">{% trans %}Dashboard{% endtrans %}</a></li>
         {% else %}
+            {# Only guest users get Home #}
             <li><a href="/">AUR {% trans %}Home{% endtrans %}</a></li>
         {% endif %}
+
+        {# All users see Packages #}
         <li><a href="/packages">{% trans %}Packages{% endtrans %}</a></li>
+
         {% if request.user.is_authenticated() %}
+
+            {# All users can see Requests #}
             <li>
                 <a href="/requests">
                     {% trans %}Requests{% endtrans %}
                 </a>
             </li>
-            {% if request.user.is_trusted_user() or request.user.is_developer() %}
+
+            {# Only CRED_ACCOUNT_SEARCH privileged users see Accounts #}
+            {% if request.user.has_credential("CRED_ACCOUNT_SEARCH") %}
                 <li>
                     <a href="/accounts">
                         {% trans %}Accounts{% endtrans %}
                     </a>
                 </li>
             {% endif %}
+
+            {# All users see My Account #}
             <li>
                 <a href="/account/{{ request.user.Username }}/edit">
                     {% trans %}My Account{% endtrans %}
                 </a>
             </li>
 
-            {% if request.user.is_trusted_user() %}
+            {# Only CRED_TU_VOTE privileged users see Trusted User #}
+            {% if request.user.has_credential("CRED_TU_VOTE") %}
                 <li>
                     <a href="/tu">{% trans %}Trusted User{% endtrans %}</a>
                 </li>
             {% endif %}
 
+            {# All logged in users see Logout #}
             <li>
                 <a href="/logout?next={{ next }}">
                     {% trans %}Logout{% endtrans %}
                 </a>
             </li>
         {% else %}
+            {# All guest users see Register #}
             <li>
                 <a href="/register">
                     {% trans %}Register{% endtrans %}
                 </a>
             </li>
+            {# All guest users see Login #}
             <li>
                 <a href="/login?next={{ next }}">
                     {% trans %}Login{% endtrans %}

From 0d734eb07d241e47641b8a3a7dbb4ad5febb26e2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 24 Oct 2021 18:07:56 -0700
Subject: [PATCH 476/844] feat(fastapi): add configurable commit hash display

Two new options have been added:

- [devel] commit_url
    - URL including an %s format specifier that can be used to link
      to a webpage for the commit.
- [devel] commit_hash
    - HEAD's commit hash (produced via `git rev-parse HEAD`)

If a `[devel] commit_hash` is configured, a link to the commit based on
`[devel] commit_url` will be displayed in the aurweb footer in
the form: `HEAD@<commit_hash>`. If no `[devel] commit_url` is
configured, a non-linked hash will be displayed.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py            |  8 +++++++
 aurweb/testing/requests.py     |  5 +++++
 conf/config.defaults           | 12 ++++++++++
 conf/config.dev                |  3 +++
 templates/partials/footer.html | 14 +++++++++++-
 test/test_templates.py         | 41 ++++++++++++++++++++++++++++++++++
 6 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 83ce0fbd..42e335b1 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -88,9 +88,17 @@ def register_function(name: str) -> Callable:
 def make_context(request: Request, title: str, next: str = None):
     """ Create a context for a jinja2 TemplateResponse. """
 
+    commit_url = aurweb.config.get_with_fallback("devel", "commit_url", None)
+    commit_hash = aurweb.config.get_with_fallback("devel", "commit_hash", None)
+    if commit_hash:
+        # Shorten commit_hash to a short Git hash.
+        commit_hash = commit_hash[:7]
+
     timezone = time.get_request_timezone(request)
     return {
         "request": request,
+        "commit_url": commit_url,
+        "commit_hash": commit_hash,
         "language": l10n.get_request_language(request),
         "languages": l10n.SUPPORTED_LANGUAGES,
         "timezone": timezone,
diff --git a/aurweb/testing/requests.py b/aurweb/testing/requests.py
index 9976b6fb..a8c077db 100644
--- a/aurweb/testing/requests.py
+++ b/aurweb/testing/requests.py
@@ -20,9 +20,14 @@ class Client:
     host = "127.0.0.1"
 
 
+class URL:
+    path = "/"
+
+
 class Request:
     """ A fake Request object which mimics a FastAPI Request for tests. """
     client = Client()
     cookies = dict()
     headers = dict()
     user = User()
+    url = URL()
diff --git a/conf/config.defaults b/conf/config.defaults
index da969343..b078e57c 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -104,3 +104,15 @@ server = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64
 packagesfile = /srv/http/aurweb/web/html/packages.gz
 pkgbasefile = /srv/http/aurweb/web/html/pkgbase.gz
 userfile = /srv/http/aurweb/web/html/users.gz
+
+[devel]
+; commit_url is a format string used to produce a link to a commit hash.
+commit_url = https://gitlab.archlinux.org/archlinux/aurweb/-/commits/%s
+
+; If commit_hash is configured, a link to the commit based on commit_url
+; will be displayed in aurweb's footer with the release version.
+; This allows us to diagnose which commit a particular instance is on
+; during testing of development branches.
+; Example deployment configuration step:
+; sed -r "s/^;?(commit_hash) =.*$/\1 = $(git rev-parse HEAD)/" config
+;commit_hash = 1234567
diff --git a/conf/config.dev b/conf/config.dev
index b8bd5bdb..fb43612e 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -62,3 +62,6 @@ bind_address = 127.0.0.1:8082
 
 ; Passphrase FastAPI uses to sign client-side sessions.
 session_secret = secret
+
+[devel]
+;commit_hash = 1234567
diff --git a/templates/partials/footer.html b/templates/partials/footer.html
index 0ac4d089..dde03c96 100644
--- a/templates/partials/footer.html
+++ b/templates/partials/footer.html
@@ -1,5 +1,17 @@
 <div id="footer">
-    <p>aurweb <a href="https://git.archlinux.org/aurweb.git/log/?h={{ config.AURWEB_VERSION }}">{{ config.AURWEB_VERSION }}</a></p>
+    <p>
+        aurweb <a href="https://git.archlinux.org/aurweb.git/log/?h={{ config.AURWEB_VERSION }}">{{ config.AURWEB_VERSION }}</a>
+        {% if commit_hash %}
+            -
+            {% if commit_url %}
+                <a href="{{ commit_url | format(commit_hash) }}">
+                    HEAD@{{ commit_hash }}
+                </a>
+            {% else %}
+                HEAD@{{ commit_hash }}
+            {% endif %}
+        {% endif %}
+    </p>
     <p>Copyright &copy; 2004-{{ now.strftime("%Y") }} aurweb Development Team.</p>
     <p>{% trans %}AUR packages are user produced content. Any use of the provided files is at your own risk.{% endtrans %}</p>
 </div>
diff --git a/test/test_templates.py b/test/test_templates.py
index 86fbf611..a483cb51 100644
--- a/test/test_templates.py
+++ b/test/test_templates.py
@@ -1,6 +1,8 @@
 import pytest
 
+from aurweb import config, templates
 from aurweb.templates import register_filter, register_function
+from aurweb.testing.requests import Request
 
 
 @register_filter("func")
@@ -29,3 +31,42 @@ def test_register_function_exists_key_error():
         @register_function("function")
         def some_func():
             pass
+
+
+def test_commit_hash():
+    # Hashes we'll use for this test. long_commit_hash should be
+    # shortened to commit_hash for rendering.
+    commit_hash = "abcdefg"
+    long_commit_hash = commit_hash + "1234567"
+
+    def config_get_with_fallback(section: str, option: str,
+                                 fallback: str = None) -> str:
+        if section == "devel" and option == "commit_hash":
+            return long_commit_hash
+        return config.original_get_with_fallback(section, option, fallback)
+
+    # Fake config.get_with_fallback.
+    config.original_get_with_fallback = config.get_with_fallback
+    config.get_with_fallback = config_get_with_fallback
+
+    request = Request()
+    context = templates.make_context(request, "Test Context")
+    render = templates.render_raw_template(request, "index.html", context)
+
+    # We've faked config.get_with_fallback to return a "valid" commit_hash
+    # when queried. Test that the expected render occurs.
+    commit_url = config.get("devel", "commit_url")
+    expected = commit_url % commit_hash
+    assert expected in render
+    assert f"HEAD@{commit_hash}" in render
+    assert long_commit_hash not in render
+
+    # Restore config.get_with_fallback.
+    config.get_with_fallback = config.original_get_with_fallback
+    config.original_get_with_fallback = None
+
+    # Now, we no longer fake the commit_hash option: no commit
+    # is displayed in the footer. Assert this expectation.
+    context = templates.make_context(request, "Test Context")
+    render = templates.render_raw_template(request, "index.html", context)
+    assert commit_hash not in render

From 7e7a1ead8875d0501b42471e64fd16eca3764945 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 24 Oct 2021 19:08:03 -0700
Subject: [PATCH 477/844] fix(fastapi): unify homepage cache expiry time to
 five minutes

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/html.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 86f8d13e..ed249794 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -68,30 +68,29 @@ async def index(request: Request):
     bases = db.query(models.PackageBase)
 
     redis = aurweb.redis.redis_connection()
-    stats_expire = 300  # Five minutes.
-    updates_expire = 600  # Ten minutes.
+    cache_expire = 300  # Five minutes.
 
     # Package statistics.
     query = bases.filter(models.PackageBase.PackagerUID.isnot(None))
     context["package_count"] = await db_count_cache(
-        redis, "package_count", query, expire=stats_expire)
+        redis, "package_count", query, expire=cache_expire)
 
     query = bases.filter(
         and_(models.PackageBase.MaintainerUID.is_(None),
              models.PackageBase.PackagerUID.isnot(None))
     )
     context["orphan_count"] = await db_count_cache(
-        redis, "orphan_count", query, expire=stats_expire)
+        redis, "orphan_count", query, expire=cache_expire)
 
     query = db.query(models.User)
     context["user_count"] = await db_count_cache(
-        redis, "user_count", query, expire=stats_expire)
+        redis, "user_count", query, expire=cache_expire)
 
     query = query.filter(
         or_(models.User.AccountTypeID == TRUSTED_USER_ID,
             models.User.AccountTypeID == TRUSTED_USER_AND_DEV_ID))
     context["trusted_user_count"] = await db_count_cache(
-        redis, "trusted_user_count", query, expire=stats_expire)
+        redis, "trusted_user_count", query, expire=cache_expire)
 
     # Current timestamp.
     now = int(datetime.utcnow().timestamp())
@@ -110,25 +109,25 @@ async def index(request: Request):
              models.PackageBase.PackagerUID.isnot(None))
     )
     context["seven_days_old_added"] = await db_count_cache(
-        redis, "seven_days_old_added", query, expire=stats_expire)
+        redis, "seven_days_old_added", query, expire=cache_expire)
 
     query = updated.filter(models.PackageBase.ModifiedTS >= seven_days_ago)
     context["seven_days_old_updated"] = await db_count_cache(
-        redis, "seven_days_old_updated", query, expire=stats_expire)
+        redis, "seven_days_old_updated", query, expire=cache_expire)
 
     year = seven_days * 52  # Fifty two weeks worth: one year.
     year_ago = now - year
     query = updated.filter(models.PackageBase.ModifiedTS >= year_ago)
     context["year_old_updated"] = await db_count_cache(
-        redis, "year_old_updated", query, expire=stats_expire)
+        redis, "year_old_updated", query, expire=cache_expire)
 
     query = bases.filter(
         models.PackageBase.ModifiedTS - models.PackageBase.SubmittedTS < 3600)
     context["never_updated"] = await db_count_cache(
-        redis, "never_updated", query, expire=stats_expire)
+        redis, "never_updated", query, expire=cache_expire)
 
     # Get the 15 most recently updated packages.
-    context["package_updates"] = updated_packages(15, updates_expire)
+    context["package_updates"] = updated_packages(15, cache_expire)
 
     if request.user.is_authenticated():
         # Authenticated users get a few extra pieces of data for

From 65be8b8e07132a7ef612deca1cd03596c3079884 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 25 Oct 2021 21:56:15 -0700
Subject: [PATCH 478/844] fix(fastapi): support "Account Type:" input for
 account edit

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/account_type.py |   3 +
 aurweb/routers/accounts.py    |  39 +++++++++++--
 po/aurweb.pot                 |  12 ++++
 test/test_accounts_routes.py  | 104 +++++++++++++++++++++++++++++++++-
 4 files changed, 153 insertions(+), 5 deletions(-)

diff --git a/aurweb/models/account_type.py b/aurweb/models/account_type.py
index 2e3dde06..7aa7733c 100644
--- a/aurweb/models/account_type.py
+++ b/aurweb/models/account_type.py
@@ -47,3 +47,6 @@ ACCOUNT_TYPE_ID = {
     DEVELOPER: DEVELOPER_ID,
     TRUSTED_USER_AND_DEV: TRUSTED_USER_AND_DEV_ID
 }
+
+# Reversed ACCOUNT_TYPE_ID mapping.
+ACCOUNT_TYPE_NAME = {v: k for k, v in ACCOUNT_TYPE_ID.items()}
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index a4f6dc56..70be2510 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -15,6 +15,8 @@ from aurweb.auth import account_type_required, auth_required
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.l10n import get_translator_for_request
 from aurweb.models import account_type
+from aurweb.models.account_type import (DEVELOPER, DEVELOPER_ID, TRUSTED_USER, TRUSTED_USER_AND_DEV, TRUSTED_USER_AND_DEV_ID,
+                                        TRUSTED_USER_ID, USER_ID)
 from aurweb.models.ssh_pub_key import get_fingerprint
 from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
@@ -226,6 +228,29 @@ def process_account_form(request: Request, user: models.User, args: dict):
                     "<strong>", fingerprint, "</strong>")
             ])
 
+    T = int(args.get("T", user.AccountTypeID))
+    if T != user.AccountTypeID:
+        if T not in account_type.ACCOUNT_TYPE_NAME:
+            return (False,
+                    ["Invalid account type provided."])
+        elif not request.user.is_elevated():
+            return (False,
+                    ["You do not have permission to change account types."])
+
+        credential_checks = {
+            DEVELOPER_ID: request.user.is_developer,
+            TRUSTED_USER_AND_DEV_ID: request.user.is_developer,
+            TRUSTED_USER_ID: request.user.is_elevated,
+            USER_ID: request.user.is_elevated
+        }
+        credential_check = credential_checks.get(T)
+
+        if not credential_check():
+            name = account_type.ACCOUNT_TYPE_NAME.get(T)
+            error = _("You do not have permission to change "
+                      "this user's account type to %s.") % name
+            return (False, [error])
+
     captcha_salt = args.get("captcha_salt", None)
     if captcha_salt and captcha_salt not in get_captcha_salts():
         return (False, ["This CAPTCHA has expired. Please try again."])
@@ -255,15 +280,16 @@ def make_account_form_context(context: dict,
     context = copy.copy(context)
 
     context["account_types"] = [
-        (1, "Normal User"),
-        (2, "Trusted User")
+        (USER_ID, "Normal User"),
+        (TRUSTED_USER_ID, TRUSTED_USER)
     ]
 
     user_account_type_id = context.get("account_types")[0][0]
 
     if request.user.has_credential("CRED_ACCOUNT_EDIT_DEV"):
-        context["account_types"].append((3, "Developer"))
-        context["account_types"].append((4, "Trusted User & Developer"))
+        context["account_types"].append((DEVELOPER_ID, DEVELOPER))
+        context["account_types"].append((TRUSTED_USER_AND_DEV_ID,
+                                         TRUSTED_USER_AND_DEV))
 
     if request.user.is_authenticated():
         context["username"] = args.get("U", user.Username)
@@ -465,6 +491,7 @@ async def account_edit_post(request: Request,
                             CN: bool = Form(default=False),  # Comment Notify
                             UN: bool = Form(default=False),  # Update Notify
                             ON: bool = Form(default=False),  # Owner Notify
+                            T: int = Form(default=None),
                             passwd: str = Form(default=str())):
     from aurweb.db import session
 
@@ -545,6 +572,10 @@ async def account_edit_post(request: Request,
             # Else, if the user has a public key already, delete it.
             session.delete(user.ssh_pub_key)
 
+    if T and T != user.AccountTypeID:
+        with db.begin():
+            user.AccountTypeID = T
+
     if P and not user.valid_password(P):
         # Remove the fields we consumed for passwords.
         context["P"] = context["C"] = str()
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 0e30b366..721f874e 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -2280,3 +2280,15 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index d5d92112..6c79cd33 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -14,13 +14,14 @@ from aurweb import captcha, db, logging
 from aurweb.asgi import app
 from aurweb.db import create, query
 from aurweb.models.accepted_term import AcceptedTerm
-from aurweb.models.account_type import DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID, AccountType
+from aurweb.models.account_type import DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID, USER_ID, AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.term import Term
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
+from aurweb.testing.html import get_errors
 from aurweb.testing.requests import Request
 
 # Some test global constants.
@@ -909,6 +910,107 @@ def test_post_account_edit_password():
     assert user.valid_password("newPassword")
 
 
+def test_post_account_edit_account_types():
+    request = Request()
+    sid = user.login(request, "testPassword")
+    cookies = {"AURSID": sid}
+    endpoint = f"/account/{user.Username}/edit"
+
+    # As a normal user, we cannot see the "Account Type:" input.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert "id_type" not in resp.text
+
+    # Invalid account types return an error.
+    post_data = {
+        "U": user.Username,
+        "E": user.Email,
+        "T": 0,  # Invalid type ID
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(endpoint, data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "Invalid account type provided."
+    assert errors[0].text.strip() == expected
+
+    # Nor can we change any account types.
+    post_data = {
+        "U": user.Username,
+        "E": user.Email,
+        "T": TRUSTED_USER_ID,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(endpoint, data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "You do not have permission to change account types."
+    assert errors[0].text.strip() == expected
+
+    # Change user from USER_ID to TRUSTED_USER_ID.
+    with db.begin():
+        user.AccountTypeID = TRUSTED_USER_ID
+
+    # As a trusted user, we can see the "Account Type:" input.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert "id_type" in resp.text
+
+    # As a trusted user, we cannot change account type to DEVELOPER_ID.
+    post_data = {
+        "U": user.Username,
+        "E": user.Email,
+        "T": DEVELOPER_ID,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(endpoint, data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = ("You do not have permission to change "
+                "this user's account type to Developer.")
+    assert errors[0].text.strip() == expected
+
+    # However, we can modify our account type to USER_ID.
+    post_data = {
+        "U": user.Username,
+        "E": user.Email,
+        "T": USER_ID,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(endpoint, data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # No errors should be displayed.
+    errors = get_errors(resp.text)
+    assert not errors
+
+    # Make sure it got changed to USER_ID as we intended.
+    assert user.AccountTypeID == USER_ID
+
+    # Change user to a Developer.
+    with db.begin():
+        user.AccountTypeID = DEVELOPER_ID
+
+    # As a developer, we can absolutely change all account types.
+    # For example, from DEVELOPER_ID to TRUSTED_USER_AND_DEV_ID:
+    post_data = {
+        "U": user.Username,
+        "E": user.Email,
+        "T": TRUSTED_USER_AND_DEV_ID,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(endpoint, data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert user.AccountTypeID == TRUSTED_USER_AND_DEV_ID
+
+
 def test_get_account():
     request = Request()
     sid = user.login(request, "testPassword")

From d7ac95a7079b08ae722c4c22dabc283cf45aeb24 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 26 Oct 2021 19:09:39 -0700
Subject: [PATCH 479/844] fix(fastapi): limit cookie migration to whitelisted
 keys

Whitelisted keys: AURSID, AURTZ, AURLANG

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index f3048efe..c24cc1d0 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -104,9 +104,12 @@ def valid_ssh_pubkey(pk):
 
 
 def migrate_cookies(request, response):
+    whitelist = {"AURSID", "AURTZ", "AURLANG"}
+
     secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
     for k, v in request.cookies.items():
-        response.set_cookie(k, v, secure=secure_cookies, httponly=True)
+        if k in whitelist:
+            response.set_cookie(k, v, secure=secure_cookies, httponly=True)
     return add_samesite_fields(response, "strict")
 
 

From 7418c33a30e7e1fd9374b84d10e1d566ef147e66 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 27 Oct 2021 00:53:46 -0700
Subject: [PATCH 480/844] add Account Request issue template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Account Request.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .gitlab/issue_templates/Account Request.md

diff --git a/.gitlab/issue_templates/Account Request.md b/.gitlab/issue_templates/Account Request.md
new file mode 100644
index 00000000..244cfbe8
--- /dev/null
+++ b/.gitlab/issue_templates/Account Request.md	
@@ -0,0 +1,12 @@
+## Checklist
+
+- [ ] I have set a Username in the Details section
+- [ ] I have set an Email in the Details section
+- [ ] I have set a valid Account Type in the Details section
+
+## Details
+
+- Instance: aur-dev.archlinux.org
+- Username: the_username_you_want
+- Email: valid@email.org
+- Account Type: (User|Trusted User)

From 64ba18e417c8c57b25d18cc27a7a323bccaabbc1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 27 Oct 2021 00:53:46 -0700
Subject: [PATCH 481/844] add Account Request issue template

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Account Request.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .gitlab/issue_templates/Account Request.md

diff --git a/.gitlab/issue_templates/Account Request.md b/.gitlab/issue_templates/Account Request.md
new file mode 100644
index 00000000..244cfbe8
--- /dev/null
+++ b/.gitlab/issue_templates/Account Request.md	
@@ -0,0 +1,12 @@
+## Checklist
+
+- [ ] I have set a Username in the Details section
+- [ ] I have set an Email in the Details section
+- [ ] I have set a valid Account Type in the Details section
+
+## Details
+
+- Instance: aur-dev.archlinux.org
+- Username: the_username_you_want
+- Email: valid@email.org
+- Account Type: (User|Trusted User)

From 034288711b6c74b49080b1eaf54d18c069977fa8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Oct 2021 00:11:23 -0700
Subject: [PATCH 482/844] fix(fastapi): rework cookies - do not re-emit
 generically

This change removes cookie re-emission of AURLANG and AURTZ,
adds the AURREMEMBER cookie (the state of the "Remember Me"
checkbox on login), and re-emits AURSID based on the AURREMEMBER
cookie.

Previously, re-emission of AURSID was forcefully modifying
the expiration of the AURSID cookie. The introduction of
AURREMEMBER allows us to deduct the correct cookie expiration
timing based on configuration variables. With this addition,
we now re-emit the AURSID cookie with an updated expiration
based on the "Remember Me" checkbox on login.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/cookies.py          | 68 ++++++++++++++++++++++++++++++++++++++
 aurweb/routers/accounts.py | 11 +++---
 aurweb/routers/auth.py     | 22 ++++++------
 aurweb/routers/html.py     |  9 ++---
 aurweb/templates.py        | 17 ++++++----
 aurweb/util.py             | 23 -------------
 6 files changed, 100 insertions(+), 50 deletions(-)
 create mode 100644 aurweb/cookies.py

diff --git a/aurweb/cookies.py b/aurweb/cookies.py
new file mode 100644
index 00000000..442a4c0a
--- /dev/null
+++ b/aurweb/cookies.py
@@ -0,0 +1,68 @@
+from fastapi import Request
+from fastapi.responses import Response
+
+from aurweb import config
+
+
+def samesite() -> str:
+    """ Produce cookie SameSite value based on options.disable_http_login.
+
+    When options.disable_http_login is True, "strict" is returned. Otherwise,
+    "lax" is returned.
+
+    :returns "strict" if options.disable_http_login else "lax"
+    """
+    secure = config.getboolean("options", "disable_http_login")
+    return "strict" if secure else "lax"
+
+
+def timeout(extended: bool) -> int:
+    """ Produce a session timeout based on `remember_me`.
+
+    This method returns one of AUR_CONFIG's options.persistent_cookie_timeout
+    and options.login_timeout based on the `extended` argument.
+
+    The `extended` argument is typically the value of the AURREMEMBER
+    cookie, defaulted to False.
+
+    If `extended` is False, options.login_timeout is returned. Otherwise,
+    if `extended` is True, options.persistent_cookie_timeout is returned.
+
+    :param extended: Flag which generates an extended timeout when True
+    :returns: Cookie timeout based on configuration options
+    """
+    timeout = config.getint("options", "login_timeout")
+    if bool(extended):
+        timeout = config.getint("options", "persistent_cookie_timeout")
+    return timeout
+
+
+def update_response_cookies(request: Request, response: Response,
+                            aurtz: str = None, aurlang: str = None,
+                            aursid: str = None) -> Response:
+    """ Update session cookies. This method is particularly useful
+    when updating a cookie which was already set.
+
+    The AURSID cookie's expiration is based on the AURREMEMBER cookie,
+    which is retrieved from `request`.
+
+    :param request: FastAPI request
+    :param response: FastAPI response
+    :param aurtz: Optional AURTZ cookie value
+    :param aurlang: Optional AURLANG cookie value
+    :param aursid: Optional AURSID cookie value
+    :returns: Updated response
+    """
+    secure = config.getboolean("options", "disable_http_login")
+    if aurtz:
+        response.set_cookie("AURTZ", aurtz, secure=secure, httponly=secure,
+                            samesite=samesite())
+    if aurlang:
+        response.set_cookie("AURLANG", aurlang, secure=secure, httponly=secure,
+                            samesite=samesite())
+    if aursid:
+        remember_me = bool(request.cookies.get("AURREMEMBER", False))
+        response.set_cookie("AURSID", aursid, secure=secure, httponly=secure,
+                            max_age=timeout(remember_me),
+                            samesite=samesite())
+    return response
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 70be2510..61c125e0 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -10,7 +10,7 @@ from sqlalchemy import and_, func, or_
 
 import aurweb.config
 
-from aurweb import db, l10n, logging, models, time, util
+from aurweb import cookies, db, l10n, logging, models, time, util
 from aurweb.auth import account_type_required, auth_required
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.l10n import get_translator_for_request
@@ -585,16 +585,19 @@ async def account_edit_post(request: Request,
             user.update_password(P)
 
         if user == request.user:
+            remember_me = request.cookies.get("AURREMEMBER", False)
+
             # If the target user is the request user, login with
-            # the updated password and update AURSID.
-            request.cookies["AURSID"] = user.login(request, P)
+            # the updated password to update the Session record.
+            user.login(request, P, cookies.timeout(remember_me))
 
     if not errors:
         context["complete"] = True
 
     # Update cookies with requests, in case they were changed.
     response = render_template(request, "account/edit.html", context)
-    return util.migrate_cookies(request, response)
+    return cookies.update_response_cookies(request, response,
+                                           aurtz=TZ, aurlang=L)
 
 
 account_template = (
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index b3f9cc68..4e6a416a 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -6,7 +6,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 
 import aurweb.config
 
-from aurweb import util
+from aurweb import cookies
 from aurweb.auth import auth_required
 from aurweb.models import User
 from aurweb.templates import make_variable_context, render_template
@@ -42,12 +42,7 @@ async def login_post(request: Request,
         return await login_template(request, next,
                                     errors=["Bad username or password."])
 
-    cookie_timeout = 0
-
-    if remember_me:
-        cookie_timeout = aurweb.config.getint(
-            "options", "persistent_cookie_timeout")
-
+    cookie_timeout = cookies.timeout(remember_me)
     sid = user.login(request, passwd, cookie_timeout)
     if not sid:
         return await login_template(request, next,
@@ -61,14 +56,17 @@ async def login_post(request: Request,
     response = RedirectResponse(url=next,
                                 status_code=HTTPStatus.SEE_OTHER)
 
-    secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
+    secure = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURSID", sid, expires=expires_at,
-                        secure=secure_cookies, httponly=True)
+                        secure=secure, httponly=secure,
+                        samesite=cookies.samesite())
     response.set_cookie("AURTZ", user.Timezone,
-                        secure=secure_cookies, httponly=True)
+                        secure=secure, httponly=secure,
+                        samesite=cookies.samesite())
     response.set_cookie("AURLANG", user.LangPreference,
-                        secure=secure_cookies, httponly=True)
-    return util.add_samesite_fields(response, "strict")
+                        secure=secure, httponly=secure,
+                        samesite=cookies.samesite())
+    return response
 
 
 @router.get("/logout")
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index ed249794..c749ca67 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -11,7 +11,7 @@ from sqlalchemy import and_, case, or_
 import aurweb.config
 import aurweb.models.package_request
 
-from aurweb import db, models, util
+from aurweb import cookies, db, models, util
 from aurweb.cache import db_count_cache
 from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
 from aurweb.models.package_request import PENDING_ID
@@ -53,10 +53,11 @@ async def language(request: Request,
     # In any case, set the response's AURLANG cookie that never expires.
     response = RedirectResponse(url=f"{next}{query_string}",
                                 status_code=HTTPStatus.SEE_OTHER)
-    secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
+    secure = aurweb.config.getboolean("options", "disable_http_login")
     response.set_cookie("AURLANG", set_lang,
-                        secure=secure_cookies, httponly=True)
-    return util.add_samesite_fields(response, "strict")
+                        secure=secure, httponly=secure,
+                        samesite=cookies.samesite())
+    return response
 
 
 @router.get("/", response_class=HTMLResponse)
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 42e335b1..0039535d 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -16,7 +16,7 @@ from fastapi.responses import HTMLResponse
 
 import aurweb.config
 
-from aurweb import captcha, l10n, time, util
+from aurweb import captcha, cookies, l10n, time, util
 
 # Prepare jinja2 objects.
 _loader = jinja2.FileSystemLoader(os.path.join(
@@ -148,9 +148,12 @@ def render_template(request: Request,
     """ Render a template as an HTMLResponse. """
     rendered = render_raw_template(request, path, context)
     response = HTMLResponse(rendered, status_code=int(status_code))
-    secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
-    response.set_cookie("AURLANG", context.get("language"),
-                        secure=secure_cookies, httponly=True)
-    response.set_cookie("AURTZ", context.get("timezone"),
-                        secure=secure_cookies, httponly=True)
-    return util.add_samesite_fields(response, "strict")
+
+    sid = None
+    if request.user.is_authenticated():
+        sid = request.cookies.get("AURSID")
+
+    # Re-emit SID via update_response_cookies with an updated expiration.
+    # This extends the life of a user session based on the AURREMEMBER
+    # cookie, which is always set to the "Remember Me" state on login.
+    return cookies.update_response_cookies(request, response, aursid=sid)
diff --git a/aurweb/util.py b/aurweb/util.py
index c24cc1d0..dd7491d3 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -14,7 +14,6 @@ from zoneinfo import ZoneInfo
 import fastapi
 
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
-from fastapi.responses import Response
 from jinja2 import pass_context
 
 import aurweb.config
@@ -103,16 +102,6 @@ def valid_ssh_pubkey(pk):
     return base64.b64encode(base64.b64decode(tokens[1])).decode() == tokens[1]
 
 
-def migrate_cookies(request, response):
-    whitelist = {"AURSID", "AURTZ", "AURLANG"}
-
-    secure_cookies = aurweb.config.getboolean("options", "disable_http_login")
-    for k, v in request.cookies.items():
-        if k in whitelist:
-            response.set_cookie(k, v, secure=secure_cookies, httponly=True)
-    return add_samesite_fields(response, "strict")
-
-
 @pass_context
 def account_url(context, user):
     request = context.get("request")
@@ -159,18 +148,6 @@ def jsonify(obj):
     return obj
 
 
-def add_samesite_fields(response: Response, value: str):
-    """ Set the SameSite field on all cookie headers found.
-    Taken from https://github.com/tiangolo/fastapi/issues/1099. """
-    for idx, header in enumerate(response.raw_headers):
-        if header[0].decode() == "set-cookie":
-            cookie = header[1].decode()
-            if f"SameSite={value}" not in cookie:
-                cookie += f"; SameSite={value}"
-                response.raw_headers[idx] = (header[0], cookie.encode())
-    return response
-
-
 def get_ssh_fingerprints():
     return aurweb.config.get_section("fingerprints") or {}
 

From 1f2347c6b4100598c486bcac1dfdbdebd6b0f1ec Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Oct 2021 07:05:42 -0700
Subject: [PATCH 483/844] fix(fastapi): fix User.login signature typing

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 5b0da4ce..e4223144 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -100,7 +100,8 @@ class User(Base):
     def _login_approved(self, request: Request):
         return not is_banned(request) and not self.Suspended
 
-    def login(self, request: Request, password: str, session_time=0):
+    def login(self, request: Request, password: str,
+              session_time: int = 0) -> str:
         """ Login and authenticate a request. """
 
         from aurweb import db

From 651c1cd8c6ce783eeef338c5fda36a2da05250ea Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Sun, 3 Oct 2021 00:29:56 +0200
Subject: [PATCH 484/844] feat(gitlab-ci): Add logic for deploying aur-dev with
 docker-compose

The infrastructure changes are here[1].

[1] https://gitlab.archlinux.org/archlinux/infrastructure/-/merge_requests/492
---
 .gitlab-ci.yml                                | 48 +++++++++++++------
 ...ose.prod.yml => docker-compose.aur-dev.yml | 16 +++++++
 2 files changed, 49 insertions(+), 15 deletions(-)
 rename docker-compose.prod.yml => docker-compose.aur-dev.yml (82%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17b666d3..6a0d5f2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,22 +11,22 @@ variables:
   DB_HOST: localhost
   TEST_RECURSION_LIMIT: 10000
 
-before_script:
-  - export PATH="$HOME/.poetry/bin:${PATH}"
-  - ./docker/scripts/install-deps.sh
-  - ./docker/scripts/install-python-deps.sh
-  - useradd -U -d /aurweb -c 'AUR User' aur
-  - ./docker/mariadb-entrypoint.sh
-  - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
-  - 'until : > /dev/tcp/127.0.0.1/3306; do sleep 1s; done'
-  - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
-  - ./docker/test-sqlite-entrypoint.sh # Create sqlite AUR_CONFIG.
-  - make -C po all install
-  - python -m aurweb.initdb # Initialize MySQL tables.
-  - AUR_CONFIG=conf/config.sqlite python -m aurweb.initdb
-  - make -C test clean
-
 test:
+  stage: test
+  before_script:
+    - export PATH="$HOME/.poetry/bin:${PATH}"
+    - ./docker/scripts/install-deps.sh
+    - ./docker/scripts/install-python-deps.sh
+    - useradd -U -d /aurweb -c 'AUR User' aur
+    - ./docker/mariadb-entrypoint.sh
+    - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
+    - 'until : > /dev/tcp/127.0.0.1/3306; do sleep 1s; done'
+    - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
+    - ./docker/test-sqlite-entrypoint.sh # Create sqlite AUR_CONFIG.
+    - make -C po all install
+    - python -m aurweb.initdb # Initialize MySQL tables.
+    - AUR_CONFIG=conf/config.sqlite python -m aurweb.initdb
+    - make -C test clean
   script:
     - make -C test sh pytest # sharness tests use sqlite & pytest w/ mysql.
     - AUR_CONFIG=conf/config.sqlite make -C test pytest
@@ -41,3 +41,21 @@ test:
   artifacts:
     reports:
       cobertura: coverage.xml
+
+deploy:
+  stage: deploy
+  tags:
+    - secure
+  rules:
+    - if: $CI_COMMIT_BRANCH == "pu"
+      when: manual
+  script:
+    - pacman -Syu --noconfirm docker-compose socat openssh
+    - chmod 600 ${SSH_KEY}
+    - socat "UNIX-LISTEN:/tmp/docker.sock,reuseaddr,fork" EXEC:"ssh -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -Ti ${SSH_KEY} ${SSH_USER}@${SSH_HOST}" &
+    - export DOCKER_HOST="unix:///tmp/docker.sock"
+    - docker-compose build
+    - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d
+  environment:
+    name: development
+    url: https://aur-dev.archlinux.org
diff --git a/docker-compose.prod.yml b/docker-compose.aur-dev.yml
similarity index 82%
rename from docker-compose.prod.yml
rename to docker-compose.aur-dev.yml
index 9ea26663..f03d0a4f 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.aur-dev.yml
@@ -5,32 +5,47 @@ services:
     volumes:
       - cache:/cache
 
+  memcached:
+    restart: always
+
+  redis:
+    restart: always
+
+  mariadb:
+    restart: always
+
   git:
+    restart: always
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
       - cache:/cache
       - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   smartgit:
+    restart: always
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
       - cache:/cache
       - smartgit_run:/var/run/smartgit
 
   cgit-php:
+    restart: always
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
 
   cgit-fastapi:
+    restart: always
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
 
   php-fpm:
+    restart: always
     volumes:
       - cache:/cache
       - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   fastapi:
+    restart: always
     environment:
       - FASTAPI_BACKEND="gunicorn"
     volumes:
@@ -42,6 +57,7 @@ services:
       - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   nginx:
+    restart: always
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
       - cache:/cache

From 1656f5824d32f6796ba2982bb0b98b77650f432b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 25 Oct 2021 14:26:22 -0700
Subject: [PATCH 485/844] fix(docker): restore mariadb service

Additionally, for now, no-op usage of the MARIADB_SOCKET_DIR
environment variable. This is particularly useful for a serious
production setup, but we don't currently use that.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.aur-dev.yml  |  7 -------
 docker-compose.override.yml | 15 ---------------
 docker-compose.yml          | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index f03d0a4f..2e7610dc 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -19,7 +19,6 @@ services:
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
       - cache:/cache
-      - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   smartgit:
     restart: always
@@ -42,7 +41,6 @@ services:
     restart: always
     volumes:
       - cache:/cache
-      - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   fastapi:
     restart: always
@@ -50,11 +48,6 @@ services:
       - FASTAPI_BACKEND="gunicorn"
     volumes:
       - cache:/cache
-      - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
-
-  mariadb_init:
-    volumes:
-      - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
 
   nginx:
     restart: always
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index e702659e..7349ac66 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,21 +1,6 @@
 version: "3.8"
 
 services:
-  mariadb:
-    image: aurweb:latest
-    init: true
-    entrypoint: /docker/mariadb-entrypoint.sh
-    command: /usr/bin/mysqld_safe --datadir=/var/lib/mysql
-    ports:
-      # This will expose mariadbd on 127.0.0.1:13306 in the host.
-      # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
-      - "13306:3306"
-    volumes:
-      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
-      - mariadb_data:/var/lib/mysql
-    healthcheck:
-      test: "bash /docker/health/mariadb.sh"
-
   mariadb_init:
     depends_on:
       mariadb:
diff --git a/docker-compose.yml b/docker-compose.yml
index e19c8fb7..195be637 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,6 +48,21 @@ services:
     ports:
       - "16379:6379"
 
+  mariadb:
+    image: aurweb:latest
+    init: true
+    entrypoint: /docker/mariadb-entrypoint.sh
+    command: /usr/bin/mysqld_safe --datadir=/var/lib/mysql
+    ports:
+      # This will expose mariadbd on 127.0.0.1:13306 in the host.
+      # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
+      - "13306:3306"
+    volumes:
+      - mariadb_run:/var/run/mysqld # Bind socket in this volume.
+      - mariadb_data:/var/lib/mysql
+    healthcheck:
+      test: "bash /docker/health/mariadb.sh"
+
   mariadb_init:
     image: aurweb:latest
     init: true
@@ -55,6 +70,9 @@ services:
     command: echo "MariaDB tables initialized."
     volumes:
       - mariadb_run:/var/run/mysqld
+    depends_on:
+      mariadb:
+        condition: service_healthy
 
   git:
     image: aurweb:latest

From 1c0543c07e9aa7e58f26937926c7038ce658eada Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 25 Oct 2021 14:46:28 -0700
Subject: [PATCH 486/844] feat(docker): fixup and utilize
 AURWEB_(SSHD|FASTAPI|PHP)_PREFIX

Previously CGIT_CLONE_PREFIX_(PHP|FASTAPI), we found that we could
use the same env var in multiple places, including non-cgit-clone-prefix
areas.

So, they were renamed, and one additional prefix was added.

- CGIT_CLONE_PREFIX_PHP -> AURWEB_PHP_PREFIX
    - Used for cgit's clone prefix and AUR_CONFIG's aur_location for PHP
- CGIT_CLONE_PREFIX_FASTAPI -> AURWEB_FASTAPI_PREFIX
    - Used for cgit's clone prefix and AUR_CONFIG's aur_location for FastAPI
- AURWEB_SSHD_PREFIX
    - Used for aurweb's sshd clone prefix shown on package pages

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .env                         | 5 +++--
 .gitlab-ci.yml               | 4 ++++
 docker-compose.aur-dev.yml   | 6 ++++++
 docker-compose.yml           | 8 ++++++--
 docker/fastapi-entrypoint.sh | 6 +++---
 docker/php-entrypoint.sh     | 6 +++---
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index 06e862c1..c95a67d5 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,8 @@
 FASTAPI_BACKEND="uvicorn"
 FASTAPI_WORKERS=2
 MARIADB_SOCKET_DIR="/var/run/mysqld/"
-CGIT_CLONE_PREFIX_PHP=https://localhost:8443
-CGIT_CLONE_PREFIX_FASTAPI=https://localhost:8444
+AURWEB_PHP_PREFIX=https://localhost:8443
+AURWEB_FASTAPI_PREFIX=https://localhost:8444
+AURWEB_SSHD_PREFIX=ssh://aur@localhost:2222
 GIT_DATA_DIR="./aur.git/"
 TEST_RECURSION_LIMIT=10000
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a0d5f2b..03348d8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,6 +49,10 @@ deploy:
   rules:
     - if: $CI_COMMIT_BRANCH == "pu"
       when: manual
+  variables:
+    AURWEB_PHP_PREFIX: https://aur-dev.archlinux.org
+    AURWEB_FASTAPI_PREFIX: https://aur-dev.archlinux.org
+    AURWEB_SSHD_PREFIX: ssh://aur@aur-dev.archlinux.org:2222
   script:
     - pacman -Syu --noconfirm docker-compose socat openssh
     - chmod 600 ${SSH_KEY}
diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index 2e7610dc..075b5bb2 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -39,6 +39,9 @@ services:
 
   php-fpm:
     restart: always
+    environment:
+      - AURWEB_PHP_PREFIX=${AURWEB_PHP_PREFIX}
+      - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
     volumes:
       - cache:/cache
 
@@ -46,6 +49,9 @@ services:
     restart: always
     environment:
       - FASTAPI_BACKEND="gunicorn"
+      - FASTAPI_WORKERS=${FASTAPI_WORKERS}
+      - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
+      - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
     volumes:
       - cache:/cache
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 195be637..2b25c7d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -106,7 +106,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
-      - CGIT_CLONE_PREFIX=$CGIT_CLONE_PREFIX_PHP
+      - CGIT_CLONE_PREFIX=${AURWEB_PHP_PREFIX}
     entrypoint: /docker/cgit-entrypoint.sh
     command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
@@ -124,7 +124,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
-      - CGIT_CLONE_PREFIX=$CGIT_CLONE_PREFIX_FASTAPI
+      - CGIT_CLONE_PREFIX=${AURWEB_FASTAPI_PREFIX}
     entrypoint: /docker/cgit-entrypoint.sh
     command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
@@ -142,6 +142,8 @@ services:
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
+      - AURWEB_PHP_PREFIX=${AURWEB_PHP_PREFIX}
+      - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
     entrypoint: /docker/php-entrypoint.sh
     command: /docker/scripts/run-php.sh
     healthcheck:
@@ -164,6 +166,8 @@ services:
     environment:
       - AUR_CONFIG=conf/config
       - FASTAPI_WORKERS=${FASTAPI_WORKERS}
+      - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
+      - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
     entrypoint: /docker/fastapi-entrypoint.sh
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 9dba5562..6d91a16d 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -5,13 +5,13 @@ set -eou pipefail
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
 
-sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8444;" conf/config
+sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_FASTAPI_PREFIX};" conf/config
 
 # Setup Redis for FastAPI.
 sed -ri 's/^(cache) = .+/\1 = redis/' conf/config
 sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config
 
-sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8444/%s.git|" conf/config.defaults
-sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
+sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_FASTAPI_PREFIX}/%s.git|" conf/config.defaults
+sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults
 
 exec "$@"
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 5292fa93..81f70673 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -5,13 +5,13 @@ set -eou pipefail
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
 
-sed -ri "s;^(aur_location) = .+;\1 = https://localhost:8443;" conf/config
+sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_PHP_PREFIX};" conf/config
 
 # Enable memcached.
 sed -ri 's/^(cache) = .+$/\1 = memcache/' conf/config
 
-sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8443/%s.git|" conf/config.defaults
-sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults
+sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_PHP_PREFIX}/%s.git|" conf/config.defaults
+sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults
 
 sed -ri 's/^(listen).*/\1 = 0.0.0.0:9000/' /etc/php/php-fpm.d/www.conf
 sed -ri 's/^;?(clear_env).*/\1 = no/' /etc/php/php-fpm.d/www.conf

From b49b629395ca99fe4ac84b7a05839b6a59bf7371 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 25 Oct 2021 14:47:51 -0700
Subject: [PATCH 487/844] feat(gitlab-ci): set FASTAPI_WORKERS=5 on aur-dev

In addition, specify FASTAPI_BACKEND=gunicorn for deployment.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03348d8f..a7864280 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,8 @@ deploy:
     - if: $CI_COMMIT_BRANCH == "pu"
       when: manual
   variables:
+    FASTAPI_BACKEND: gunicorn
+    FASTAPI_WORKERS: 5
     AURWEB_PHP_PREFIX: https://aur-dev.archlinux.org
     AURWEB_FASTAPI_PREFIX: https://aur-dev.archlinux.org
     AURWEB_SSHD_PREFIX: ssh://aur@aur-dev.archlinux.org:2222

From 8239dcdd1b9c9ff96d1cf9fcadc81e0e27f98182 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 25 Oct 2021 15:38:51 -0700
Subject: [PATCH 488/844] feat(docker): configure fastapi's commit_hash based
 on $COMMIT_HASH

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .env                         | 1 +
 .gitlab-ci.yml               | 1 +
 docker-compose.aur-dev.yml   | 1 +
 docker/fastapi-entrypoint.sh | 4 ++++
 4 files changed, 7 insertions(+)

diff --git a/.env b/.env
index c95a67d5..22846cb4 100644
--- a/.env
+++ b/.env
@@ -6,3 +6,4 @@ AURWEB_FASTAPI_PREFIX=https://localhost:8444
 AURWEB_SSHD_PREFIX=ssh://aur@localhost:2222
 GIT_DATA_DIR="./aur.git/"
 TEST_RECURSION_LIMIT=10000
+COMMIT_HASH=
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7864280..c1a20427 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,6 +55,7 @@ deploy:
     AURWEB_PHP_PREFIX: https://aur-dev.archlinux.org
     AURWEB_FASTAPI_PREFIX: https://aur-dev.archlinux.org
     AURWEB_SSHD_PREFIX: ssh://aur@aur-dev.archlinux.org:2222
+    COMMIT_HASH: $CI_COMMIT_SHA
   script:
     - pacman -Syu --noconfirm docker-compose socat openssh
     - chmod 600 ${SSH_KEY}
diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index 075b5bb2..3f574d42 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -48,6 +48,7 @@ services:
   fastapi:
     restart: always
     environment:
+      - COMMIT_HASH=$COMMIT_HASH
       - FASTAPI_BACKEND="gunicorn"
       - FASTAPI_WORKERS=${FASTAPI_WORKERS}
       - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 6d91a16d..ec9eb5c1 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -11,6 +11,10 @@ sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_FASTAPI_PREFIX};" conf/config
 sed -ri 's/^(cache) = .+/\1 = redis/' conf/config
 sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config
 
+if [ "$COMMIT_HASH" ]; then
+    sed -ri "s/^;?(commit_hash) =.*$/\1 = $COMMIT_HASH/" conf/config
+fi
+
 sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_FASTAPI_PREFIX}/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults
 

From 7ee32a4ea13585be8b99a37c3d8af076488c493c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 25 Oct 2021 18:18:22 -0700
Subject: [PATCH 489/844] fix(gitlab-ci): set GIT_DATA_DIR=git_data on aur-dev

This uses the internally defined docker volume `git_data`,
but the variable is configurable for changes in the future.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1a20427..4b5b0491 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,6 +56,7 @@ deploy:
     AURWEB_FASTAPI_PREFIX: https://aur-dev.archlinux.org
     AURWEB_SSHD_PREFIX: ssh://aur@aur-dev.archlinux.org:2222
     COMMIT_HASH: $CI_COMMIT_SHA
+    GIT_DATA_DIR: git_data
   script:
     - pacman -Syu --noconfirm docker-compose socat openssh
     - chmod 600 ${SSH_KEY}

From a3a5ec678cdd533c53aa7b7d3afde73d781176ee Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Oct 2021 07:21:31 -0700
Subject: [PATCH 490/844] fix(gitlab-ci): enable options.disable_http_login on
 aur-dev

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b5b0491..156f0abf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,6 +62,8 @@ deploy:
     - chmod 600 ${SSH_KEY}
     - socat "UNIX-LISTEN:/tmp/docker.sock,reuseaddr,fork" EXEC:"ssh -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -Ti ${SSH_KEY} ${SSH_USER}@${SSH_HOST}" &
     - export DOCKER_HOST="unix:///tmp/docker.sock"
+    # Set secure login config for aurweb.
+    - sed -ri "s/^(disable_http_login).*$/\1 = 1/" conf/config.dev
     - docker-compose build
     - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d
   environment:

From 9fd07c36eb543f32f6d32e6392da0da583b68ab9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Oct 2021 12:12:13 -0700
Subject: [PATCH 491/844] fix(fastapi): fix account page title

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 61c125e0..b3203356 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -612,7 +612,8 @@ account_template = (
                status_code=HTTPStatus.UNAUTHORIZED)
 async def account(request: Request, username: str):
     _ = l10n.get_translator_for_request(request)
-    context = await make_variable_context(request, _("Account") + username)
+    context = await make_variable_context(request,
+                                          _("Account") + " " + username)
 
     user = db.query(models.User, models.User.Username == username).first()
     if not user:

From adb6252f85ca7c2150a5e5bae5105ad323f754d0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Oct 2021 13:01:32 -0700
Subject: [PATCH 492/844] feat(fastapi): add /account/{username}/comments

This commit contains a base template of account comments
in sorted order (based on ColumnTS.desc).

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py      | 16 ++++++++++
 templates/account/comments.html | 52 +++++++++++++++++++++++++++++++++
 test/test_packages_routes.py    | 48 ++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 templates/account/comments.html

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index b3203356..152b0a15 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -624,6 +624,22 @@ async def account(request: Request, username: str):
     return render_template(request, "account/show.html", context)
 
 
+@router.get("/account/{username}/comments")
+@auth_required(redirect="/account/{username}/comments")
+async def account_comments(request: Request, username: str):
+    user = db.query(models.User).filter(
+        models.User.Username == username
+    ).first()
+    if not user:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
+
+    context = make_context(request, "Accounts")
+    context["username"] = username
+    context["comments"] = user.package_comments.order_by(
+        models.PackageComment.CommentTS.desc())
+    return render_template(request, "account/comments.html", context)
+
+
 @router.get("/accounts")
 @auth_required(True, redirect="/accounts")
 @account_type_required({account_type.TRUSTED_USER,
diff --git a/templates/account/comments.html b/templates/account/comments.html
new file mode 100644
index 00000000..a1012b1b
--- /dev/null
+++ b/templates/account/comments.html
@@ -0,0 +1,52 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Accounts" | tr }}</h2>
+
+        <div class="comments">
+            <div class="comments-header">
+                <h3>
+                    {{
+                        "Comments for %s%s%s" | tr
+                        | format('<a href="/account/%s">' | format(username),
+                                 username,
+                                 "</a>")
+                        | safe
+                    }}
+                </h3>
+            </div>
+
+            {% for comment in comments %}
+                {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
+                <h4 id="comment-{{ comment.ID }}" class="comment-header">
+                    {{
+                        "Commented on package %s%s%s on %s%s%s" | tr
+                        | format(
+                            '<a href="/pkgbase/{{ comment.PackageBase.Name }}">',
+                            comment.PackageBase.Name,
+                            "</a>",
+                            '<a href="/account/%s/comments#comment-%s">' | format(
+                                username,
+                                comment.ID
+                            ),
+                            commented_at.strftime("%Y-%m-%d %H:%M"),
+                            "</a>"
+                        ) | safe
+                    }}
+                </h4>
+                <div id="comment-{{ comment.ID }}-content" class="article-content">
+                    <div>
+                        {% if comment.RenderedComment %}
+                            {{ comment.RenderedComment | safe }}
+                        {% else %}
+                            {{ comment.Comments }}
+                        {% endif %}
+                    </div>
+                </div>
+            {% endfor %}
+
+        </div>
+
+    </div>
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 7e67775a..063c8f11 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2523,3 +2523,51 @@ def test_pkgbase_merge_post(client: TestClient, tu_user: User,
              PackageRequest.MergeBaseName == target.PackageBase.Name)
     ).first()
     assert pkgreq is not None
+
+
+def test_account_comments_unauthorized(client: TestClient, user: User):
+    """ This test may seem out of place, but it requires packages,
+    so its being included in the packages routes test suite to
+    leverage existing fixtures. """
+    endpoint = f"/account/{user.Username}/comments"
+    with client as request:
+        resp = request.get(endpoint, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location").startswith("/login")
+
+
+def test_account_comments(client: TestClient, user: User, package: Package):
+    """ This test may seem out of place, but it requires packages,
+    so its being included in the packages routes test suite to
+    leverage existing fixtures. """
+    now = (datetime.utcnow().timestamp())
+    with db.begin():
+        # This comment's CommentTS is `now + 1`, so it is found in rendered
+        # HTML before the rendered_comment, which has a CommentTS of `now`.
+        comment = db.create(PackageComment,
+                            PackageBase=package.PackageBase,
+                            User=user, Comments="Test comment",
+                            CommentTS=now + 1)
+        rendered_comment = db.create(PackageComment,
+                                     PackageBase=package.PackageBase,
+                                     User=user, Comments="Test comment",
+                                     RenderedComment="<p>Test comment</p>",
+                                     CommentTS=now)
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user.Username}/comments"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    comments = root.xpath('//div[@class="article-content"]/div')
+
+    # Assert that we got Comments rendered from the first comment.
+    assert comments[0].text.strip() == comment.Comments
+
+    # And from the second, we have rendered content.
+    rendered = comments[1].xpath('./p')
+    expected = rendered_comment.RenderedComment.replace(
+        "<p>", "").replace("</p>", "")
+    assert rendered[0].text.strip() == expected

From 691b7b9091cf20227d1ebb572c9a236ca4251b01 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 28 Oct 2021 17:52:17 -0700
Subject: [PATCH 493/844] feat(fastapi): add comment actions to
 /account/{username}/comments

With this change, we've decoupled some partials shared between
`/pkgbase/{name}` and `/account/{username}/comments`. The comment
actions template now resolves its package base via the `comment`
instance instead of requiring `pkgbase`.

We've also modified the existing package comment routes to
support execution from any location using the `next` parameter.
This allows us to reuse code from package comments for
account comments actions.

Moved the majority of comment editing javascript to its own
.js file.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py                    |   3 +-
 aurweb/routers/packages.py                    |  52 ++++++---
 templates/account/comments.html               |  65 +++++++-----
 templates/partials/comment_actions.html       | 100 ++++++++++++++++++
 templates/partials/comment_content.html       |  15 +++
 templates/partials/head.html                  |   3 +
 templates/partials/packages/comment.html      |  75 +------------
 templates/partials/packages/comment_form.html |   1 +
 templates/partials/packages/comments.html     |  69 ------------
 test/test_accounts_routes.py                  |   7 ++
 test/test_packages_routes.py                  |   7 ++
 web/html/js/comment-edit.js                   |  61 +++++++++++
 12 files changed, 276 insertions(+), 182 deletions(-)
 create mode 100644 templates/partials/comment_actions.html
 create mode 100644 templates/partials/comment_content.html
 create mode 100644 web/html/js/comment-edit.js

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 152b0a15..f45b55da 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -612,8 +612,7 @@ account_template = (
                status_code=HTTPStatus.UNAUTHORIZED)
 async def account(request: Request, username: str):
     _ = l10n.get_translator_for_request(request)
-    context = await make_variable_context(request,
-                                          _("Account") + " " + username)
+    context = await make_variable_context(request, _("Account") + username)
 
     user = db.query(models.User, models.User.Username == username).first()
     if not user:
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 27a30205..b0da3bf9 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -318,7 +318,8 @@ async def pkgbase_comments_post(
 
 @router.get("/pkgbase/{name}/comments/{id}/form")
 @auth_required(True, login=False)
-async def pkgbase_comment_form(request: Request, name: str, id: int):
+async def pkgbase_comment_form(request: Request, name: str, id: int,
+                               next: str = Query(default=None)):
     """ Produce a comment form for comment {id}. """
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = pkgbase.comments.filter(models.PackageComment.ID == id).first()
@@ -331,6 +332,11 @@ async def pkgbase_comment_form(request: Request, name: str, id: int):
     context = await make_single_context(request, pkgbase)
     context["comment"] = comment
 
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    context["next"] = next
+
     form = render_raw_template(
         request, "partials/packages/comment_form.html", context)
     return JSONResponse({"form": form})
@@ -341,7 +347,8 @@ async def pkgbase_comment_form(request: Request, name: str, id: int):
 async def pkgbase_comment_post(
         request: Request, name: str, id: int,
         comment: str = Form(default=str()),
-        enable_notifications: bool = Form(default=False)):
+        enable_notifications: bool = Form(default=False),
+        next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     db_comment = get_pkgbase_comment(pkgbase, id)
 
@@ -366,14 +373,18 @@ async def pkgbase_comment_post(
                           PackageBase=pkgbase)
     update_comment_render(db_comment.ID)
 
+    if not next:
+        next = f"/pkgbase/{pkgbase.Name}"
+
     # Redirect to the pkgbase page anchored to the updated comment.
-    return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{db_comment.ID}",
+    return RedirectResponse(f"{next}#comment-{db_comment.ID}",
                             status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/comments/{id}/delete")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/delete")
-async def pkgbase_comment_delete(request: Request, name: str, id: int):
+async def pkgbase_comment_delete(request: Request, name: str, id: int,
+                                 next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
@@ -390,13 +401,16 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int):
         comment.Deleter = request.user
         comment.DelTS = now
 
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/comments/{id}/undelete")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/undelete")
-async def pkgbase_comment_undelete(request: Request, name: str, id: int):
+async def pkgbase_comment_undelete(request: Request, name: str, id: int,
+                                   next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
@@ -412,13 +426,16 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int):
         comment.Deleter = None
         comment.DelTS = None
 
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/comments/{id}/pin")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/pin")
-async def pkgbase_comment_pin(request: Request, name: str, id: int):
+async def pkgbase_comment_pin(request: Request, name: str, id: int,
+                              next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
@@ -434,13 +451,16 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int):
     with db.begin():
         comment.PinnedTS = now
 
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.post("/pkgbase/{name}/comments/{id}/unpin")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/unpin")
-async def pkgbase_comment_unpin(request: Request, name: str, id: int):
+async def pkgbase_comment_unpin(request: Request, name: str, id: int,
+                                next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
@@ -455,8 +475,10 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int):
     with db.begin():
         comment.PinnedTS = 0
 
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.get("/pkgbase/{name}/comaintainers")
diff --git a/templates/account/comments.html b/templates/account/comments.html
index a1012b1b..4a516dca 100644
--- a/templates/account/comments.html
+++ b/templates/account/comments.html
@@ -18,35 +18,50 @@
             </div>
 
             {% for comment in comments %}
-                {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
-                <h4 id="comment-{{ comment.ID }}" class="comment-header">
-                    {{
-                        "Commented on package %s%s%s on %s%s%s" | tr
-                        | format(
-                            '<a href="/pkgbase/{{ comment.PackageBase.Name }}">',
-                            comment.PackageBase.Name,
-                            "</a>",
-                            '<a href="/account/%s/comments#comment-%s">' | format(
-                                username,
-                                comment.ID
-                            ),
-                            commented_at.strftime("%Y-%m-%d %H:%M"),
-                            "</a>"
-                        ) | safe
-                    }}
-                </h4>
-                <div id="comment-{{ comment.ID }}-content" class="article-content">
-                    <div>
-                        {% if comment.RenderedComment %}
-                            {{ comment.RenderedComment | safe }}
-                        {% else %}
-                            {{ comment.Comments }}
+                {% set header_cls = "comment-header" %}
+                {% if comment.Deleter %}
+                    {% set header_cls = "%s %s" | format(header_cls, "comment-deleted") %}
+                {% endif %}
+
+                {% if not comment.Deleter or request.user.has_credential("CRED_COMMENT_VIEW_DELETED", approved=[comment.Deleter]) %}
+
+                    {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
+                    <h4 id="comment-{{ comment.ID }}" class="{{ header_cls }}">
+                        {{
+                            "Commented on package %s%s%s on %s%s%s" | tr
+                            | format(
+                                '<a href="/pkgbase/%s">' | format(comment.PackageBase.Name),
+                                comment.PackageBase.Name,
+                                "</a>",
+                                '<a href="/account/%s/comments#comment-%s">' | format(
+                                    username,
+                                    comment.ID
+                                ),
+                                commented_at.strftime("%Y-%m-%d %H:%M"),
+                                "</a>"
+                            ) | safe
+                        }}
+                        {% if comment.Editor %}
+                            {% set edited_on = comment.EditedTS | dt | as_timezone(timezone) %}
+                            <span class="edited">
+                                ({{ "edited on %s by %s" | tr
+                                | format(edited_on.strftime('%Y-%m-%d %H:%M'),
+                                '<a href="/account/%s">%s</a>' | format(
+                                comment.Editor.Username, comment.Editor.Username))
+                                | safe
+                                }})
+                            </span>
                         {% endif %}
-                    </div>
-                </div>
+
+                        {% include "partials/comment_actions.html" %}
+                    </h4>
+
+                    {% include "partials/comment_content.html" %}
+                {% endif %}
             {% endfor %}
 
         </div>
 
     </div>
+
 {% endblock %}
diff --git a/templates/partials/comment_actions.html b/templates/partials/comment_actions.html
new file mode 100644
index 00000000..b21b90bd
--- /dev/null
+++ b/templates/partials/comment_actions.html
@@ -0,0 +1,100 @@
+{% set pkgbasename = comment.PackageBase.Name %}
+
+{% if not comment.Deleter %}
+    {% if request.user.has_credential('CRED_COMMENT_DELETE', approved=[comment.User]) %}
+        <form class="delete-comment-form"
+              method="post"
+              action="/pkgbase/{{ pkgbasename }}/comments/{{ comment.ID }}/delete"
+        >
+            <fieldset style="display:inline;">
+                <input type="hidden"
+                       name="next"
+                       value="{{ request.url.path }}" />
+                <input type="image"
+                       class="delete-comment"
+                       src="/images/x.min.svg"
+                       width="11"
+                       height="11"
+                       alt="{{ 'Delete comment' | tr }}"
+                       title="{{ 'Delete comment' | tr }}"
+                       name="submit" value="1" />
+            </fieldset>
+        </form>
+    {% endif %}
+
+    {% if request.user.has_credential('CRED_COMMENT_EDIT', approved=[comment.User]) %}
+        <a id="comment-edit-link-{{ comment.ID }}"
+           {# /pkgbase/{name}/comments/{id}/edit #}
+           href="/pkgbase/{{ pkgbasename }}/comments/{{ comment.ID }}/edit?{{ {'next': request.url.path} | urlencode }}"
+           class="edit-comment"
+           title="{{ 'Edit comment' | tr }}"
+        >
+            <img src="/images/pencil.min.svg" alt="{{ 'Edit comment' | tr }}"
+                 width="11" height="11">
+        </a>
+
+        {# Set the edit event listener for this link. We must do this here
+        so that we can utilize Jinja2's values. #}
+        <script type="text/javascript" nonce="{{ request.user.nonce }}">
+            document.addEventListener("DOMContentLoaded", function() {
+                let link = document.getElementById("comment-edit-link-{{ comment.ID }}");
+                let fn = function(event) {
+                    return handleEditCommentClick(event, "{{ comment.PackageBase.Name }}");
+                };
+                link.addEventListener("click", fn);
+            });
+        </script>
+
+    {% endif %}
+
+    {% if request.user.has_credential("CRED_COMMENT_PIN", approved=[comment.PackageBase.Maintainer]) %}
+        {% if comment.PinnedTS %}
+            <form class="pin-comment-form"
+                  method="post"
+                  action="/pkgbase/{{ comment.PackageBase.Name }}/comments/{{ comment.ID }}/unpin"
+            >
+                <fieldset style="display:inline;">
+                    <input type="hidden" name="next" value="{{ request.url.path }}" />
+                    <input type="image"
+                           class="pin-comment"
+                           src="/images/unpin.min.svg"
+                           alt="{{ 'Unpin comment' | tr }}"
+                           title="{{ 'Unpin comment' | tr }}"
+                           name="submit"
+                           value="1" width="11" height="11" />
+                </fieldset>
+            </form>
+        {% else %}
+            <form class="pin-comment-form"
+                  method="post"
+                  action="/pkgbase/{{ comment.PackageBase.Name }}/comments/{{ comment.ID }}/pin"
+            >
+                <fieldset style="display:inline;">
+                    <input type="hidden" name="next" value="{{ request.url.path }}" />
+                    <input type="image"
+                           class="pin-comment"
+                           src="/images/pin.min.svg"
+                           alt="{{ 'Pin comment' | tr }}"
+                           title="{{ 'Pin comment' | tr }}"
+                           name="submit"
+                           value="1" width="11" height="11" />
+                </fieldset>
+            </form>
+        {% endif %}
+    {% endif %}
+{% elif request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
+        <form class="undelete-comment-form"
+              method="post"
+              action="/pkgbase/{{ comment.PackageBase.Name }}/comments/{{ comment.ID }}/undelete"
+        >
+            <fieldset style="display:inline;">
+                <input type="hidden" name="next" value="{{ request.url.path }}" />
+                <input type="image"
+                       class="undelete-comment"
+                       src="/images/action-undo.min.svg"
+                       alt="{{ 'Undelete comment' | tr }}"
+                       title="{{ 'Undelete comment' | tr }}"
+                       name="submit" value="1" width="11" height="11" />
+            </fieldset>
+        </form>
+{% endif %}
diff --git a/templates/partials/comment_content.html b/templates/partials/comment_content.html
new file mode 100644
index 00000000..f89dc505
--- /dev/null
+++ b/templates/partials/comment_content.html
@@ -0,0 +1,15 @@
+
+{% set article_cls = "article-content" %}
+{% if comment.Deleter %}
+    {% set article_cls = "%s %s" | format(article_cls, "comment-deleted") %}
+{% endif %}
+
+<div id="comment-{{ comment.ID }}-content" class="{{ article_cls }}">
+    <div>
+        {% if comment.RenderedComment %}
+            {{ comment.RenderedComment | safe }}
+        {% else %}
+            {{ comment.Comments }}
+        {% endif %}
+    </div>
+</div>
diff --git a/templates/partials/head.html b/templates/partials/head.html
index 8bfde020..21c79887 100644
--- a/templates/partials/head.html
+++ b/templates/partials/head.html
@@ -15,5 +15,8 @@
     <!-- Include local typeahead -->
     <script type="text/javascript" src="/static/js/typeahead.js"></script>
 
+    <!-- On-the-fly comment editing functions -->
+    <script type="text/javascript" src="/static/js/comment-edit.js"></script>
+
     <title>AUR ({{ language }}) - {{ title | tr }}</title>
 </head>
diff --git a/templates/partials/packages/comment.html b/templates/partials/packages/comment.html
index 533ac40d..676a7a73 100644
--- a/templates/partials/packages/comment.html
+++ b/templates/partials/packages/comment.html
@@ -34,77 +34,10 @@
 				| safe
 				}})
 			</span>
-		{% endif %}
-		{% if not comment.Deleter %}
-			{% if request.user.has_credential('CRED_COMMENT_DELETE', approved=[comment.User]) %}
-				<form class="delete-comment-form" method="post"
-					  action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/delete">
-					<fieldset style="display:inline;">
-						<input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="{{ 'Delete comment' | tr }}" title="{{ 'Delete comment' | tr }}" name="submit" value="1" />
-					</fieldset>
-				</form>
-			{% endif %}
+        {% endif %}
 
-			{% if request.user.has_credential('CRED_COMMENT_EDIT', approved=[comment.User]) %}
-				<a href="/pkgbase/{{ pkgname }}/edit-comment/?comment_id={{ comment.ID }}" class="edit-comment" title="Edit comment"><img src="/images/pencil.min.svg" alt="Edit comment" width="11" height="11"></a>
-			{% endif %}
+        {% include "partials/comment_actions.html" %}
+    </h4>
 
-            {% if request.user.has_credential("CRED_COMMENT_PIN", approved=[pkgbase.Maintainer]) %}
-                {% if comment.PinnedTS %}
-                    <form class="pin-comment-form"
-                          method="post"
-                          action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/unpin"
-                    >
-                        <fieldset style="display:inline;">
-                            <input type="image"
-                                   class="pin-comment"
-                                   src="/images/unpin.min.svg"
-                                   alt="{{ 'Unpin comment' | tr }}"
-                                   title="{{ 'Unpin comment' | tr }}"
-                                   name="submit"
-                                   value="1" width="11" height="11" />
-                        </fieldset>
-                    </form>
-                {% else %}
-                    <form class="pin-comment-form"
-                          method="post"
-                          action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/pin"
-                    >
-                        <fieldset style="display:inline;">
-                            <input type="image"
-                                   class="pin-comment"
-                                   src="/images/pin.min.svg"
-                                   alt="{{ 'Pin comment' | tr }}"
-                                   title="{{ 'Pin comment' | tr }}"
-                                   name="submit"
-                                   value="1" width="11" height="11" />
-                        </fieldset>
-                    </form>
-                {% endif %}
-			{% endif %}
-		{% elif request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
-				<form class="undelete-comment-form"
-					  method="post"
-					  action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/undelete"
-				>
-					<fieldset style="display:inline;">
-						<input type="image"
-							   class="undelete-comment"
-							   src="/images/action-undo.min.svg"
-							   alt="{{ 'Undelete comment' | tr }}"
-							   title="{{ 'Undelete comment' | tr }}"
-							   name="submit" value="1" width="11" height="11" />
-					</fieldset>
-				</form>
-		{% endif %}
-	</h4>
-	<div id="comment-{{ comment.ID }}-content" class="{{ article_cls }}">
-		<div>
-			{% if comment.RenderedComment %}
-				{{ comment.RenderedComment | safe }}
-			{% else %}
-				{{ comment.Comments }}
-			{% endif %}
-		</div>
-	</div>
+    {% include "partials/comment_content.html" %}
 {% endif %}
diff --git a/templates/partials/packages/comment_form.html b/templates/partials/packages/comment_form.html
index c1c25f87..5368e784 100644
--- a/templates/partials/packages/comment_form.html
+++ b/templates/partials/packages/comment_form.html
@@ -13,6 +13,7 @@ Routes:
 
 <form action="{{ action }}" method="post">
     <fieldset>
+        <input type="hidden" name="next" value="{{ next }}" />
         <p>
             {{ "Git commit identifiers referencing commits in the AUR package "
             "repository and URLs are converted to links automatically." | tr }}
diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
index 56b5ab03..6e6b9a47 100644
--- a/templates/partials/packages/comments.html
+++ b/templates/partials/packages/comments.html
@@ -39,72 +39,3 @@
         {% endfor %}
     </div>
 {% endif %}
-
-<script type="text/javascript" nonce="{{ request.user.nonce }}">
-function add_busy_indicator(sibling) {
-    const img = document.createElement('img');
-    img.src = "/images/ajax-loader.gif";
-    img.classList.add('ajax-loader');
-    img.style.height = 11;
-    img.style.width = 16;
-    img.alt = "Busy…";
-
-    sibling.insertAdjacentElement('afterend', img);
-}
-
-function remove_busy_indicator(sibling) {
-    const elem = sibling.nextElementSibling;
-    elem.parentNode.removeChild(elem);
-}
-
-function getParentsUntil(elem, className) {
-    // Limit to 10 depth
-    for ( ; elem && elem !== document; elem = elem.parentNode) {
-        if (elem.matches(className)) {
-            break;
-        }
-    }
-
-    return elem;
-}
-
-function handleEditCommentClick(event) {
-    event.preventDefault();
-    const parent_element = getParentsUntil(event.target, '.comment-header');
-    const parent_id = parent_element.id;
-    const comment_id = parent_id.substr(parent_id.indexOf('-') + 1);
-    // The div class="article-content" which contains the comment
-    const edit_form = parent_element.nextElementSibling;
-
-    const url = "/pkgbase/{{ pkgbase.Name }}/comments/" + comment_id + "/form";
-
-    add_busy_indicator(event.target);
-
-    fetch(url, {
-        method: 'GET',
-        credentials: 'same-origin'
-    })
-    .then(function(response) {
-        if (!response.ok) {
-            throw Error(response.statusText);
-        }
-        return response.json();
-    })
-    .then(function(data) {
-        remove_busy_indicator(event.target);
-        edit_form.innerHTML = data.form;
-        edit_form.querySelector('textarea').focus();
-    })
-    .catch(function(error) {
-        remove_busy_indicator(event.target);
-        console.error(error);
-    });
-}
-
-document.addEventListener('DOMContentLoaded', function() {
-    const divs = document.querySelectorAll('.edit-comment');;
-    for (let div of divs) {
-        div.addEventListener('click', handleEditCommentClick);
-    }
-});
-</script>
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 6c79cd33..188f7048 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -1625,3 +1625,10 @@ def test_post_terms_of_service():
         response = request.get("/tos", cookies=cookies, allow_redirects=False)
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
     assert response.headers.get("location") == "/"
+
+
+def test_account_comments_not_found():
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/account/non-existent/comments", cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 063c8f11..b4a582e3 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1055,6 +1055,13 @@ def test_pkgbase_comments_missing_comment(client: TestClient, maintainer: User,
 
 def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
                           package: Package):
+    """ This test includes tests against the following routes:
+    - POST /pkgbase/{name}/comments
+    - GET /pkgbase/{name} (to check comments)
+        - Tested against a comment created with the POST route
+    - GET /pkgbase/{name}/comments/{id}/form
+        - Tested against a comment created with the POST route
+    """
     cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
     pkgbasename = package.PackageBase.Name
     endpoint = f"/pkgbase/{pkgbasename}/comments"
diff --git a/web/html/js/comment-edit.js b/web/html/js/comment-edit.js
new file mode 100644
index 00000000..4898c8d4
--- /dev/null
+++ b/web/html/js/comment-edit.js
@@ -0,0 +1,61 @@
+function add_busy_indicator(sibling) {
+    const img = document.createElement('img');
+    img.src = "/images/ajax-loader.gif";
+    img.classList.add('ajax-loader');
+    img.style.height = 11;
+    img.style.width = 16;
+    img.alt = "Busy…";
+
+    sibling.insertAdjacentElement('afterend', img);
+}
+
+function remove_busy_indicator(sibling) {
+    const elem = sibling.nextElementSibling;
+    elem.parentNode.removeChild(elem);
+}
+
+function getParentsUntil(elem, className) {
+    // Limit to 10 depth
+    for ( ; elem && elem !== document; elem = elem.parentNode) {
+        if (elem.matches(className)) {
+            break;
+        }
+    }
+
+    return elem;
+}
+
+function handleEditCommentClick(event, pkgbasename) {
+    event.preventDefault();
+    const parent_element = getParentsUntil(event.target, '.comment-header');
+    const parent_id = parent_element.id;
+    const comment_id = parent_id.substr(parent_id.indexOf('-') + 1);
+    // The div class="article-content" which contains the comment
+    const edit_form = parent_element.nextElementSibling;
+
+    const url = "/pkgbase/" + pkgbasename + "/comments/" + comment_id + "/form?";
+
+    add_busy_indicator(event.target);
+
+    fetch(url + new URLSearchParams({ next: window.location.pathname }), {
+        method: 'GET',
+        credentials: 'same-origin'
+    })
+    .then(function(response) {
+        if (!response.ok) {
+            throw Error(response.statusText);
+        }
+        return response.json();
+    })
+    .then(function(data) {
+        remove_busy_indicator(event.target);
+        edit_form.innerHTML = data.form;
+        edit_form.querySelector('textarea').focus();
+    })
+    .catch(function(error) {
+        remove_busy_indicator(event.target);
+        console.error(error);
+    });
+
+    return false;
+}

From 348128fada7081a02d0bc47e03f7b68c1afbe769 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 17:06:16 -0700
Subject: [PATCH 494/844] fix(fastapi): fix /account/{username} page title

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index f45b55da..152b0a15 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -612,7 +612,8 @@ account_template = (
                status_code=HTTPStatus.UNAUTHORIZED)
 async def account(request: Request, username: str):
     _ = l10n.get_translator_for_request(request)
-    context = await make_variable_context(request, _("Account") + username)
+    context = await make_variable_context(request,
+                                          _("Account") + " " + username)
 
     user = db.query(models.User, models.User.Username == username).first()
     if not user:

From 46c39399ff63e5566fed2529de664dd92479aa67 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 17:18:15 -0700
Subject: [PATCH 495/844] fix(fastapi): fix /account/{username} links

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/account/show.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/account/show.html b/templates/account/show.html
index 9d3c26e5..0c99c99f 100644
--- a/templates/account/show.html
+++ b/templates/account/show.html
@@ -72,14 +72,14 @@
                                                 <li>
                                                     {{ "%sEdit this user's account%s"
                                                     | tr
-                                                    | format('<a href="%s/edit">' | format(user | account_url), "</a>")
+                                                    | format('<a href="/account/%s/edit">' | format(user.Username), "</a>")
                                                     | safe
                                                     }}
                                                 </li>
                                                 <li>
                                                     {{ "%sList this user's comments%s"
                                                     | tr
-                                                    | format('<a href="%s/comments">' | format(user | account_url), "</a>")
+                                                    | format('<a href="/account/%s/comments">' | format(user.Username), "</a>")
                                                     | safe
                                                     }}
                                                 </li>

From 8dcdc7ff38fcf21434ef79045db7621891d02d74 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 18:27:07 -0700
Subject: [PATCH 496/844] change(fastapi): decouple account comment templates

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/account/comments.html         | 41 +------------------------
 templates/partials/account/comment.html | 40 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 templates/partials/account/comment.html

diff --git a/templates/account/comments.html b/templates/account/comments.html
index 4a516dca..95585180 100644
--- a/templates/account/comments.html
+++ b/templates/account/comments.html
@@ -18,46 +18,7 @@
             </div>
 
             {% for comment in comments %}
-                {% set header_cls = "comment-header" %}
-                {% if comment.Deleter %}
-                    {% set header_cls = "%s %s" | format(header_cls, "comment-deleted") %}
-                {% endif %}
-
-                {% if not comment.Deleter or request.user.has_credential("CRED_COMMENT_VIEW_DELETED", approved=[comment.Deleter]) %}
-
-                    {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
-                    <h4 id="comment-{{ comment.ID }}" class="{{ header_cls }}">
-                        {{
-                            "Commented on package %s%s%s on %s%s%s" | tr
-                            | format(
-                                '<a href="/pkgbase/%s">' | format(comment.PackageBase.Name),
-                                comment.PackageBase.Name,
-                                "</a>",
-                                '<a href="/account/%s/comments#comment-%s">' | format(
-                                    username,
-                                    comment.ID
-                                ),
-                                commented_at.strftime("%Y-%m-%d %H:%M"),
-                                "</a>"
-                            ) | safe
-                        }}
-                        {% if comment.Editor %}
-                            {% set edited_on = comment.EditedTS | dt | as_timezone(timezone) %}
-                            <span class="edited">
-                                ({{ "edited on %s by %s" | tr
-                                | format(edited_on.strftime('%Y-%m-%d %H:%M'),
-                                '<a href="/account/%s">%s</a>' | format(
-                                comment.Editor.Username, comment.Editor.Username))
-                                | safe
-                                }})
-                            </span>
-                        {% endif %}
-
-                        {% include "partials/comment_actions.html" %}
-                    </h4>
-
-                    {% include "partials/comment_content.html" %}
-                {% endif %}
+                {% include "partials/account/comment.html" %}
             {% endfor %}
 
         </div>
diff --git a/templates/partials/account/comment.html b/templates/partials/account/comment.html
new file mode 100644
index 00000000..bc167cf7
--- /dev/null
+++ b/templates/partials/account/comment.html
@@ -0,0 +1,40 @@
+{% set header_cls = "comment-header" %}
+{% if comment.Deleter %}
+    {% set header_cls = "%s %s" | format(header_cls, "comment-deleted") %}
+{% endif %}
+
+{% if not comment.Deleter or request.user.has_credential("CRED_COMMENT_VIEW_DELETED", approved=[comment.Deleter]) %}
+
+    {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
+    <h4 id="comment-{{ comment.ID }}" class="{{ header_cls }}">
+        {{
+            "Commented on package %s%s%s on %s%s%s" | tr
+            | format(
+                '<a href="/pkgbase/%s">' | format(comment.PackageBase.Name),
+                comment.PackageBase.Name,
+                "</a>",
+                '<a href="/account/%s/comments#comment-%s">' | format(
+                    username,
+                    comment.ID
+                ),
+                commented_at.strftime("%Y-%m-%d %H:%M"),
+                "</a>"
+            ) | safe
+        }}
+        {% if comment.Editor %}
+            {% set edited_on = comment.EditedTS | dt | as_timezone(timezone) %}
+            <span class="edited">
+                ({{ "edited on %s by %s" | tr
+                | format(edited_on.strftime('%Y-%m-%d %H:%M'),
+                '<a href="/account/%s">%s</a>' | format(
+                comment.Editor.Username, comment.Editor.Username))
+                | safe
+                }})
+            </span>
+        {% endif %}
+
+        {% include "partials/comment_actions.html" %}
+    </h4>
+
+    {% include "partials/comment_content.html" %}
+{% endif %}

From 7f4c011dc3d4db377c7676bde50b67db9b937c72 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 20:26:57 -0700
Subject: [PATCH 497/844] fix(fastapi): sanitize PP/O parameters for package
 search

This definitely leaked through in more areas. We'll need to reuse
this new utility function in a few other routes in upcoming commits.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   |  7 +++++--
 aurweb/util.py               | 18 ++++++++++++++++--
 test/test_packages_routes.py | 10 +++-------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index b0da3bf9..14b91221 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -30,8 +30,11 @@ async def packages_get(request: Request, context: Dict[str, Any],
     context["q"] = dict(request.query_params)
 
     # Per page and offset.
-    per_page = context["PP"] = int(request.query_params.get("PP", 50))
-    offset = context["O"] = int(request.query_params.get("O", 0))
+    offset, per_page = util.sanitize_params(
+        request.query_params.get("O", defaults.O),
+        request.query_params.get("PP", defaults.PP))
+    context["O"] = offset
+    context["PP"] = per_page
 
     # Query search by.
     search_by = context["SeB"] = request.query_params.get("SeB", "nd")
diff --git a/aurweb/util.py b/aurweb/util.py
index dd7491d3..88142cbc 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -7,7 +7,7 @@ import secrets
 import string
 
 from datetime import datetime
-from typing import Any, Callable, Dict, Iterable
+from typing import Any, Callable, Dict, Iterable, Tuple
 from urllib.parse import urlencode, urlparse
 from zoneinfo import ZoneInfo
 
@@ -18,7 +18,7 @@ from jinja2 import pass_context
 
 import aurweb.config
 
-from aurweb import logging
+from aurweb import defaults, logging
 
 logger = logging.get_logger(__name__)
 
@@ -155,3 +155,17 @@ def get_ssh_fingerprints():
 def apply_all(iterable: Iterable, fn: Callable):
     for item in iterable:
         fn(item)
+
+
+def sanitize_params(offset: str, per_page: str) -> Tuple[int, int]:
+    try:
+        offset = int(offset)
+    except ValueError:
+        offset = defaults.O
+
+    try:
+        per_page = int(per_page)
+    except ValueError:
+        per_page = defaults.PP
+
+    return (offset, per_page)
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index b4a582e3..2ef3f3d8 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -486,15 +486,11 @@ def test_pkgbase(client: TestClient, package: Package):
 
 
 def test_packages(client: TestClient, packages: List[Package]):
-    """ Test the / packages route with defaults.
-
-    Defaults:
-        50 results per page
-        offset of 0
-    """
     with client as request:
         response = request.get("/packages", params={
-            "SeB": "X"  # "X" isn't valid, defaults to "nd"
+            "SeB": "X",  # "X" isn't valid, defaults to "nd"
+            "PP": "1 or 1",
+            "O": "0 or 0"
         })
     assert response.status_code == int(HTTPStatus.OK)
 

From 01e27fa34719b8e68def295c575bfb1f9b0ed362 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 20:29:56 -0700
Subject: [PATCH 498/844] fix(fastapi): sanitize /requests params

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 14b91221..27125b60 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -635,6 +635,8 @@ async def requests(request: Request,
     context = make_context(request, "Requests")
 
     context["q"] = dict(request.query_params)
+
+    O, PP = util.sanitize_params(O, PP)
     context["O"] = O
     context["PP"] = PP
 

From 9464de108f39e3fe633083ddf3c7a3526426fd98 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 21:37:52 -0700
Subject: [PATCH 499/844] feat(fastapi): add /pkgbase/{name}/comments/{id}/edit
 (get)

This is needed so that users can edit comments when they don't have
Javascript being used in their browser.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py            | 15 +++++++++
 templates/packages/comments/edit.html | 44 +++++++++++++++++++++++++++
 test/test_packages_routes.py          |  7 +++++
 3 files changed, 66 insertions(+)
 create mode 100644 templates/packages/comments/edit.html

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 27125b60..c574ec18 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -384,6 +384,21 @@ async def pkgbase_comment_post(
                             status_code=HTTPStatus.SEE_OTHER)
 
 
+@router.get("/pkgbase/{name}/comments/{id}/edit")
+@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/edit")
+async def pkgbase_comment_edit(request: Request, name: str, id: int,
+                               next: str = Form(default=None)):
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    context = await make_variable_context(request, "Edit comment", next=next)
+    context["comment"] = comment
+    return render_template(request, "packages/comments/edit.html", context)
+
+
 @router.post("/pkgbase/{name}/comments/{id}/delete")
 @auth_required(True, redirect="/pkgbase/{name}/comments/{id}/delete")
 async def pkgbase_comment_delete(request: Request, name: str, id: int,
diff --git a/templates/packages/comments/edit.html b/templates/packages/comments/edit.html
new file mode 100644
index 00000000..f938287e
--- /dev/null
+++ b/templates/packages/comments/edit.html
@@ -0,0 +1,44 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>{{ "Edit comment for: %s" | tr | format(comment.PackageBase.Name) }}</h2>
+
+        <form action="/pkgbase/{{ comment.PackageBase.Name }}/comments/{{ comment.ID }}"
+              method="post">
+            <fieldset>
+                <div>
+                    <input type="hidden" name="next" value="{{ next }}" />
+                </div>
+
+                <p>
+                    {{
+                        "Git commit identifiers referencing commits in "
+                        "the AUR package repository and URLs are converted "
+                        "to links automatically." | tr
+                    }}
+                    {{
+                        "%sMarkdown syntax%s is partiaully supported."
+                        | tr | format(
+                            '<a href="https://daringfireball.net/projects/markdown/syntax">',
+                            "</a>"
+                        ) | safe
+                    }}
+                </p>
+
+                <p>
+                    <textarea id="id_comment"
+                              name="comment"
+                              cols="80"
+                              rows="10">{{ comment.Comments }}</textarea>
+                </p>
+
+                <p>
+                    <input type="submit" value="{{ 'Save' | tr }}" />
+                </p>
+
+            </fieldset>
+        </form>
+
+    </div>
+{% endblock %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 2ef3f3d8..207be379 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1084,6 +1084,13 @@ def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
     assert len(bodies) == 1
 
     assert bodies[0].text.strip() == "Test comment."
+    comment_id = headers[0].attrib["id"].split("-")[-1]
+
+    # Test the non-javascript version of comment editing by
+    # visiting the /pkgbase/{name}/comments/{id}/edit route.
+    with client as request:
+        resp = request.get(f"{endpoint}/{comment_id}/edit", cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
 
     # Clear up the PackageNotification. This doubles as testing
     # that the notification was created and clears it up so we can

From b3b31394e840b2372134fb23f9217e9c40ef242b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 22:59:40 -0700
Subject: [PATCH 500/844] fix(rpc): simplify json generation complexity

This simply decouples depends and relations population into
their own helper functions.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py | 60 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 84bae53c..e92f9c70 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -1,5 +1,5 @@
 from collections import defaultdict
-from typing import List
+from typing import Any, Dict, List
 
 from sqlalchemy import and_
 
@@ -95,6 +95,36 @@ class RPC:
             raise RPCError(
                 f"Request type '{self.type}' is not yet implemented.")
 
+    def _update_json_depends(self, package: models.Package,
+                             data: Dict[str, Any]):
+        # Walk through all related PackageDependencies and produce
+        # the appropriate dict entries.
+        depends = package.package_dependencies
+        for dep in depends:
+            if dep.DepTypeID in DEP_TYPES:
+                key = DEP_TYPES.get(dep.DepTypeID)
+
+                display = dep.DepName
+                if dep.DepCondition:
+                    display += dep.DepCondition
+
+                data[key].append(display)
+
+    def _update_json_relations(self, package: models.Package,
+                               data: Dict[str, Any]):
+        # Walk through all related PackageRelations and produce
+        # the appropriate dict entries.
+        relations = package.package_relations
+        for rel in relations:
+            if rel.RelTypeID in REL_TYPES:
+                key = REL_TYPES.get(rel.RelTypeID)
+
+                display = rel.RelName
+                if rel.RelCondition:
+                    display += rel.RelCondition
+
+                data[key].append(display)
+
     def _get_json_data(self, package: models.Package):
         """ Produce dictionary data of one Package that can be JSON-serialized.
 
@@ -137,32 +167,8 @@ class RPC:
             # We do have a maintainer: set the Maintainer key.
             data["Maintainer"] = package.PackageBase.Maintainer.Username
 
-        # Walk through all related PackageDependencies and produce
-        # the appropriate dict entries.
-        if depends := package.package_dependencies:
-            for dep in depends:
-                if dep.DepTypeID in DEP_TYPES:
-                    key = DEP_TYPES.get(dep.DepTypeID)
-
-                    display = dep.DepName
-                    if dep.DepCondition:
-                        display += dep.DepCondition
-
-                    data[key].append(display)
-
-        # Walk through all related PackageRelations and produce
-        # the appropriate dict entries.
-        if relations := package.package_relations:
-            for rel in relations:
-                if rel.RelTypeID in REL_TYPES:
-                    key = REL_TYPES.get(rel.RelTypeID)
-
-                    display = rel.RelName
-                    if rel.RelCondition:
-                        display += rel.RelCondition
-
-                    data[key].append(display)
-
+        self._update_json_depends(package, data)
+        self._update_json_relations(package, data)
         return data
 
     def _handle_multiinfo_type(self, args: List[str] = []):

From 0af6a2c32f04f1c0f8b98e1be9fa45983eec9bd5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 23:47:47 -0700
Subject: [PATCH 501/844] fix(docker): fix COMMIT_HASH variable check

The previous method was super bad. Even if a variable was declared,
if it was empty, we would run into a false-positive. Additionally,
the previous method did not allow us to not specify the COMMIT_HASH
variable; which is problematic for development environments.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/fastapi-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index ec9eb5c1..58fafe56 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -11,7 +11,7 @@ sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_FASTAPI_PREFIX};" conf/config
 sed -ri 's/^(cache) = .+/\1 = redis/' conf/config
 sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config
 
-if [ "$COMMIT_HASH" ]; then
+if [ ! -z ${COMMIT_HASH+x} ]; then
     sed -ri "s/^;?(commit_hash) =.*$/\1 = $COMMIT_HASH/" conf/config
 fi
 

From 6d376fed1576e036d8a4ceb687493e647f3d8c0d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 29 Oct 2021 23:10:20 -0700
Subject: [PATCH 502/844] feat(rpc): add ETag header with md5 hash content

The ETag header can be used for client-side caching.

https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/rpc.py | 25 +++++++++++++++++++++++--
 aurweb/rpc.py         |  6 ++----
 test/test_rpc.py      |  8 ++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index 0616326b..0c52404c 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -1,8 +1,12 @@
+import hashlib
+
 from http import HTTPStatus
 from typing import List, Optional
 from urllib.parse import unquote
 
-from fastapi import APIRouter, Query, Request
+import orjson
+
+from fastapi import APIRouter, Query, Request, Response
 from fastapi.responses import JSONResponse
 
 from aurweb.ratelimit import check_ratelimit
@@ -74,4 +78,21 @@ async def rpc(request: Request,
     # Prepare list of arguments for input. If 'arg' was given, it'll
     # be a list with one element.
     arguments = parse_args(request)
-    return JSONResponse(rpc.handle(arguments))
+    data = rpc.handle(arguments)
+
+    # Serialize `data` into JSON in a sorted fashion. This way, our
+    # ETag header produced below will never end up changed.
+    output = orjson.dumps(data, option=orjson.OPT_SORT_KEYS)
+
+    # Produce an md5 hash based on `output`.
+    md5 = hashlib.md5()
+    md5.update(output)
+    etag = md5.hexdigest()
+
+    # Finally, return our JSONResponse with the ETag header.
+    # The ETag header expects quotes to surround any identifier.
+    # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
+    return Response(output.decode(), headers={
+        "Content-Type": "application/json",
+        "ETag": f'"{etag}"'
+    })
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index e92f9c70..87700a2f 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -99,8 +99,7 @@ class RPC:
                              data: Dict[str, Any]):
         # Walk through all related PackageDependencies and produce
         # the appropriate dict entries.
-        depends = package.package_dependencies
-        for dep in depends:
+        for dep in package.package_dependencies:
             if dep.DepTypeID in DEP_TYPES:
                 key = DEP_TYPES.get(dep.DepTypeID)
 
@@ -114,8 +113,7 @@ class RPC:
                                data: Dict[str, Any]):
         # Walk through all related PackageRelations and produce
         # the appropriate dict entries.
-        relations = package.package_relations
-        for rel in relations:
+        for rel in package.package_relations:
             if rel.RelTypeID in REL_TYPES:
                 key = REL_TYPES.get(rel.RelTypeID)
 
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 9400ee06..00703c23 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -488,3 +488,11 @@ def test_rpc_ratelimit(getint: mock.MagicMock, pipeline: Pipeline):
     # The new first request should be good.
     response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
     assert response.status_code == int(HTTPStatus.OK)
+
+
+def test_rpc_etag():
+    response1 = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+    response2 = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+    assert response1.headers.get("ETag") is not None
+    assert response1.headers.get("ETag") != str()
+    assert response1.headers.get("ETag") == response2.headers.get("ETag")

From 9d6dbaf0ecfaf576d0c966ca0c93ba68dbd07544 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 30 Oct 2021 00:36:21 -0700
Subject: [PATCH 503/844] feat(rpc): add suggest type handler

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py    |  8 ++++++++
 test/test_rpc.py | 24 +++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 87700a2f..5c9df1a7 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -175,6 +175,14 @@ class RPC:
             models.Package.Name.in_(args))
         return [self._get_json_data(pkg) for pkg in packages]
 
+    def _handle_suggest_type(self, args: List[str] = []):
+        arg = args[0]
+        packages = db.query(models.Package).join(models.PackageBase).filter(
+            and_(models.PackageBase.PackagerUID.isnot(None),
+                 models.Package.Name.like(f"%{arg}%"))
+        ).order_by(models.Package.Name.asc()).limit(20)
+        return [pkg.Name for pkg in packages]
+
     def _handle_suggest_pkgbase_type(self, args: List[str] = []):
         records = db.query(models.PackageBase).filter(
             and_(models.PackageBase.PackagerUID.isnot(None),
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 00703c23..71c7397f 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -98,6 +98,17 @@ def setup():
                           Maintainer=user1,
                           Packager=user1)
 
+        pkgbase4 = create(PackageBase, Name="fugly-chungus",
+                          Maintainer=user1,
+                          Packager=user1)
+
+        desc = "A Package belonging to a PackageBase with another name."
+        create(Package,
+               PackageBase=pkgbase4,
+               Name="other-pkg",
+               Description=desc,
+               URL="https://example.com")
+
         create(Package,
                PackageBase=pkgbase3,
                Name=pkgbase3.Name,
@@ -451,8 +462,19 @@ def test_rpc_suggest_pkgbase():
     assert data == ["chungy-chungus"]
 
 
+def test_rpc_suggest():
+    response = make_request("/rpc?v=5&type=suggest&arg=other")
+    data = response.json()
+    assert data == ["other-pkg"]
+
+    # Test non-existent Package.
+    response = make_request("/rpc?v=5&type=suggest&arg=nonexistent")
+    data = response.json()
+    assert data == []
+
+
 def test_rpc_unimplemented_types():
-    unimplemented = ["search", "msearch", "suggest"]
+    unimplemented = ["search", "msearch"]
     for type in unimplemented:
         response = make_request(f"/rpc?v=5&type={type}&arg=big")
         data = response.json()

From c28f1695edb6d94c038363648c99768e23d7fcf5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 30 Oct 2021 16:22:54 -0700
Subject: [PATCH 504/844] fix(fastapi): support `by` maintainer search with no
 keywords

In this case, package search should return orphaned packages.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/search.py    | 10 +++++++---
 test/test_packages_routes.py | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/aurweb/packages/search.py b/aurweb/packages/search.py
index e4729d89..0319a2ba 100644
--- a/aurweb/packages/search.py
+++ b/aurweb/packages/search.py
@@ -90,9 +90,13 @@ class PackageSearch:
         return self
 
     def _search_by_maintainer(self, keywords: str) -> orm.Query:
-        self.query = self.query.join(
-            models.User, models.User.ID == models.PackageBase.MaintainerUID
-        ).filter(models.User.Username == keywords)
+        if keywords:
+            self.query = self.query.join(
+                models.User, models.User.ID == models.PackageBase.MaintainerUID
+            ).filter(models.User.Username == keywords)
+        else:
+            self.query = self.query.filter(
+                models.PackageBase.MaintainerUID.is_(None))
         return self
 
     def _search_by_comaintainer(self, keywords: str) -> orm.Query:
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 207be379..c4d9ab1c 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -623,13 +623,36 @@ def test_packages_search_by_keywords(client: TestClient,
 def test_packages_search_by_maintainer(client: TestClient,
                                        maintainer: User,
                                        package: Package):
+    # We should expect that searching by `package`'s maintainer
+    # returns `package` in the results.
     with client as request:
         response = request.get("/packages", params={
             "SeB": "m",
             "K": maintainer.Username
         })
     assert response.status_code == int(HTTPStatus.OK)
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 1
 
+    # Search again by maintainer with no keywords given.
+    # This kind of search returns all orphans instead.
+    # In this first case, there are no orphan packages; assert that.
+    with client as request:
+        response = request.get("/packages", params={"SeB": "m"})
+    assert response.status_code == int(HTTPStatus.OK)
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 0
+
+    # Orphan `package`.
+    with db.begin():
+        package.PackageBase.Maintainer = None
+
+    # This time, we should get `package` returned, since it's now an orphan.
+    with client as request:
+        response = request.get("/packages", params={"SeB": "m"})
+    assert response.status_code == int(HTTPStatus.OK)
     root = parse_root(response.text)
     rows = root.xpath('//table[@class="results"]/tbody/tr')
     assert len(rows) == 1

From af2f3694e7fa59f06ebe1af22ac6592b513ef42f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 30 Oct 2021 16:39:20 -0700
Subject: [PATCH 505/844] feat(rpc): add search type handler

This commit introduces a PackageSearch-derivative class: `RPCSearch`.
This derivative modifies callback behavior of PackageSearch to
suit RPC searches, including [make|check|opt]depends `by` types.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/defaults.py        |   3 +
 aurweb/packages/search.py | 118 ++++++++++++++++++++++++++++++++------
 aurweb/routers/rpc.py     |  12 ++--
 aurweb/rpc.py             |  75 +++++++++++++++++++-----
 test/test_rpc.py          |  74 +++++++++++++++++++++++-
 5 files changed, 245 insertions(+), 37 deletions(-)

diff --git a/aurweb/defaults.py b/aurweb/defaults.py
index c2568d05..51072e8f 100644
--- a/aurweb/defaults.py
+++ b/aurweb/defaults.py
@@ -9,6 +9,9 @@ PP = 50
 # A whitelist of valid PP values
 PP_WHITELIST = {50, 100, 250}
 
+# Default `by` parameter for RPC search.
+RPC_SEARCH_BY = "name-desc"
+
 
 def fallback_pp(per_page: int) -> int:
     """ If `per_page` is a valid value in PP_WHITELIST, return it.
diff --git a/aurweb/packages/search.py b/aurweb/packages/search.py
index 0319a2ba..a14fe19b 100644
--- a/aurweb/packages/search.py
+++ b/aurweb/packages/search.py
@@ -1,6 +1,7 @@
 from sqlalchemy import and_, case, or_, orm
 
-from aurweb import config, db, models
+from aurweb import config, db, models, util
+from aurweb.models.dependency_type import CHECKDEPENDS_ID, DEPENDS_ID, MAKEDEPENDS_ID, OPTDEPENDS_ID
 
 DEFAULT_MAX_RESULTS = 2500
 
@@ -11,24 +12,25 @@ class PackageSearch:
     # A constant mapping of short to full name sort orderings.
     FULL_SORT_ORDER = {"d": "desc", "a": "asc"}
 
-    def __init__(self, user: models.User):
-        """ Construct an instance of PackageSearch.
-
-        This constructors performs several steps during initialization:
-            1. Setup self.query: an ORM query of Package joined by PackageBase.
-        """
+    def __init__(self, user: models.User = None):
         self.user = user
-        self.query = db.query(models.Package).join(models.PackageBase).join(
-            models.PackageVote,
-            and_(models.PackageVote.PackageBaseID == models.PackageBase.ID,
-                 models.PackageVote.UsersID == self.user.ID),
-            isouter=True
-        ).join(
-            models.PackageNotification,
-            and_(models.PackageNotification.PackageBaseID == models.PackageBase.ID,
-                 models.PackageNotification.UserID == self.user.ID),
-            isouter=True
-        )
+        self.query = db.query(models.Package).join(models.PackageBase)
+
+        if self.user:
+            PackageVote = models.PackageVote
+            join_vote_on = and_(
+                PackageVote.PackageBaseID == models.PackageBase.ID,
+                PackageVote.UsersID == self.user.ID)
+
+            PackageNotification = models.PackageNotification
+            join_notif_on = and_(
+                PackageNotification.PackageBaseID == models.PackageBase.ID,
+                PackageNotification.UserID == self.user.ID)
+
+            self.query = self.query.join(
+                models.PackageVote, join_vote_on, isouter=True
+            ).join(models.PackageNotification, join_notif_on, isouter=True)
+
         self.ordering = "d"
 
         # Setup SeB (Search By) callbacks.
@@ -198,3 +200,83 @@ class PackageSearch:
 
         # Return the query to the user.
         return self.query
+
+
+class RPCSearch(PackageSearch):
+    """ A PackageSearch-derived RPC package search query builder.
+
+    With RPC search, we need a subset of PackageSearch's handlers,
+    with a few additional handlers added. So, within the RPCSearch
+    constructor, we pop unneeded keys out of inherited self.search_by_cb
+    and add a few more keys to it, namely: depends, makedepends,
+    optdepends and checkdepends.
+
+    Additionally, some logic within the inherited PackageSearch.search_by
+    method is not needed, so it is overridden in this class without
+    sanitization done for the PackageSearch `by` argument.
+    """
+
+    keys_removed = ("b", "N", "B", "k", "c", "M", "s")
+
+    def __init__(self) -> "RPCSearch":
+        super().__init__()
+
+        # Fix-up inherited search_by_cb to reflect RPC-specific by params.
+        # We keep: "nd", "n" and "m". We also overlay four new by params
+        # on top: "depends", "makedepends", "optdepends" and "checkdepends".
+        util.apply_all(RPCSearch.keys_removed,
+                       lambda k: self.search_by_cb.pop(k))
+        self.search_by_cb.update({
+            "depends": self._search_by_depends,
+            "makedepends": self._search_by_makedepends,
+            "optdepends": self._search_by_optdepends,
+            "checkdepends": self._search_by_checkdepends
+        })
+
+    def _join_depends(self, dep_type_id: int) -> orm.Query:
+        """ Join Package with PackageDependency and filter results
+        based on `dep_type_id`.
+
+        :param dep_type_id: DependencyType ID
+        :returns: PackageDependency-joined orm.Query
+        """
+        self.query = self.query.join(models.PackageDependency).filter(
+            models.PackageDependency.DepTypeID == dep_type_id)
+        return self.query
+
+    def _search_by_depends(self, keywords: str) -> "RPCSearch":
+        self.query = self._join_depends(DEPENDS_ID).filter(
+            models.PackageDependency.DepName == keywords)
+        return self
+
+    def _search_by_makedepends(self, keywords: str) -> "RPCSearch":
+        self.query = self._join_depends(MAKEDEPENDS_ID).filter(
+            models.PackageDependency.DepName == keywords)
+        return self
+
+    def _search_by_optdepends(self, keywords: str) -> "RPCSearch":
+        self.query = self._join_depends(OPTDEPENDS_ID).filter(
+            models.PackageDependency.DepName == keywords)
+        return self
+
+    def _search_by_checkdepends(self, keywords: str) -> "RPCSearch":
+        self.query = self._join_depends(CHECKDEPENDS_ID).filter(
+            models.PackageDependency.DepName == keywords)
+        return self
+
+    def search_by(self, by: str, keywords: str) -> "RPCSearch":
+        """ Override inherited search_by. In this override, we reduce the
+        scope of what we handle within this function. We do not set `by`
+        to a default of "nd" in the RPC, as the RPC returns an error when
+        incorrect `by` fields are specified.
+
+        :param by: RPC `by` argument
+        :param keywords: RPC `arg` argument
+        :returns: self
+        """
+        callback = self.search_by_cb.get(by)
+        result = callback(keywords)
+        return result
+
+    def results(self) -> orm.Query:
+        return self.query
diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index 0c52404c..6d3dce54 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -9,6 +9,7 @@ import orjson
 from fastapi import APIRouter, Query, Request, Response
 from fastapi.responses import JSONResponse
 
+from aurweb import defaults
 from aurweb.ratelimit import check_ratelimit
 from aurweb.rpc import RPC
 
@@ -62,10 +63,11 @@ def parse_args(request: Request):
 
 @router.get("/rpc")
 async def rpc(request: Request,
-              v: Optional[int] = Query(None),
-              type: Optional[str] = Query(None),
-              arg: Optional[str] = Query(None),
-              args: Optional[List[str]] = Query(None, alias="arg[]")):
+              v: Optional[int] = Query(default=None),
+              type: Optional[str] = Query(default=None),
+              by: Optional[str] = Query(default=defaults.RPC_SEARCH_BY),
+              arg: Optional[str] = Query(default=None),
+              args: Optional[List[str]] = Query(default=[], alias="arg[]")):
 
     # Create a handle to our RPC class.
     rpc = RPC(version=v, type=type)
@@ -78,7 +80,7 @@ async def rpc(request: Request,
     # Prepare list of arguments for input. If 'arg' was given, it'll
     # be a list with one element.
     arguments = parse_args(request)
-    data = rpc.handle(arguments)
+    data = rpc.handle(by=by, args=arguments)
 
     # Serialize `data` into JSON in a sorted fashion. This way, our
     # ETag header produced below will never end up changed.
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 5c9df1a7..009b1440 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -5,8 +5,9 @@ from sqlalchemy import and_
 
 import aurweb.config as config
 
-from aurweb import db, models, util
+from aurweb import db, defaults, models, util
 from aurweb.models import dependency_type, relation_type
+from aurweb.packages.search import RPCSearch
 
 # Define dependency type mappings from ID to RPC-compatible keys.
 DEP_TYPES = {
@@ -60,8 +61,16 @@ class RPC:
         "suggest", "suggest-pkgbase"
     }
 
-    # A mapping of aliases.
-    ALIASES = {"info": "multiinfo"}
+    # A mapping of type aliases.
+    TYPE_ALIASES = {"info": "multiinfo"}
+
+    EXPOSED_BYS = {
+        "name-desc", "name", "maintainer",
+        "depends", "makedepends", "optdepends", "checkdepends"
+    }
+
+    # A mapping of by aliases.
+    BY_ALIASES = {"name-desc": "nd", "name": "n", "maintainer": "m"}
 
     def __init__(self, version: int = 0, type: str = None):
         self.version = version
@@ -76,14 +85,17 @@ class RPC:
             "error": message
         }
 
-    def _verify_inputs(self, args: List[str] = []):
+    def _verify_inputs(self, by: str = [], args: List[str] = []):
         if self.version is None:
             raise RPCError("Please specify an API version.")
 
         if self.version not in RPC.EXPOSED_VERSIONS:
             raise RPCError("Invalid version specified.")
 
-        if self.type is None or not len(args):
+        if by not in RPC.EXPOSED_BYS:
+            raise RPCError("Incorrect by field specified.")
+
+        if self.type is None:
             raise RPCError("No request type/data specified.")
 
         if self.type not in RPC.EXPOSED_TYPES:
@@ -95,6 +107,10 @@ class RPC:
             raise RPCError(
                 f"Request type '{self.type}' is not yet implemented.")
 
+    def _enforce_args(self, args: List[str]):
+        if not args:
+            raise RPCError("No request type/data specified.")
+
     def _update_json_depends(self, package: models.Package,
                              data: Dict[str, Any]):
         # Walk through all related PackageDependencies and produce
@@ -169,13 +185,36 @@ class RPC:
         self._update_json_relations(package, data)
         return data
 
-    def _handle_multiinfo_type(self, args: List[str] = []):
+    def _handle_multiinfo_type(self, args: List[str] = [], **kwargs):
+        self._enforce_args(args)
         args = set(args)
         packages = db.query(models.Package).filter(
             models.Package.Name.in_(args))
         return [self._get_json_data(pkg) for pkg in packages]
 
-    def _handle_suggest_type(self, args: List[str] = []):
+    def _handle_search_type(self, by: str = defaults.RPC_SEARCH_BY,
+                            args: List[str] = []):
+        # If `by` isn't maintainer and we don't have any args, raise an error.
+        # In maintainer's case, return all orphans if there are no args,
+        # so we need args to pass through to the handler without errors.
+        if by != "m" and not len(args):
+            raise RPCError("No request type/data specified.")
+
+        arg = args[0]
+        if len(arg) < 2:
+            raise RPCError("Query arg too small.")
+
+        search = RPCSearch()
+        search.search_by(by, arg)
+
+        max_results = config.getint("options", "max_rpc_results")
+        results = search.results().limit(max_results)
+        return [self._get_json_data(pkg) for pkg in results]
+
+    def _handle_suggest_type(self, args: List[str] = [], **kwargs):
+        if not args:
+            return []
+
         arg = args[0]
         packages = db.query(models.Package).join(models.PackageBase).filter(
             and_(models.PackageBase.PackagerUID.isnot(None),
@@ -183,14 +222,17 @@ class RPC:
         ).order_by(models.Package.Name.asc()).limit(20)
         return [pkg.Name for pkg in packages]
 
-    def _handle_suggest_pkgbase_type(self, args: List[str] = []):
+    def _handle_suggest_pkgbase_type(self, args: List[str] = [], **kwargs):
+        if not args:
+            return []
+
         records = db.query(models.PackageBase).filter(
             and_(models.PackageBase.PackagerUID.isnot(None),
                  models.PackageBase.Name.like(f"%{args[0]}%"))
         ).order_by(models.PackageBase.Name.asc()).limit(20)
         return [record.Name for record in records]
 
-    def handle(self, args: List[str] = []):
+    def handle(self, by: str = defaults.RPC_SEARCH_BY, args: List[str] = []):
         """ Request entrypoint. A router should pass v, type and args
         to this function and expect an output dictionary to be returned.
 
@@ -199,22 +241,29 @@ class RPC:
         :param args: Deciphered list of arguments based on arg/arg[] inputs
         """
         # Convert type aliased types.
-        if self.type in RPC.ALIASES:
-            self.type = RPC.ALIASES.get(self.type)
+        if self.type in RPC.TYPE_ALIASES:
+            self.type = RPC.TYPE_ALIASES.get(self.type)
 
         # Prepare our output data dictionary with some basic keys.
         data = {"version": self.version, "type": self.type}
 
         # Run some verification on our given arguments.
         try:
-            self._verify_inputs(args)
+            self._verify_inputs(by=by, args=args)
         except RPCError as exc:
             return self.error(str(exc))
 
+        # Convert by to its aliased value if it has one.
+        if by in RPC.BY_ALIASES:
+            by = RPC.BY_ALIASES.get(by)
+
         # Get a handle to our callback and trap an RPCError with
         # an empty list of results based on callback's execution.
         callback = getattr(self, f"_handle_{self.type.replace('-', '_')}_type")
-        results = callback(args)
+        try:
+            results = callback(by=by, args=args)
+        except RPCError as exc:
+            return self.error(str(exc))
 
         # These types are special: we produce a different kind of
         # successful JSON output: a list of results.
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 71c7397f..38b81226 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -461,6 +461,11 @@ def test_rpc_suggest_pkgbase():
     data = response.json()
     assert data == ["chungy-chungus"]
 
+    # Test no arg supplied.
+    response = make_request("/rpc?v=5&type=suggest-pkgbase")
+    data = response.json()
+    assert data == []
+
 
 def test_rpc_suggest():
     response = make_request("/rpc?v=5&type=suggest&arg=other")
@@ -472,9 +477,14 @@ def test_rpc_suggest():
     data = response.json()
     assert data == []
 
+    # Test no arg supplied.
+    response = make_request("/rpc?v=5&type=suggest")
+    data = response.json()
+    assert data == []
+
 
 def test_rpc_unimplemented_types():
-    unimplemented = ["search", "msearch"]
+    unimplemented = ["msearch"]
     for type in unimplemented:
         response = make_request(f"/rpc?v=5&type={type}&arg=big")
         data = response.json()
@@ -518,3 +528,65 @@ def test_rpc_etag():
     assert response1.headers.get("ETag") is not None
     assert response1.headers.get("ETag") != str()
     assert response1.headers.get("ETag") == response2.headers.get("ETag")
+
+
+def test_rpc_search_arg_too_small():
+    response = make_request("/rpc?v=5&type=search&arg=b")
+    assert response.status_code == int(HTTPStatus.OK)
+    assert response.json().get("error") == "Query arg too small."
+
+
+def test_rpc_search():
+    response = make_request("/rpc?v=5&type=search&arg=big")
+    assert response.status_code == int(HTTPStatus.OK)
+
+    data = response.json()
+    assert data.get("resultcount") == 1
+
+    result = data.get("results")[0]
+    assert result.get("Name") == "big-chungus"
+
+    # No args on non-m by types return an error.
+    response = make_request("/rpc?v=5&type=search")
+    assert response.json().get("error") == "No request type/data specified."
+
+
+def test_rpc_search_depends():
+    response = make_request(
+        "/rpc?v=5&type=search&by=depends&arg=chungus-depends")
+    data = response.json()
+    assert data.get("resultcount") == 1
+    result = data.get("results")[0]
+    assert result.get("Name") == "big-chungus"
+
+
+def test_rpc_search_makedepends():
+    response = make_request(
+        "/rpc?v=5&type=search&by=makedepends&arg=chungus-makedepends")
+    data = response.json()
+    assert data.get("resultcount") == 1
+    result = data.get("results")[0]
+    assert result.get("Name") == "big-chungus"
+
+
+def test_rpc_search_optdepends():
+    response = make_request(
+        "/rpc?v=5&type=search&by=optdepends&arg=chungus-optdepends")
+    data = response.json()
+    assert data.get("resultcount") == 1
+    result = data.get("results")[0]
+    assert result.get("Name") == "big-chungus"
+
+
+def test_rpc_search_checkdepends():
+    response = make_request(
+        "/rpc?v=5&type=search&by=checkdepends&arg=chungus-checkdepends")
+    data = response.json()
+    assert data.get("resultcount") == 1
+    result = data.get("results")[0]
+    assert result.get("Name") == "big-chungus"
+
+
+def test_rpc_incorrect_by():
+    response = make_request("/rpc?v=5&type=search&by=fake&arg=big")
+    assert response.json().get("error") == "Incorrect by field specified."

From 9fef8b06114e011cedab7c25fc6d44f9de99b2ab Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 30 Oct 2021 22:53:30 -0700
Subject: [PATCH 506/844] fix(rpc): fix search arg check

When by == 'maintainer', we allow an unspecified keyword,
resulting in a search of orphan packages. Fix our search
check so that when no arg is given, it is set to an empty
str().

We already check for valid args when type is not maintainer,
so there's no need to worry about other args falling through.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 009b1440..16985f37 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -200,8 +200,8 @@ class RPC:
         if by != "m" and not len(args):
             raise RPCError("No request type/data specified.")
 
-        arg = args[0]
-        if len(arg) < 2:
+        arg = args[0] if args else str()
+        if by != "m" and len(arg) < 2:
             raise RPCError("Query arg too small.")
 
         search = RPCSearch()

From 05e6cfca62162ffa5ca7e524f08810bc4d0df42a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 30 Oct 2021 22:56:18 -0700
Subject: [PATCH 507/844] feat(rpc): add msearch type handler

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py    |  9 +++------
 test/test_rpc.py | 38 +++++++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 16985f37..56f75391 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -101,12 +101,6 @@ class RPC:
         if self.type not in RPC.EXPOSED_TYPES:
             raise RPCError("Incorrect request type specified.")
 
-        try:
-            getattr(self, f"_handle_{self.type.replace('-', '_')}_type")
-        except AttributeError:
-            raise RPCError(
-                f"Request type '{self.type}' is not yet implemented.")
-
     def _enforce_args(self, args: List[str]):
         if not args:
             raise RPCError("No request type/data specified.")
@@ -211,6 +205,9 @@ class RPC:
         results = search.results().limit(max_results)
         return [self._get_json_data(pkg) for pkg in results]
 
+    def _handle_msearch_type(self, args: List[str] = [], **kwargs):
+        return self._handle_search_type(by="m", args=args)
+
     def _handle_suggest_type(self, args: List[str] = [], **kwargs):
         if not args:
             return []
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 38b81226..0636c792 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -483,15 +483,6 @@ def test_rpc_suggest():
     assert data == []
 
 
-def test_rpc_unimplemented_types():
-    unimplemented = ["msearch"]
-    for type in unimplemented:
-        response = make_request(f"/rpc?v=5&type={type}&arg=big")
-        data = response.json()
-        expected = f"Request type '{type}' is not yet implemented."
-        assert data.get("error") == expected
-
-
 def mock_config_getint(section: str, key: str):
     if key == "request_limit":
         return 4
@@ -551,6 +542,35 @@ def test_rpc_search():
     assert response.json().get("error") == "No request type/data specified."
 
 
+def test_rpc_msearch():
+    response = make_request("/rpc?v=5&type=msearch&arg=user1")
+    data = response.json()
+
+    # user1 maintains 4 packages; assert that we got them all.
+    assert data.get("resultcount") == 4
+    names = list(sorted(r.get("Name") for r in data.get("results")))
+    expected_results = list(sorted([
+        "big-chungus",
+        "chungy-chungus",
+        "gluggly-chungus",
+        "other-pkg"
+    ]))
+    assert names == expected_results
+
+    # Search for a non-existent maintainer, giving us zero packages.
+    response = make_request("/rpc?v=5&type=msearch&arg=blah-blah")
+    data = response.json()
+    assert data.get("resultcount") == 0
+
+    # A missing arg still succeeds, but it returns all orphans.
+    # Just verify that we receive no error and the orphaned result.
+    response = make_request("/rpc?v=5&type=msearch")
+    data = response.json()
+    assert data.get("resultcount") == 1
+    result = data.get("results")[0]
+    assert result.get("Name") == "woogly-chungus"
+
+
 def test_rpc_search_depends():
     response = make_request(
         "/rpc?v=5&type=search&by=depends&arg=chungus-depends")

From 12b4269ba8c1b4dbe9aa55b9e0541db4f0cdac77 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 00:28:55 -0700
Subject: [PATCH 508/844] feat(rpc): support jsonp callbacks

This change introduces alternate rendering of text/javascript
JSONP-compatible callback content. The `examples/jsonp.html`
HTML document can be used to test this functionality against
a running aurweb server.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/rpc.py | 26 +++++++++++----
 examples/jsonp.html   | 74 +++++++++++++++++++++++++++++++++++++++++++
 test/test_rpc.py      | 14 ++++++++
 3 files changed, 107 insertions(+), 7 deletions(-)
 create mode 100644 examples/jsonp.html

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index 6d3dce54..175e5f0f 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -67,7 +67,8 @@ async def rpc(request: Request,
               type: Optional[str] = Query(default=None),
               by: Optional[str] = Query(default=defaults.RPC_SEARCH_BY),
               arg: Optional[str] = Query(default=None),
-              args: Optional[List[str]] = Query(default=[], alias="arg[]")):
+              args: Optional[List[str]] = Query(default=[], alias="arg[]"),
+              callback: Optional[str] = Query(default=None)):
 
     # Create a handle to our RPC class.
     rpc = RPC(version=v, type=type)
@@ -84,17 +85,28 @@ async def rpc(request: Request,
 
     # Serialize `data` into JSON in a sorted fashion. This way, our
     # ETag header produced below will never end up changed.
-    output = orjson.dumps(data, option=orjson.OPT_SORT_KEYS)
+    content = orjson.dumps(data, option=orjson.OPT_SORT_KEYS)
 
     # Produce an md5 hash based on `output`.
     md5 = hashlib.md5()
-    md5.update(output)
+    md5.update(content)
     etag = md5.hexdigest()
 
-    # Finally, return our JSONResponse with the ETag header.
+    # If `callback` was provided, produce a text/javascript response
+    # valid for the jsonp callback. Otherwise, by default, return
+    # application/json containing `output`.
+    # Note: Being the API hot path, `content` is not defaulted to
+    # avoid copying the JSON string in the case callback is provided.
+    content_type = "application/json"
+    if callback:
+        print("callback called")
+        content_type = "text/javascript"
+        content = f"/**/{callback}({content.decode()})"
+
     # The ETag header expects quotes to surround any identifier.
     # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
-    return Response(output.decode(), headers={
-        "Content-Type": "application/json",
+    headers = {
+        "Content-Type": content_type,
         "ETag": f'"{etag}"'
-    })
+    }
+    return Response(content, headers=headers)
diff --git a/examples/jsonp.html b/examples/jsonp.html
new file mode 100644
index 00000000..d73ec91e
--- /dev/null
+++ b/examples/jsonp.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<!-- This file can be navigated to in a browser and used to
+test JSONP callback functionality in aurweb's RPC. -->
+<html lang="en">
+    <head>
+        <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
+        <meta content="utf-8" http-equiv="encoding">
+
+        <title>JSONP Callback Test</title>
+            <style>
+            .container {
+                width: 460px;
+                margin: 0 auto;
+            }
+            .intro {
+                font-size: 14px;
+            }
+            .prefix-label, .search-label {
+                display: inline-block;
+                width: 200px;
+                text-align: right;
+            }
+            .button-wrapper {
+                text-align: center;
+                width: 460px;
+                margin-top: 10px;
+            }
+        </style>
+        <script type="text/javascript">
+            function rpcCallback(data) {
+                console.log(data);
+            }
+            function createJSONP(event) {
+                event.preventDefault();
+
+                let input = document.getElementById("arg").value;
+                let rpc = document.getElementById("prefix").value;
+                let s = document.createElement("script");
+                s.src = rpc + "?v=5&type=search&arg="+ input + "&callback=rpcCallback";
+                document.body.appendChild(s);
+
+                return false;
+            }
+        </script>
+    </head>
+
+    <body>
+        <form>
+            <div class="container">
+                <p class="intro">
+                    Searching with the following form uses a JSONP callback
+                    to log data out to the javascript console.
+                </p>
+
+                <div>
+                    <label class="prefix-label" for="prefix">RPC URL Prefix:</label>
+                    <input id="prefix" type="text" name="prefix"
+                           value="https://localhost:8444/rpc" />
+                </div>
+
+                <div>
+                    <label class="search-label" for="arg">Search:</label>
+                    <input id="arg" type="text" name="arg" />
+                </div>
+
+                <div class="button-wrapper">
+                    <button type="submit" onclick="return createJSONP(event)">
+                        Search via JSONP
+                    </button>
+                </div>
+            </div>
+        </form>
+    </body>
+</html>
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 0636c792..acf1ae26 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -1,3 +1,5 @@
+import re
+
 from http import HTTPStatus
 from unittest import mock
 
@@ -610,3 +612,15 @@ def test_rpc_search_checkdepends():
 def test_rpc_incorrect_by():
     response = make_request("/rpc?v=5&type=search&by=fake&arg=big")
     assert response.json().get("error") == "Incorrect by field specified."
+
+
+def test_rpc_jsonp_callback():
+    """ Test the callback parameter.
+
+    For end-to-end verification, the `examples/jsonp.html` file can be
+    used to submit jsonp callback requests to the RPC.
+    """
+    response = make_request(
+        "/rpc?v=5&type=search&arg=big&callback=jsonCallback")
+    assert response.headers.get("content-type") == "text/javascript"
+    assert re.search(r'^/\*\*/jsonCallback\(.*\)$', response.text) is not None

From 2cc44e8f28275c5ccdefc65e6075bd0bec245026 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 01:17:16 -0700
Subject: [PATCH 509/844] fix(rpc): perform regex match against callback name

Since we're in the hot path, a constant re.compiled
JSONP_EXPR is defined for checks against the callback.

Additionally, reorganized `content_type` and `content`
to avoid performing a DB query when we encounter a
regex mismatch.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/rpc.py | 29 ++++++++++++++++++-----------
 test/test_rpc.py      |  6 ++++++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index 175e5f0f..6abd73d9 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -1,4 +1,5 @@
 import hashlib
+import re
 
 from http import HTTPStatus
 from typing import List, Optional
@@ -61,6 +62,9 @@ def parse_args(request: Request):
     return args
 
 
+JSONP_EXPR = re.compile(r'^[a-zA-Z0-9()_.]{1,128}$')
+
+
 @router.get("/rpc")
 async def rpc(request: Request,
               v: Optional[int] = Query(default=None),
@@ -78,6 +82,16 @@ async def rpc(request: Request,
         return JSONResponse(rpc.error("Rate limit reached"),
                             status_code=int(HTTPStatus.TOO_MANY_REQUESTS))
 
+    # If `callback` was provided, produce a text/javascript response
+    # valid for the jsonp callback. Otherwise, by default, return
+    # application/json containing `output`.
+    content_type = "application/json"
+    if callback:
+        if not re.match(JSONP_EXPR, callback):
+            return rpc.error("Invalid callback name.")
+
+        content_type = "text/javascript"
+
     # Prepare list of arguments for input. If 'arg' was given, it'll
     # be a list with one element.
     arguments = parse_args(request)
@@ -92,21 +106,14 @@ async def rpc(request: Request,
     md5.update(content)
     etag = md5.hexdigest()
 
-    # If `callback` was provided, produce a text/javascript response
-    # valid for the jsonp callback. Otherwise, by default, return
-    # application/json containing `output`.
-    # Note: Being the API hot path, `content` is not defaulted to
-    # avoid copying the JSON string in the case callback is provided.
-    content_type = "application/json"
-    if callback:
-        print("callback called")
-        content_type = "text/javascript"
-        content = f"/**/{callback}({content.decode()})"
-
     # The ETag header expects quotes to surround any identifier.
     # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
     headers = {
         "Content-Type": content_type,
         "ETag": f'"{etag}"'
     }
+
+    if callback:
+        content = f"/**/{callback}({content.decode()})"
+
     return Response(content, headers=headers)
diff --git a/test/test_rpc.py b/test/test_rpc.py
index acf1ae26..f4ce6de8 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -624,3 +624,9 @@ def test_rpc_jsonp_callback():
         "/rpc?v=5&type=search&arg=big&callback=jsonCallback")
     assert response.headers.get("content-type") == "text/javascript"
     assert re.search(r'^/\*\*/jsonCallback\(.*\)$', response.text) is not None
+
+    # Test an invalid callback name; we get an application/json error.
+    response = make_request(
+        "/rpc?v=5&type=search&arg=big&callback=jsonCallback!")
+    assert response.headers.get("content-type") == "application/json"
+    assert response.json().get("error") == "Invalid callback name."

From 61f3cb938ce601900aba70a1e73bf454689fa156 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 01:22:54 -0700
Subject: [PATCH 510/844] feat(rpc): support the If-None-Match request header

If the If-None-Match header is supplied with a previously
obtained ETag from the same query, a 304 Not Modified is
returned with no content.

This allows clients to completely leverage the ETag header.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/rpc.py |  5 +++++
 test/test_rpc.py      | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index 6abd73d9..66376067 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -113,6 +113,11 @@ async def rpc(request: Request,
         "ETag": f'"{etag}"'
     }
 
+    if_none_match = request.headers.get("If-None-Match", str())
+    if if_none_match and if_none_match.strip("\t\n\r\" ") == etag:
+        return Response(headers=headers,
+                        status_code=int(HTTPStatus.NOT_MODIFIED))
+
     if callback:
         content = f"/**/{callback}({content.decode()})"
 
diff --git a/test/test_rpc.py b/test/test_rpc.py
index f4ce6de8..055baa33 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -1,6 +1,7 @@
 import re
 
 from http import HTTPStatus
+from typing import Dict
 from unittest import mock
 
 import orjson
@@ -28,9 +29,9 @@ from aurweb.redis import redis_connection
 from aurweb.testing import setup_test_db
 
 
-def make_request(path):
+def make_request(path, headers: Dict[str, str] = {}):
     with TestClient(app) as request:
-        return request.get(path)
+        return request.get(path, headers=headers)
 
 
 @pytest.fixture(autouse=True)
@@ -539,6 +540,13 @@ def test_rpc_search():
     result = data.get("results")[0]
     assert result.get("Name") == "big-chungus"
 
+    # Test the If-None-Match headers.
+    etag = response.headers.get("ETag").strip('"')
+    headers = {"If-None-Match": etag}
+    response = make_request("/rpc?v=5&type=search&arg=big", headers=headers)
+    assert response.status_code == int(HTTPStatus.NOT_MODIFIED)
+    assert response.content == b''
+
     # No args on non-m by types return an error.
     response = make_request("/rpc?v=5&type=search")
     assert response.json().get("error") == "No request type/data specified."

From b7475a5bd0607200afae508729c53b95c2b40c6c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 04:11:42 -0700
Subject: [PATCH 511/844] fix(rpc): fix performance of suggest[-pkgbase]

We were selecting the entire record; we should just select
the Name column as done in this commit.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 56f75391..ca838050 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -213,7 +213,9 @@ class RPC:
             return []
 
         arg = args[0]
-        packages = db.query(models.Package).join(models.PackageBase).filter(
+        packages = db.query(models.Package.Name).join(
+            models.PackageBase
+        ).filter(
             and_(models.PackageBase.PackagerUID.isnot(None),
                  models.Package.Name.like(f"%{arg}%"))
         ).order_by(models.Package.Name.asc()).limit(20)
@@ -223,11 +225,11 @@ class RPC:
         if not args:
             return []
 
-        records = db.query(models.PackageBase).filter(
+        packages = db.query(models.PackageBase.Name).filter(
             and_(models.PackageBase.PackagerUID.isnot(None),
                  models.PackageBase.Name.like(f"%{args[0]}%"))
         ).order_by(models.PackageBase.Name.asc()).limit(20)
-        return [record.Name for record in records]
+        return [pkg.Name for pkg in packages]
 
     def handle(self, by: str = defaults.RPC_SEARCH_BY, args: List[str] = []):
         """ Request entrypoint. A router should pass v, type and args

From cef69b634233b54642c54350d89b6831605f2e81 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 15:47:39 -0700
Subject: [PATCH 512/844] fix(gitlab-ci): prune dangling images and build cache

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 156f0abf..e18df8ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,6 +65,7 @@ deploy:
     # Set secure login config for aurweb.
     - sed -ri "s/^(disable_http_login).*$/\1 = 1/" conf/config.dev
     - docker-compose build
+    - docker system prune -f
     - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d
   environment:
     name: development

From f26cd1e9941d2ac3ffbd852c504251ce2f0d3c40 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 16:13:01 -0700
Subject: [PATCH 513/844] fix(gitlab-ci): add `docker` dep to deploy target

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e18df8ee..1590bf34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ deploy:
     COMMIT_HASH: $CI_COMMIT_SHA
     GIT_DATA_DIR: git_data
   script:
-    - pacman -Syu --noconfirm docker-compose socat openssh
+    - pacman -Syu --noconfirm docker docker-compose socat openssh
     - chmod 600 ${SSH_KEY}
     - socat "UNIX-LISTEN:/tmp/docker.sock,reuseaddr,fork" EXEC:"ssh -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -Ti ${SSH_KEY} ${SSH_USER}@${SSH_HOST}" &
     - export DOCKER_HOST="unix:///tmp/docker.sock"

From 451eec0c28113425c951861f70ba1fd55ecabf87 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 15:45:41 -0700
Subject: [PATCH 514/844] fix(fastapi): remove info-specific fields from search
 results

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index ca838050..4ab005af 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -162,7 +162,20 @@ class RPC:
             "Popularity": pop,
             "OutOfDate": package.PackageBase.OutOfDateTS,
             "FirstSubmitted": package.PackageBase.SubmittedTS,
-            "LastModified": package.PackageBase.ModifiedTS,
+            "LastModified": package.PackageBase.ModifiedTS
+        })
+
+        if package.PackageBase.Maintainer is not None:
+            # We do have a maintainer: set the Maintainer key.
+            data["Maintainer"] = package.PackageBase.Maintainer.Username
+
+        return data
+
+    def _get_info_json_data(self, package: models.Package):
+        data = self._get_json_data(package)
+
+        # Add licenses and keywords to info output.
+        data.update({
             "License": [
                 lic.License.Name for lic in package.package_licenses
             ],
@@ -171,10 +184,6 @@ class RPC:
             ]
         })
 
-        if package.PackageBase.Maintainer is not None:
-            # We do have a maintainer: set the Maintainer key.
-            data["Maintainer"] = package.PackageBase.Maintainer.Username
-
         self._update_json_depends(package, data)
         self._update_json_relations(package, data)
         return data
@@ -184,7 +193,7 @@ class RPC:
         args = set(args)
         packages = db.query(models.Package).filter(
             models.Package.Name.in_(args))
-        return [self._get_json_data(pkg) for pkg in packages]
+        return [self._get_info_json_data(pkg) for pkg in packages]
 
     def _handle_search_type(self, by: str = defaults.RPC_SEARCH_BY,
                             args: List[str] = []):

From a82879210c9dd04c511a5521d0cd163971db9838 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 19:56:56 -0700
Subject: [PATCH 515/844] fix(poetry): add mysql-connector dep

This is not used anymore in our FastAPI code, however, for
back-compatibility with pre-FastAPI scripts, we need it.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 13 ++++++++++++-
 pyproject.toml |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index eefec89b..4f41307d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -518,6 +518,14 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "mysql-connector"
+version = "2.2.9"
+description = "MySQL driver written in Python"
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "mysqlclient"
 version = "2.0.3"
@@ -962,7 +970,7 @@ h11 = ">=0.9.0,<1"
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.10"
-content-hash = "eb5ec82957f9fb964ca6f3852e353da51542982923dc6169658bd4bccfa78513"
+content-hash = "6a45364297f5a6e88ee62240bb2eb1eaf3b41283b6d8f040ee67db02601f18e7"
 
 [metadata.files]
 aiofiles = [
@@ -1380,6 +1388,9 @@ mccabe = [
     {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
     {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
 ]
+mysql-connector = [
+    {file = "mysql-connector-2.2.9.tar.gz", hash = "sha256:1733e6ce52a049243de3264f1fbc22a852cb35458c4ad739ba88189285efdf32"},
+]
 mysqlclient = [
     {file = "mysqlclient-2.0.3-cp36-cp36m-win_amd64.whl", hash = "sha256:3381ca1a4f37ff1155fcfde20836b46416d66531add8843f6aa6d968982731c3"},
     {file = "mysqlclient-2.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:0ac0dd759c4ca02c35a9fedc24bc982cf75171651e8187c2495ec957a87dfff7"},
diff --git a/pyproject.toml b/pyproject.toml
index 12812bc8..2f327318 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -82,6 +82,7 @@ SQLAlchemy = "^1.4.26"
 uvicorn = "^0.15.0"
 gunicorn = "^20.1.0"
 Hypercorn = "^0.11.2"
+mysql-connector = "^2.2.9"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^4.0.1"

From cc45290ec274530d66d77bad5692576876b35446 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 1 Nov 2021 11:41:20 -0700
Subject: [PATCH 516/844] feat(poetry): add prometheus-fastapi-instrumentator

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 33 ++++++++++++++++++++++++++++++++-
 pyproject.toml |  1 +
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index 4f41307d..9f528d12 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -594,6 +594,29 @@ category = "main"
 optional = false
 python-versions = ">=3.6.1"
 
+[[package]]
+name = "prometheus-client"
+version = "0.12.0"
+description = "Python client for the Prometheus monitoring system."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[package.extras]
+twisted = ["twisted"]
+
+[[package]]
+name = "prometheus-fastapi-instrumentator"
+version = "5.7.1"
+description = "Instrument your FastAPI with Prometheus metrics"
+category = "main"
+optional = false
+python-versions = ">=3.6.0,<4.0.0"
+
+[package.dependencies]
+fastapi = ">=0.38.1,<1.0.0"
+prometheus-client = ">=0.8.0,<1.0.0"
+
 [[package]]
 name = "protobuf"
 version = "3.19.0"
@@ -970,7 +993,7 @@ h11 = ">=0.9.0,<1"
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.10"
-content-hash = "6a45364297f5a6e88ee62240bb2eb1eaf3b41283b6d8f040ee67db02601f18e7"
+content-hash = "569b0489389b884d269458f8e4252efcf3ebbbaa5fa77b6d09d7f0cdbda53362"
 
 [metadata.files]
 aiofiles = [
@@ -1440,6 +1463,14 @@ priority = [
     {file = "priority-2.0.0-py3-none-any.whl", hash = "sha256:6f8eefce5f3ad59baf2c080a664037bb4725cd0a790d53d59ab4059288faf6aa"},
     {file = "priority-2.0.0.tar.gz", hash = "sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"},
 ]
+prometheus-client = [
+    {file = "prometheus_client-0.12.0-py2.py3-none-any.whl", hash = "sha256:317453ebabff0a1b02df7f708efbab21e3489e7072b61cb6957230dd004a0af0"},
+    {file = "prometheus_client-0.12.0.tar.gz", hash = "sha256:1b12ba48cee33b9b0b9de64a1047cbd3c5f2d0ab6ebcead7ddda613a750ec3c5"},
+]
+prometheus-fastapi-instrumentator = [
+    {file = "prometheus-fastapi-instrumentator-5.7.1.tar.gz", hash = "sha256:5371f1b494e2b00017a02898d854119b4929025d1a203670b07b3f42dd0b5526"},
+    {file = "prometheus_fastapi_instrumentator-5.7.1-py3-none-any.whl", hash = "sha256:da40ea0df14b0e95d584769747fba777522a8df6a8c47cec2edf798f1fff49b5"},
+]
 protobuf = [
     {file = "protobuf-3.19.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:01a0645ef3acddfbc90237e1cdfae1086130fc7cb480b5874656193afd657083"},
     {file = "protobuf-3.19.0-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:d3861c9721a90ba83ee0936a9cfcc4fa1c4b4144ac9658fb6f6343b38558e9b4"},
diff --git a/pyproject.toml b/pyproject.toml
index 2f327318..20855fa6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -83,6 +83,7 @@ uvicorn = "^0.15.0"
 gunicorn = "^20.1.0"
 Hypercorn = "^0.11.2"
 mysql-connector = "^2.2.9"
+prometheus-fastapi-instrumentator = "^5.7.1"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^4.0.1"

From f21765bfe467f225825ddeeca48c37dd5220d225 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 02:16:50 -0700
Subject: [PATCH 517/844] feat(fastapi): add prometheus /metrics

This commit provides custom metrics, so we can group requests
into their route paths and not by the arguments given, e.g.
/pkgbase/some-package -> /pkgbase/{name}. We also count RPC
requests as `http_api_requests_total`, split by the RPC
query "type" argument.

- `http_api_requests_total`
    - Labels: ["type", "status"]
- `http_requests_total`
    - Number of HTTP requests in total.
    - Labels: ["method", "path", "status"]

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 LICENSES/starlette_exporter | 201 ++++++++++++++++++++++++++++++++++++
 aurweb/asgi.py              |   8 ++
 aurweb/prometheus.py        | 101 ++++++++++++++++++
 3 files changed, 310 insertions(+)
 create mode 100644 LICENSES/starlette_exporter
 create mode 100644 aurweb/prometheus.py

diff --git a/LICENSES/starlette_exporter b/LICENSES/starlette_exporter
new file mode 100644
index 00000000..261eeb9e
--- /dev/null
+++ b/LICENSES/starlette_exporter
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 8ebeef29..2ba2afd0 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -19,11 +19,18 @@ import aurweb.logging
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
+from aurweb.prometheus import http_api_requests_total, http_requests_total, instrumentator
 from aurweb.routers import accounts, auth, errors, html, packages, rpc, rss, sso, trusted_user
 
 # Setup the FastAPI app.
 app = FastAPI(exception_handlers=errors.exceptions)
 
+# Instrument routes with the prometheus-fastapi-instrumentator
+# library with custom collectors and expose /metrics.
+instrumentator().add(http_api_requests_total())
+instrumentator().add(http_requests_total())
+instrumentator().instrument(app).expose(app)
+
 
 @app.on_event("startup")
 async def app_startup():
@@ -67,6 +74,7 @@ async def app_startup():
     app.include_router(rss.router)
     app.include_router(packages.router)
     app.include_router(rpc.router)
+
     # Initialize the database engine and ORM.
     get_engine()
 
diff --git a/aurweb/prometheus.py b/aurweb/prometheus.py
new file mode 100644
index 00000000..0a3dd173
--- /dev/null
+++ b/aurweb/prometheus.py
@@ -0,0 +1,101 @@
+from typing import Any, Callable, Dict, List, Optional
+
+from prometheus_client import Counter
+from prometheus_fastapi_instrumentator import Instrumentator
+from prometheus_fastapi_instrumentator.metrics import Info
+from starlette.routing import Match, Route
+
+from aurweb import logging
+
+logger = logging.get_logger(__name__)
+_instrumentator = Instrumentator()
+
+
+def instrumentator():
+    return _instrumentator
+
+
+# Taken from https://github.com/stephenhillier/starlette_exporter
+# Their license is included in LICENSES/starlette_exporter.
+# The code has been modified to remove child route checks
+# (since we don't have any) and to stay within an 80-width limit.
+def get_matching_route_path(scope: Dict[Any, Any], routes: List[Route],
+                            route_name: Optional[str] = None) -> str:
+    """
+    Find a matching route and return its original path string
+
+    Will attempt to enter mounted routes and subrouters.
+
+    Credit to https://github.com/elastic/apm-agent-python
+
+    """
+    for route in routes:
+        match, child_scope = route.matches(scope)
+        if match == Match.FULL:
+            route_name = route.path
+
+            '''
+            # This path exists in the original function's code, but we
+            # don't need it (currently), so it's been removed to avoid
+            # useless test coverage.
+            child_scope = {**scope, **child_scope}
+            if isinstance(route, Mount) and route.routes:
+                child_route_name = get_matching_route_path(child_scope,
+                                                           route.routes,
+                                                           route_name)
+                if child_route_name is None:
+                    route_name = None
+                else:
+                    route_name += child_route_name
+            '''
+
+            return route_name
+        elif match == Match.PARTIAL and route_name is None:
+            route_name = route.path
+
+
+def http_requests_total() -> Callable[[Info], None]:
+    metric = Counter("http_requests_total",
+                     "Number of HTTP requests.",
+                     labelnames=("method", "path", "status"))
+
+    def instrumentation(info: Info) -> None:
+        scope = info.request.scope
+
+        # Taken from https://github.com/stephenhillier/starlette_exporter
+        # Their license is included at LICENSES/starlette_exporter.
+        # The code has been slightly modified: we no longer catch
+        # exceptions; we expect this collector to always succeed.
+        # Failures in this collector shall cause test failures.
+        if not (scope.get("endpoint", None) and scope.get("router", None)):
+            return None
+
+        base_scope = {
+            "type": scope.get("type"),
+            "path": scope.get("root_path", "") + scope.get("path"),
+            "path_params": scope.get("path_params", {}),
+            "method": scope.get("method")
+        }
+
+        method = scope.get("method")
+        path = get_matching_route_path(base_scope, scope.get("router").routes)
+        status = str(info.response.status_code)[:1] + "xx"
+
+        metric.labels(method=method, path=path, status=status).inc()
+
+    return instrumentation
+
+
+def http_api_requests_total() -> Callable[[Info], None]:
+    metric = Counter(
+        "http_api_requests",
+        "Number of times an RPC API type has been requested.",
+        labelnames=("type", "status"))
+
+    def instrumentation(info: Info) -> None:
+        if info.request.url.path.rstrip("/") == "/rpc":
+            type = info.request.query_params.get("type", "None")
+            status = str(info.response.status_code)[:1] + "xx"
+            metric.labels(type=type, status=status).inc()
+
+    return instrumentation

From 1be4ac2fde4f8d867fe476e52332f98ca18341f0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 1 Nov 2021 12:27:33 -0700
Subject: [PATCH 518/844] feat(docker): use PROMETHEUS_MULTIPROC_DIR

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.aur-dev.yml   | 1 +
 docker-compose.yml           | 1 +
 docker/fastapi-entrypoint.sh | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index 3f574d42..1db306cc 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -53,6 +53,7 @@ services:
       - FASTAPI_WORKERS=${FASTAPI_WORKERS}
       - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
       - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
+      - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
     volumes:
       - cache:/cache
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 2b25c7d8..6c822e7c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -168,6 +168,7 @@ services:
       - FASTAPI_WORKERS=${FASTAPI_WORKERS}
       - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
       - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
+      - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
     entrypoint: /docker/fastapi-entrypoint.sh
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 58fafe56..f4ceaafa 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -18,4 +18,7 @@ fi
 sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_FASTAPI_PREFIX}/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults
 
+rm -rf $PROMETHEUS_MULTIPROC_DIR
+mkdir -p $PROMETHEUS_MULTIPROC_DIR
+
 exec "$@"

From dc397f6bd8d95efcebfa479d897cc00651d3bb20 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 1 Nov 2021 13:17:24 -0700
Subject: [PATCH 519/844] fix(fastapi): utilize PROMETHEUS_MULTIPROC_DIR in our
 own /metrics

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py         |  9 ++++++++-
 aurweb/routers/html.py | 21 +++++++++++++++++++--
 test/test_html.py      |  7 +++++++
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 2ba2afd0..16de771e 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -9,6 +9,7 @@ from urllib.parse import quote_plus
 from fastapi import FastAPI, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
+from prometheus_client import multiprocess
 from sqlalchemy import and_, or_
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.middleware.sessions import SessionMiddleware
@@ -29,7 +30,7 @@ app = FastAPI(exception_handlers=errors.exceptions)
 # library with custom collectors and expose /metrics.
 instrumentator().add(http_api_requests_total())
 instrumentator().add(http_requests_total())
-instrumentator().instrument(app).expose(app)
+instrumentator().instrument(app)
 
 
 @app.on_event("startup")
@@ -79,6 +80,12 @@ async def app_startup():
     get_engine()
 
 
+def child_exit(server, worker):  # pragma: no cover
+    """ This function is required for gunicorn customization
+    of prometheus multiprocessing. """
+    multiprocess.mark_process_dead(worker.pid)
+
+
 @app.exception_handler(HTTPException)
 async def http_exception_handler(request, exc):
     """
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index c749ca67..4cee5f99 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -1,11 +1,14 @@
 """ AURWeb's primary routing module. Define all routes via @app.app.{get,post}
 decorators in some way; more complex routes should be defined in their
 own modules and imported here. """
+import os
+
 from datetime import datetime
 from http import HTTPStatus
 
-from fastapi import APIRouter, Form, HTTPException, Request
+from fastapi import APIRouter, Form, HTTPException, Request, Response
 from fastapi.responses import HTMLResponse, RedirectResponse
+from prometheus_client import CONTENT_TYPE_LATEST, CollectorRegistry, generate_latest, multiprocess
 from sqlalchemy import and_, case, or_
 
 import aurweb.config
@@ -203,7 +206,21 @@ async def index(request: Request):
     return render_template(request, "index.html", context)
 
 
-# A route that returns a error 503. For testing purposes.
+@router.get("/metrics")
+async def metrics(request: Request):
+    registry = CollectorRegistry()
+    if os.environ.get("FASTAPI_BACKEND", "") == "gunicorn":  # pragma: no cover
+        # This case only ever happens in production, when we are running
+        # gunicorn. We don't test with gunicorn, so we don't cover this path.
+        multiprocess.MultiProcessCollector(registry)
+    data = generate_latest(registry)
+    headers = {
+        "Content-Type": CONTENT_TYPE_LATEST,
+        "Content-Length": str(len(data))
+    }
+    return Response(data, headers=headers)
+
+
 @router.get("/raisefivethree", response_class=HTMLResponse)
 async def raise_service_unavailable(request: Request):
     raise HTTPException(status_code=503)
diff --git a/test/test_html.py b/test/test_html.py
index 2018840b..8e7cb2d1 100644
--- a/test/test_html.py
+++ b/test/test_html.py
@@ -117,3 +117,10 @@ def test_get_successes():
 """
     successes = get_successes(html)
     assert successes[0].text.strip() == "Test"
+
+
+def test_metrics(client: TestClient):
+    with client as request:
+        resp = request.get("/metrics")
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert resp.headers.get("Content-Type").startswith("text/plain")

From cdb854259af49ff759ce1481cd799612cd657bbc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 1 Nov 2021 13:54:58 -0700
Subject: [PATCH 520/844] fix(docker): share FASTAPI_BACKEND with the server

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml            | 1 +
 docker/scripts/run-fastapi.sh | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6c822e7c..5dffe5d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -165,6 +165,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config
+      - FASTAPI_BACKEND=${FASTAPI_BACKEND}
       - FASTAPI_WORKERS=${FASTAPI_WORKERS}
       - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
       - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index 16ae3cb9..effc7fe4 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -14,10 +14,12 @@ fi
 
 # By default, set FASTAPI_WORKERS to 2. In production, this should
 # be configured by the deployer.
-if [ -z "$FASTAPI_WORKERS" ]; then
+if [ -z ${FASTAPI_WORKERS+x} ]; then
     FASTAPI_WORKERS=2
 fi
 
+export FASTAPI_BACKEND="$1"
+
 echo "FASTAPI_BACKEND: $FASTAPI_BACKEND"
 echo "FASTAPI_WORKERS: $FASTAPI_WORKERS"
 

From 9aa8decf403c618092b00db0f8b76c9917987b6b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 1 Nov 2021 14:18:19 -0700
Subject: [PATCH 521/844] fix(fastapi): use metrics in cases where
 PROMETHEUS_MULTIPROC_DIR is defined

Previously, we restricted this to gunicorn to get it working on aur-dev.
This change makes it usable through any backend, and also no-op if
PROMETHEUS_MULTIPROC_DIR is not defined.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/html.py        | 4 +---
 docker-compose.yml            | 3 +++
 docker/scripts/run-pytests.sh | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 4cee5f99..525fb626 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -209,9 +209,7 @@ async def index(request: Request):
 @router.get("/metrics")
 async def metrics(request: Request):
     registry = CollectorRegistry()
-    if os.environ.get("FASTAPI_BACKEND", "") == "gunicorn":  # pragma: no cover
-        # This case only ever happens in production, when we are running
-        # gunicorn. We don't test with gunicorn, so we don't cover this path.
+    if os.environ.get("PROMETHEUS_MULTIPROC_DIR", None):  # pragma: no cover
         multiprocess.MultiProcessCollector(registry)
     data = generate_latest(registry)
     headers = {
diff --git a/docker-compose.yml b/docker-compose.yml
index 5dffe5d3..225e5b9b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -241,6 +241,7 @@ services:
     environment:
       - AUR_CONFIG=conf/config
       - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
+      - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
     entrypoint: /docker/test-mysql-entrypoint.sh
     command: /docker/scripts/run-pytests.sh clean
     stdin_open: true
@@ -267,6 +268,7 @@ services:
     environment:
       - AUR_CONFIG=conf/config.sqlite
       - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
+      - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
     entrypoint: /docker/test-sqlite-entrypoint.sh
     command: setup-sqlite.sh run-pytests.sh clean
     stdin_open: true
@@ -289,6 +291,7 @@ services:
     environment:
       - AUR_CONFIG=conf/config
       - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
+      - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
     entrypoint: /docker/tests-entrypoint.sh
     command: setup-sqlite.sh run-tests.sh
     stdin_open: true
diff --git a/docker/scripts/run-pytests.sh b/docker/scripts/run-pytests.sh
index d992bf06..ee546fb7 100755
--- a/docker/scripts/run-pytests.sh
+++ b/docker/scripts/run-pytests.sh
@@ -22,6 +22,9 @@ while [ $# -ne 0 ]; do
     esac
 done
 
+rm -rf $PROMETHEUS_MULTIPROC_DIR
+mkdir -p $PROMETHEUS_MULTIPROC_DIR
+
 # Initialize the new database; ignore errors.
 python -m aurweb.initdb 2>/dev/null || \
     (echo "Error: aurweb.initdb failed; already initialized?" && /bin/true)

From 16e6fa2cdd002fecf6ad5e4251727315d7a3dfc8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 1 Nov 2021 14:23:15 -0700
Subject: [PATCH 522/844] fix(fastapi): fix prometheus parsing of HTTPStatus

This wasn't actually casting to int. We shouldn't be providing
HTTPStatus.CONSTANTS directly anyway, but, in case we do, we now
just convert the status to an int before converting it to a string.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/prometheus.py       | 2 +-
 aurweb/routers/packages.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/prometheus.py b/aurweb/prometheus.py
index 0a3dd173..a64f6b27 100644
--- a/aurweb/prometheus.py
+++ b/aurweb/prometheus.py
@@ -79,7 +79,7 @@ def http_requests_total() -> Callable[[Info], None]:
 
         method = scope.get("method")
         path = get_matching_route_path(base_scope, scope.get("router").routes)
-        status = str(info.response.status_code)[:1] + "xx"
+        status = str(int(info.response.status_code))[:1] + "xx"
 
         metric.labels(method=method, path=path, status=status).inc()
 
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index c574ec18..bcc0be56 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -269,7 +269,7 @@ async def package_base(request: Request, name: str) -> Response:
     # If this is not a split package, redirect to /packages/{name}.
     if pkgbase.packages.count() == 1:
         return RedirectResponse(f"/packages/{name}",
-                                status_code=HTTPStatus.SEE_OTHER)
+                                status_code=int(HTTPStatus.SEE_OTHER))
 
     # Add our base information.
     context = await make_single_context(request, pkgbase)

From e4a5b7fae968e1d1335b3c03a9b816b2d1b668ae Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 3 Nov 2021 05:39:28 -0700
Subject: [PATCH 523/844] fix(docker): use 3s intervals for all healthchecks

This'll speed up the docker development and deployment
processes significantly.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 225e5b9b..038eb65b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,8 @@ services:
     command: /docker/scripts/run-memcached.sh
     healthcheck:
       test: "bash /docker/health/memcached.sh"
-
+      interval: 3s
+ 
   redis:
     image: aurweb:latest
     init: true
@@ -45,6 +46,7 @@ services:
     command: /docker/scripts/run-redis.sh
     healthcheck:
       test: "bash /docker/health/redis.sh"
+      interval: 3s
     ports:
       - "16379:6379"
 
@@ -62,6 +64,7 @@ services:
       - mariadb_data:/var/lib/mysql
     healthcheck:
       test: "bash /docker/health/mariadb.sh"
+      interval: 3s
 
   mariadb_init:
     image: aurweb:latest
@@ -85,6 +88,7 @@ services:
       - "2222:2222"
     healthcheck:
       test: "bash /docker/health/sshd.sh"
+      interval: 3s
     depends_on:
       mariadb_init:
         condition: service_started
@@ -100,6 +104,7 @@ services:
     command: /docker/scripts/run-smartgit.sh
     healthcheck:
       test: "bash /docker/health/smartgit.sh"
+      interval: 3s
 
   cgit-php:
     image: aurweb:latest
@@ -111,6 +116,7 @@ services:
     command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
       test: "bash /docker/health/cgit.sh 3000"
+      interval: 3s
     depends_on:
       git:
         condition: service_healthy
@@ -129,6 +135,7 @@ services:
     command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
       test: "bash /docker/health/cgit.sh 3000"
+      interval: 3s
     depends_on:
       git:
         condition: service_healthy
@@ -148,6 +155,7 @@ services:
     command: /docker/scripts/run-php.sh
     healthcheck:
       test: "bash /docker/health/php.sh"
+      interval: 3s
     depends_on:
       ca:
         condition: service_started
@@ -174,6 +182,7 @@ services:
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:
       test: "bash /docker/health/fastapi.sh ${FASTAPI_BACKEND}"
+      interval: 3s
     depends_on:
       ca:
         condition: service_started
@@ -198,6 +207,7 @@ services:
       - "8444:8444" # FastAPI
     healthcheck:
       test: "bash /docker/health/nginx.sh"
+      interval: 3s
     depends_on:
       cgit-php:
         condition: service_healthy

From 020409ef46452bafb0e1bf0d6a9537912059a6dd Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Mon, 1 Nov 2021 17:18:09 -0400
Subject: [PATCH 524/844] fix(FastAPI): prevent CSRF forging login requests

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/routers/auth.py   | 12 +++++++++++-
 po/aurweb.pot            |  4 ++++
 test/test_auth_routes.py | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 4e6a416a..b8e83c7d 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -1,13 +1,14 @@
 from datetime import datetime
 from http import HTTPStatus
 
-from fastapi import APIRouter, Form, Request
+from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 
 import aurweb.config
 
 from aurweb import cookies
 from aurweb.auth import auth_required
+from aurweb.l10n import get_translator_for_request
 from aurweb.models import User
 from aurweb.templates import make_variable_context, render_template
 
@@ -35,6 +36,15 @@ async def login_post(request: Request,
                      user: str = Form(default=str()),
                      passwd: str = Form(default=str()),
                      remember_me: bool = Form(default=False)):
+    # TODO: Once the Origin header gets broader adoption, this code can be
+    # slightly simplified to use it.
+    login_path = aurweb.config.get("options", "aur_location") + "/login"
+    referer = request.headers.get("Referer")
+    if not referer or not referer.startswith(login_path):
+        _ = get_translator_for_request(request)
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
+                            detail=_("Bad Referer header."))
+
     from aurweb.db import session
 
     user = session.query(User).filter(User.Username == user).first()
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 721f874e..dd93ca27 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -964,6 +964,10 @@ msgstr ""
 msgid "Package details could not be found."
 msgstr ""
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
 #: aurweb/routers/packages.py
 msgid "You did not select any packages to be notified about."
 msgstr ""
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index 313f9927..39afc6f9 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -18,6 +18,9 @@ from aurweb.testing import setup_test_db
 # Some test global constants.
 TEST_USERNAME = "test"
 TEST_EMAIL = "test@example.org"
+TEST_REFERER = {
+    "referer": aurweb.config.get("options", "aur_location") + "/login",
+}
 
 # Global mutables.
 user = client = None
@@ -39,6 +42,10 @@ def setup():
 
     client = TestClient(app)
 
+    # Necessary for forged login CSRF protection on the login route. Set here
+    # instead of only on the necessary requests for convenience.
+    client.headers.update(TEST_REFERER)
+
 
 def test_login_logout():
     post_data = {
@@ -92,6 +99,10 @@ def test_secure_login(mock):
     # Create a local TestClient here since we mocked configuration.
     client = TestClient(app)
 
+    # Necessary for forged login CSRF protection on the login route. Set here
+    # instead of only on the necessary requests for convenience.
+    client.headers.update(TEST_REFERER)
+
     # Data used for our upcoming http post request.
     post_data = {
         "user": user.Username,
@@ -246,3 +257,26 @@ def test_login_incorrect_password():
     assert post_data["user"] in content
     assert post_data["passwd"] not in content
     assert "checked" not in content
+
+
+def test_login_bad_referer():
+    post_data = {
+        "user": "test",
+        "passwd": "testPassword",
+        "next": "/",
+    }
+
+    # Create new TestClient without a Referer header.
+    client = TestClient(app)
+
+    with client as request:
+        response = request.post("/login", data=post_data)
+    assert "AURSID" not in response.cookies
+
+    BAD_REFERER = {
+        "referer": aurweb.config.get("options", "aur_location") + ".mal.local",
+    }
+    with client as request:
+        response = request.post("/login", data=post_data, headers=BAD_REFERER)
+    assert response.status_code == int(HTTPStatus.BAD_REQUEST)
+    assert "AURSID" not in response.cookies

From 69773a5b58ba86bf43a4c4240e5db4842c5dfbe0 Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Fri, 15 Oct 2021 20:14:31 +0200
Subject: [PATCH 525/844] feat(PHP): Add packages dump file with more metadata

---
 aurweb/scripts/mkpkglists.py | 10 ++++++++++
 conf/config.defaults         |  1 +
 test/setup.sh                |  1 +
 web/html/index.php           |  1 +
 4 files changed, 13 insertions(+)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 6724141a..c73cc3be 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -2,11 +2,13 @@
 
 import datetime
 import gzip
+import json
 
 import aurweb.config
 import aurweb.db
 
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
+packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
 pkgbasefile = aurweb.config.get('mkpkglists', 'pkgbasefile')
 userfile = aurweb.config.get('mkpkglists', 'userfile')
 
@@ -27,6 +29,14 @@ def main():
                            "WHERE PackageBases.PackagerUID IS NOT NULL")
         f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
+    with gzip.open(packagesmetafile, "wt") as f:
+        cur = conn.execute("SELECT * FROM Packages")
+        json.dump({
+            "warning": "This is a experimental! It can be removed or modified without warning!",
+            "columns": [d[0] for d in cur.description],
+            "data": cur.fetchall()
+        }, f)
+
     with gzip.open(pkgbasefile, "w") as f:
         f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
         cur = conn.execute("SELECT Name FROM PackageBases " +
diff --git a/conf/config.defaults b/conf/config.defaults
index b7bc0368..36ea02ef 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -92,5 +92,6 @@ server = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64
 
 [mkpkglists]
 packagesfile = /srv/http/aurweb/web/html/packages.gz
+packagesmetafile = /srv/http/aurweb/web/html/packages-meta-v1.json.gz
 pkgbasefile = /srv/http/aurweb/web/html/pkgbase.gz
 userfile = /srv/http/aurweb/web/html/users.gz
diff --git a/test/setup.sh b/test/setup.sh
index 764d4518..24bb5f48 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -61,6 +61,7 @@ server = file://$(pwd)/remote/
 
 [mkpkglists]
 packagesfile = packages.gz
+packagesmetafile = packages-meta-v1.json.gz
 pkgbasefile = pkgbase.gz
 userfile = users.gz
 EOF
diff --git a/web/html/index.php b/web/html/index.php
index e57e7708..3163c3e8 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -189,6 +189,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
 		readfile("./$path");
 		break;
 	case "/packages.gz":
+	case "/packages-teapot.json.gz":
 	case "/pkgbase.gz":
 	case "/users.gz":
 		header("Content-Type: text/plain");

From 51fb24ab730f3b09d78e200f020b01974dc9e457 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 16:52:30 -0700
Subject: [PATCH 526/844] fix(mkpkglists): improve package meta archive

The SQL logic in this file for package metadata now exactly
reflects RPC's search logic, without searching for specific
packages.

Two command line arguments are available:

    --extended | Include License, Keywords, Groups, relations
                 and dependencies.

When --extended is passed, the script will create a
packages-meta-ext-v1.json.gz, configured via packagesmetaextfile.

Archive JSON is in the following format: line-separated package objects
enclosed in a list:

    [
    {...},
    {...},
    {...}
    ]

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml               |   2 +-
 INSTALL                      |   3 +-
 aurweb/scripts/mkpkglists.py | 273 ++++++++++++++++++++++++++++++++---
 conf/config.defaults         |   1 +
 test/setup.sh                |   2 +
 web/html/index.php           |   3 +-
 6 files changed, 258 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aff18a83..ce374082 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ before_script:
            python-pygit2 python-srcinfo python-bleach python-markdown
            python-sqlalchemy python-alembic python-pytest python-werkzeug
            python-pytest-tap python-fastapi hypercorn nginx python-authlib
-           python-itsdangerous python-httpx
+           python-itsdangerous python-httpx python-orjson
 
 test:
   script:
diff --git a/INSTALL b/INSTALL
index 9bcd0759..dc9cc51f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -49,7 +49,8 @@ read the instructions below.
 
     # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy \
                 python-bleach python-markdown python-alembic python-jinja \
-                python-itsdangerous python-authlib python-httpx hypercorn
+                python-itsdangerous python-authlib python-httpx hypercorn \
+                python-orjson
     # python3 setup.py install
 
 5) Create a new MySQL database and a user and import the aurweb SQL schema:
diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index c73cc3be..f2095a20 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -1,16 +1,192 @@
 #!/usr/bin/env python3
+"""
+Produces package, package base and user archives for the AUR
+database.
+
+Archives:
+
+    packages.gz               | A line-separated list of package names
+    packages-meta-v1.json     | A type=search RPC-formatted JSON dataset
+    packages-meta-ext-v1.json | An --extended archive
+    pkgbase.gz                | A line-separated list of package base names
+    users.gz                  | A line-separated list of user names
+
+This script takes an optional argument: --extended. Based
+on the following, right-hand side fields are added to each item.
+
+    --extended  | License, Keywords, Groups, relations and dependencies
+
+"""
 
 import datetime
 import gzip
-import json
+import os
+import sys
+
+from collections import defaultdict
+from decimal import Decimal
+from typing import Tuple
+
+import orjson
 
 import aurweb.config
 import aurweb.db
 
+
+def state_path(archive: str) -> str:
+    # A hard-coded /tmp state directory.
+    # TODO: Use Redis cache to store this state after we merge
+    # FastAPI into master and removed PHP from the tree.
+    return os.path.join("/tmp", os.path.basename(archive) + ".state")
+
+
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
 packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
+packagesmetaextfile = aurweb.config.get('mkpkglists', 'packagesmetaextfile')
+packages_state = state_path(packagesfile)
+
 pkgbasefile = aurweb.config.get('mkpkglists', 'pkgbasefile')
+pkgbases_state = state_path(pkgbasefile)
+
 userfile = aurweb.config.get('mkpkglists', 'userfile')
+users_state = state_path(userfile)
+
+
+def should_update(state: str, tablename: str) -> Tuple[bool, int]:
+    if aurweb.config.get("database", "backend") != "mysql":
+        return (False, 0)
+
+    db_name = aurweb.config.get("database", "name")
+    conn = aurweb.db.Connection()
+    cur = conn.execute("SELECT auto_increment FROM information_schema.tables "
+                       "WHERE table_schema = ? AND table_name = ?",
+                       (db_name, tablename,))
+    update_time = cur.fetchone()[0]
+
+    saved_update_time = 0
+    if os.path.exists(state):
+        with open(state) as f:
+            saved_update_time = int(f.read().strip())
+
+    return (saved_update_time == update_time, update_time)
+
+
+def update_state(state: str, update_time: int) -> None:
+    with open(state, "w") as f:
+        f.write(str(update_time))
+
+
+TYPE_MAP = {
+    "depends": "Depends",
+    "makedepends": "MakeDepends",
+    "checkdepends": "CheckDepends",
+    "optdepends": "OptDepends",
+    "conflicts": "Conflicts",
+    "provides": "Provides",
+    "replaces": "Replaces",
+}
+
+
+def get_extended_dict(query: str):
+    """
+    Produce data in the form in a single bulk SQL query:
+
+    {
+        <integer_package_id>: {
+            "Depends": [...],
+            "Conflicts": [...],
+            "License": [...]
+        }
+    }
+
+    The caller can then use this data to populate a dataset of packages.
+
+    output = produce_base_output_data()
+    data = get_extended_dict(query)
+    for i in range(len(output)):
+        package_id = output[i].get("ID")
+        output[i].update(data.get(package_id))
+    """
+
+    conn = aurweb.db.Connection()
+
+    cursor = conn.execute(query)
+
+    data = defaultdict(lambda: defaultdict(list))
+
+    for result in cursor.fetchall():
+
+        pkgid = result[0]
+        key = TYPE_MAP.get(result[1])
+        output = result[2]
+        if result[3]:
+            output += result[3]
+
+        # In all cases, we have at least an empty License list.
+        if "License" not in data[pkgid]:
+            data[pkgid]["License"] = []
+
+        # In all cases, we have at least an empty Keywords list.
+        if "Keywords" not in data[pkgid]:
+            data[pkgid]["Keywords"] = []
+
+        data[pkgid][key].append(output)
+
+    conn.close()
+    return data
+
+
+def get_extended_fields():
+    # Returns: [ID, Type, Name, Cond]
+    query = """
+    SELECT PackageDepends.PackageID AS ID, DependencyTypes.Name AS Type,
+           PackageDepends.DepName AS Name, PackageDepends.DepCondition AS Cond
+    FROM PackageDepends
+    LEFT JOIN DependencyTypes
+    ON DependencyTypes.ID = PackageDepends.DepTypeID
+    UNION SELECT PackageRelations.PackageID AS ID, RelationTypes.Name AS Type,
+          PackageRelations.RelName AS Name,
+          PackageRelations.RelCondition AS Cond
+    FROM PackageRelations
+    LEFT JOIN RelationTypes
+    ON RelationTypes.ID = PackageRelations.RelTypeID
+    UNION SELECT PackageGroups.PackageID AS ID, 'Groups' AS Type,
+          Groups.Name, '' AS Cond
+    FROM Groups
+    INNER JOIN PackageGroups ON PackageGroups.GroupID = Groups.ID
+    UNION SELECT PackageLicenses.PackageID AS ID, 'License' AS Type,
+          Licenses.Name, '' as Cond
+    FROM Licenses
+    INNER JOIN PackageLicenses ON PackageLicenses.LicenseID = Licenses.ID
+    UNION SELECT Packages.ID AS ID, 'Keywords' AS Type,
+          PackageKeywords.Keyword AS Name, '' as Cond
+    FROM PackageKeywords
+    INNER JOIN Packages ON Packages.PackageBaseID = PackageKeywords.PackageBaseID
+    """
+    return get_extended_dict(query)
+
+
+EXTENDED_FIELD_HANDLERS = {
+    "--extended": get_extended_fields
+}
+
+
+def is_decimal(column):
+    """ Check if an SQL column is of decimal.Decimal type. """
+    if isinstance(column, Decimal):
+        return float(column)
+    return column
+
+
+def write_archive(archive: str, output: list):
+    with gzip.open(archive, "wb") as f:
+        f.write(b"[\n")
+        for i, item in enumerate(output):
+            f.write(orjson.dumps(item))
+            if i < len(output) - 1:
+                f.write(b",")
+            f.write(b"\n")
+        f.write(b"]")
 
 
 def main():
@@ -21,32 +197,83 @@ def main():
     pkgbaselist_header = "# AUR package base list, generated on " + datestr
     userlist_header = "# AUR user name list, generated on " + datestr
 
-    with gzip.open(packagesfile, "w") as f:
-        f.write(bytes(pkglist_header + "\n", "UTF-8"))
-        cur = conn.execute("SELECT Packages.Name FROM Packages " +
-                           "INNER JOIN PackageBases " +
-                           "ON PackageBases.ID = Packages.PackageBaseID " +
+    updated, update_time = should_update(packages_state, "Packages")
+    if not updated:
+        print("Updating Packages...")
+
+        # Query columns; copied from RPC.
+        columns = ("Packages.ID, Packages.Name, "
+                   "PackageBases.ID AS PackageBaseID, "
+                   "PackageBases.Name AS PackageBase, "
+                   "Version, Description, URL, NumVotes, "
+                   "Popularity, OutOfDateTS AS OutOfDate, "
+                   "Users.UserName AS Maintainer, "
+                   "SubmittedTS AS FirstSubmitted, "
+                   "ModifiedTS AS LastModified")
+
+        # Perform query.
+        cur = conn.execute(f"SELECT {columns} FROM Packages "
+                           "LEFT JOIN PackageBases "
+                           "ON PackageBases.ID = Packages.PackageBaseID "
+                           "LEFT JOIN Users "
+                           "ON PackageBases.MaintainerUID = Users.ID "
                            "WHERE PackageBases.PackagerUID IS NOT NULL")
-        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
-    with gzip.open(packagesmetafile, "wt") as f:
-        cur = conn.execute("SELECT * FROM Packages")
-        json.dump({
-            "warning": "This is a experimental! It can be removed or modified without warning!",
-            "columns": [d[0] for d in cur.description],
-            "data": cur.fetchall()
-        }, f)
+        # Produce packages-meta-v1.json.gz
+        output = list()
+        snapshot_uri = aurweb.config.get("options", "snapshot_uri")
+        for result in cur.fetchall():
+            item = {
+                column[0]: is_decimal(result[i])
+                for i, column in enumerate(cur.description)
+            }
+            item["URLPath"] = snapshot_uri % item.get("Name")
+            output.append(item)
 
-    with gzip.open(pkgbasefile, "w") as f:
-        f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
-        cur = conn.execute("SELECT Name FROM PackageBases " +
-                           "WHERE PackagerUID IS NOT NULL")
-        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+        write_archive(packagesmetafile, output)
 
-    with gzip.open(userfile, "w") as f:
-        f.write(bytes(userlist_header + "\n", "UTF-8"))
-        cur = conn.execute("SELECT UserName FROM Users")
-        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+        # Produce packages-meta-ext-v1.json.gz
+        if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS:
+            f = EXTENDED_FIELD_HANDLERS.get(sys.argv[1])
+            data = f()
+
+            default_ = {"Groups": [], "License": [], "Keywords": []}
+            for i in range(len(output)):
+                data_ = data.get(output[i].get("ID"), default_)
+                output[i].update(data_)
+
+            write_archive(packagesmetaextfile, output)
+
+        # Produce packages.gz
+        with gzip.open(packagesfile, "wb") as f:
+            f.write(bytes(pkglist_header + "\n", "UTF-8"))
+            f.writelines([
+                bytes(x.get("Name") + "\n", "UTF-8")
+                for x in output
+            ])
+
+        update_state(packages_state, update_time)
+
+    updated, update_time = should_update(pkgbases_state, "PackageBases")
+    if not updated:
+        print("Updating PackageBases...")
+        # Produce pkgbase.gz
+        with gzip.open(pkgbasefile, "w") as f:
+            f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
+            cur = conn.execute("SELECT Name FROM PackageBases " +
+                               "WHERE PackagerUID IS NOT NULL")
+            f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+        update_state(pkgbases_state, update_time)
+
+    updated, update_time = should_update(users_state, "Users")
+    if not updated:
+        print("Updating Users...")
+        # Produce users.gz
+        with gzip.open(userfile, "w") as f:
+            f.write(bytes(userlist_header + "\n", "UTF-8"))
+            cur = conn.execute("SELECT UserName FROM Users")
+            f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+        update_state(users_state, update_time)
 
     conn.close()
 
diff --git a/conf/config.defaults b/conf/config.defaults
index 36ea02ef..a04f21bc 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -93,5 +93,6 @@ server = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64
 [mkpkglists]
 packagesfile = /srv/http/aurweb/web/html/packages.gz
 packagesmetafile = /srv/http/aurweb/web/html/packages-meta-v1.json.gz
+packagesmetaextfile = /srv/http/aurweb/web/html/packages-meta-ext-v1.json.gz
 pkgbasefile = /srv/http/aurweb/web/html/pkgbase.gz
 userfile = /srv/http/aurweb/web/html/users.gz
diff --git a/test/setup.sh b/test/setup.sh
index 24bb5f48..f74cd1b7 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -31,6 +31,7 @@ enable-maintenance = 0
 maintenance-exceptions = 127.0.0.1
 commit_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s&id=%s
 localedir = $TOPLEVEL/web/locale/
+snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz
 
 [notifications]
 notify-cmd = $NOTIFY
@@ -62,6 +63,7 @@ server = file://$(pwd)/remote/
 [mkpkglists]
 packagesfile = packages.gz
 packagesmetafile = packages-meta-v1.json.gz
+packagesmetaextfile = packages-meta-ext-v1.json.gz
 pkgbasefile = pkgbase.gz
 userfile = users.gz
 EOF
diff --git a/web/html/index.php b/web/html/index.php
index 3163c3e8..dc435162 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -189,7 +189,8 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
 		readfile("./$path");
 		break;
 	case "/packages.gz":
-	case "/packages-teapot.json.gz":
+	case "/packages-meta-v1.json.gz":
+	case "/packages-meta-ext-v1.json.gz":
 	case "/pkgbase.gz":
 	case "/users.gz":
 		header("Content-Type: text/plain");

From cdca8bd2953f3c3aa3a1b4cedb89c3b7b9fd4ddb Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 6 Nov 2021 16:23:08 -0700
Subject: [PATCH 527/844] feat(mkpkglists): added metadata archives

Two new archives are available:

- packages-meta-v1.json.gz
    - RPC search formatted data for all packages
    - ~2.1MB at the time of writing.
- packages-meta-ext-v1.json.gz (via --extended)
    - RPC multiinfo formatted data for all packages.
    - ~9.8MB at the time of writing.

New dependencies are required for this update:

- `python-orjson`

All archives served out by aur.archlinux.org distribute the Last-Modified
header and support the If-Modified-Since header, which should be
populated with Last-Modified's value. These should be used by clients
to avoid redownloading the archive when unnecessary.

Additionally, the new meta archives contain a format suitable for
streaming the data as the file is retrieved. It is still in JSON
format, however, users can parse package objects line by line after
the first '[' found in the file, until the last ']'; both contained
on their own lines.

Note: This commit is a documentation change and commit body.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 doc/maintenance.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/maintenance.txt b/doc/maintenance.txt
index d6094545..2c5c9faf 100644
--- a/doc/maintenance.txt
+++ b/doc/maintenance.txt
@@ -70,7 +70,8 @@ computations and clean up the database:
 * aurweb-pkgmaint automatically removes empty repositories that were created
   within the last 24 hours but never populated.
 
-* aurweb-mkpkglists generates the package list files.
+* aurweb-mkpkglists generates the package list files; it takes an optional
+  --extended flag, which additionally produces multiinfo metadata.
 
 * aurweb-usermaint removes the last login IP address of all users that did not
   login within the past seven days.
@@ -79,7 +80,7 @@ These scripts can be installed by running `python3 setup.py install` and are
 usually scheduled using Cron. The current setup is:
 
 ----
-*/5 * * * * aurweb-mkpkglists
+*/5 * * * * aurweb-mkpkglists [--extended]
 1 */2 * * * aurweb-popupdate
 2 */2 * * * aurweb-aurblup
 3 */2 * * * aurweb-pkgmaint

From 9f1f39995740e04d44309c7aed69a9b15d26dac0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 6 Nov 2021 17:13:16 -0700
Subject: [PATCH 528/844] fix(mkpkglists): remove caching

We really need caching for this; however, our current caching
method will cause the script to bypass changes to columns
if they have nothing to do with IDs.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py | 159 ++++++++++++-----------------------
 1 file changed, 54 insertions(+), 105 deletions(-)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index f2095a20..2566a146 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -20,60 +20,23 @@ on the following, right-hand side fields are added to each item.
 
 import datetime
 import gzip
-import os
 import sys
 
 from collections import defaultdict
 from decimal import Decimal
-from typing import Tuple
 
 import orjson
 
 import aurweb.config
 import aurweb.db
 
-
-def state_path(archive: str) -> str:
-    # A hard-coded /tmp state directory.
-    # TODO: Use Redis cache to store this state after we merge
-    # FastAPI into master and removed PHP from the tree.
-    return os.path.join("/tmp", os.path.basename(archive) + ".state")
-
-
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
 packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
 packagesmetaextfile = aurweb.config.get('mkpkglists', 'packagesmetaextfile')
-packages_state = state_path(packagesfile)
 
 pkgbasefile = aurweb.config.get('mkpkglists', 'pkgbasefile')
-pkgbases_state = state_path(pkgbasefile)
 
 userfile = aurweb.config.get('mkpkglists', 'userfile')
-users_state = state_path(userfile)
-
-
-def should_update(state: str, tablename: str) -> Tuple[bool, int]:
-    if aurweb.config.get("database", "backend") != "mysql":
-        return (False, 0)
-
-    db_name = aurweb.config.get("database", "name")
-    conn = aurweb.db.Connection()
-    cur = conn.execute("SELECT auto_increment FROM information_schema.tables "
-                       "WHERE table_schema = ? AND table_name = ?",
-                       (db_name, tablename,))
-    update_time = cur.fetchone()[0]
-
-    saved_update_time = 0
-    if os.path.exists(state):
-        with open(state) as f:
-            saved_update_time = int(f.read().strip())
-
-    return (saved_update_time == update_time, update_time)
-
-
-def update_state(state: str, update_time: int) -> None:
-    with open(state, "w") as f:
-        f.write(str(update_time))
 
 
 TYPE_MAP = {
@@ -197,83 +160,69 @@ def main():
     pkgbaselist_header = "# AUR package base list, generated on " + datestr
     userlist_header = "# AUR user name list, generated on " + datestr
 
-    updated, update_time = should_update(packages_state, "Packages")
-    if not updated:
-        print("Updating Packages...")
+    # Query columns; copied from RPC.
+    columns = ("Packages.ID, Packages.Name, "
+               "PackageBases.ID AS PackageBaseID, "
+               "PackageBases.Name AS PackageBase, "
+               "Version, Description, URL, NumVotes, "
+               "Popularity, OutOfDateTS AS OutOfDate, "
+               "Users.UserName AS Maintainer, "
+               "SubmittedTS AS FirstSubmitted, "
+               "ModifiedTS AS LastModified")
 
-        # Query columns; copied from RPC.
-        columns = ("Packages.ID, Packages.Name, "
-                   "PackageBases.ID AS PackageBaseID, "
-                   "PackageBases.Name AS PackageBase, "
-                   "Version, Description, URL, NumVotes, "
-                   "Popularity, OutOfDateTS AS OutOfDate, "
-                   "Users.UserName AS Maintainer, "
-                   "SubmittedTS AS FirstSubmitted, "
-                   "ModifiedTS AS LastModified")
+    # Perform query.
+    cur = conn.execute(f"SELECT {columns} FROM Packages "
+                       "LEFT JOIN PackageBases "
+                       "ON PackageBases.ID = Packages.PackageBaseID "
+                       "LEFT JOIN Users "
+                       "ON PackageBases.MaintainerUID = Users.ID "
+                       "WHERE PackageBases.PackagerUID IS NOT NULL")
 
-        # Perform query.
-        cur = conn.execute(f"SELECT {columns} FROM Packages "
-                           "LEFT JOIN PackageBases "
-                           "ON PackageBases.ID = Packages.PackageBaseID "
-                           "LEFT JOIN Users "
-                           "ON PackageBases.MaintainerUID = Users.ID "
-                           "WHERE PackageBases.PackagerUID IS NOT NULL")
+    # Produce packages-meta-v1.json.gz
+    output = list()
+    snapshot_uri = aurweb.config.get("options", "snapshot_uri")
+    for result in cur.fetchall():
+        item = {
+            column[0]: is_decimal(result[i])
+            for i, column in enumerate(cur.description)
+        }
+        item["URLPath"] = snapshot_uri % item.get("Name")
+        output.append(item)
 
-        # Produce packages-meta-v1.json.gz
-        output = list()
-        snapshot_uri = aurweb.config.get("options", "snapshot_uri")
-        for result in cur.fetchall():
-            item = {
-                column[0]: is_decimal(result[i])
-                for i, column in enumerate(cur.description)
-            }
-            item["URLPath"] = snapshot_uri % item.get("Name")
-            output.append(item)
+    write_archive(packagesmetafile, output)
 
-        write_archive(packagesmetafile, output)
+    # Produce packages-meta-ext-v1.json.gz
+    if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS:
+        f = EXTENDED_FIELD_HANDLERS.get(sys.argv[1])
+        data = f()
 
-        # Produce packages-meta-ext-v1.json.gz
-        if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS:
-            f = EXTENDED_FIELD_HANDLERS.get(sys.argv[1])
-            data = f()
+        default_ = {"Groups": [], "License": [], "Keywords": []}
+        for i in range(len(output)):
+            data_ = data.get(output[i].get("ID"), default_)
+            output[i].update(data_)
 
-            default_ = {"Groups": [], "License": [], "Keywords": []}
-            for i in range(len(output)):
-                data_ = data.get(output[i].get("ID"), default_)
-                output[i].update(data_)
+        write_archive(packagesmetaextfile, output)
 
-            write_archive(packagesmetaextfile, output)
+    # Produce packages.gz
+    with gzip.open(packagesfile, "wb") as f:
+        f.write(bytes(pkglist_header + "\n", "UTF-8"))
+        f.writelines([
+            bytes(x.get("Name") + "\n", "UTF-8")
+            for x in output
+        ])
 
-        # Produce packages.gz
-        with gzip.open(packagesfile, "wb") as f:
-            f.write(bytes(pkglist_header + "\n", "UTF-8"))
-            f.writelines([
-                bytes(x.get("Name") + "\n", "UTF-8")
-                for x in output
-            ])
+    # Produce pkgbase.gz
+    with gzip.open(pkgbasefile, "w") as f:
+        f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
+        cur = conn.execute("SELECT Name FROM PackageBases " +
+                           "WHERE PackagerUID IS NOT NULL")
+        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
-        update_state(packages_state, update_time)
-
-    updated, update_time = should_update(pkgbases_state, "PackageBases")
-    if not updated:
-        print("Updating PackageBases...")
-        # Produce pkgbase.gz
-        with gzip.open(pkgbasefile, "w") as f:
-            f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
-            cur = conn.execute("SELECT Name FROM PackageBases " +
-                               "WHERE PackagerUID IS NOT NULL")
-            f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
-        update_state(pkgbases_state, update_time)
-
-    updated, update_time = should_update(users_state, "Users")
-    if not updated:
-        print("Updating Users...")
-        # Produce users.gz
-        with gzip.open(userfile, "w") as f:
-            f.write(bytes(userlist_header + "\n", "UTF-8"))
-            cur = conn.execute("SELECT UserName FROM Users")
-            f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
-        update_state(users_state, update_time)
+    # Produce users.gz
+    with gzip.open(userfile, "w") as f:
+        f.write(bytes(userlist_header + "\n", "UTF-8"))
+        cur = conn.execute("SELECT UserName FROM Users")
+        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
     conn.close()
 

From 446a082352bf2bb8d7398afbdbe9dfad42f21fed Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 7 Nov 2021 17:26:05 -0800
Subject: [PATCH 529/844] change(fastapi): refactor database ORM model
 definitions

We don't want to depend on the database to load up data
about the models we define. We now leverage the existing
`aurweb.schema` module for table definitions and set
__table_args__["autoload"] to False.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/accepted_term.py        | 16 +++-----
 aurweb/models/account_type.py         | 56 +++++++++++----------------
 aurweb/models/api_rate_limit.py       | 10 ++---
 aurweb/models/ban.py                  | 10 ++---
 aurweb/models/declarative.py          |  6 +--
 aurweb/models/dependency_type.py      | 27 +++++--------
 aurweb/models/group.py                | 10 ++---
 aurweb/models/license.py              | 10 ++---
 aurweb/models/official_provider.py    | 10 ++---
 aurweb/models/package.py              | 15 +++----
 aurweb/models/package_base.py         | 21 ++++------
 aurweb/models/package_blacklist.py    | 10 ++---
 aurweb/models/package_comaintainer.py | 20 ++++------
 aurweb/models/package_comment.py      | 26 ++++---------
 aurweb/models/package_dependency.py   | 22 ++++-------
 aurweb/models/package_group.py        | 18 ++++-----
 aurweb/models/package_keyword.py      | 19 ++++-----
 aurweb/models/package_license.py      | 20 ++++------
 aurweb/models/package_notification.py | 20 ++++------
 aurweb/models/package_relation.py     | 22 ++++-------
 aurweb/models/package_request.py      | 25 ++++--------
 aurweb/models/package_source.py       | 14 +++----
 aurweb/models/package_vote.py         | 20 ++++------
 aurweb/models/relation_type.py        | 24 ++++--------
 aurweb/models/request_type.py         | 21 ++++------
 aurweb/models/session.py              | 13 +++----
 aurweb/models/ssh_pub_key.py          | 19 +++------
 aurweb/models/term.py                 | 10 ++---
 aurweb/models/tu_vote.py              | 18 ++++-----
 aurweb/models/tu_voteinfo.py          | 15 +++----
 aurweb/models/user.py                 | 21 ++++------
 31 files changed, 212 insertions(+), 356 deletions(-)

diff --git a/aurweb/models/accepted_term.py b/aurweb/models/accepted_term.py
index b4dbb410..0f9b187e 100644
--- a/aurweb/models/accepted_term.py
+++ b/aurweb/models/accepted_term.py
@@ -1,28 +1,24 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.term import Term as _Term
 from aurweb.models.user import User as _User
 
 
 class AcceptedTerm(Base):
-    __tablename__ = "AcceptedTerms"
+    __table__ = schema.AcceptedTerms
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.TermsID]}
 
-    UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
-                     nullable=False)
     User = relationship(
         _User, backref=backref("accepted_terms", lazy="dynamic"),
-        foreign_keys=[UsersID])
+        foreign_keys=[__table__.c.UsersID])
 
-    TermsID = Column(Integer, ForeignKey("Terms.ID", ondelete="CASCADE"),
-                     nullable=False)
     Term = relationship(
         _Term, backref=backref("accepted_terms", lazy="dynamic"),
-        foreign_keys=[TermsID])
-
-    __mapper_args__ = {"primary_key": [TermsID]}
+        foreign_keys=[__table__.c.TermsID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/account_type.py b/aurweb/models/account_type.py
index 7aa7733c..a849df02 100644
--- a/aurweb/models/account_type.py
+++ b/aurweb/models/account_type.py
@@ -1,6 +1,4 @@
-from sqlalchemy import Column, Integer
-
-from aurweb import db
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 USER = "User"
@@ -8,37 +6,10 @@ TRUSTED_USER = "Trusted User"
 DEVELOPER = "Developer"
 TRUSTED_USER_AND_DEV = "Trusted User & Developer"
 
-
-class AccountType(Base):
-    """ An ORM model of a single AccountTypes record. """
-    __tablename__ = "AccountTypes"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
-
-    def __init__(self, **kwargs):
-        self.AccountType = kwargs.pop("AccountType")
-
-    def __str__(self):
-        return str(self.AccountType)
-
-    def __repr__(self):
-        return "<AccountType(ID='%s', AccountType='%s')>" % (
-            self.ID, str(self))
-
-
-# Fetch account type IDs from the database for constants.
-_account_types = db.query(AccountType)
-USER_ID = _account_types.filter(
-    AccountType.AccountType == USER).first().ID
-TRUSTED_USER_ID = _account_types.filter(
-    AccountType.AccountType == TRUSTED_USER).first().ID
-DEVELOPER_ID = _account_types.filter(
-    AccountType.AccountType == DEVELOPER).first().ID
-TRUSTED_USER_AND_DEV_ID = _account_types.filter(
-    AccountType.AccountType == TRUSTED_USER_AND_DEV).first().ID
-_account_types = None  # Get rid of the query handle.
+USER_ID = 1
+TRUSTED_USER_ID = 2
+DEVELOPER_ID = 3
+TRUSTED_USER_AND_DEV_ID = 4
 
 # Map string constants to integer constants.
 ACCOUNT_TYPE_ID = {
@@ -50,3 +21,20 @@ ACCOUNT_TYPE_ID = {
 
 # Reversed ACCOUNT_TYPE_ID mapping.
 ACCOUNT_TYPE_NAME = {v: k for k, v in ACCOUNT_TYPE_ID.items()}
+
+
+class AccountType(Base):
+    """ An ORM model of a single AccountTypes record. """
+    __table__ = schema.AccountTypes
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
+
+    def __init__(self, **kwargs):
+        self.AccountType = kwargs.pop("AccountType")
+
+    def __str__(self):
+        return str(self.AccountType)
+
+    def __repr__(self):
+        return "<AccountType(ID='%s', AccountType='%s')>" % (
+            self.ID, str(self))
diff --git a/aurweb/models/api_rate_limit.py b/aurweb/models/api_rate_limit.py
index f8641896..19b656df 100644
--- a/aurweb/models/api_rate_limit.py
+++ b/aurweb/models/api_rate_limit.py
@@ -1,15 +1,13 @@
-from sqlalchemy import Column, String
 from sqlalchemy.exc import IntegrityError
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 
 class ApiRateLimit(Base):
-    __tablename__ = "ApiRateLimit"
-
-    IP = Column(String(45), primary_key=True, unique=True, default=str())
-
-    __mapper_args__ = {"primary_key": [IP]}
+    __table__ = schema.ApiRateLimit
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.IP]}
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/ban.py b/aurweb/models/ban.py
index e10087b0..a70be7b9 100644
--- a/aurweb/models/ban.py
+++ b/aurweb/models/ban.py
@@ -1,15 +1,13 @@
 from fastapi import Request
-from sqlalchemy import Column, String
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 
 class Ban(Base):
-    __tablename__ = "Bans"
-
-    IPAddress = Column(String(45), primary_key=True)
-
-    __mapper_args__ = {"primary_key": [IPAddress]}
+    __table__ = schema.Bans
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.IPAddress]}
 
     def __init__(self, **kwargs):
         self.IPAddress = kwargs.get("IPAddress")
diff --git a/aurweb/models/declarative.py b/aurweb/models/declarative.py
index 96ee1829..20ddd20c 100644
--- a/aurweb/models/declarative.py
+++ b/aurweb/models/declarative.py
@@ -2,8 +2,6 @@ import json
 
 from sqlalchemy.ext.declarative import declarative_base
 
-import aurweb.db
-
 from aurweb import util
 
 
@@ -25,12 +23,10 @@ Base = declarative_base()
 
 # Setup __table_args__ applicable to every table.
 Base.__table_args__ = {
-    "autoload": True,
-    "autoload_with": aurweb.db.get_engine(),
+    "autoload": False,
     "extend_existing": True
 }
 
-
 # Setup Base.as_dict and Base.json.
 #
 # With this, declarative models can use .as_dict() or .json()
diff --git a/aurweb/models/dependency_type.py b/aurweb/models/dependency_type.py
index 3b5fafcc..98418802 100644
--- a/aurweb/models/dependency_type.py
+++ b/aurweb/models/dependency_type.py
@@ -1,6 +1,4 @@
-from sqlalchemy import Column, Integer
-
-from aurweb import db
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 DEPENDS = "depends"
@@ -8,23 +6,16 @@ MAKEDEPENDS = "makedepends"
 CHECKDEPENDS = "checkdepends"
 OPTDEPENDS = "optdepends"
 
+DEPENDS_ID = 1
+MAKEDEPENDS_ID = 2
+CHECKDEPENDS_ID = 3
+OPTDEPENDS_ID = 4
+
 
 class DependencyType(Base):
-    __tablename__ = "DependencyTypes"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
+    __table__ = schema.DependencyTypes
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     def __init__(self, Name: str = None):
         self.Name = Name
-
-
-DEPENDS_ID = db.query(DependencyType).filter(
-    DependencyType.Name == DEPENDS).first().ID
-MAKEDEPENDS_ID = db.query(DependencyType).filter(
-    DependencyType.Name == MAKEDEPENDS).first().ID
-CHECKDEPENDS_ID = db.query(DependencyType).filter(
-    DependencyType.Name == CHECKDEPENDS).first().ID
-OPTDEPENDS_ID = db.query(DependencyType).filter(
-    DependencyType.Name == OPTDEPENDS).first().ID
diff --git a/aurweb/models/group.py b/aurweb/models/group.py
index 5493bb7f..0275ed94 100644
--- a/aurweb/models/group.py
+++ b/aurweb/models/group.py
@@ -1,15 +1,13 @@
-from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 
 class Group(Base):
-    __tablename__ = "Groups"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
+    __table__ = schema.Groups
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/license.py b/aurweb/models/license.py
index fa863379..86aeaa86 100644
--- a/aurweb/models/license.py
+++ b/aurweb/models/license.py
@@ -1,15 +1,13 @@
-from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 
 class License(Base):
-    __tablename__ = "Licenses"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
+    __table__ = schema.Licenses
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/official_provider.py b/aurweb/models/official_provider.py
index a273dd06..a8282ff1 100644
--- a/aurweb/models/official_provider.py
+++ b/aurweb/models/official_provider.py
@@ -1,6 +1,6 @@
-from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 # TODO: Fix this! Official packages aren't from aur.archlinux.org...
@@ -8,11 +8,9 @@ OFFICIAL_BASE = "https://aur.archlinux.org"
 
 
 class OfficialProvider(Base):
-    __tablename__ = "OfficialProviders"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
+    __table__ = schema.OfficialProviders
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package.py b/aurweb/models/package.py
index ef119f3c..8f82dadd 100644
--- a/aurweb/models/package.py
+++ b/aurweb/models/package.py
@@ -1,24 +1,19 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package_base import PackageBase as _PackageBase
 
 
 class Package(Base):
-    __tablename__ = "Packages"
+    __table__ = schema.Packages
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
-    ID = Column(Integer, primary_key=True)
-
-    PackageBaseID = Column(
-        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
-        nullable=False)
     PackageBase = relationship(
         _PackageBase, backref=backref("packages", lazy="dynamic"),
-        foreign_keys=[PackageBaseID])
-
-    __mapper_args__ = {"primary_key": [ID]}
+        foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_base.py b/aurweb/models/package_base.py
index e6f28050..8c88b7b5 100644
--- a/aurweb/models/package_base.py
+++ b/aurweb/models/package_base.py
@@ -1,38 +1,33 @@
 from datetime import datetime
 
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.user import User as _User
 
 
 class PackageBase(Base):
-    __tablename__ = "PackageBases"
+    __table__ = schema.PackageBases
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
-    FlaggerUID = Column(Integer,
-                        ForeignKey("Users.ID", ondelete="SET NULL"))
     Flagger = relationship(
         _User, backref=backref("flagged_bases", lazy="dynamic"),
-        foreign_keys=[FlaggerUID])
+        foreign_keys=[__table__.c.FlaggerUID])
 
-    SubmitterUID = Column(Integer,
-                          ForeignKey("Users.ID", ondelete="SET NULL"))
     Submitter = relationship(
         _User, backref=backref("submitted_bases", lazy="dynamic"),
-        foreign_keys=[SubmitterUID])
+        foreign_keys=[__table__.c.SubmitterUID])
 
-    MaintainerUID = Column(Integer,
-                           ForeignKey("Users.ID", ondelete="SET NULL"))
     Maintainer = relationship(
         _User, backref=backref("maintained_bases", lazy="dynamic"),
-        foreign_keys=[MaintainerUID])
+        foreign_keys=[__table__.c.MaintainerUID])
 
-    PackagerUID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     Packager = relationship(
         _User, backref=backref("package_bases", lazy="dynamic"),
-        foreign_keys=[PackagerUID])
+        foreign_keys=[__table__.c.PackagerUID])
 
     # A set used to check for floatable values.
     TO_FLOAT = {"Popularity"}
diff --git a/aurweb/models/package_blacklist.py b/aurweb/models/package_blacklist.py
index 4ba3f308..0f8f0cee 100644
--- a/aurweb/models/package_blacklist.py
+++ b/aurweb/models/package_blacklist.py
@@ -1,15 +1,13 @@
-from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 
 class PackageBlacklist(Base):
-    __tablename__ = "PackageBlacklist"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
+    __table__ = schema.PackageBlacklist
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_comaintainer.py b/aurweb/models/package_comaintainer.py
index 2f77782c..7641fb43 100644
--- a/aurweb/models/package_comaintainer.py
+++ b/aurweb/models/package_comaintainer.py
@@ -1,30 +1,26 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package_base import PackageBase as _PackageBase
 from aurweb.models.user import User as _User
 
 
 class PackageComaintainer(Base):
-    __tablename__ = "PackageComaintainers"
+    __table__ = schema.PackageComaintainers
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.UsersID, __table__.c.PackageBaseID]
+    }
 
-    UsersID = Column(
-        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
-        nullable=False)
     User = relationship(
         _User, backref=backref("comaintained", lazy="dynamic"),
-        foreign_keys=[UsersID])
+        foreign_keys=[__table__.c.UsersID])
 
-    PackageBaseID = Column(
-        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
-        nullable=False)
     PackageBase = relationship(
         _PackageBase, backref=backref("comaintainers", lazy="dynamic"),
-        foreign_keys=[PackageBaseID])
-
-    __mapper_args__ = {"primary_key": [UsersID, PackageBaseID]}
+        foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_comment.py b/aurweb/models/package_comment.py
index a511df9b..2a529c9c 100644
--- a/aurweb/models/package_comment.py
+++ b/aurweb/models/package_comment.py
@@ -1,43 +1,33 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package_base import PackageBase as _PackageBase
 from aurweb.models.user import User as _User
 
 
 class PackageComment(Base):
-    __tablename__ = "PackageComments"
+    __table__ = schema.PackageComments
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
-    ID = Column(Integer, primary_key=True)
-
-    PackageBaseID = Column(
-        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
-        nullable=False)
     PackageBase = relationship(
         _PackageBase, backref=backref("comments", lazy="dynamic",
                                       cascade="all, delete"),
-        foreign_keys=[PackageBaseID])
+        foreign_keys=[__table__.c.PackageBaseID])
 
-    UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     User = relationship(
         _User, backref=backref("package_comments", lazy="dynamic"),
-        foreign_keys=[UsersID])
+        foreign_keys=[__table__.c.UsersID])
 
-    EditedUsersID = Column(
-        Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     Editor = relationship(
         _User, backref=backref("edited_comments", lazy="dynamic"),
-        foreign_keys=[EditedUsersID])
+        foreign_keys=[__table__.c.EditedUsersID])
 
-    DelUsersID = Column(
-        Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     Deleter = relationship(
         _User, backref=backref("deleted_comments", lazy="dynamic"),
-        foreign_keys=[DelUsersID])
-
-    __mapper_args__ = {"primary_key": [ID]}
+        foreign_keys=[__table__.c.DelUsersID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index 3f4e2baa..edaa6538 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -1,34 +1,28 @@
-from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.dependency_type import DependencyType as _DependencyType
 from aurweb.models.package import Package as _Package
 
 
 class PackageDependency(Base):
-    __tablename__ = "PackageDepends"
+    __table__ = schema.PackageDepends
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.PackageID, __table__.c.DepName]
+    }
 
-    PackageID = Column(
-        Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
-        nullable=False)
     Package = relationship(
         _Package, backref=backref("package_dependencies", lazy="dynamic",
                                   cascade="all, delete"),
-        foreign_keys=[PackageID])
+        foreign_keys=[__table__.c.PackageID])
 
-    DepTypeID = Column(
-        Integer, ForeignKey("DependencyTypes.ID", ondelete="NO ACTION"),
-        nullable=False)
     DependencyType = relationship(
         _DependencyType,
         backref=backref("package_dependencies", lazy="dynamic"),
-        foreign_keys=[DepTypeID])
-
-    DepName = Column(String(255), nullable=False)
-
-    __mapper_args__ = {"primary_key": [PackageID, DepName]}
+        foreign_keys=[__table__.c.DepTypeID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_group.py b/aurweb/models/package_group.py
index c1d1e4f8..3b6db37d 100644
--- a/aurweb/models/package_group.py
+++ b/aurweb/models/package_group.py
@@ -1,28 +1,26 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.group import Group as _Group
 from aurweb.models.package import Package as _Package
 
 
 class PackageGroup(Base):
-    __tablename__ = "PackageGroups"
+    __table__ = schema.PackageGroups
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.PackageID, __table__.c.GroupID]
+    }
 
-    PackageID = Column(Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
-                       primary_key=True, nullable=True)
     Package = relationship(
         _Package, backref=backref("package_groups", lazy="dynamic"),
-        foreign_keys=[PackageID])
+        foreign_keys=[__table__.c.PackageID])
 
-    GroupID = Column(Integer, ForeignKey("Groups.ID", ondelete="CASCADE"),
-                     primary_key=True, nullable=True)
     Group = relationship(
         _Group, backref=backref("package_groups", lazy="dynamic"),
-        foreign_keys=[GroupID])
-
-    __mapper_args__ = {"primary_key": [PackageID, GroupID]}
+        foreign_keys=[__table__.c.GroupID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py
index 25bd340b..581aafdc 100644
--- a/aurweb/models/package_keyword.py
+++ b/aurweb/models/package_keyword.py
@@ -1,27 +1,22 @@
-from sqlalchemy import Column, ForeignKey, Integer, String, text
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package_base import PackageBase as _PackageBase
 
 
 class PackageKeyword(Base):
-    __tablename__ = "PackageKeywords"
+    __table__ = schema.PackageKeywords
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.PackageBaseID, __table__.c.Keyword]
+    }
 
-    PackageBaseID = Column(
-        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
-        primary_key=True, nullable=True)
     PackageBase = relationship(
         _PackageBase, backref=backref("keywords", lazy="dynamic",
                                       cascade="all, delete"),
-        foreign_keys=[PackageBaseID])
-
-    Keyword = Column(
-        String(255), primary_key=True, nullable=False,
-        server_default=text("''"))
-
-    __mapper_args__ = {"primary_key": [PackageBaseID, Keyword]}
+        foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_license.py b/aurweb/models/package_license.py
index db12a7c3..43dd0339 100644
--- a/aurweb/models/package_license.py
+++ b/aurweb/models/package_license.py
@@ -1,32 +1,28 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.license import License as _License
 from aurweb.models.package import Package as _Package
 
 
 class PackageLicense(Base):
-    __tablename__ = "PackageLicenses"
+    __table__ = schema.PackageLicenses
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.PackageID, __table__.c.LicenseID]
+    }
 
-    PackageID = Column(
-        Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
-        primary_key=True, nullable=True)
     Package = relationship(
         _Package, backref=backref("package_licenses", lazy="dynamic",
                                   cascade="all, delete"),
-        foreign_keys=[PackageID])
+        foreign_keys=[__table__.c.PackageID])
 
-    LicenseID = Column(
-        Integer, ForeignKey("Licenses.ID", ondelete="CASCADE"),
-        primary_key=True, nullable=True)
     License = relationship(
         _License, backref=backref("package_licenses", lazy="dynamic",
                                   cascade="all, delete"),
-        foreign_keys=[LicenseID])
-
-    __mapper_args__ = {"primary_key": [PackageID, LicenseID]}
+        foreign_keys=[__table__.c.LicenseID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_notification.py b/aurweb/models/package_notification.py
index 221067e1..97dbe38f 100644
--- a/aurweb/models/package_notification.py
+++ b/aurweb/models/package_notification.py
@@ -1,31 +1,27 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package_base import PackageBase as _PackageBase
 from aurweb.models.user import User as _User
 
 
 class PackageNotification(Base):
-    __tablename__ = "PackageNotifications"
+    __table__ = schema.PackageNotifications
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.UserID, __table__.c.PackageBaseID]
+    }
 
-    UserID = Column(
-        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
-        nullable=False)
     User = relationship(
         _User, backref=backref("notifications", lazy="dynamic"),
-        foreign_keys=[UserID])
+        foreign_keys=[__table__.c.UserID])
 
-    PackageBaseID = Column(
-        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
-        nullable=False)
     PackageBase = relationship(
         _PackageBase,
         backref=backref("notifications", lazy="dynamic"),
-        foreign_keys=[PackageBaseID])
-
-    __mapper_args__ = {"primary_key": [UserID, PackageBaseID]}
+        foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
index e79a90d6..eb6caa84 100644
--- a/aurweb/models/package_relation.py
+++ b/aurweb/models/package_relation.py
@@ -1,33 +1,27 @@
-from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package import Package as _Package
 from aurweb.models.relation_type import RelationType as _RelationType
 
 
 class PackageRelation(Base):
-    __tablename__ = "PackageRelations"
+    __table__ = schema.PackageRelations
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.PackageID, __table__.c.RelName]
+    }
 
-    PackageID = Column(
-        Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
-        nullable=False)
     Package = relationship(
         _Package, backref=backref("package_relations", lazy="dynamic",
                                   cascade="all, delete"),
-        foreign_keys=[PackageID])
+        foreign_keys=[__table__.c.PackageID])
 
-    RelTypeID = Column(
-        Integer, ForeignKey("RelationTypes.ID", ondelete="CASCADE"),
-        nullable=False)
     RelationType = relationship(
         _RelationType, backref=backref("package_relations", lazy="dynamic"),
-        foreign_keys=[RelTypeID])
-
-    RelName = Column(String(255), unique=True)
-
-    __mapper_args__ = {"primary_key": [PackageID, RelName]}
+        foreign_keys=[__table__.c.RelTypeID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_request.py b/aurweb/models/package_request.py
index f600566c..9669ec46 100644
--- a/aurweb/models/package_request.py
+++ b/aurweb/models/package_request.py
@@ -1,7 +1,7 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package_base import PackageBase as _PackageBase
 from aurweb.models.request_type import RequestType as _RequestType
@@ -20,34 +20,25 @@ REJECTED_ID = 3
 
 
 class PackageRequest(Base):
-    __tablename__ = "PackageRequests"
+    __table__ = schema.PackageRequests
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
-    ID = Column(Integer, primary_key=True)
-
-    ReqTypeID = Column(
-        Integer, ForeignKey("RequestTypes.ID", ondelete="NO ACTION"),
-        nullable=False)
     RequestType = relationship(
         _RequestType, backref=backref("package_requests", lazy="dynamic"),
-        foreign_keys=[ReqTypeID])
+        foreign_keys=[__table__.c.ReqTypeID])
 
-    UsersID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     User = relationship(
         _User, backref=backref("package_requests", lazy="dynamic"),
-        foreign_keys=[UsersID])
+        foreign_keys=[__table__.c.UsersID])
 
-    PackageBaseID = Column(
-        Integer, ForeignKey("PackageBases.ID", ondelete="SET NULL"))
     PackageBase = relationship(
         _PackageBase, backref=backref("requests", lazy="dynamic"),
-        foreign_keys=[PackageBaseID])
+        foreign_keys=[__table__.c.PackageBaseID])
 
-    ClosedUID = Column(Integer, ForeignKey("Users.ID", ondelete="SET NULL"))
     Closer = relationship(
         _User, backref=backref("closed_requests", lazy="dynamic"),
-        foreign_keys=[ClosedUID])
-
-    __mapper_args__ = {"primary_key": [ID]}
+        foreign_keys=[__table__.c.ClosedUID])
 
     STATUS_DISPLAY = {
         PENDING_ID: PENDING,
diff --git a/aurweb/models/package_source.py b/aurweb/models/package_source.py
index db983272..59046bbd 100644
--- a/aurweb/models/package_source.py
+++ b/aurweb/models/package_source.py
@@ -1,22 +1,22 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package import Package as _Package
 
 
 class PackageSource(Base):
-    __tablename__ = "PackageSources"
+    __table__ = schema.PackageSources
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.PackageID]
+    }
 
-    PackageID = Column(Integer, ForeignKey("Packages.ID", ondelete="CASCADE"),
-                       nullable=False)
     Package = relationship(
         _Package, backref=backref("package_sources", lazy="dynamic",
                                   cascade="all, delete"),
-        foreign_keys=[PackageID])
-
-    __mapper_args__ = {"primary_key": [PackageID]}
+        foreign_keys=[__table__.c.PackageID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/package_vote.py b/aurweb/models/package_vote.py
index 2d70be16..7221d527 100644
--- a/aurweb/models/package_vote.py
+++ b/aurweb/models/package_vote.py
@@ -1,30 +1,26 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.package_base import PackageBase as _PackageBase
 from aurweb.models.user import User as _User
 
 
 class PackageVote(Base):
-    __tablename__ = "PackageVotes"
+    __table__ = schema.PackageVotes
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.UsersID, __table__.c.PackageBaseID]
+    }
 
-    UsersID = Column(
-        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
-        nullable=False)
     User = relationship(
         _User, backref=backref("package_votes", lazy="dynamic"),
-        foreign_keys=[UsersID])
+        foreign_keys=[__table__.c.UsersID])
 
-    PackageBaseID = Column(
-        Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
-        nullable=False)
     PackageBase = relationship(
         _PackageBase, backref=backref("package_votes", lazy="dynamic"),
-        foreign_keys=[PackageBaseID])
-
-    __mapper_args__ = {"primary_key": [UsersID, PackageBaseID]}
+        foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/relation_type.py b/aurweb/models/relation_type.py
index 71b6adbb..b52c91ec 100644
--- a/aurweb/models/relation_type.py
+++ b/aurweb/models/relation_type.py
@@ -1,27 +1,19 @@
-from sqlalchemy import Column, Integer
-
-from aurweb import db
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 CONFLICTS = "conflicts"
 PROVIDES = "provides"
 REPLACES = "replaces"
 
+CONFLICTS_ID = 1
+PROVIDES_ID = 2
+REPLACES_ID = 3
+
 
 class RelationType(Base):
-    __tablename__ = "RelationTypes"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
+    __table__ = schema.RelationTypes
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     def __init__(self, Name: str = None):
         self.Name = Name
-
-
-CONFLICTS_ID = db.query(RelationType).filter(
-    RelationType.Name == CONFLICTS).first().ID
-PROVIDES_ID = db.query(RelationType).filter(
-    RelationType.Name == PROVIDES).first().ID
-REPLACES_ID = db.query(RelationType).filter(
-    RelationType.Name == REPLACES).first().ID
diff --git a/aurweb/models/request_type.py b/aurweb/models/request_type.py
index 4578464c..cabab3d2 100644
--- a/aurweb/models/request_type.py
+++ b/aurweb/models/request_type.py
@@ -1,25 +1,20 @@
-from sqlalchemy import Column, Integer
-
-from aurweb import db
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 DELETION = "deletion"
 ORPHAN = "orphan"
 MERGE = "merge"
 
+DELETION_ID = 1
+ORPHAN_ID = 2
+MERGE_ID = 3
+
 
 class RequestType(Base):
-    __tablename__ = "RequestTypes"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
+    __table__ = schema.RequestTypes
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     def name_display(self) -> str:
         """ Return the Name column with its first char capitalized. """
         return self.Name.title()
-
-
-DELETION_ID = db.query(RequestType, RequestType.Name == DELETION).first().ID
-ORPHAN_ID = db.query(RequestType, RequestType.Name == ORPHAN).first().ID
-MERGE_ID = db.query(RequestType, RequestType.Name == MERGE).first().ID
diff --git a/aurweb/models/session.py b/aurweb/models/session.py
index a4034678..96f88d85 100644
--- a/aurweb/models/session.py
+++ b/aurweb/models/session.py
@@ -1,23 +1,20 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.db import make_random_value, query
 from aurweb.models.declarative import Base
 from aurweb.models.user import User as _User
 
 
 class Session(Base):
-    __tablename__ = "Sessions"
+    __table__ = schema.Sessions
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.UsersID]}
 
-    UsersID = Column(
-        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
-        nullable=False)
     User = relationship(
         _User, backref=backref("session", uselist=False),
-        foreign_keys=[UsersID])
-
-    __mapper_args__ = {"primary_key": [UsersID]}
+        foreign_keys=[__table__.c.UsersID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/ssh_pub_key.py b/aurweb/models/ssh_pub_key.py
index 268a585b..789be629 100644
--- a/aurweb/models/ssh_pub_key.py
+++ b/aurweb/models/ssh_pub_key.py
@@ -3,30 +3,23 @@ import tempfile
 
 from subprocess import PIPE, Popen
 
-from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 
 class SSHPubKey(Base):
-    __tablename__ = "SSHPubKeys"
+    __table__ = schema.SSHPubKeys
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.Fingerprint]}
 
-    UserID = Column(
-        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
-        nullable=False)
     User = relationship(
         "User", backref=backref("ssh_pub_key", uselist=False),
-        foreign_keys=[UserID])
-
-    Fingerprint = Column(String(44), primary_key=True)
-
-    __mapper_args__ = {"primary_key": Fingerprint}
+        foreign_keys=[__table__.c.UserID])
 
     def __init__(self, **kwargs):
-        self.UserID = kwargs.get("UserID")
-        self.Fingerprint = kwargs.get("Fingerprint")
-        self.PubKey = kwargs.get("PubKey")
+        super().__init__(**kwargs)
 
 
 def get_fingerprint(pubkey):
diff --git a/aurweb/models/term.py b/aurweb/models/term.py
index 0985cd76..59534bbc 100644
--- a/aurweb/models/term.py
+++ b/aurweb/models/term.py
@@ -1,15 +1,13 @@
-from sqlalchemy import Column, Integer
 from sqlalchemy.exc import IntegrityError
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 
 
 class Term(Base):
-    __tablename__ = "Terms"
-
-    ID = Column(Integer, primary_key=True)
-
-    __mapper_args__ = {"primary_key": [ID]}
+    __table__ = schema.Terms
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/tu_vote.py b/aurweb/models/tu_vote.py
index 634c041e..efb23b19 100644
--- a/aurweb/models/tu_vote.py
+++ b/aurweb/models/tu_vote.py
@@ -1,28 +1,26 @@
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.tu_voteinfo import TUVoteInfo as _TUVoteInfo
 from aurweb.models.user import User as _User
 
 
 class TUVote(Base):
-    __tablename__ = "TU_Votes"
+    __table__ = schema.TU_Votes
+    __tablename__ = __table__.name
+    __mapper_args__ = {
+        "primary_key": [__table__.c.VoteID, __table__.c.UserID]
+    }
 
-    VoteID = Column(Integer, ForeignKey("TU_VoteInfo.ID", ondelete="CASCADE"),
-                    nullable=False)
     VoteInfo = relationship(
         _TUVoteInfo, backref=backref("tu_votes", lazy="dynamic"),
-        foreign_keys=[VoteID])
+        foreign_keys=[__table__.c.VoteID])
 
-    UserID = Column(Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
-                    nullable=False)
     User = relationship(
         _User, backref=backref("tu_votes", lazy="dynamic"),
-        foreign_keys=[UserID])
-
-    __mapper_args__ = {"primary_key": [VoteID, UserID]}
+        foreign_keys=[__table__.c.UserID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/tu_voteinfo.py b/aurweb/models/tu_voteinfo.py
index da43b097..35675ccc 100644
--- a/aurweb/models/tu_voteinfo.py
+++ b/aurweb/models/tu_voteinfo.py
@@ -2,27 +2,22 @@ import typing
 
 from datetime import datetime
 
-from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
+from aurweb import schema
 from aurweb.models.declarative import Base
 from aurweb.models.user import User as _User
 
 
 class TUVoteInfo(Base):
-    __tablename__ = "TU_VoteInfo"
+    __table__ = schema.TU_VoteInfo
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
-    ID = Column(Integer, primary_key=True)
-
-    SubmitterID = Column(
-        Integer, ForeignKey("Users.ID", ondelete="CASCADE"),
-        nullable=False)
     Submitter = relationship(
         _User, backref=backref("tu_voteinfo_set", lazy="dynamic"),
-        foreign_keys=[SubmitterID])
-
-    __mapper_args__ = {"primary_key": [ID]}
+        foreign_keys=[__table__.c.SubmitterID])
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index e4223144..8db34c38 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -5,14 +5,14 @@ from datetime import datetime
 import bcrypt
 
 from fastapi import Request
-from sqlalchemy import Column, ForeignKey, Integer, String, or_, text
+from sqlalchemy import or_
 from sqlalchemy.orm import backref, relationship
 
 import aurweb.config
 import aurweb.models.account_type
 import aurweb.schema
 
-from aurweb import db
+from aurweb import db, schema
 from aurweb.models.account_type import AccountType as _AccountType
 from aurweb.models.ban import is_banned
 from aurweb.models.declarative import Base
@@ -22,23 +22,16 @@ SALT_ROUNDS_DEFAULT = 12
 
 class User(Base):
     """ An ORM model of a single Users record. """
-    __tablename__ = "Users"
+    __table__ = schema.Users
+    __tablename__ = __table__.name
+    __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
-    ID = Column(Integer, primary_key=True)
-
-    AccountTypeID = Column(
-        Integer, ForeignKey("AccountTypes.ID", ondelete="NO ACTION"),
-        nullable=False, server_default=text("1"))
     AccountType = relationship(
         _AccountType,
         backref=backref("users", lazy="dynamic"),
-        foreign_keys=[AccountTypeID],
+        foreign_keys=[__table__.c.AccountTypeID],
         uselist=False)
 
-    Passwd = Column(String(255), default=str())
-
-    __mapper_args__ = {"primary_key": [ID]}
-
     # High-level variables used to track authentication (not in DB).
     authenticated = False
     nonce = None
@@ -49,7 +42,7 @@ class User(Base):
                                        SALT_ROUNDS_DEFAULT)
 
     def __init__(self, Passwd: str = str(), **kwargs):
-        super().__init__(**kwargs)
+        super().__init__(**kwargs, Passwd=str())
 
         # Run this again in the constructor in case we rehashed config.
         self.salt_rounds = aurweb.config.getint("options", "salt_rounds",

From 3517862ecdaf665693bbfb6e06fe547249d34005 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 8 Nov 2021 18:46:21 -0800
Subject: [PATCH 530/844] change(poetry): use kevr@upgrade-starlette-0.17.0 as
 fastapi source

Starlette 0.16.0 has a pretty bad bug in terms of logging which
has been fixed in the 0.17.0 release. That being said, FastAPI has
not yet merged a request at https://github.com/tiangolo/fastapi/pull/4145
which resolves this dependency resolution so we can use the updated
starlette package.

kevr has forked the pull request in question and we are using it
for now in our poetry dependencies to get ahead of the game.

When FastAPI upstream is updated to support 0.17.0, we'll need
to switch this back to using upstream's source.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 317 +++++++++++++++++++++++++++----------------------
 pyproject.toml |   2 +-
 2 files changed, 177 insertions(+), 142 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 9f528d12..37e2f8f9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -165,7 +165,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "coverage"
-version = "6.0.2"
+version = "6.1.1"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -213,12 +213,15 @@ trio = ["trio (>=0.14.0)", "sniffio (>=1.1)"]
 
 [[package]]
 name = "dunamai"
-version = "1.6.0"
+version = "1.7.0"
 description = "Dynamic version generation"
 category = "main"
 optional = false
 python-versions = ">=3.5,<4.0"
 
+[package.dependencies]
+packaging = ">=20.9"
+
 [[package]]
 name = "email-validator"
 version = "1.1.3"
@@ -256,10 +259,11 @@ description = "FastAPI framework, high performance, easy to learn, fast to code,
 category = "main"
 optional = false
 python-versions = ">=3.6.1"
+develop = false
 
 [package.dependencies]
 pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0"
-starlette = "0.16.0"
+starlette = "0.17.0"
 
 [package.extras]
 all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"]
@@ -267,6 +271,12 @@ dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<
 doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"]
 test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"]
 
+[package.source]
+type = "git"
+url = "https://github.com/kevr/fastapi.git"
+reference = "upgrade-starlette-0.17.0"
+resolved_reference = "5d2d79e6bafd86564c318b7f99153132cd6ca466"
+
 [[package]]
 name = "feedgen"
 version = "0.9.0"
@@ -428,7 +438,7 @@ python-versions = "*"
 
 [[package]]
 name = "isort"
-version = "5.9.3"
+version = "5.10.0"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
@@ -464,7 +474,7 @@ i18n = ["Babel (>=2.7)"]
 
 [[package]]
 name = "lxml"
-version = "4.6.3"
+version = "4.6.4"
 description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
 category = "main"
 optional = false
@@ -544,14 +554,14 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "packaging"
-version = "21.0"
+version = "21.2"
 description = "Core utilities for Python packages"
 category = "main"
 optional = false
 python-versions = ">=3.6"
 
 [package.dependencies]
-pyparsing = ">=2.0.2"
+pyparsing = ">=2.0.2,<3"
 
 [[package]]
 name = "paginate"
@@ -619,7 +629,7 @@ prometheus-client = ">=0.8.0,<1.0.0"
 
 [[package]]
 name = "protobuf"
-version = "3.19.0"
+version = "3.19.1"
 description = "Protocol Buffers"
 category = "main"
 optional = false
@@ -627,11 +637,11 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "py"
-version = "1.10.0"
+version = "1.11.0"
 description = "library with cross-python path, ini-parsing, io, code, log facilities"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "pycodestyle"
@@ -643,7 +653,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "pycparser"
-version = "2.20"
+version = "2.21"
 description = "C parser in Python"
 category = "main"
 optional = false
@@ -743,7 +753,7 @@ testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtuale
 
 [[package]]
 name = "pytest-tap"
-version = "3.2"
+version = "3.3"
 description = "Test Anything Protocol (TAP) reporting plugin for pytest"
 category = "dev"
 optional = false
@@ -876,7 +886,7 @@ sqlcipher = ["sqlcipher3-binary"]
 
 [[package]]
 name = "starlette"
-version = "0.16.0"
+version = "0.17.0"
 description = "The little ASGI library that shines."
 category = "main"
 optional = false
@@ -886,7 +896,7 @@ python-versions = ">=3.6"
 anyio = ">=3.0.0,<4"
 
 [package.extras]
-full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"]
+full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"]
 
 [[package]]
 name = "tap.py"
@@ -909,7 +919,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "tomli"
-version = "1.2.1"
+version = "1.2.2"
 description = "A lil' TOML parser"
 category = "dev"
 optional = false
@@ -993,7 +1003,7 @@ h11 = ">=0.9.0,<1"
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.10"
-content-hash = "569b0489389b884d269458f8e4252efcf3ebbbaa5fa77b6d09d7f0cdbda53362"
+content-hash = "356b37d545d78b8aa1e1939f42522207bcf79526abe8193308c5a2955897d6fd"
 
 [metadata.files]
 aiofiles = [
@@ -1106,39 +1116,55 @@ colorama = [
     {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
 ]
 coverage = [
-    {file = "coverage-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1549e1d08ce38259de2bc3e9a0d5f3642ff4a8f500ffc1b2df73fd621a6cdfc0"},
-    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bcae10fccb27ca2a5f456bf64d84110a5a74144be3136a5e598f9d9fb48c0caa"},
-    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:53a294dc53cfb39c74758edaa6305193fb4258a30b1f6af24b360a6c8bd0ffa7"},
-    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8251b37be1f2cd9c0e5ccd9ae0380909c24d2a5ed2162a41fcdbafaf59a85ebd"},
-    {file = "coverage-6.0.2-cp310-cp310-win32.whl", hash = "sha256:db42baa892cba723326284490283a68d4de516bfb5aaba369b4e3b2787a778b7"},
-    {file = "coverage-6.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:bbffde2a68398682623d9dd8c0ca3f46fda074709b26fcf08ae7a4c431a6ab2d"},
-    {file = "coverage-6.0.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:60e51a3dd55540bec686d7fff61b05048ca31e804c1f32cbb44533e6372d9cc3"},
-    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a6a9409223a27d5ef3cca57dd7cd4dfcb64aadf2fad5c3b787830ac9223e01a"},
-    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4b34ae4f51bbfa5f96b758b55a163d502be3dcb24f505d0227858c2b3f94f5b9"},
-    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3bbda1b550e70fa6ac40533d3f23acd4f4e9cb4e6e77251ce77fdf41b3309fb2"},
-    {file = "coverage-6.0.2-cp36-cp36m-win32.whl", hash = "sha256:4e28d2a195c533b58fc94a12826f4431726d8eb029ac21d874345f943530c122"},
-    {file = "coverage-6.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a82d79586a0a4f5fd1cf153e647464ced402938fbccb3ffc358c7babd4da1dd9"},
-    {file = "coverage-6.0.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3be1206dc09fb6298de3fce70593e27436862331a85daee36270b6d0e1c251c4"},
-    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9cd3828bbe1a40070c11fe16a51df733fd2f0cb0d745fb83b7b5c1f05967df7"},
-    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d036dc1ed8e1388e995833c62325df3f996675779541f682677efc6af71e96cc"},
-    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04560539c19ec26995ecfb3d9307ff154fbb9a172cb57e3b3cfc4ced673103d1"},
-    {file = "coverage-6.0.2-cp37-cp37m-win32.whl", hash = "sha256:e4fb7ced4d9dec77d6cf533acfbf8e1415fe799430366affb18d69ee8a3c6330"},
-    {file = "coverage-6.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:77b1da5767ed2f44611bc9bc019bc93c03fa495728ec389759b6e9e5039ac6b1"},
-    {file = "coverage-6.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:61b598cbdbaae22d9e34e3f675997194342f866bb1d781da5d0be54783dce1ff"},
-    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36e9040a43d2017f2787b28d365a4bb33fcd792c7ff46a047a04094dc0e2a30d"},
-    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9f1627e162e3864a596486774876415a7410021f4b67fd2d9efdf93ade681afc"},
-    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e7a0b42db2a47ecb488cde14e0f6c7679a2c5a9f44814393b162ff6397fcdfbb"},
-    {file = "coverage-6.0.2-cp38-cp38-win32.whl", hash = "sha256:a1b73c7c4d2a42b9d37dd43199c5711d91424ff3c6c22681bc132db4a4afec6f"},
-    {file = "coverage-6.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:1db67c497688fd4ba85b373b37cc52c50d437fd7267520ecd77bddbd89ea22c9"},
-    {file = "coverage-6.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f2f184bf38e74f152eed7f87e345b51f3ab0b703842f447c22efe35e59942c24"},
-    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd1cf1deb3d5544bd942356364a2fdc8959bad2b6cf6eb17f47d301ea34ae822"},
-    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ad9b8c1206ae41d46ec7380b78ba735ebb77758a650643e841dd3894966c31d0"},
-    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:381d773d896cc7f8ba4ff3b92dee4ed740fb88dfe33b6e42efc5e8ab6dfa1cfe"},
-    {file = "coverage-6.0.2-cp39-cp39-win32.whl", hash = "sha256:424c44f65e8be58b54e2b0bd1515e434b940679624b1b72726147cfc6a9fc7ce"},
-    {file = "coverage-6.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:abbff240f77347d17306d3201e14431519bf64495648ca5a49571f988f88dee9"},
-    {file = "coverage-6.0.2-pp36-none-any.whl", hash = "sha256:7092eab374346121805fb637572483270324407bf150c30a3b161fc0c4ca5164"},
-    {file = "coverage-6.0.2-pp37-none-any.whl", hash = "sha256:30922626ce6f7a5a30bdba984ad21021529d3d05a68b4f71ea3b16bda35b8895"},
-    {file = "coverage-6.0.2.tar.gz", hash = "sha256:6807947a09510dc31fa86f43595bf3a14017cd60bf633cc746d52141bfa6b149"},
+    {file = "coverage-6.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:42a1fb5dee3355df90b635906bb99126faa7936d87dfc97eacc5293397618cb7"},
+    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a00284dbfb53b42e35c7dd99fc0e26ef89b4a34efff68078ed29d03ccb28402a"},
+    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:51a441011a30d693e71dea198b2a6f53ba029afc39f8e2aeb5b77245c1b282ef"},
+    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e76f017b6d4140a038c5ff12be1581183d7874e41f1c0af58ecf07748d36a336"},
+    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7833c872718dc913f18e51ee97ea0dece61d9930893a58b20b3daf09bb1af6b6"},
+    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8186b5a4730c896cbe1e4b645bdc524e62d874351ae50e1db7c3e9f5dc81dc26"},
+    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bbca34dca5a2d60f81326d908d77313816fad23d11b6069031a3d6b8c97a54f9"},
+    {file = "coverage-6.1.1-cp310-cp310-win32.whl", hash = "sha256:72bf437d54186d104388cbae73c9f2b0f8a3e11b6e8d7deb593bd14625c96026"},
+    {file = "coverage-6.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:994ce5a7b3d20981b81d83618aa4882f955bfa573efdbef033d5632b58597ba9"},
+    {file = "coverage-6.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ab6a0fe4c96f8058d41948ddf134420d3ef8c42d5508b5a341a440cce7a37a1d"},
+    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10ab138b153e4cc408b43792cb7f518f9ee02f4ff55cd1ab67ad6fd7e9905c7e"},
+    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7e083d32965d2eb6638a77e65b622be32a094fdc0250f28ce6039b0732fbcaa8"},
+    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:359a32515e94e398a5c0fa057e5887a42e647a9502d8e41165cf5cb8d3d1ca67"},
+    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:bf656cd74ff7b4ed7006cdb2a6728150aaad69c7242b42a2a532f77b63ea233f"},
+    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:dc5023be1c2a8b0a0ab5e31389e62c28b2453eb31dd069f4b8d1a0f9814d951a"},
+    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:557594a50bfe3fb0b1b57460f6789affe8850ad19c1acf2d14a3e12b2757d489"},
+    {file = "coverage-6.1.1-cp36-cp36m-win32.whl", hash = "sha256:9eb0a1923354e0fdd1c8a6f53f5db2e6180d670e2b587914bf2e79fa8acfd003"},
+    {file = "coverage-6.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:04a92a6cf9afd99f9979c61348ec79725a9f9342fb45e63c889e33c04610d97b"},
+    {file = "coverage-6.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:479228e1b798d3c246ac89b09897ee706c51b3e5f8f8d778067f38db73ccc717"},
+    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78287731e3601ea5ce9d6468c82d88a12ef8fe625d6b7bdec9b45d96c1ad6533"},
+    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c95257aa2ccf75d3d91d772060538d5fea7f625e48157f8ca44594f94d41cb33"},
+    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9ad5895938a894c368d49d8470fe9f519909e5ebc6b8f8ea5190bd0df6aa4271"},
+    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:326d944aad0189603733d646e8d4a7d952f7145684da973c463ec2eefe1387c2"},
+    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e7d5606b9240ed4def9cbdf35be4308047d11e858b9c88a6c26974758d6225ce"},
+    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:572f917267f363101eec375c109c9c1118037c7cc98041440b5eabda3185ac7b"},
+    {file = "coverage-6.1.1-cp37-cp37m-win32.whl", hash = "sha256:35cd2230e1ed76df7d0081a997f0fe705be1f7d8696264eb508076e0d0b5a685"},
+    {file = "coverage-6.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:65ad3ff837c89a229d626b8004f0ee32110f9bfdb6a88b76a80df36ccc60d926"},
+    {file = "coverage-6.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:977ce557d79577a3dd510844904d5d968bfef9489f512be65e2882e1c6eed7d8"},
+    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62512c0ec5d307f56d86504c58eace11c1bc2afcdf44e3ff20de8ca427ca1d0e"},
+    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2e5b9c17a56b8bf0c0a9477fcd30d357deb486e4e1b389ed154f608f18556c8a"},
+    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:666c6b32b69e56221ad1551d377f718ed00e6167c7a1b9257f780b105a101271"},
+    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:fb2fa2f6506c03c48ca42e3fe5a692d7470d290c047ee6de7c0f3e5fa7639ac9"},
+    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f0f80e323a17af63eac6a9db0c9188c10f1fd815c3ab299727150cc0eb92c7a4"},
+    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:738e823a746841248b56f0f3bd6abf3b73af191d1fd65e4c723b9c456216f0ad"},
+    {file = "coverage-6.1.1-cp38-cp38-win32.whl", hash = "sha256:8605add58e6a960729aa40c0fd9a20a55909dd9b586d3e8104cc7f45869e4c6b"},
+    {file = "coverage-6.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:6e994003e719458420e14ffb43c08f4c14990e20d9e077cb5cad7a3e419bbb54"},
+    {file = "coverage-6.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e3c4f5211394cd0bf6874ac5d29684a495f9c374919833dcfff0bd6d37f96201"},
+    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e14bceb1f3ae8a14374be2b2d7bc12a59226872285f91d66d301e5f41705d4d6"},
+    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0147f7833c41927d84f5af9219d9b32f875c0689e5e74ac8ca3cb61e73a698f9"},
+    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b1d0a1bce919de0dd8da5cff4e616b2d9e6ebf3bd1410ff645318c3dd615010a"},
+    {file = "coverage-6.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ae6de0e41f44794e68d23644636544ed8003ce24845f213b24de097cbf44997f"},
+    {file = "coverage-6.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db2797ed7a7e883b9ab76e8e778bb4c859fc2037d6fd0644d8675e64d58d1653"},
+    {file = "coverage-6.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c40966b683d92869b72ea3c11fd6b99a091fd30e12652727eca117273fc97366"},
+    {file = "coverage-6.1.1-cp39-cp39-win32.whl", hash = "sha256:a11a2c019324fc111485e79d55907e7289e53d0031275a6c8daed30690bc50c0"},
+    {file = "coverage-6.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:4d8b453764b9b26b0dd2afb83086a7c3f9379134e340288d2a52f8a91592394b"},
+    {file = "coverage-6.1.1-pp36-none-any.whl", hash = "sha256:3b270c6b48d3ff5a35deb3648028ba2643ad8434b07836782b1139cf9c66313f"},
+    {file = "coverage-6.1.1-pp37-none-any.whl", hash = "sha256:ffa8fee2b1b9e60b531c4c27cf528d6b5d5da46b1730db1f4d6eee56ff282e07"},
+    {file = "coverage-6.1.1-pp38-none-any.whl", hash = "sha256:4cd919057636f63ab299ccb86ea0e78b87812400c76abab245ca385f17d19fb5"},
+    {file = "coverage-6.1.1.tar.gz", hash = "sha256:b8e4f15b672c9156c1154249a9c5746e86ac9ae9edc3799ee3afebc323d9d9e0"},
 ]
 cryptography = [
     {file = "cryptography-35.0.0-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:d57e0cdc1b44b6cdf8af1d01807db06886f10177469312fbde8f44ccbb284bc9"},
@@ -1167,8 +1193,8 @@ dnspython = [
     {file = "dnspython-2.1.0.zip", hash = "sha256:e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4"},
 ]
 dunamai = [
-    {file = "dunamai-1.6.0-py3-none-any.whl", hash = "sha256:44a94a4edebb145bb6198a2f26de957b12b77d43b7c9c0646be814c60cf5d8df"},
-    {file = "dunamai-1.6.0.tar.gz", hash = "sha256:6f1111f47e869ed58d44a7d37f112e3e7c761dce3c71f2c5464526928d7e9896"},
+    {file = "dunamai-1.7.0-py3-none-any.whl", hash = "sha256:375e017eb014681e9c8f6e7f2c4c2065ef35832d429f8b70900bed24e8be83f8"},
+    {file = "dunamai-1.7.0.tar.gz", hash = "sha256:6abfeb91768caea59d65a4989cec49472fa66ee04dcd6a5c9f92ebc019926a93"},
 ]
 email-validator = [
     {file = "email_validator-1.1.3-py2.py3-none-any.whl", hash = "sha256:5675c8ceb7106a37e40e2698a57c056756bf3f272cfa8682a4f87ebd95d8440b"},
@@ -1178,10 +1204,7 @@ fakeredis = [
     {file = "fakeredis-1.6.1-py3-none-any.whl", hash = "sha256:5eb1516f1fe1813e9da8f6c482178fc067af09f53de587ae03887ef5d9d13024"},
     {file = "fakeredis-1.6.1.tar.gz", hash = "sha256:0d06a9384fb79da9f2164ce96e34eb9d4e2ea46215070805ea6fd3c174590b47"},
 ]
-fastapi = [
-    {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"},
-    {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"},
-]
+fastapi = []
 feedgen = [
     {file = "feedgen-0.9.0.tar.gz", hash = "sha256:8e811bdbbed6570034950db23a4388453628a70e689a6e8303ccec430f5a804a"},
 ]
@@ -1282,8 +1305,8 @@ iniconfig = [
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 isort = [
-    {file = "isort-5.9.3-py3-none-any.whl", hash = "sha256:e17d6e2b81095c9db0a03a8025a957f334d6ea30b26f9ec70805411e5c7c81f2"},
-    {file = "isort-5.9.3.tar.gz", hash = "sha256:9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899"},
+    {file = "isort-5.10.0-py3-none-any.whl", hash = "sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f"},
+    {file = "isort-5.10.0.tar.gz", hash = "sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345"},
 ]
 itsdangerous = [
     {file = "itsdangerous-2.0.1-py3-none-any.whl", hash = "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c"},
@@ -1294,54 +1317,66 @@ jinja2 = [
     {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"},
 ]
 lxml = [
-    {file = "lxml-4.6.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:df7c53783a46febb0e70f6b05df2ba104610f2fb0d27023409734a3ecbb78fb2"},
-    {file = "lxml-4.6.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:1b7584d421d254ab86d4f0b13ec662a9014397678a7c4265a02a6d7c2b18a75f"},
-    {file = "lxml-4.6.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:079f3ae844f38982d156efce585bc540c16a926d4436712cf4baee0cce487a3d"},
-    {file = "lxml-4.6.3-cp27-cp27m-win32.whl", hash = "sha256:bc4313cbeb0e7a416a488d72f9680fffffc645f8a838bd2193809881c67dd106"},
-    {file = "lxml-4.6.3-cp27-cp27m-win_amd64.whl", hash = "sha256:8157dadbb09a34a6bd95a50690595e1fa0af1a99445e2744110e3dca7831c4ee"},
-    {file = "lxml-4.6.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:7728e05c35412ba36d3e9795ae8995e3c86958179c9770e65558ec3fdfd3724f"},
-    {file = "lxml-4.6.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:4bff24dfeea62f2e56f5bab929b4428ae6caba2d1eea0c2d6eb618e30a71e6d4"},
-    {file = "lxml-4.6.3-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:64812391546a18896adaa86c77c59a4998f33c24788cadc35789e55b727a37f4"},
-    {file = "lxml-4.6.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:c1a40c06fd5ba37ad39caa0b3144eb3772e813b5fb5b084198a985431c2f1e8d"},
-    {file = "lxml-4.6.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:74f7d8d439b18fa4c385f3f5dfd11144bb87c1da034a466c5b5577d23a1d9b51"},
-    {file = "lxml-4.6.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f90ba11136bfdd25cae3951af8da2e95121c9b9b93727b1b896e3fa105b2f586"},
-    {file = "lxml-4.6.3-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:4c61b3a0db43a1607d6264166b230438f85bfed02e8cff20c22e564d0faff354"},
-    {file = "lxml-4.6.3-cp35-cp35m-manylinux2014_x86_64.whl", hash = "sha256:5c8c163396cc0df3fd151b927e74f6e4acd67160d6c33304e805b84293351d16"},
-    {file = "lxml-4.6.3-cp35-cp35m-win32.whl", hash = "sha256:f2380a6376dfa090227b663f9678150ef27543483055cc327555fb592c5967e2"},
-    {file = "lxml-4.6.3-cp35-cp35m-win_amd64.whl", hash = "sha256:c4f05c5a7c49d2fb70223d0d5bcfbe474cf928310ac9fa6a7c6dddc831d0b1d4"},
-    {file = "lxml-4.6.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d2e35d7bf1c1ac8c538f88d26b396e73dd81440d59c1ef8522e1ea77b345ede4"},
-    {file = "lxml-4.6.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:289e9ca1a9287f08daaf796d96e06cb2bc2958891d7911ac7cae1c5f9e1e0ee3"},
-    {file = "lxml-4.6.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:bccbfc27563652de7dc9bdc595cb25e90b59c5f8e23e806ed0fd623755b6565d"},
-    {file = "lxml-4.6.3-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d916d31fd85b2f78c76400d625076d9124de3e4bda8b016d25a050cc7d603f24"},
-    {file = "lxml-4.6.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:820628b7b3135403540202e60551e741f9b6d3304371712521be939470b454ec"},
-    {file = "lxml-4.6.3-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:c47ff7e0a36d4efac9fd692cfa33fbd0636674c102e9e8d9b26e1b93a94e7617"},
-    {file = "lxml-4.6.3-cp36-cp36m-win32.whl", hash = "sha256:5a0a14e264069c03e46f926be0d8919f4105c1623d620e7ec0e612a2e9bf1c04"},
-    {file = "lxml-4.6.3-cp36-cp36m-win_amd64.whl", hash = "sha256:92e821e43ad382332eade6812e298dc9701c75fe289f2a2d39c7960b43d1e92a"},
-    {file = "lxml-4.6.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:efd7a09678fd8b53117f6bae4fa3825e0a22b03ef0a932e070c0bdbb3a35e654"},
-    {file = "lxml-4.6.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:efac139c3f0bf4f0939f9375af4b02c5ad83a622de52d6dfa8e438e8e01d0eb0"},
-    {file = "lxml-4.6.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:0fbcf5565ac01dff87cbfc0ff323515c823081c5777a9fc7703ff58388c258c3"},
-    {file = "lxml-4.6.3-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:36108c73739985979bf302006527cf8a20515ce444ba916281d1c43938b8bb96"},
-    {file = "lxml-4.6.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:122fba10466c7bd4178b07dba427aa516286b846b2cbd6f6169141917283aae2"},
-    {file = "lxml-4.6.3-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:cdaf11d2bd275bf391b5308f86731e5194a21af45fbaaaf1d9e8147b9160ea92"},
-    {file = "lxml-4.6.3-cp37-cp37m-win32.whl", hash = "sha256:3439c71103ef0e904ea0a1901611863e51f50b5cd5e8654a151740fde5e1cade"},
-    {file = "lxml-4.6.3-cp37-cp37m-win_amd64.whl", hash = "sha256:4289728b5e2000a4ad4ab8da6e1db2e093c63c08bdc0414799ee776a3f78da4b"},
-    {file = "lxml-4.6.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b007cbb845b28db4fb8b6a5cdcbf65bacb16a8bd328b53cbc0698688a68e1caa"},
-    {file = "lxml-4.6.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:76fa7b1362d19f8fbd3e75fe2fb7c79359b0af8747e6f7141c338f0bee2f871a"},
-    {file = "lxml-4.6.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:26e761ab5b07adf5f555ee82fb4bfc35bf93750499c6c7614bd64d12aaa67927"},
-    {file = "lxml-4.6.3-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:e1cbd3f19a61e27e011e02f9600837b921ac661f0c40560eefb366e4e4fb275e"},
-    {file = "lxml-4.6.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:66e575c62792c3f9ca47cb8b6fab9e35bab91360c783d1606f758761810c9791"},
-    {file = "lxml-4.6.3-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:1b38116b6e628118dea5b2186ee6820ab138dbb1e24a13e478490c7db2f326ae"},
-    {file = "lxml-4.6.3-cp38-cp38-win32.whl", hash = "sha256:89b8b22a5ff72d89d48d0e62abb14340d9e99fd637d046c27b8b257a01ffbe28"},
-    {file = "lxml-4.6.3-cp38-cp38-win_amd64.whl", hash = "sha256:2a9d50e69aac3ebee695424f7dbd7b8c6d6eb7de2a2eb6b0f6c7db6aa41e02b7"},
-    {file = "lxml-4.6.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ce256aaa50f6cc9a649c51be3cd4ff142d67295bfc4f490c9134d0f9f6d58ef0"},
-    {file = "lxml-4.6.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:7610b8c31688f0b1be0ef882889817939490a36d0ee880ea562a4e1399c447a1"},
-    {file = "lxml-4.6.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f8380c03e45cf09f8557bdaa41e1fa7c81f3ae22828e1db470ab2a6c96d8bc23"},
-    {file = "lxml-4.6.3-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:3082c518be8e97324390614dacd041bb1358c882d77108ca1957ba47738d9d59"},
-    {file = "lxml-4.6.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:884ab9b29feaca361f7f88d811b1eea9bfca36cf3da27768d28ad45c3ee6f969"},
-    {file = "lxml-4.6.3-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:6f12e1427285008fd32a6025e38e977d44d6382cf28e7201ed10d6c1698d2a9a"},
-    {file = "lxml-4.6.3-cp39-cp39-win32.whl", hash = "sha256:33bb934a044cf32157c12bfcfbb6649807da20aa92c062ef51903415c704704f"},
-    {file = "lxml-4.6.3-cp39-cp39-win_amd64.whl", hash = "sha256:542d454665a3e277f76954418124d67516c5f88e51a900365ed54a9806122b83"},
-    {file = "lxml-4.6.3.tar.gz", hash = "sha256:39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468"},
+    {file = "lxml-4.6.4-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:bbf2dc330bd44bfc0254ab37677ec60f7c7ecea55ad8ba1b8b2ea7bf20c265f5"},
+    {file = "lxml-4.6.4-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b667c51682fe9b9788c69465956baa8b6999531876ccedcafc895c74ad716cd8"},
+    {file = "lxml-4.6.4-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:72e730d33fe2e302fd07285f14624fca5e5e2fb2bb4fb2c3941e318c41c443d1"},
+    {file = "lxml-4.6.4-cp27-cp27m-win32.whl", hash = "sha256:433df8c7dde0f9e41cbf4f36b0829d50a378116ef5e962ba3881f2f5f025c7be"},
+    {file = "lxml-4.6.4-cp27-cp27m-win_amd64.whl", hash = "sha256:35752ee40f7bbf6adc9ff4e1f4b84794a3593736dcce80db32e3c2aa85e294ac"},
+    {file = "lxml-4.6.4-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5ff5bb2a198ea67403bb6818705e9a4f90e0313f2215428ec51001ce56d939fb"},
+    {file = "lxml-4.6.4-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:9b87727561c1150c0cc91c5d9d389448b37a7d15f0ba939ed3d1acb2f11bf6c5"},
+    {file = "lxml-4.6.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:45fdb2899c755138722797161547a40b3e2a06feda620cc41195ee7e97806d81"},
+    {file = "lxml-4.6.4-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:38b9de0de3aa689fe9fb9877ae1be1e83b8cf9621f7e62049d0436b9ecf4ad64"},
+    {file = "lxml-4.6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:662523cd2a0246740225c7e32531f2e766544122e58bee70e700a024cfc0cf81"},
+    {file = "lxml-4.6.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:4aa349c5567651f34d4eaae7de6ed5b523f6d70a288f9c6fbac22d13a0784e04"},
+    {file = "lxml-4.6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:08eb9200d88b376a8ed5e50f1dc1d1a45b49305169674002a3b5929943390591"},
+    {file = "lxml-4.6.4-cp310-cp310-win32.whl", hash = "sha256:bdc224f216ead849e902151112efef6e96c41ee1322e15d4e5f7c8a826929aee"},
+    {file = "lxml-4.6.4-cp310-cp310-win_amd64.whl", hash = "sha256:ab6db93a2b6b66cbf62b4e4a7135f476e708e8c5c990d186584142c77d7f975a"},
+    {file = "lxml-4.6.4-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:50790313df028aa05cf22be9a8da033b86c42fa32523e4fd944827b482b17bf0"},
+    {file = "lxml-4.6.4-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6764998345552b1dfc9326a932d2bad6367c6b37a176bb73ada6b9486bf602f7"},
+    {file = "lxml-4.6.4-cp35-cp35m-win32.whl", hash = "sha256:543b239b191bb3b6d9bef5f09f1fb2be5b7eb09ab4d386aa655e4d53fbe9ff47"},
+    {file = "lxml-4.6.4-cp35-cp35m-win_amd64.whl", hash = "sha256:a75c1ad05eedb1a3ff2a34a52a4f0836cfaa892e12796ba39a7732c82701eff4"},
+    {file = "lxml-4.6.4-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:47e955112ce64241fdb357acf0216081f9f3255b3ac9c502ca4b3323ec1ca558"},
+    {file = "lxml-4.6.4-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:20d7c8d90d449c6a353b15ee0459abae8395dbe59ad01e406ccbf30cd81c6f98"},
+    {file = "lxml-4.6.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:240db6f3228d26e3c6f4fad914b9ddaaf8707254e8b3efd564dc680c8ec3c264"},
+    {file = "lxml-4.6.4-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:351482da8dd028834028537f08724b1de22d40dcf3bb723b469446564f409074"},
+    {file = "lxml-4.6.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e678a643177c0e5ec947b645fa7bc84260dfb9b6bf8fb1fdd83008dfc2ca5928"},
+    {file = "lxml-4.6.4-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:15d0381feb56f08f78c5cc4fc385ddfe0bde1456e37f54a9322833371aec4060"},
+    {file = "lxml-4.6.4-cp36-cp36m-win32.whl", hash = "sha256:4ba74afe5ee5cb5e28d83b513a6e8f0875fda1dc1a9aea42cc0065f029160d2a"},
+    {file = "lxml-4.6.4-cp36-cp36m-win_amd64.whl", hash = "sha256:9c91a73971a922c13070fd8fa5a114c858251791ba2122a941e6aa781c713e44"},
+    {file = "lxml-4.6.4-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:6020c70ff695106bf80651953a23e37718ef1fee9abd060dcad8e32ab2dc13f3"},
+    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f5dd358536b8a964bf6bd48de038754c1609e72e5f17f5d21efe2dda17594dbf"},
+    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:7ae7089d81fc502df4b217ad77f03c54039fe90dac0acbe70448d7e53bfbc57e"},
+    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:80d10d53d3184837445ff8562021bdd37f57c4cadacbf9d8726cc16220a00d54"},
+    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e95da348d57eb448d226a44b868ff2ca5786fbcbe417ac99ff62d0a7d724b9c7"},
+    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:ffd65cfa33fed01735c82aca640fde4cc63f0414775cba11e06f84fae2085a6e"},
+    {file = "lxml-4.6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:877666418598f6cb289546c77ff87590cfd212f903b522b0afa0b9fb73b3ccfb"},
+    {file = "lxml-4.6.4-cp37-cp37m-win32.whl", hash = "sha256:e91d24623e747eeb2d8121f4a94c6a7ad27dc48e747e2dc95bfe88632bd028a2"},
+    {file = "lxml-4.6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:4ec9a80dd5704ecfde54319b6964368daf02848c8954d3bacb9b64d1c7659159"},
+    {file = "lxml-4.6.4-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:2901625f4a878a055d275beedc20ba9cb359cefc4386a967222fee29eb236038"},
+    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b567178a74a2261345890eac66fbf394692a6e002709d329f28a673ca6042473"},
+    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4717123f7c11c81e0da69989e5a64079c3f402b0efeb4c6241db6c369d657bd8"},
+    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:cf201bf5594d1aab139fe53e3fca457e4f8204a5bbd65d48ab3b82a16f517868"},
+    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a77a3470ba37e11872c75ca95baf9b3312133a3d5a5dc720803b23098c653976"},
+    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:619c6d2b552bba00491e96c0518aad94002651c108a0f7364ff2d7798812c00e"},
+    {file = "lxml-4.6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:601f0ab75538b280aaf1e720eb9d68d4fa104ac274e1e9e6971df488f4dcdb0f"},
+    {file = "lxml-4.6.4-cp38-cp38-win32.whl", hash = "sha256:75d3c5bbc0ddbad03bb68b9be638599f67e4b98ed3dcd0fec9f6f39e41ee96cb"},
+    {file = "lxml-4.6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4341d135f5660db10184963d9c3418c3e28d7f868aaf8b11a323ebf85813f7f4"},
+    {file = "lxml-4.6.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:9db24803fa71e3305fe4a7812782b708da21a0b774b130dd1860cf40a6d7a3ee"},
+    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:afd60230ad9d8bcba005945ec3a343722f09e0b7f8ae804246e5d2cfc6bd71a6"},
+    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:0c15e1cd55055956e77b0732270f1c6005850696bc3ef3e03d01e78af84eaa42"},
+    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:6d422b3c729737d8a39279a25fa156c983a56458f8b2f97661ee6fb22b80b1d6"},
+    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2eb90f6ec3c236ef2f1bb38aee7c0d23e77d423d395af6326e7cca637519a4cb"},
+    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:51a0e5d243687596f46e24e464121d4b232ad772e2d1785b2a2c0eb413c285d4"},
+    {file = "lxml-4.6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d43bd68714049c84e297c005456a15ecdec818f7b5aa5868c8b0a865cfb78a44"},
+    {file = "lxml-4.6.4-cp39-cp39-win32.whl", hash = "sha256:ee9e4b07b0eba4b6a521509e9e1877476729c1243246b6959de697ebea739643"},
+    {file = "lxml-4.6.4-cp39-cp39-win_amd64.whl", hash = "sha256:48eaac2991b3036175b42ee8d3c23f4cca13f2be8426bf29401a690ab58c88f4"},
+    {file = "lxml-4.6.4-pp37-pypy37_pp73-macosx_10_14_x86_64.whl", hash = "sha256:2b06a91cf7b8acea7793006e4ae50646cef0fe35ce5acd4f5cb1c77eb228e4a1"},
+    {file = "lxml-4.6.4-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:523f195948a1ba4f9f5b7294d83c6cd876547dc741820750a7e5e893a24bbe38"},
+    {file = "lxml-4.6.4-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:b0ca0ada9d3bc18bd6f611bd001a28abdd49ab9698bd6d717f7f5394c8e94628"},
+    {file = "lxml-4.6.4-pp38-pypy38_pp73-macosx_10_14_x86_64.whl", hash = "sha256:197b7cb7a753cf553a45115739afd8458464a28913da00f5c525063f94cd3f48"},
+    {file = "lxml-4.6.4-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:6298f5b42a26581206ef63fffa97c754245d329414108707c525512a5197f2ba"},
+    {file = "lxml-4.6.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:0b12c95542f04d10cba46b3ff28ea52ea56995b78cf918f0b11b05e75812bb79"},
+    {file = "lxml-4.6.4.tar.gz", hash = "sha256:daf9bd1fee31f1c7a5928b3e1059e09a8d683ea58fb3ffc773b6c88cb8d1399c"},
 ]
 mako = [
     {file = "Mako-1.1.5-py2.py3-none-any.whl", hash = "sha256:6804ee66a7f6a6416910463b00d76a7b25194cd27f1918500c5bd7be2a088a23"},
@@ -1445,8 +1480,8 @@ orjson = [
     {file = "orjson-3.6.4.tar.gz", hash = "sha256:f8dbc428fc6d7420f231a7133d8dff4c882e64acb585dcf2fda74bdcfe1a6d9d"},
 ]
 packaging = [
-    {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"},
-    {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"},
+    {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
+    {file = "packaging-21.2.tar.gz", hash = "sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"},
 ]
 paginate = [
     {file = "paginate-0.5.6.tar.gz", hash = "sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d"},
@@ -1472,42 +1507,42 @@ prometheus-fastapi-instrumentator = [
     {file = "prometheus_fastapi_instrumentator-5.7.1-py3-none-any.whl", hash = "sha256:da40ea0df14b0e95d584769747fba777522a8df6a8c47cec2edf798f1fff49b5"},
 ]
 protobuf = [
-    {file = "protobuf-3.19.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:01a0645ef3acddfbc90237e1cdfae1086130fc7cb480b5874656193afd657083"},
-    {file = "protobuf-3.19.0-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:d3861c9721a90ba83ee0936a9cfcc4fa1c4b4144ac9658fb6f6343b38558e9b4"},
-    {file = "protobuf-3.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b64be5d7270cf5e76375bac049846e8a9543a2d4368b69afe78ab725380a7487"},
-    {file = "protobuf-3.19.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:2f6046b9e2feee0dce994493186e8715b4392ed5f50f356280ad9c2f9f93080a"},
-    {file = "protobuf-3.19.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac2f8ec942d414609aba0331952ae12bb823e8f424bbb6b8c422f1cef32dc842"},
-    {file = "protobuf-3.19.0-cp36-cp36m-win32.whl", hash = "sha256:3fea09aa04ef2f8b01fcc9bb87f19509934f8a35d177c865b8f9ee5c32b60c1b"},
-    {file = "protobuf-3.19.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d1f4277d321f60456845ca9b882c4845736f1f5c1c69eb778eba22a97977d8af"},
-    {file = "protobuf-3.19.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8488c2276f14f294e890cc1260ab342a13e90cd20dcc03319d2eea258f1fd321"},
-    {file = "protobuf-3.19.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:36bf292f44966c67080e535321501717f4f1eba30faef8f2cd4b0c745a027211"},
-    {file = "protobuf-3.19.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c99af73ae34c93e0e2ace57ea2e70243f34fc015c8c23fd39ee93652e726f7e7"},
-    {file = "protobuf-3.19.0-cp37-cp37m-win32.whl", hash = "sha256:f7a031cf8e2fc14acc0ba694f6dff0a01e06b70d817eba6edc72ee6cc20517ac"},
-    {file = "protobuf-3.19.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d4ca5f0c7bc8d2e6966ca3bbd85e9ebe7191b6e21f067896d4af6b28ecff29fe"},
-    {file = "protobuf-3.19.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9a8a880593015ef2c83f7af797fa4fbf583b2c98b4bd94e46c5b61fee319d84b"},
-    {file = "protobuf-3.19.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:6f16925f5c977dd7787973a50c242e60c22b1d1182aba6bec7bd02862579c10f"},
-    {file = "protobuf-3.19.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9097327d277b0aa4a3224e61cd6850aef3269172397715299bcffc9f90293c9"},
-    {file = "protobuf-3.19.0-cp38-cp38-win32.whl", hash = "sha256:708d04394a63ee9bdc797938b6e15ed5bf24a1cb37743eb3886fd74a5a67a234"},
-    {file = "protobuf-3.19.0-cp38-cp38-win_amd64.whl", hash = "sha256:ee4d07d596357f51316b6ecf1cc1927660e9d5e418385bb1c51fd2496cd9bee7"},
-    {file = "protobuf-3.19.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:34a77b8fafdeb8f89fee2b7108ae60d8958d72e33478680cc1e05517892ecc46"},
-    {file = "protobuf-3.19.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:4f93e0f6af796ddd1502225ff8ea25340ced186ca05b601c44d5c88b45ba80a0"},
-    {file = "protobuf-3.19.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:942dd6bc8bd2a3c6a156d8ab0f80bd45313f22b78e1176283270054dcc8ca4c2"},
-    {file = "protobuf-3.19.0-cp39-cp39-win32.whl", hash = "sha256:7b3867795708ac88fde8d6f34f0d9a50af56087e41f624bdb2e9ff808ea5dda7"},
-    {file = "protobuf-3.19.0-cp39-cp39-win_amd64.whl", hash = "sha256:a74432e9d28a6072a2359a0f49f81eb14dd718e7dbbfb6c0789b456c49e1f130"},
-    {file = "protobuf-3.19.0-py2.py3-none-any.whl", hash = "sha256:c96e94d3e523a82caa3e5f74b35dd1c4884199358d01c950d95c341255ff48bc"},
-    {file = "protobuf-3.19.0.tar.gz", hash = "sha256:6a1dc6584d24ef86f5b104bcad64fa0fe06ed36e5687f426e0445d363a041d18"},
+    {file = "protobuf-3.19.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d80f80eb175bf5f1169139c2e0c5ada98b1c098e2b3c3736667f28cbbea39fc8"},
+    {file = "protobuf-3.19.1-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:a529e7df52204565bcd33738a7a5f288f3d2d37d86caa5d78c458fa5fabbd54d"},
+    {file = "protobuf-3.19.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28ccea56d4dc38d35cd70c43c2da2f40ac0be0a355ef882242e8586c6d66666f"},
+    {file = "protobuf-3.19.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:8b30a7de128c46b5ecb343917d9fa737612a6e8280f440874e5cc2ba0d79b8f6"},
+    {file = "protobuf-3.19.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5935c8ce02e3d89c7900140a8a42b35bc037ec07a6aeb61cc108be8d3c9438a6"},
+    {file = "protobuf-3.19.1-cp36-cp36m-win32.whl", hash = "sha256:74f33edeb4f3b7ed13d567881da8e5a92a72b36495d57d696c2ea1ae0cfee80c"},
+    {file = "protobuf-3.19.1-cp36-cp36m-win_amd64.whl", hash = "sha256:038daf4fa38a7e818dd61f51f22588d61755160a98db087a046f80d66b855942"},
+    {file = "protobuf-3.19.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e51561d72efd5bd5c91490af1f13e32bcba8dab4643761eb7de3ce18e64a853"},
+    {file = "protobuf-3.19.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:6e8ea9173403219239cdfd8d946ed101f2ab6ecc025b0fda0c6c713c35c9981d"},
+    {file = "protobuf-3.19.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db3532d9f7a6ebbe2392041350437953b6d7a792de10e629c1e4f5a6b1fe1ac6"},
+    {file = "protobuf-3.19.1-cp37-cp37m-win32.whl", hash = "sha256:615b426a177780ce381ecd212edc1e0f70db8557ed72560b82096bd36b01bc04"},
+    {file = "protobuf-3.19.1-cp37-cp37m-win_amd64.whl", hash = "sha256:d8919368410110633717c406ab5c97e8df5ce93020cfcf3012834f28b1fab1ea"},
+    {file = "protobuf-3.19.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:71b0250b0cfb738442d60cab68abc166de43411f2a4f791d31378590bfb71bd7"},
+    {file = "protobuf-3.19.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:3cd0458870ea7d1c58e948ac8078f6ba8a7ecc44a57e03032ed066c5bb318089"},
+    {file = "protobuf-3.19.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:655264ed0d0efe47a523e2255fc1106a22f6faab7cc46cfe99b5bae085c2a13e"},
+    {file = "protobuf-3.19.1-cp38-cp38-win32.whl", hash = "sha256:b691d996c6d0984947c4cf8b7ae2fe372d99b32821d0584f0b90277aa36982d3"},
+    {file = "protobuf-3.19.1-cp38-cp38-win_amd64.whl", hash = "sha256:e7e8d2c20921f8da0dea277dfefc6abac05903ceac8e72839b2da519db69206b"},
+    {file = "protobuf-3.19.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fd390367fc211cc0ffcf3a9e149dfeca78fecc62adb911371db0cec5c8b7472d"},
+    {file = "protobuf-3.19.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d83e1ef8cb74009bebee3e61cc84b1c9cd04935b72bca0cbc83217d140424995"},
+    {file = "protobuf-3.19.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:36d90676d6f426718463fe382ec6274909337ca6319d375eebd2044e6c6ac560"},
+    {file = "protobuf-3.19.1-cp39-cp39-win32.whl", hash = "sha256:e7b24c11df36ee8e0c085e5b0dc560289e4b58804746fb487287dda51410f1e2"},
+    {file = "protobuf-3.19.1-cp39-cp39-win_amd64.whl", hash = "sha256:77d2fadcf369b3f22859ab25bd12bb8e98fb11e05d9ff9b7cd45b711c719c002"},
+    {file = "protobuf-3.19.1-py2.py3-none-any.whl", hash = "sha256:e813b1c9006b6399308e917ac5d298f345d95bb31f46f02b60cd92970a9afa17"},
+    {file = "protobuf-3.19.1.tar.gz", hash = "sha256:62a8e4baa9cb9e064eb62d1002eca820857ab2138440cb4b3ea4243830f94ca7"},
 ]
 py = [
-    {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
-    {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
+    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
+    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
 ]
 pycodestyle = [
     {file = "pycodestyle-2.8.0-py2.py3-none-any.whl", hash = "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20"},
     {file = "pycodestyle-2.8.0.tar.gz", hash = "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"},
 ]
 pycparser = [
-    {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
-    {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"},
+    {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
+    {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
 ]
 pydantic = [
     {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"},
@@ -1575,8 +1610,8 @@ pytest-cov = [
     {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"},
 ]
 pytest-tap = [
-    {file = "pytest-tap-3.2.tar.gz", hash = "sha256:1b585c4a636458dbd958d136381bbabb1752c5877d05fac7d6a6001a8a9ddc29"},
-    {file = "pytest_tap-3.2-py3-none-any.whl", hash = "sha256:18f59047f8bc68247d37f807fae7f2f8897d2c7397aea2fd2870f0421dc566cb"},
+    {file = "pytest-tap-3.3.tar.gz", hash = "sha256:5f0919a147cf0396b2f10d64d365a0bf8062e06543e93c675c9d37f5605e983c"},
+    {file = "pytest_tap-3.3-py3-none-any.whl", hash = "sha256:4fbbc0e090c2e94f6199bee4e4f68ab3c5e176b37a72a589ad84e0f72a2fce55"},
 ]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
@@ -1648,8 +1683,8 @@ sqlalchemy = [
     {file = "SQLAlchemy-1.4.26.tar.gz", hash = "sha256:6bc7f9d7d90ef55e8c6db1308a8619cd8f40e24a34f759119b95e7284dca351a"},
 ]
 starlette = [
-    {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"},
-    {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"},
+    {file = "starlette-0.17.0-py3-none-any.whl", hash = "sha256:64ffd950183d474df2cf7a4018c8bbb31a481367691c70f5ace4b2d376235f72"},
+    {file = "starlette-0.17.0.tar.gz", hash = "sha256:31a889e7d7bf487f70d9d197ed7efadb47fa938c58626ed93e381480833c5b84"},
 ]
 "tap.py" = [
     {file = "tap.py-3.0-py2.py3-none-any.whl", hash = "sha256:a598bfaa2e224d71f2e86147c2ef822c18ff2e1b8ef006397e5056b08f92f699"},
@@ -1660,8 +1695,8 @@ toml = [
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
 tomli = [
-    {file = "tomli-1.2.1-py3-none-any.whl", hash = "sha256:8dd0e9524d6f386271a36b41dbf6c57d8e32fd96fd22b6584679dc569d20899f"},
-    {file = "tomli-1.2.1.tar.gz", hash = "sha256:a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442"},
+    {file = "tomli-1.2.2-py3-none-any.whl", hash = "sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade"},
+    {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
 ]
 tomlkit = [
     {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"},
diff --git a/pyproject.toml b/pyproject.toml
index 20855fa6..1d4c858c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,7 +56,7 @@ bcrypt = "^3.2.0"
 bleach = "^4.1.0"
 email-validator = "^1.1.3"
 fakeredis = "^1.6.1"
-fastapi = "^0.70.0"
+fastapi = { git = "https://github.com/kevr/fastapi.git", branch = "upgrade-starlette-0.17.0" }
 feedgen = "^0.9.0"
 httpx = "^0.20.0"
 itsdangerous = "^2.0.1"

From 85ebc72e8af542d73909b6f58f9bfb3b4f40ccd3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 8 Nov 2021 18:18:41 -0800
Subject: [PATCH 531/844] fix(fastapi): only elevated users are allowed to
 suspend accounts

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py                       |  3 ++
 aurweb/routers/accounts.py           |  7 +++-
 po/aurweb.pot                        |  4 +++
 templates/partials/account_form.html | 18 +++++-----
 test/test_accounts_routes.py         | 49 ++++++++++++++++++++++++++++
 5 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 5e45ee83..38754db0 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -51,6 +51,9 @@ class AnonymousUser:
     LangPreference = aurweb.config.get("options", "default_lang")
     Timezone = aurweb.config.get("options", "default_timezone")
 
+    Suspended = 0
+    InactivityTS = 0
+
     # A stub ssh_pub_key relationship.
     ssh_pub_key = None
 
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 152b0a15..498568ad 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -143,6 +143,10 @@ def process_account_form(request: Request, user: models.User, args: dict):
     if not email or not username:
         return (False, ["Missing a required field."])
 
+    inactive = args.get("J", False)
+    if not request.user.is_elevated() and inactive != bool(user.InactivityTS):
+        return (False, ["You do not have permission to suspend accounts."])
+
     username_min_len = aurweb.config.getint("options", "username_min_len")
     username_max_len = aurweb.config.getint("options", "username_max_len")
     if not util.valid_username(args.get("U")):
@@ -528,7 +532,8 @@ async def account_edit_post(request: Request,
         user.Homepage = HP or user.Homepage
         user.IRCNick = I or user.IRCNick
         user.PGPKey = K or user.PGPKey
-        user.InactivityTS = datetime.utcnow().timestamp() if J else 0
+        user.Suspended = J
+        user.InactivityTS = int(datetime.utcnow().timestamp()) * int(J)
 
     # If we update the language, update the cookie as well.
     if L and L != user.LangPreference:
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 721f874e..f4deee70 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -879,6 +879,10 @@ msgstr ""
 msgid "Account suspended"
 msgstr ""
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index f166c230..2e47a932 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -42,14 +42,16 @@
             "account is inactive." | tr }}</em>
         </p>
 
-        <p>
-            <label for="id_inactive">{% trans %}Inactive{% endtrans %}:</label>
-            <input id="id_inactive" type="checkbox" name="J"
-               {% if inactive %}
-                   checked="checked"
-               {% endif %}
-            >
-        </p>
+        {% if request.user.is_elevated() %}
+            <p>
+                <label for="id_inactive">{% trans %}Inactive{% endtrans %}:</label>
+                <input id="id_inactive" type="checkbox" name="J"
+                   {% if inactive %}
+                       checked="checked"
+                   {% endif %}
+                >
+            </p>
+        {% endif %}
 
         {% if request.user.has_credential("CRED_ACCOUNT_CHANGE_TYPE") %}
 		<p>
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 188f7048..5e855daf 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -780,6 +780,55 @@ def test_post_account_edit_error_invalid_password():
     assert "Invalid password." in content
 
 
+def test_post_account_edit_inactivity_unauthorized():
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "J": True,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(f"/account/{user.Username}/edit", data=post_data,
+                            cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    errors = get_errors(resp.text)
+    expected = "You do not have permission to suspend accounts."
+    assert errors[0].text.strip() == expected
+
+
+def test_post_account_edit_inactivity():
+    with db.begin():
+        user.AccountTypeID = TRUSTED_USER_ID
+    assert not user.Suspended
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "J": True,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(f"/account/{user.Username}/edit", data=post_data,
+                            cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Make sure the user record got updated correctly.
+    assert user.Suspended
+    assert user.InactivityTS > 0
+
+    post_data.update({"J": False})
+    with client as request:
+        resp = request.post(f"/account/{user.Username}/edit", data=post_data,
+                            cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    assert not user.Suspended
+    assert user.InactivityTS == 0
+
+
 def test_post_account_edit_error_unauthorized():
     request = Request()
     sid = user.login(request, "testPassword")

From 464540c9a9f41aad52e633698647a9030092dc51 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 9 Nov 2021 00:14:24 -0800
Subject: [PATCH 532/844] fix: use https for aurblup's default mirror instead
 of ftp

It seems the ftp mirror from kernel.org cannot be used anymore,
but the https mirror can. So, the default config has been updated
to reflect this; otherwise, aurblup bugs out.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/config.defaults b/conf/config.defaults
index b078e57c..babfd482 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -98,7 +98,7 @@ max-blob-size = 256000
 [aurblup]
 db-path = /srv/http/aurweb/aurblup/
 sync-dbs = core extra community multilib testing community-testing
-server = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64
+server = https://mirrors.kernel.org/archlinux/%s/os/x86_64
 
 [mkpkglists]
 packagesfile = /srv/http/aurweb/web/html/packages.gz

From b8d7619dbc34c41d2dac59fd717c7553054eb9d9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 9 Nov 2021 00:17:52 -0800
Subject: [PATCH 533/844] change: add mkpkglists options to config.dev

Here, we default to using root as the storage directory. Primarily
because it makes sense in Docker; config.dev can always be fixed up
by developers to reflect local system changes.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.dev | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/conf/config.dev b/conf/config.dev
index fb43612e..6cbe97cc 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -65,3 +65,8 @@ session_secret = secret
 
 [devel]
 ;commit_hash = 1234567
+
+[mkpkglists]
+packagesfile = /packages.gz
+pkgbasefile = /pkgbase.gz
+userfile = /users.gz

From 338a44839f02850890e69f2985827cab9a1aefb4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 9 Nov 2021 00:18:54 -0800
Subject: [PATCH 534/844] fix: override aurblup's db-path option in config.dev

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.dev | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/config.dev b/conf/config.dev
index 6cbe97cc..dac85477 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -70,3 +70,6 @@ session_secret = secret
 packagesfile = /packages.gz
 pkgbasefile = /pkgbase.gz
 userfile = /users.gz
+
+[aurblup]
+db-path = YOUR_AUR_ROOT/aurblup/

From 4b8963b7bac999e2effb9840b01c9c01b8218fc0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 9 Nov 2021 00:29:19 -0800
Subject: [PATCH 535/844] feat(docker): add cron service (aurblup + mkpkglists)

Normally, these scripts are used to update official providers
in the aurweb database along with archives that can be retrieved.

Run both of these scripts in a 5 minute cron job, to both reflect
the live instance database and production load.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml             | 17 +++++++++++++++++
 docker/config/aurweb-cron      |  2 ++
 docker/cron-entrypoint.sh      | 16 ++++++++++++++++
 docker/scripts/install-deps.sh |  2 +-
 docker/scripts/run-cron.sh     |  7 +++++++
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 docker/config/aurweb-cron
 create mode 100755 docker/cron-entrypoint.sh
 create mode 100755 docker/scripts/run-cron.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 038eb65b..c2b14f91 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -144,6 +144,19 @@ services:
     volumes:
       - git_data:/aurweb/aur.git
 
+  cron:
+    image: aurweb:latest
+    init: true
+    environment:
+      - AUR_CONFIG=/aurweb/conf/config
+    entrypoint: /docker/cron-entrypoint.sh
+    command: /docker/scripts/run-cron.sh
+    depends_on:
+      mariadb_init:
+        condition: service_started
+    volumes:
+      - mariadb_run:/var/run/mysqld
+
   php-fpm:
     image: aurweb:latest
     init: true
@@ -163,6 +176,8 @@ services:
         condition: service_healthy
       memcached:
         condition: service_healthy
+      cron:
+        condition: service_started
     volumes:
       - mariadb_run:/var/run/mysqld
     ports:
@@ -190,6 +205,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+      cron:
+        condition: service_started
     volumes:
       - mariadb_run:/var/run/mysqld
     ports:
diff --git a/docker/config/aurweb-cron b/docker/config/aurweb-cron
new file mode 100644
index 00000000..1be7c13c
--- /dev/null
+++ b/docker/config/aurweb-cron
@@ -0,0 +1,2 @@
+*/5 * * * * aurweb-aurblup
+*/5 * * * * aurweb-mkpkglists
diff --git a/docker/cron-entrypoint.sh b/docker/cron-entrypoint.sh
new file mode 100755
index 00000000..d4173eaf
--- /dev/null
+++ b/docker/cron-entrypoint.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -eou pipefail
+
+# Prepare AUR_CONFIG.
+cp -vf conf/config.dev conf/config
+sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
+
+# Create directories we need.
+mkdir -p /aurweb/aurblup
+
+# Install the cron configuration.
+cp /docker/config/aurweb-cron /etc/cron.d/aurweb-cron
+chmod 0644 /etc/cron.d/aurweb-cron
+crontab /etc/cron.d/aurweb-cron
+
+exec "$@"
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index 52ad6747..d64340e3 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -8,7 +8,7 @@ pacman -Syu --noconfirm --noprogressbar \
     --cachedir .pkg-cache git gpgme nginx redis openssh \
       mariadb mariadb-libs cgit-aurweb uwsgi uwsgi-plugin-cgi \
       php php-fpm memcached php-memcached python-pip pyalpm \
-      python-srcinfo curl libeatmydata
+      python-srcinfo curl libeatmydata cronie
 
 # https://python-poetry.org/docs/ Installation section.
 curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
diff --git a/docker/scripts/run-cron.sh b/docker/scripts/run-cron.sh
new file mode 100755
index 00000000..d927a790
--- /dev/null
+++ b/docker/scripts/run-cron.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cd /aurweb
+aurweb-aurblup
+aurweb-mkpkglists
+
+exec /usr/bin/crond -n

From 10fcf939911cce4481bc1ec825329c8bc57ebd1d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 9 Nov 2021 01:51:23 -0800
Subject: [PATCH 536/844] fix(fastapi): use correct official pkg base url

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/official_provider.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aurweb/models/official_provider.py b/aurweb/models/official_provider.py
index a8282ff1..ff70fe43 100644
--- a/aurweb/models/official_provider.py
+++ b/aurweb/models/official_provider.py
@@ -3,8 +3,7 @@ from sqlalchemy.exc import IntegrityError
 from aurweb import schema
 from aurweb.models.declarative import Base
 
-# TODO: Fix this! Official packages aren't from aur.archlinux.org...
-OFFICIAL_BASE = "https://aur.archlinux.org"
+OFFICIAL_BASE = "https://archlinux.org"
 
 
 class OfficialProvider(Base):

From f6061400509fdd808d066fceb4572c2728a39fde Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Fri, 15 Oct 2021 20:14:31 +0200
Subject: [PATCH 537/844] feat(PHP): Add packages dump file with more metadata

---
 aurweb/scripts/mkpkglists.py | 10 ++++++++++
 conf/config.defaults         |  1 +
 test/setup.sh                |  1 +
 web/html/index.php           |  1 +
 4 files changed, 13 insertions(+)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 6724141a..c73cc3be 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -2,11 +2,13 @@
 
 import datetime
 import gzip
+import json
 
 import aurweb.config
 import aurweb.db
 
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
+packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
 pkgbasefile = aurweb.config.get('mkpkglists', 'pkgbasefile')
 userfile = aurweb.config.get('mkpkglists', 'userfile')
 
@@ -27,6 +29,14 @@ def main():
                            "WHERE PackageBases.PackagerUID IS NOT NULL")
         f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
+    with gzip.open(packagesmetafile, "wt") as f:
+        cur = conn.execute("SELECT * FROM Packages")
+        json.dump({
+            "warning": "This is a experimental! It can be removed or modified without warning!",
+            "columns": [d[0] for d in cur.description],
+            "data": cur.fetchall()
+        }, f)
+
     with gzip.open(pkgbasefile, "w") as f:
         f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
         cur = conn.execute("SELECT Name FROM PackageBases " +
diff --git a/conf/config.defaults b/conf/config.defaults
index babfd482..6ccf42d0 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -102,6 +102,7 @@ server = https://mirrors.kernel.org/archlinux/%s/os/x86_64
 
 [mkpkglists]
 packagesfile = /srv/http/aurweb/web/html/packages.gz
+packagesmetafile = /srv/http/aurweb/web/html/packages-meta-v1.json.gz
 pkgbasefile = /srv/http/aurweb/web/html/pkgbase.gz
 userfile = /srv/http/aurweb/web/html/users.gz
 
diff --git a/test/setup.sh b/test/setup.sh
index 191a73d8..8ee9eef2 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -67,6 +67,7 @@ server = file://$(pwd)/remote/
 
 [mkpkglists]
 packagesfile = packages.gz
+packagesmetafile = packages-meta-v1.json.gz
 pkgbasefile = pkgbase.gz
 userfile = users.gz
 EOF
diff --git a/web/html/index.php b/web/html/index.php
index e57e7708..3163c3e8 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -189,6 +189,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
 		readfile("./$path");
 		break;
 	case "/packages.gz":
+	case "/packages-teapot.json.gz":
 	case "/pkgbase.gz":
 	case "/users.gz":
 		header("Content-Type: text/plain");

From f3f662c696aaa35b57737c63bc506ded464a7d81 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 31 Oct 2021 16:52:30 -0700
Subject: [PATCH 538/844] fix(mkpkglists): improve package meta archive

The SQL logic in this file for package metadata now exactly
reflects RPC's search logic, without searching for specific
packages.

Two command line arguments are available:

    --extended | Include License, Keywords, Groups, relations
                 and dependencies.

When --extended is passed, the script will create a
packages-meta-ext-v1.json.gz, configured via packagesmetaextfile.

Archive JSON is in the following format: line-separated package objects
enclosed in a list:

    [
    {...},
    {...},
    {...}
    ]

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py | 273 ++++++++++++++++++++++++++++++++---
 conf/config.defaults         |   1 +
 test/setup.sh                |   2 +
 web/html/index.php           |   3 +-
 4 files changed, 255 insertions(+), 24 deletions(-)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index c73cc3be..f2095a20 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -1,16 +1,192 @@
 #!/usr/bin/env python3
+"""
+Produces package, package base and user archives for the AUR
+database.
+
+Archives:
+
+    packages.gz               | A line-separated list of package names
+    packages-meta-v1.json     | A type=search RPC-formatted JSON dataset
+    packages-meta-ext-v1.json | An --extended archive
+    pkgbase.gz                | A line-separated list of package base names
+    users.gz                  | A line-separated list of user names
+
+This script takes an optional argument: --extended. Based
+on the following, right-hand side fields are added to each item.
+
+    --extended  | License, Keywords, Groups, relations and dependencies
+
+"""
 
 import datetime
 import gzip
-import json
+import os
+import sys
+
+from collections import defaultdict
+from decimal import Decimal
+from typing import Tuple
+
+import orjson
 
 import aurweb.config
 import aurweb.db
 
+
+def state_path(archive: str) -> str:
+    # A hard-coded /tmp state directory.
+    # TODO: Use Redis cache to store this state after we merge
+    # FastAPI into master and removed PHP from the tree.
+    return os.path.join("/tmp", os.path.basename(archive) + ".state")
+
+
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
 packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
+packagesmetaextfile = aurweb.config.get('mkpkglists', 'packagesmetaextfile')
+packages_state = state_path(packagesfile)
+
 pkgbasefile = aurweb.config.get('mkpkglists', 'pkgbasefile')
+pkgbases_state = state_path(pkgbasefile)
+
 userfile = aurweb.config.get('mkpkglists', 'userfile')
+users_state = state_path(userfile)
+
+
+def should_update(state: str, tablename: str) -> Tuple[bool, int]:
+    if aurweb.config.get("database", "backend") != "mysql":
+        return (False, 0)
+
+    db_name = aurweb.config.get("database", "name")
+    conn = aurweb.db.Connection()
+    cur = conn.execute("SELECT auto_increment FROM information_schema.tables "
+                       "WHERE table_schema = ? AND table_name = ?",
+                       (db_name, tablename,))
+    update_time = cur.fetchone()[0]
+
+    saved_update_time = 0
+    if os.path.exists(state):
+        with open(state) as f:
+            saved_update_time = int(f.read().strip())
+
+    return (saved_update_time == update_time, update_time)
+
+
+def update_state(state: str, update_time: int) -> None:
+    with open(state, "w") as f:
+        f.write(str(update_time))
+
+
+TYPE_MAP = {
+    "depends": "Depends",
+    "makedepends": "MakeDepends",
+    "checkdepends": "CheckDepends",
+    "optdepends": "OptDepends",
+    "conflicts": "Conflicts",
+    "provides": "Provides",
+    "replaces": "Replaces",
+}
+
+
+def get_extended_dict(query: str):
+    """
+    Produce data in the form in a single bulk SQL query:
+
+    {
+        <integer_package_id>: {
+            "Depends": [...],
+            "Conflicts": [...],
+            "License": [...]
+        }
+    }
+
+    The caller can then use this data to populate a dataset of packages.
+
+    output = produce_base_output_data()
+    data = get_extended_dict(query)
+    for i in range(len(output)):
+        package_id = output[i].get("ID")
+        output[i].update(data.get(package_id))
+    """
+
+    conn = aurweb.db.Connection()
+
+    cursor = conn.execute(query)
+
+    data = defaultdict(lambda: defaultdict(list))
+
+    for result in cursor.fetchall():
+
+        pkgid = result[0]
+        key = TYPE_MAP.get(result[1])
+        output = result[2]
+        if result[3]:
+            output += result[3]
+
+        # In all cases, we have at least an empty License list.
+        if "License" not in data[pkgid]:
+            data[pkgid]["License"] = []
+
+        # In all cases, we have at least an empty Keywords list.
+        if "Keywords" not in data[pkgid]:
+            data[pkgid]["Keywords"] = []
+
+        data[pkgid][key].append(output)
+
+    conn.close()
+    return data
+
+
+def get_extended_fields():
+    # Returns: [ID, Type, Name, Cond]
+    query = """
+    SELECT PackageDepends.PackageID AS ID, DependencyTypes.Name AS Type,
+           PackageDepends.DepName AS Name, PackageDepends.DepCondition AS Cond
+    FROM PackageDepends
+    LEFT JOIN DependencyTypes
+    ON DependencyTypes.ID = PackageDepends.DepTypeID
+    UNION SELECT PackageRelations.PackageID AS ID, RelationTypes.Name AS Type,
+          PackageRelations.RelName AS Name,
+          PackageRelations.RelCondition AS Cond
+    FROM PackageRelations
+    LEFT JOIN RelationTypes
+    ON RelationTypes.ID = PackageRelations.RelTypeID
+    UNION SELECT PackageGroups.PackageID AS ID, 'Groups' AS Type,
+          Groups.Name, '' AS Cond
+    FROM Groups
+    INNER JOIN PackageGroups ON PackageGroups.GroupID = Groups.ID
+    UNION SELECT PackageLicenses.PackageID AS ID, 'License' AS Type,
+          Licenses.Name, '' as Cond
+    FROM Licenses
+    INNER JOIN PackageLicenses ON PackageLicenses.LicenseID = Licenses.ID
+    UNION SELECT Packages.ID AS ID, 'Keywords' AS Type,
+          PackageKeywords.Keyword AS Name, '' as Cond
+    FROM PackageKeywords
+    INNER JOIN Packages ON Packages.PackageBaseID = PackageKeywords.PackageBaseID
+    """
+    return get_extended_dict(query)
+
+
+EXTENDED_FIELD_HANDLERS = {
+    "--extended": get_extended_fields
+}
+
+
+def is_decimal(column):
+    """ Check if an SQL column is of decimal.Decimal type. """
+    if isinstance(column, Decimal):
+        return float(column)
+    return column
+
+
+def write_archive(archive: str, output: list):
+    with gzip.open(archive, "wb") as f:
+        f.write(b"[\n")
+        for i, item in enumerate(output):
+            f.write(orjson.dumps(item))
+            if i < len(output) - 1:
+                f.write(b",")
+            f.write(b"\n")
+        f.write(b"]")
 
 
 def main():
@@ -21,32 +197,83 @@ def main():
     pkgbaselist_header = "# AUR package base list, generated on " + datestr
     userlist_header = "# AUR user name list, generated on " + datestr
 
-    with gzip.open(packagesfile, "w") as f:
-        f.write(bytes(pkglist_header + "\n", "UTF-8"))
-        cur = conn.execute("SELECT Packages.Name FROM Packages " +
-                           "INNER JOIN PackageBases " +
-                           "ON PackageBases.ID = Packages.PackageBaseID " +
+    updated, update_time = should_update(packages_state, "Packages")
+    if not updated:
+        print("Updating Packages...")
+
+        # Query columns; copied from RPC.
+        columns = ("Packages.ID, Packages.Name, "
+                   "PackageBases.ID AS PackageBaseID, "
+                   "PackageBases.Name AS PackageBase, "
+                   "Version, Description, URL, NumVotes, "
+                   "Popularity, OutOfDateTS AS OutOfDate, "
+                   "Users.UserName AS Maintainer, "
+                   "SubmittedTS AS FirstSubmitted, "
+                   "ModifiedTS AS LastModified")
+
+        # Perform query.
+        cur = conn.execute(f"SELECT {columns} FROM Packages "
+                           "LEFT JOIN PackageBases "
+                           "ON PackageBases.ID = Packages.PackageBaseID "
+                           "LEFT JOIN Users "
+                           "ON PackageBases.MaintainerUID = Users.ID "
                            "WHERE PackageBases.PackagerUID IS NOT NULL")
-        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
-    with gzip.open(packagesmetafile, "wt") as f:
-        cur = conn.execute("SELECT * FROM Packages")
-        json.dump({
-            "warning": "This is a experimental! It can be removed or modified without warning!",
-            "columns": [d[0] for d in cur.description],
-            "data": cur.fetchall()
-        }, f)
+        # Produce packages-meta-v1.json.gz
+        output = list()
+        snapshot_uri = aurweb.config.get("options", "snapshot_uri")
+        for result in cur.fetchall():
+            item = {
+                column[0]: is_decimal(result[i])
+                for i, column in enumerate(cur.description)
+            }
+            item["URLPath"] = snapshot_uri % item.get("Name")
+            output.append(item)
 
-    with gzip.open(pkgbasefile, "w") as f:
-        f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
-        cur = conn.execute("SELECT Name FROM PackageBases " +
-                           "WHERE PackagerUID IS NOT NULL")
-        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+        write_archive(packagesmetafile, output)
 
-    with gzip.open(userfile, "w") as f:
-        f.write(bytes(userlist_header + "\n", "UTF-8"))
-        cur = conn.execute("SELECT UserName FROM Users")
-        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+        # Produce packages-meta-ext-v1.json.gz
+        if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS:
+            f = EXTENDED_FIELD_HANDLERS.get(sys.argv[1])
+            data = f()
+
+            default_ = {"Groups": [], "License": [], "Keywords": []}
+            for i in range(len(output)):
+                data_ = data.get(output[i].get("ID"), default_)
+                output[i].update(data_)
+
+            write_archive(packagesmetaextfile, output)
+
+        # Produce packages.gz
+        with gzip.open(packagesfile, "wb") as f:
+            f.write(bytes(pkglist_header + "\n", "UTF-8"))
+            f.writelines([
+                bytes(x.get("Name") + "\n", "UTF-8")
+                for x in output
+            ])
+
+        update_state(packages_state, update_time)
+
+    updated, update_time = should_update(pkgbases_state, "PackageBases")
+    if not updated:
+        print("Updating PackageBases...")
+        # Produce pkgbase.gz
+        with gzip.open(pkgbasefile, "w") as f:
+            f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
+            cur = conn.execute("SELECT Name FROM PackageBases " +
+                               "WHERE PackagerUID IS NOT NULL")
+            f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+        update_state(pkgbases_state, update_time)
+
+    updated, update_time = should_update(users_state, "Users")
+    if not updated:
+        print("Updating Users...")
+        # Produce users.gz
+        with gzip.open(userfile, "w") as f:
+            f.write(bytes(userlist_header + "\n", "UTF-8"))
+            cur = conn.execute("SELECT UserName FROM Users")
+            f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+        update_state(users_state, update_time)
 
     conn.close()
 
diff --git a/conf/config.defaults b/conf/config.defaults
index 6ccf42d0..25d6dff9 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -103,6 +103,7 @@ server = https://mirrors.kernel.org/archlinux/%s/os/x86_64
 [mkpkglists]
 packagesfile = /srv/http/aurweb/web/html/packages.gz
 packagesmetafile = /srv/http/aurweb/web/html/packages-meta-v1.json.gz
+packagesmetaextfile = /srv/http/aurweb/web/html/packages-meta-ext-v1.json.gz
 pkgbasefile = /srv/http/aurweb/web/html/pkgbase.gz
 userfile = /srv/http/aurweb/web/html/users.gz
 
diff --git a/test/setup.sh b/test/setup.sh
index 8ee9eef2..d0c15b82 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -37,6 +37,7 @@ enable-maintenance = 0
 maintenance-exceptions = 127.0.0.1
 commit_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s&id=%s
 localedir = $TOPLEVEL/web/locale/
+snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz
 
 [notifications]
 notify-cmd = $NOTIFY
@@ -68,6 +69,7 @@ server = file://$(pwd)/remote/
 [mkpkglists]
 packagesfile = packages.gz
 packagesmetafile = packages-meta-v1.json.gz
+packagesmetaextfile = packages-meta-ext-v1.json.gz
 pkgbasefile = pkgbase.gz
 userfile = users.gz
 EOF
diff --git a/web/html/index.php b/web/html/index.php
index 3163c3e8..dc435162 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -189,7 +189,8 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
 		readfile("./$path");
 		break;
 	case "/packages.gz":
-	case "/packages-teapot.json.gz":
+	case "/packages-meta-v1.json.gz":
+	case "/packages-meta-ext-v1.json.gz":
 	case "/pkgbase.gz":
 	case "/users.gz":
 		header("Content-Type: text/plain");

From d62af4ceb582c360a6d7bbb876418170efbd92fc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 6 Nov 2021 16:23:08 -0700
Subject: [PATCH 539/844] feat(mkpkglists): added metadata archives

Two new archives are available:

- packages-meta-v1.json.gz
    - RPC search formatted data for all packages
    - ~2.1MB at the time of writing.
- packages-meta-ext-v1.json.gz (via --extended)
    - RPC multiinfo formatted data for all packages.
    - ~9.8MB at the time of writing.

New dependencies are required for this update:

- `python-orjson`

All archives served out by aur.archlinux.org distribute the Last-Modified
header and support the If-Modified-Since header, which should be
populated with Last-Modified's value. These should be used by clients
to avoid redownloading the archive when unnecessary.

Additionally, the new meta archives contain a format suitable for
streaming the data as the file is retrieved. It is still in JSON
format, however, users can parse package objects line by line after
the first '[' found in the file, until the last ']'; both contained
on their own lines.

Note: This commit is a documentation change and commit body.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 doc/maintenance.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/maintenance.txt b/doc/maintenance.txt
index d6094545..2c5c9faf 100644
--- a/doc/maintenance.txt
+++ b/doc/maintenance.txt
@@ -70,7 +70,8 @@ computations and clean up the database:
 * aurweb-pkgmaint automatically removes empty repositories that were created
   within the last 24 hours but never populated.
 
-* aurweb-mkpkglists generates the package list files.
+* aurweb-mkpkglists generates the package list files; it takes an optional
+  --extended flag, which additionally produces multiinfo metadata.
 
 * aurweb-usermaint removes the last login IP address of all users that did not
   login within the past seven days.
@@ -79,7 +80,7 @@ These scripts can be installed by running `python3 setup.py install` and are
 usually scheduled using Cron. The current setup is:
 
 ----
-*/5 * * * * aurweb-mkpkglists
+*/5 * * * * aurweb-mkpkglists [--extended]
 1 */2 * * * aurweb-popupdate
 2 */2 * * * aurweb-aurblup
 3 */2 * * * aurweb-pkgmaint

From 0155f4ea84917ca12c905e9035a1d202ea91a3ff Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 6 Nov 2021 17:13:16 -0700
Subject: [PATCH 540/844] fix(mkpkglists): remove caching

We really need caching for this; however, our current caching
method will cause the script to bypass changes to columns
if they have nothing to do with IDs.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py | 159 ++++++++++++-----------------------
 1 file changed, 54 insertions(+), 105 deletions(-)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index f2095a20..2566a146 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -20,60 +20,23 @@ on the following, right-hand side fields are added to each item.
 
 import datetime
 import gzip
-import os
 import sys
 
 from collections import defaultdict
 from decimal import Decimal
-from typing import Tuple
 
 import orjson
 
 import aurweb.config
 import aurweb.db
 
-
-def state_path(archive: str) -> str:
-    # A hard-coded /tmp state directory.
-    # TODO: Use Redis cache to store this state after we merge
-    # FastAPI into master and removed PHP from the tree.
-    return os.path.join("/tmp", os.path.basename(archive) + ".state")
-
-
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
 packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
 packagesmetaextfile = aurweb.config.get('mkpkglists', 'packagesmetaextfile')
-packages_state = state_path(packagesfile)
 
 pkgbasefile = aurweb.config.get('mkpkglists', 'pkgbasefile')
-pkgbases_state = state_path(pkgbasefile)
 
 userfile = aurweb.config.get('mkpkglists', 'userfile')
-users_state = state_path(userfile)
-
-
-def should_update(state: str, tablename: str) -> Tuple[bool, int]:
-    if aurweb.config.get("database", "backend") != "mysql":
-        return (False, 0)
-
-    db_name = aurweb.config.get("database", "name")
-    conn = aurweb.db.Connection()
-    cur = conn.execute("SELECT auto_increment FROM information_schema.tables "
-                       "WHERE table_schema = ? AND table_name = ?",
-                       (db_name, tablename,))
-    update_time = cur.fetchone()[0]
-
-    saved_update_time = 0
-    if os.path.exists(state):
-        with open(state) as f:
-            saved_update_time = int(f.read().strip())
-
-    return (saved_update_time == update_time, update_time)
-
-
-def update_state(state: str, update_time: int) -> None:
-    with open(state, "w") as f:
-        f.write(str(update_time))
 
 
 TYPE_MAP = {
@@ -197,83 +160,69 @@ def main():
     pkgbaselist_header = "# AUR package base list, generated on " + datestr
     userlist_header = "# AUR user name list, generated on " + datestr
 
-    updated, update_time = should_update(packages_state, "Packages")
-    if not updated:
-        print("Updating Packages...")
+    # Query columns; copied from RPC.
+    columns = ("Packages.ID, Packages.Name, "
+               "PackageBases.ID AS PackageBaseID, "
+               "PackageBases.Name AS PackageBase, "
+               "Version, Description, URL, NumVotes, "
+               "Popularity, OutOfDateTS AS OutOfDate, "
+               "Users.UserName AS Maintainer, "
+               "SubmittedTS AS FirstSubmitted, "
+               "ModifiedTS AS LastModified")
 
-        # Query columns; copied from RPC.
-        columns = ("Packages.ID, Packages.Name, "
-                   "PackageBases.ID AS PackageBaseID, "
-                   "PackageBases.Name AS PackageBase, "
-                   "Version, Description, URL, NumVotes, "
-                   "Popularity, OutOfDateTS AS OutOfDate, "
-                   "Users.UserName AS Maintainer, "
-                   "SubmittedTS AS FirstSubmitted, "
-                   "ModifiedTS AS LastModified")
+    # Perform query.
+    cur = conn.execute(f"SELECT {columns} FROM Packages "
+                       "LEFT JOIN PackageBases "
+                       "ON PackageBases.ID = Packages.PackageBaseID "
+                       "LEFT JOIN Users "
+                       "ON PackageBases.MaintainerUID = Users.ID "
+                       "WHERE PackageBases.PackagerUID IS NOT NULL")
 
-        # Perform query.
-        cur = conn.execute(f"SELECT {columns} FROM Packages "
-                           "LEFT JOIN PackageBases "
-                           "ON PackageBases.ID = Packages.PackageBaseID "
-                           "LEFT JOIN Users "
-                           "ON PackageBases.MaintainerUID = Users.ID "
-                           "WHERE PackageBases.PackagerUID IS NOT NULL")
+    # Produce packages-meta-v1.json.gz
+    output = list()
+    snapshot_uri = aurweb.config.get("options", "snapshot_uri")
+    for result in cur.fetchall():
+        item = {
+            column[0]: is_decimal(result[i])
+            for i, column in enumerate(cur.description)
+        }
+        item["URLPath"] = snapshot_uri % item.get("Name")
+        output.append(item)
 
-        # Produce packages-meta-v1.json.gz
-        output = list()
-        snapshot_uri = aurweb.config.get("options", "snapshot_uri")
-        for result in cur.fetchall():
-            item = {
-                column[0]: is_decimal(result[i])
-                for i, column in enumerate(cur.description)
-            }
-            item["URLPath"] = snapshot_uri % item.get("Name")
-            output.append(item)
+    write_archive(packagesmetafile, output)
 
-        write_archive(packagesmetafile, output)
+    # Produce packages-meta-ext-v1.json.gz
+    if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS:
+        f = EXTENDED_FIELD_HANDLERS.get(sys.argv[1])
+        data = f()
 
-        # Produce packages-meta-ext-v1.json.gz
-        if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS:
-            f = EXTENDED_FIELD_HANDLERS.get(sys.argv[1])
-            data = f()
+        default_ = {"Groups": [], "License": [], "Keywords": []}
+        for i in range(len(output)):
+            data_ = data.get(output[i].get("ID"), default_)
+            output[i].update(data_)
 
-            default_ = {"Groups": [], "License": [], "Keywords": []}
-            for i in range(len(output)):
-                data_ = data.get(output[i].get("ID"), default_)
-                output[i].update(data_)
+        write_archive(packagesmetaextfile, output)
 
-            write_archive(packagesmetaextfile, output)
+    # Produce packages.gz
+    with gzip.open(packagesfile, "wb") as f:
+        f.write(bytes(pkglist_header + "\n", "UTF-8"))
+        f.writelines([
+            bytes(x.get("Name") + "\n", "UTF-8")
+            for x in output
+        ])
 
-        # Produce packages.gz
-        with gzip.open(packagesfile, "wb") as f:
-            f.write(bytes(pkglist_header + "\n", "UTF-8"))
-            f.writelines([
-                bytes(x.get("Name") + "\n", "UTF-8")
-                for x in output
-            ])
+    # Produce pkgbase.gz
+    with gzip.open(pkgbasefile, "w") as f:
+        f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
+        cur = conn.execute("SELECT Name FROM PackageBases " +
+                           "WHERE PackagerUID IS NOT NULL")
+        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
-        update_state(packages_state, update_time)
-
-    updated, update_time = should_update(pkgbases_state, "PackageBases")
-    if not updated:
-        print("Updating PackageBases...")
-        # Produce pkgbase.gz
-        with gzip.open(pkgbasefile, "w") as f:
-            f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
-            cur = conn.execute("SELECT Name FROM PackageBases " +
-                               "WHERE PackagerUID IS NOT NULL")
-            f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
-        update_state(pkgbases_state, update_time)
-
-    updated, update_time = should_update(users_state, "Users")
-    if not updated:
-        print("Updating Users...")
-        # Produce users.gz
-        with gzip.open(userfile, "w") as f:
-            f.write(bytes(userlist_header + "\n", "UTF-8"))
-            cur = conn.execute("SELECT UserName FROM Users")
-            f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
-        update_state(users_state, update_time)
+    # Produce users.gz
+    with gzip.open(userfile, "w") as f:
+        f.write(bytes(userlist_header + "\n", "UTF-8"))
+        cur = conn.execute("SELECT UserName FROM Users")
+        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
     conn.close()
 

From 0403b89f53302f7d58b170081ef7bbd2726d8fc1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 9 Nov 2021 02:08:03 -0800
Subject: [PATCH 541/844] feat: add packagesmeta[ext]file option to
 conf/config.dev

Better defaults for Docker here.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.dev | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/config.dev b/conf/config.dev
index dac85477..05566e8b 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -68,6 +68,8 @@ session_secret = secret
 
 [mkpkglists]
 packagesfile = /packages.gz
+packagesmetafile = /packages-meta-v1.json.gz
+packagesmetaextfile = /packages-meta-ext-v1.json.gz
 pkgbasefile = /pkgbase.gz
 userfile = /users.gz
 

From 068b067e148cb4f39fdfb7aa2086568084ac6a0a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 9 Nov 2021 02:28:52 -0800
Subject: [PATCH 542/844] feat(docker): log cron executions

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/aurweb-cron  | 4 ++--
 docker/scripts/run-cron.sh | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker/config/aurweb-cron b/docker/config/aurweb-cron
index 1be7c13c..87d7ed05 100644
--- a/docker/config/aurweb-cron
+++ b/docker/config/aurweb-cron
@@ -1,2 +1,2 @@
-*/5 * * * * aurweb-aurblup
-*/5 * * * * aurweb-mkpkglists
+*/5 * * * * bash -c 'aurweb-aurblup && echo "[$(date -u)] executed aurblup" >> /var/log/mkpkglists.log'
+*/5 * * * * bash -c 'aurweb-mkpkglists && echo "[$(date -u)] executed mkpkglists" >> /var/log/mkpkglists.log'
diff --git a/docker/scripts/run-cron.sh b/docker/scripts/run-cron.sh
index d927a790..d227be94 100755
--- a/docker/scripts/run-cron.sh
+++ b/docker/scripts/run-cron.sh
@@ -2,6 +2,13 @@
 
 cd /aurweb
 aurweb-aurblup
+if [ $? -eq 0 ]; then
+    echo "[$(date -u)] executed aurblup" >> /var/log/aurblup.log
+fi
+
 aurweb-mkpkglists
+if [ $? -eq 0 ]; then
+    echo "[$(date -u)] executed mkpkglists" >> /var/log/mkpkglists.log
+fi
 
 exec /usr/bin/crond -n

From 107367f958ef320d63952def915b65cef1ed31bd Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 9 Nov 2021 02:29:39 -0800
Subject: [PATCH 543/844] feat(docker): use mkpkglists --extended flag

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/aurweb-cron  | 2 +-
 docker/scripts/run-cron.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/config/aurweb-cron b/docker/config/aurweb-cron
index 87d7ed05..149b9d19 100644
--- a/docker/config/aurweb-cron
+++ b/docker/config/aurweb-cron
@@ -1,2 +1,2 @@
 */5 * * * * bash -c 'aurweb-aurblup && echo "[$(date -u)] executed aurblup" >> /var/log/mkpkglists.log'
-*/5 * * * * bash -c 'aurweb-mkpkglists && echo "[$(date -u)] executed mkpkglists" >> /var/log/mkpkglists.log'
+*/5 * * * * bash -c 'aurweb-mkpkglists --extended && echo "[$(date -u)] executed mkpkglists" >> /var/log/mkpkglists.log'
diff --git a/docker/scripts/run-cron.sh b/docker/scripts/run-cron.sh
index d227be94..83ad6566 100755
--- a/docker/scripts/run-cron.sh
+++ b/docker/scripts/run-cron.sh
@@ -6,7 +6,7 @@ if [ $? -eq 0 ]; then
     echo "[$(date -u)] executed aurblup" >> /var/log/aurblup.log
 fi
 
-aurweb-mkpkglists
+aurweb-mkpkglists --extended
 if [ $? -eq 0 ]; then
     echo "[$(date -u)] executed mkpkglists" >> /var/log/mkpkglists.log
 fi

From abbecf5194b69d419e81b547eaa8b3e72d550524 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 06:18:34 -0800
Subject: [PATCH 544/844] change(mkpkglists): remove header comments

These comments change every time mkpkglists is run; which
would invalidate the ETag headers disbursed by the gzip
host. This commit removes those changing headers.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 2566a146..b2d37d85 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -18,7 +18,6 @@ on the following, right-hand side fields are added to each item.
 
 """
 
-import datetime
 import gzip
 import sys
 
@@ -155,11 +154,6 @@ def write_archive(archive: str, output: list):
 def main():
     conn = aurweb.db.Connection()
 
-    datestr = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")
-    pkglist_header = "# AUR package list, generated on " + datestr
-    pkgbaselist_header = "# AUR package base list, generated on " + datestr
-    userlist_header = "# AUR user name list, generated on " + datestr
-
     # Query columns; copied from RPC.
     columns = ("Packages.ID, Packages.Name, "
                "PackageBases.ID AS PackageBaseID, "
@@ -205,7 +199,6 @@ def main():
 
     # Produce packages.gz
     with gzip.open(packagesfile, "wb") as f:
-        f.write(bytes(pkglist_header + "\n", "UTF-8"))
         f.writelines([
             bytes(x.get("Name") + "\n", "UTF-8")
             for x in output
@@ -213,14 +206,12 @@ def main():
 
     # Produce pkgbase.gz
     with gzip.open(pkgbasefile, "w") as f:
-        f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
         cur = conn.execute("SELECT Name FROM PackageBases " +
                            "WHERE PackagerUID IS NOT NULL")
         f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
     # Produce users.gz
     with gzip.open(userfile, "w") as f:
-        f.write(bytes(userlist_header + "\n", "UTF-8"))
         cur = conn.execute("SELECT UserName FROM Users")
         f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 

From 4f7aeafa8d9fc835c604b82bd8f94308220ed0dd Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 06:20:22 -0800
Subject: [PATCH 545/844] feat(docker): host gzip archive downloads

- added config option [mkpkglists] archivedir
    - created by mkpkglists

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py |  4 ++++
 conf/config.defaults         |  1 +
 conf/config.dev              | 11 ++++++-----
 docker-compose.yml           |  5 +++++
 docker/config/nginx.conf     | 19 ++++++++++++++++++-
 docker/php-entrypoint.sh     |  4 ++++
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index b2d37d85..f4b0fbe5 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -19,6 +19,7 @@ on the following, right-hand side fields are added to each item.
 """
 
 import gzip
+import os
 import sys
 
 from collections import defaultdict
@@ -29,6 +30,9 @@ import orjson
 import aurweb.config
 import aurweb.db
 
+archivedir = aurweb.config.get("mkpkglists", "archivedir")
+os.makedirs(archivedir, exist_ok=True)
+
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
 packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
 packagesmetaextfile = aurweb.config.get('mkpkglists', 'packagesmetaextfile')
diff --git a/conf/config.defaults b/conf/config.defaults
index 25d6dff9..c29d7045 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -101,6 +101,7 @@ sync-dbs = core extra community multilib testing community-testing
 server = https://mirrors.kernel.org/archlinux/%s/os/x86_64
 
 [mkpkglists]
+archivedir = /srv/http/aurweb/web/html
 packagesfile = /srv/http/aurweb/web/html/packages.gz
 packagesmetafile = /srv/http/aurweb/web/html/packages-meta-v1.json.gz
 packagesmetaextfile = /srv/http/aurweb/web/html/packages-meta-ext-v1.json.gz
diff --git a/conf/config.dev b/conf/config.dev
index 05566e8b..9467615e 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -67,11 +67,12 @@ session_secret = secret
 ;commit_hash = 1234567
 
 [mkpkglists]
-packagesfile = /packages.gz
-packagesmetafile = /packages-meta-v1.json.gz
-packagesmetaextfile = /packages-meta-ext-v1.json.gz
-pkgbasefile = /pkgbase.gz
-userfile = /users.gz
+archivedir = /var/lib/aurweb/archives
+packagesfile = /var/lib/aurweb/archives/packages.gz
+packagesmetafile = /var/lib/aurweb/archives/packages-meta-v1.json.gz
+packagesmetaextfile = /var/lib/aurweb/archives/packages-meta-ext-v1.json.gz
+pkgbasefile = /var/lib/aurweb/archives/pkgbase.gz
+userfile = /var/lib/aurweb/archives/users.gz
 
 [aurblup]
 db-path = YOUR_AUR_ROOT/aurblup/
diff --git a/docker-compose.yml b/docker-compose.yml
index c2b14f91..2fba1305 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -156,6 +156,7 @@ services:
         condition: service_started
     volumes:
       - mariadb_run:/var/run/mysqld
+      - archives:/var/lib/aurweb/archives
 
   php-fpm:
     image: aurweb:latest
@@ -180,6 +181,7 @@ services:
         condition: service_started
     volumes:
       - mariadb_run:/var/run/mysqld
+      - archives:/var/lib/aurweb/archives
     ports:
       - "19000:9000"
 
@@ -236,6 +238,8 @@ services:
         condition: service_healthy
       php-fpm:
         condition: service_healthy
+    volumes:
+      - archives:/var/lib/aurweb/archives
 
   sharness:
     image: aurweb:latest
@@ -343,3 +347,4 @@ volumes:
   mariadb_data: {} # Share /var/lib/mysql
   git_data: {} # Share aurweb/aur.git
   smartgit_run: {}
+  archives: {}
diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index 4288a57d..c3ffd7fa 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -94,7 +94,24 @@ http {
         ssl_certificate /etc/ssl/certs/web.cert.pem;
         ssl_certificate_key /etc/ssl/private/web.key.pem;
 
-        root /aurweb/web/html;
+        location ~ ^/.*\.gz$ {
+            # Override mime type to text/plain.
+            types { text/plain gz; }
+            default_type text/plain;
+
+            # Filesystem location of .gz archives.
+            root /var/lib/aurweb/archives;
+
+            # When we match this block, fix-up trying without a trailing slash.
+            try_files $uri $uri/ =404;
+
+            # Caching headers.
+            expires    max;
+            add_header Content-Encoding gzip;
+            add_header Cache-Control public;
+            add_header Last-Modified "";
+            add_header ETag "";
+        }
 
         location / {
             try_files $uri @proxy_to_app;
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 81f70673..274f8e17 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 set -eou pipefail
 
+for archive in packages pkgbase users packages-meta-v1.json packages-meta-ext-v1.json; do
+    ln -vsf /var/lib/aurweb/archives/${archive}.gz /aurweb/web/html/${archive}.gz
+done
+
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config

From 0c57c53da18b36c470471a754e5ea892a46db505 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 07:04:03 -0800
Subject: [PATCH 546/844] fix(sharness): fix AUR_CONFIG generation for
 mkpkglists test

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/setup.sh           | 1 +
 test/t2100-mkpkglists.t | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/setup.sh b/test/setup.sh
index d0c15b82..a09e0c6e 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -67,6 +67,7 @@ sync-dbs = test
 server = file://$(pwd)/remote/
 
 [mkpkglists]
+archivedir = $(pwd)/archive
 packagesfile = packages.gz
 packagesmetafile = packages-meta-v1.json.gz
 packagesmetaextfile = packages-meta-ext-v1.json.gz
diff --git a/test/t2100-mkpkglists.t b/test/t2100-mkpkglists.t
index 6bb6838d..d217c4f6 100755
--- a/test/t2100-mkpkglists.t
+++ b/test/t2100-mkpkglists.t
@@ -8,8 +8,8 @@ test_expect_success 'Test package list generation with no packages.' '
 	echo "DELETE FROM Packages;" | sqlite3 aur.db &&
 	echo "DELETE FROM PackageBases;" | sqlite3 aur.db &&
 	cover "$MKPKGLISTS" &&
-	test $(zcat packages.gz | wc -l) -eq 1 &&
-	test $(zcat pkgbase.gz | wc -l) -eq 1
+	test $(zcat packages.gz | wc -l) -eq 0 &&
+	test $(zcat pkgbase.gz | wc -l) -eq 0
 '
 
 test_expect_success 'Test package list generation.' '

From 4b2be7fff8f8e5203cd84a9f25f590d4bdf8ef5d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 13:00:01 -0800
Subject: [PATCH 547/844] feat(docker): add poetry caching

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index b490d2fa..3c12cbf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
 FROM archlinux:base-devel
 
+VOLUME /root/.cache/pypoetry/cache
+VOLUME /root/.cache/pypoetry/artifacts
+
 ENV PATH="/root/.poetry/bin:${PATH}"
 ENV PYTHONPATH=/aurweb
 ENV AUR_CONFIG=conf/config

From daef98080e7f1f595dde09c20da1b7b57f5478ed Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 13:05:19 -0800
Subject: [PATCH 548/844] fix(fastapi): fix broken official package query

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index be351ebe..cdec26f3 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -56,8 +56,8 @@ def dep_extra_desc(dep: models.PackageDependency) -> str:
 def pkgname_link(pkgname: str) -> str:
     base = "/".join([OFFICIAL_BASE, "packages"])
     official = db.query(models.OfficialProvider).filter(
-        models.OfficialProvider.Name == pkgname)
-    if official.scalar():
+        models.OfficialProvider.Name == pkgname).exists()
+    if db.query(official).scalar():
         return f"{base}/?q={pkgname}"
     return f"/packages/{pkgname}"
 

From 52110b7db5e9b6f3a1dc4fefdf60a31dc946d487 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 13:40:19 -0800
Subject: [PATCH 549/844] fix(mkpkglists): default keys to result[1]

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 2566a146..72efcd0a 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -21,14 +21,12 @@ on the following, right-hand side fields are added to each item.
 import datetime
 import gzip
 import sys
-
 from collections import defaultdict
 from decimal import Decimal
 
-import orjson
-
 import aurweb.config
 import aurweb.db
+import orjson
 
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
 packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
@@ -80,7 +78,7 @@ def get_extended_dict(query: str):
     for result in cursor.fetchall():
 
         pkgid = result[0]
-        key = TYPE_MAP.get(result[1])
+        key = TYPE_MAP.get(result[1], result[1])
         output = result[2]
         if result[3]:
             output += result[3]

From 6e344ce9da894cdb70fb02cc531145907ac28a48 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 13:40:19 -0800
Subject: [PATCH 550/844] fix(mkpkglists): default keys to result[1]

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index f4b0fbe5..74d41c7c 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -21,7 +21,6 @@ on the following, right-hand side fields are added to each item.
 import gzip
 import os
 import sys
-
 from collections import defaultdict
 from decimal import Decimal
 
@@ -83,7 +82,7 @@ def get_extended_dict(query: str):
     for result in cursor.fetchall():
 
         pkgid = result[0]
-        key = TYPE_MAP.get(result[1])
+        key = TYPE_MAP.get(result[1], result[1])
         output = result[2]
         if result[3]:
             output += result[3]

From 8788f9900576bc7fa79b54566f23cdaeaeafa9eb Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 13:54:18 -0800
Subject: [PATCH 551/844] fix(mkpkglists): restore isort order

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 74d41c7c..307b2b12 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -21,6 +21,7 @@ on the following, right-hand side fields are added to each item.
 import gzip
 import os
 import sys
+
 from collections import defaultdict
 from decimal import Decimal
 

From 66978e40a46cd096a49c0c7cba1ad60010313ba1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 10 Nov 2021 13:57:33 -0800
Subject: [PATCH 552/844] fix(mkpkglists): fix isort order (master)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/mkpkglists.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 72efcd0a..2d34a17b 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -21,12 +21,14 @@ on the following, right-hand side fields are added to each item.
 import datetime
 import gzip
 import sys
+
 from collections import defaultdict
 from decimal import Decimal
 
+import orjson
+
 import aurweb.config
 import aurweb.db
-import orjson
 
 packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
 packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')

From 567090547d5f96b5e4266bb2d88c7344348bccf2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 13:09:05 -0800
Subject: [PATCH 553/844] add labels to gitlab issue templates

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Account Request.md | 2 ++
 .gitlab/issue_templates/Bug.md             | 2 ++
 .gitlab/issue_templates/Feature.md         | 2 ++
 .gitlab/issue_templates/Feedback.md        | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/.gitlab/issue_templates/Account Request.md b/.gitlab/issue_templates/Account Request.md
index 244cfbe8..6831d3ad 100644
--- a/.gitlab/issue_templates/Account Request.md	
+++ b/.gitlab/issue_templates/Account Request.md	
@@ -10,3 +10,5 @@
 - Username: the_username_you_want
 - Email: valid@email.org
 - Account Type: (User|Trusted User)
+
+/label account-request
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index d84a5181..d125e22b 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -32,3 +32,5 @@ aurweb's HTML render output. If you're testing locally, use the
 commit on which you are experiencing the bug. If you have found
 a bug which exists on live aur.archlinux.org, include the version
 located at the bottom of the webpage.
+
+/label bug unconfirmed
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
index 5b1524b1..c907adcd 100644
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -28,3 +28,5 @@ Example:
 
 - [Feature] Do not allow users to be Tyrants
     - \<(issue|merge_request)_link\>
+
+/label feature unconsidered
diff --git a/.gitlab/issue_templates/Feedback.md b/.gitlab/issue_templates/Feedback.md
index e32120aa..950ec0c6 100644
--- a/.gitlab/issue_templates/Feedback.md
+++ b/.gitlab/issue_templates/Feedback.md
@@ -54,3 +54,5 @@ That being said: please include an overall summary of your experience
 and how you felt about the current implementation which you're testing
 in comparison with PHP (current aur.archlinux.org, or https://localhost:8443
 through docker).
+
+/label feedback

From 0da11f068bd34bc534baf34027b2a925475f6666 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 16:22:30 -0800
Subject: [PATCH 554/844] fix(fastapi): check for prometheus info.response

When this is unchecked, exceptions cause the resulting stack
trace to be oblivious to the original exception thrown.

This commit changes that behavior so that metrics are created
only when info.response exists.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/prometheus.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/aurweb/prometheus.py b/aurweb/prometheus.py
index a64f6b27..dae56320 100644
--- a/aurweb/prometheus.py
+++ b/aurweb/prometheus.py
@@ -79,9 +79,10 @@ def http_requests_total() -> Callable[[Info], None]:
 
         method = scope.get("method")
         path = get_matching_route_path(base_scope, scope.get("router").routes)
-        status = str(int(info.response.status_code))[:1] + "xx"
 
-        metric.labels(method=method, path=path, status=status).inc()
+        if info.response:
+            status = str(int(info.response.status_code))[:1] + "xx"
+            metric.labels(method=method, path=path, status=status).inc()
 
     return instrumentation
 
@@ -95,7 +96,8 @@ def http_api_requests_total() -> Callable[[Info], None]:
     def instrumentation(info: Info) -> None:
         if info.request.url.path.rstrip("/") == "/rpc":
             type = info.request.query_params.get("type", "None")
-            status = str(info.response.status_code)[:1] + "xx"
-            metric.labels(type=type, status=status).inc()
+            if info.response:
+                status = str(info.response.status_code)[:1] + "xx"
+                metric.labels(type=type, status=status).inc()
 
     return instrumentation

From cef217388adaa97e66e638ca4baf99f3b8d0f865 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 13:09:05 -0800
Subject: [PATCH 555/844] add labels to gitlab issue templates

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab/issue_templates/Account Request.md | 2 ++
 .gitlab/issue_templates/Bug.md             | 2 ++
 .gitlab/issue_templates/Feature.md         | 2 ++
 .gitlab/issue_templates/Feedback.md        | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/.gitlab/issue_templates/Account Request.md b/.gitlab/issue_templates/Account Request.md
index 244cfbe8..6831d3ad 100644
--- a/.gitlab/issue_templates/Account Request.md	
+++ b/.gitlab/issue_templates/Account Request.md	
@@ -10,3 +10,5 @@
 - Username: the_username_you_want
 - Email: valid@email.org
 - Account Type: (User|Trusted User)
+
+/label account-request
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index d84a5181..d125e22b 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -32,3 +32,5 @@ aurweb's HTML render output. If you're testing locally, use the
 commit on which you are experiencing the bug. If you have found
 a bug which exists on live aur.archlinux.org, include the version
 located at the bottom of the webpage.
+
+/label bug unconfirmed
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
index 5b1524b1..c907adcd 100644
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -28,3 +28,5 @@ Example:
 
 - [Feature] Do not allow users to be Tyrants
     - \<(issue|merge_request)_link\>
+
+/label feature unconsidered
diff --git a/.gitlab/issue_templates/Feedback.md b/.gitlab/issue_templates/Feedback.md
index e32120aa..950ec0c6 100644
--- a/.gitlab/issue_templates/Feedback.md
+++ b/.gitlab/issue_templates/Feedback.md
@@ -54,3 +54,5 @@ That being said: please include an overall summary of your experience
 and how you felt about the current implementation which you're testing
 in comparison with PHP (current aur.archlinux.org, or https://localhost:8443
 through docker).
+
+/label feedback

From 5f5fa44d0d3b1930ce22e64968392c8b595205c7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 17:12:13 -0800
Subject: [PATCH 556/844] fix(fastapi): fix licenses check

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index e8414bf4..583149f8 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -61,7 +61,7 @@
         </td>
         {% endif %}
     </tr>
-    {% if licenses and licenses.scalar() and show_package_details %}
+    {% if licenses and licenses.count() and show_package_details %}
         <tr>
             <th>{{ "Licenses" | tr }}:</th>
             <td>{{ licenses | join(', ', attribute='Name') | default('None' | tr) }} </td>

From 363afff33260b2e3ce6236a22c8d6c32f0ffdd70 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 17:36:08 -0800
Subject: [PATCH 557/844] feat(fastapi): add /pkgbase/{name}/keywords (post)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 23 ++++++++++++++++++
 templates/partials/packages/details.html |  4 ++--
 test/test_packages_routes.py             | 30 ++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index bcc0be56..e227fe23 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -816,6 +816,29 @@ async def requests_close_post(request: Request, id: int,
     return RedirectResponse("/requests", status_code=HTTPStatus.SEE_OTHER)
 
 
+@router.post("/pkgbase/{name}/keywords")
+async def pkgbase_keywords(request: Request, name: str,
+                           keywords: str = Form(default=str())):
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
+    keywords = set(keywords.split(" "))
+
+    # Delete all keywords which are not supplied by the user.
+    with db.begin():
+        db.delete(models.PackageKeyword,
+                  and_(models.PackageKeyword.PackageBaseID == pkgbase.ID,
+                       ~models.PackageKeyword.Keyword.in_(keywords)))
+
+    existing_keywords = set(kwd.Keyword for kwd in pkgbase.keywords.all())
+    with db.begin():
+        for keyword in keywords.difference(existing_keywords):
+            db.create(models.PackageKeyword,
+                      PackageBase=pkgbase,
+                      Keyword=keyword)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
 @router.get("/pkgbase/{name}/flag")
 @auth_required(True, redirect="/pkgbase/{name}/flag")
 async def pkgbase_flag_get(request: Request, name: str):
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 583149f8..d525f63b 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -37,7 +37,7 @@
         <th>{{ "Keywords" | tr }}:</th>
         {% if request.user.has_credential("CRED_PKGBASE_SET_KEYWORDS", approved=[pkgbase.Maintainer]) %}
         <td>
-            <form method="update"
+            <form method="post"
                   action="/pkgbase/{{ pkgbase.Name }}/keywords"
             >
                 <div>
@@ -51,7 +51,7 @@
         </td>
         {% else %}
         <td>
-            {% for keyword in pkgbase.keywords %}
+            {% for keyword in pkgbase.keywords.all() %}
                 <a class="keyword"
                    href="/packages/?K={{ keyword.Keyword }}&amp;SB=p"
                 >
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index c4d9ab1c..887945d9 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2604,3 +2604,33 @@ def test_account_comments(client: TestClient, user: User, package: Package):
     expected = rendered_comment.RenderedComment.replace(
         "<p>", "").replace("</p>", "")
     assert rendered[0].text.strip() == expected
+
+
+def test_pkgbase_keywords(client: TestClient, user: User, package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}"
+    with client as request:
+        resp = request.get(endpoint)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    keywords = root.xpath('//a[@class="keyword"]')
+    assert len(keywords) == 0
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    post_endpoint = f"{endpoint}/keywords"
+    with client as request:
+        resp = request.post(post_endpoint, data={
+            "keywords": "abc test"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    with client as request:
+        resp = request.get(resp.headers.get("location"))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    keywords = root.xpath('//a[@class="keyword"]')
+    assert len(keywords) == 2
+    expected = ["abc", "test"]
+    for i, keyword in enumerate(keywords):
+        assert keyword.text.strip() == expected[i]

From 20f5519b99a29dc376a6d8a2325f58ca9305380c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 18:13:21 -0800
Subject: [PATCH 558/844] fix(fastapi): hide keywords when there are none or
 they can't be edited

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html | 56 ++++++++++++------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index d525f63b..00859068 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -33,34 +33,36 @@
             </td>
         </tr>
     {% endif %}
-    <tr>
-        <th>{{ "Keywords" | tr }}:</th>
-        {% if request.user.has_credential("CRED_PKGBASE_SET_KEYWORDS", approved=[pkgbase.Maintainer]) %}
-        <td>
-            <form method="post"
-                  action="/pkgbase/{{ pkgbase.Name }}/keywords"
-            >
-                <div>
-                    <input type="text"
-                           name="keywords"
-                           value="{{ pkgbase.keywords | join(' ', attribute='Keyword') }}"
-                    />
-                    <input type="submit" value="{{ 'Update' | tr }}"/>
-                </div>
-            </form>
-        </td>
-        {% else %}
-        <td>
-            {% for keyword in pkgbase.keywords.all() %}
-                <a class="keyword"
-                   href="/packages/?K={{ keyword.Keyword }}&amp;SB=p"
+    {% if pkgbase.keywords.count() or request.user.has_credential("CRED_PKGBASE_SET_KEYWORDS", approved=[pkgbase.Maintainer]) %}
+        <tr>
+            <th>{{ "Keywords" | tr }}:</th>
+            {% if request.user.has_credential("CRED_PKGBASE_SET_KEYWORDS", approved=[pkgbase.Maintainer]) %}
+            <td>
+                <form method="post"
+                      action="/pkgbase/{{ pkgbase.Name }}/keywords"
                 >
-                    {{ keyword.Keyword }}
-                </a>
-            {% endfor %}
-        </td>
-        {% endif %}
-    </tr>
+                    <div>
+                        <input type="text"
+                               name="keywords"
+                               value="{{ pkgbase.keywords | join(' ', attribute='Keyword') }}"
+                        />
+                        <input type="submit" value="{{ 'Update' | tr }}"/>
+                    </div>
+                </form>
+            </td>
+            {% else %}
+            <td>
+                {% for keyword in pkgbase.keywords.all() %}
+                    <a class="keyword"
+                       href="/packages/?K={{ keyword.Keyword }}&amp;SB=p"
+                    >
+                        {{ keyword.Keyword }}
+                    </a>
+                {% endfor %}
+            </td>
+            {% endif %}
+        </tr>
+    {% endif %}
     {% if licenses and licenses.count() and show_package_details %}
         <tr>
             <th>{{ "Licenses" | tr }}:</th>

From 2dc6cfec23dcc8432db52f0676e7aa9f643d521c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 18:14:15 -0800
Subject: [PATCH 559/844] fix(fastapi): reorganize licenses display

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 00859068..1fbd47d9 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -63,10 +63,10 @@
             {% endif %}
         </tr>
     {% endif %}
-    {% if licenses and licenses.count() and show_package_details %}
+    {% if show_package_details and licenses and licenses.count() %}
         <tr>
             <th>{{ "Licenses" | tr }}:</th>
-            <td>{{ licenses | join(', ', attribute='Name') | default('None' | tr) }} </td>
+            <td>{{ licenses.all() | join(', ', attribute='Name') | default('None' | tr) }} </td>
         </tr>
     {% endif %}
     {% if show_package_details %}

From 2016b80ea97dc89d3170a91265abfd05763b81ab Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 18:14:50 -0800
Subject: [PATCH 560/844] fix(fastapi): hide conflicts when there are none

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 1fbd47d9..da99cf1b 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -69,11 +69,11 @@
             <td>{{ licenses.all() | join(', ', attribute='Name') | default('None' | tr) }} </td>
         </tr>
     {% endif %}
-    {% if show_package_details %}
+    {% if show_package_details and conflicts and conflicts.count() %}
         <tr>
             <th>{{ "Conflicts" | tr }}:</th>
             <td class="wrap">
-                {{ conflicts | join(', ', attribute='RelName') }}
+                {{ conflicts.all() | join(', ', attribute='RelName') }}
             </td>
         </tr>
     {% endif %}

From 50a9690c2ddefeb3fe758ed998f2edbe3773d5f1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 19:09:24 -0800
Subject: [PATCH 561/844] feat(fastapi): add Provides field in package details

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               |  6 +++++-
 templates/partials/packages/details.html |  8 ++++++++
 test/test_packages_routes.py             | 14 +++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index e227fe23..fb91a8e3 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -12,7 +12,7 @@ import aurweb.packages.util
 from aurweb import db, defaults, l10n, logging, models, util
 from aurweb.auth import auth_required
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
-from aurweb.models.relation_type import CONFLICTS_ID
+from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID
 from aurweb.models.request_type import DELETION_ID, MERGE, MERGE_ID
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
@@ -258,6 +258,10 @@ async def package(request: Request, name: str) -> Response:
     )
     context["conflicts"] = conflicts
 
+    provides = pkg.package_relations.filter(
+        models.PackageRelation.RelTypeID == PROVIDES_ID)
+    context["provides"] = provides
+
     return render_template(request, "packages/show.html", context)
 
 
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index da99cf1b..70636926 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -77,6 +77,14 @@
             </td>
         </tr>
     {% endif %}
+    {% if show_package_details and provides and provides.count() %}
+        <tr id="provides">
+            <th>{{ "Provides" | tr }}:</th>
+            <td class="wrap">
+                {{ provides.all() | join(', ', attribute='RelName') }}
+            </td>
+        </tr>
+    {% endif %}
     <tr>
         <th>{{ "Submitter" | tr }}:</th>
         <td>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 887945d9..464a7f60 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -217,8 +217,16 @@ def test_package_official_not_found(client: TestClient, package: Package):
 
 def test_package(client: TestClient, package: Package):
     """ Test a single / packages / {name} route. """
-    with client as request:
 
+    with db.begin():
+        db.create(PackageRelation, PackageID=package.ID,
+                  RelTypeID=PROVIDES_ID,
+                  RelName="test_provider1")
+        db.create(PackageRelation, PackageID=package.ID,
+                  RelTypeID=PROVIDES_ID,
+                  RelName="test_provider2")
+
+    with client as request:
         resp = request.get(package_endpoint(package))
     assert resp.status_code == int(HTTPStatus.OK)
 
@@ -238,6 +246,10 @@ def test_package(client: TestClient, package: Package):
     pkgbase = row.find("./td/a")
     assert pkgbase.text.strip() == package.PackageBase.Name
 
+    provides = root.xpath('//tr[@id="provides"]/td')
+    expected = ["test_provider1", "test_provider2"]
+    assert provides[0].text.strip() == ", ".join(expected)
+
 
 def test_package_comments(client: TestClient, user: User, package: Package):
     now = (datetime.utcnow().timestamp())

From a33e9bd571dfaf1bd2a719df0a80e66f0c33cc2e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 19:14:08 -0800
Subject: [PATCH 562/844] feat(fastapi): add Replaces field to package details

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               |  6 +++++-
 templates/partials/packages/details.html |  8 ++++++++
 test/test_packages_routes.py             | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index fb91a8e3..f03be217 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -12,7 +12,7 @@ import aurweb.packages.util
 from aurweb import db, defaults, l10n, logging, models, util
 from aurweb.auth import auth_required
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
-from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID
+from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
 from aurweb.models.request_type import DELETION_ID, MERGE, MERGE_ID
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
@@ -262,6 +262,10 @@ async def package(request: Request, name: str) -> Response:
         models.PackageRelation.RelTypeID == PROVIDES_ID)
     context["provides"] = provides
 
+    replaces = pkg.package_relations.filter(
+        models.PackageRelation.RelTypeID == REPLACES_ID)
+    context["replaces"] = replaces
+
     return render_template(request, "packages/show.html", context)
 
 
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 70636926..7516b324 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -85,6 +85,14 @@
             </td>
         </tr>
     {% endif %}
+    {% if show_package_details and replaces and replaces.count() %}
+        <tr id="replaces">
+            <th>{{ "Replaces" | tr }}:</th>
+            <td class="wrap">
+                {{ replaces.all() | join(', ', attribute='RelName') }}
+            </td>
+        </tr>
+    {% endif %}
     <tr>
         <th>{{ "Submitter" | tr }}:</th>
         <td>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 464a7f60..b00844c2 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -24,7 +24,7 @@ from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_request import ACCEPTED_ID, REJECTED_ID, PackageRequest
 from aurweb.models.package_vote import PackageVote
-from aurweb.models.relation_type import PROVIDES_ID, RelationType
+from aurweb.models.relation_type import PROVIDES_ID, REPLACES_ID, RelationType
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, RequestType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
@@ -226,6 +226,13 @@ def test_package(client: TestClient, package: Package):
                   RelTypeID=PROVIDES_ID,
                   RelName="test_provider2")
 
+        db.create(PackageRelation, PackageID=package.ID,
+                  RelTypeID=REPLACES_ID,
+                  RelName="test_replacer1")
+        db.create(PackageRelation, PackageID=package.ID,
+                  RelTypeID=REPLACES_ID,
+                  RelName="test_replacer2")
+
     with client as request:
         resp = request.get(package_endpoint(package))
     assert resp.status_code == int(HTTPStatus.OK)
@@ -250,6 +257,10 @@ def test_package(client: TestClient, package: Package):
     expected = ["test_provider1", "test_provider2"]
     assert provides[0].text.strip() == ", ".join(expected)
 
+    replaces = root.xpath('//tr[@id="replaces"]/td')
+    expected = ["test_replacer1", "test_replacer2"]
+    assert replaces[0].text.strip() == ", ".join(expected)
+
 
 def test_package_comments(client: TestClient, user: User, package: Package):
     now = (datetime.utcnow().timestamp())

From e8e9edbb21cfe5dd33f491acbdcc1d9b98845a69 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 19:30:21 -0800
Subject: [PATCH 563/844] change(fastapi): simplify package details database
 queries

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 16 ++++------------
 templates/partials/packages/details.html |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index f03be217..0949909e 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -229,9 +229,7 @@ async def package(request: Request, name: str) -> Response:
     context["package"] = pkg
 
     # Package sources.
-    context["sources"] = db.query(models.PackageSource).join(
-        models.Package).join(models.PackageBase).filter(
-        models.PackageBase.ID == pkgbase.ID)
+    context["sources"] = pkg.package_sources
 
     # Package dependencies.
     dependencies = db.query(models.PackageDependency).join(
@@ -246,16 +244,10 @@ async def package(request: Request, name: str) -> Response:
         models.Package.Name.asc())
     context["required_by"] = required_by
 
-    licenses = db.query(models.License).join(models.PackageLicense).join(
-        models.Package).join(models.PackageBase).filter(
-        models.PackageBase.ID == pkgbase.ID)
-    context["licenses"] = licenses
+    context["licenses"] = pkg.package_licenses
 
-    conflicts = db.query(models.PackageRelation).join(models.Package).join(
-        models.PackageBase).filter(
-        and_(models.PackageRelation.RelTypeID == CONFLICTS_ID,
-             models.PackageBase.ID == pkgbase.ID)
-    )
+    conflicts = pkg.package_relations.filter(
+        models.PackageRelation.RelTypeID == CONFLICTS_ID)
     context["conflicts"] = conflicts
 
     provides = pkg.package_relations.filter(
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 7516b324..7e20b082 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -66,7 +66,7 @@
     {% if show_package_details and licenses and licenses.count() %}
         <tr>
             <th>{{ "Licenses" | tr }}:</th>
-            <td>{{ licenses.all() | join(', ', attribute='Name') | default('None' | tr) }} </td>
+            <td>{{ licenses.all() | join(', ', attribute='License.Name') }} </td>
         </tr>
     {% endif %}
     {% if show_package_details and conflicts and conflicts.count() %}

From 7aa959150ec6614fbf0684917a3efe1c2e3918d4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 19:53:50 -0800
Subject: [PATCH 564/844] feat(fastapi): add id="conflicts" to package details
 conflicts

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html |  2 +-
 test/test_packages_routes.py             | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 7e20b082..c9b95a26 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -70,7 +70,7 @@
         </tr>
     {% endif %}
     {% if show_package_details and conflicts and conflicts.count() %}
-        <tr>
+        <tr id="conflicts">
             <th>{{ "Conflicts" | tr }}:</th>
             <td class="wrap">
                 {{ conflicts.all() | join(', ', attribute='RelName') }}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index b00844c2..1dabada8 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -24,7 +24,7 @@ from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_request import ACCEPTED_ID, REJECTED_ID, PackageRequest
 from aurweb.models.package_vote import PackageVote
-from aurweb.models.relation_type import PROVIDES_ID, REPLACES_ID, RelationType
+from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID, RelationType
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, RequestType
 from aurweb.models.user import User
 from aurweb.testing import setup_test_db
@@ -233,6 +233,13 @@ def test_package(client: TestClient, package: Package):
                   RelTypeID=REPLACES_ID,
                   RelName="test_replacer2")
 
+        db.create(PackageRelation, PackageID=package.ID,
+                  RelTypeID=CONFLICTS_ID,
+                  RelName="test_conflict1")
+        db.create(PackageRelation, PackageID=package.ID,
+                  RelTypeID=CONFLICTS_ID,
+                  RelName="test_conflict2")
+
     with client as request:
         resp = request.get(package_endpoint(package))
     assert resp.status_code == int(HTTPStatus.OK)
@@ -261,6 +268,10 @@ def test_package(client: TestClient, package: Package):
     expected = ["test_replacer1", "test_replacer2"]
     assert replaces[0].text.strip() == ", ".join(expected)
 
+    conflicts = root.xpath('//tr[@id="conflicts"]/td')
+    expected = ["test_conflict1", "test_conflict2"]
+    assert conflicts[0].text.strip() == ", ".join(expected)
+
 
 def test_package_comments(client: TestClient, user: User, package: Package):
     now = (datetime.utcnow().timestamp())

From 686c0322907ed3bb8015c42f050f845323549776 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 11 Nov 2021 19:55:04 -0800
Subject: [PATCH 565/844] feat(fastapi): add id="licenses" to package details
 licenses

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html |  2 +-
 test/test_packages_routes.py             | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index c9b95a26..67c32170 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -64,7 +64,7 @@
         </tr>
     {% endif %}
     {% if show_package_details and licenses and licenses.count() %}
-        <tr>
+        <tr id="licenses">
             <th>{{ "Licenses" | tr }}:</th>
             <td>{{ licenses.all() | join(', ', attribute='License.Name') }} </td>
         </tr>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 1dabada8..1bdb3ea3 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -11,6 +11,7 @@ from fastapi.testclient import TestClient
 from sqlalchemy import and_
 
 from aurweb import asgi, db, defaults
+from aurweb.models import License, PackageLicense
 from aurweb.models.account_type import USER_ID, AccountType
 from aurweb.models.dependency_type import DependencyType
 from aurweb.models.official_provider import OfficialProvider
@@ -240,6 +241,17 @@ def test_package(client: TestClient, package: Package):
                   RelTypeID=CONFLICTS_ID,
                   RelName="test_conflict2")
 
+        # Create some licenses.
+        licenses = [
+            db.create(License, Name="test_license1"),
+            db.create(License, Name="test_license2")
+        ]
+
+        db.create(PackageLicense, PackageID=package.ID,
+                  License=licenses[0])
+        db.create(PackageLicense, PackageID=package.ID,
+                  License=licenses[1])
+
     with client as request:
         resp = request.get(package_endpoint(package))
     assert resp.status_code == int(HTTPStatus.OK)
@@ -260,6 +272,10 @@ def test_package(client: TestClient, package: Package):
     pkgbase = row.find("./td/a")
     assert pkgbase.text.strip() == package.PackageBase.Name
 
+    licenses = root.xpath('//tr[@id="licenses"]/td')
+    expected = ["test_license1", "test_license2"]
+    assert licenses[0].text.strip() == ", ".join(expected)
+
     provides = root.xpath('//tr[@id="provides"]/td')
     expected = ["test_provider1", "test_provider2"]
     assert provides[0].text.strip() == ", ".join(expected)

From bd59adc886a6ce53fc5fe4c874a81cc9f8d4fcb5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 12 Nov 2021 17:39:26 -0800
Subject: [PATCH 566/844] fix(fastapi): use NumVotes for votes field in package
 details

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 67c32170..dbb81c19 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -132,11 +132,11 @@
     <tr>
         <th>{{ "Votes" | tr }}:</th>
         {% if not is_maintainer %}
-            <td>{{ pkgbase.package_votes.count() }}</td>
+            <td>{{ pkgbase.NumVotes }}</td>
         {% else %}
             <td>
                 <a href="/pkgbase/{{ pkgbase.Name }}/voters">
-                    {{ pkgbase.package_votes.count() }}
+                    {{ pkgbase.NumVotes }}
                 </a>
             </td>
         {% endif %}

From cee7512e4d843c771a1aee42277781fd949648cc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 12 Nov 2021 20:49:25 -0800
Subject: [PATCH 567/844] cleanup(fastapi): simplify
 PackageDependency.is_package()

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_dependency.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index edaa6538..c4c5f6c1 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -1,9 +1,10 @@
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-from aurweb import schema
+from aurweb import db, schema
 from aurweb.models.declarative import Base
 from aurweb.models.dependency_type import DependencyType as _DependencyType
+from aurweb.models.official_provider import OfficialProvider as _OfficialProvider
 from aurweb.models.package import Package as _Package
 
 
@@ -46,11 +47,7 @@ class PackageDependency(Base):
                 params=("NULL"))
 
     def is_package(self) -> bool:
-        # TODO: Improve the speed of this query if possible.
-        from aurweb import db
-        from aurweb.models.official_provider import OfficialProvider
-        from aurweb.models.package import Package
-        pkg = db.query(Package, Package.Name == self.DepName)
-        official = db.query(OfficialProvider,
-                            OfficialProvider.Name == self.DepName)
-        return pkg.scalar() or official.scalar()
+        pkg = db.query(_Package).filter(_Package.Name == self.DepName).exists()
+        official = db.query(_OfficialProvider).filter(
+            _OfficialProvider.Name == self.DepName).exists()
+        return db.query(pkg).scalar() or db.query(official).scalar()

From f8ba2c53421050ab154040a7cbb2c0de554ae8d1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 14 Nov 2021 15:32:11 -0800
Subject: [PATCH 568/844] cleanup(fastapi): simplify
 aurweb.routers.accounts.accounts_post

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 498568ad..83c16ed0 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -662,7 +662,7 @@ async def accounts(request: Request):
                         account_type.TRUSTED_USER_AND_DEV})
 async def accounts_post(request: Request,
                         O: int = Form(default=0),  # Offset
-                        SB: str = Form(default=str()),  # Search By
+                        SB: str = Form(default=str()),  # Sort By
                         U: str = Form(default=str()),  # Username
                         T: str = Form(default=str()),  # Account Type
                         S: bool = Form(default=False),  # Suspended
@@ -705,23 +705,19 @@ async def accounts_post(request: Request,
 
     # Populate this list with any additional statements to
     # be ANDed together.
-    statements = []
-    if account_type_id is not None:
-        statements.append(models.AccountType.ID == account_type_id)
-    if U:
-        statements.append(models.User.Username.like(f"%{U}%"))
-    if S:
-        statements.append(models.User.Suspended == S)
-    if E:
-        statements.append(models.User.Email.like(f"%{E}%"))
-    if R:
-        statements.append(models.User.RealName.like(f"%{R}%"))
-    if I:
-        statements.append(models.User.IRCNick.like(f"%{I}%"))
-    if K:
-        statements.append(models.User.PGPKey.like(f"%{K}%"))
+    statements = [
+        v for k, v in [
+            (account_type_id is not None, models.AccountType.ID == account_type_id),
+            (bool(U), models.User.Username.like(f"%{U}%")),
+            (bool(S), models.User.Suspended == S),
+            (bool(E), models.User.Email.like(f"%{E}%")),
+            (bool(R), models.User.RealName.like(f"%{R}%")),
+            (bool(I), models.User.IRCNick.like(f"%{I}%")),
+            (bool(K), models.User.PGPKey.like(f"%{K}%")),
+        ] if k
+    ]
 
-    # Filter the query by combining all statements added above into
+    # Filter the query by coe-mbining all statements added above into
     # an AND statement, unless there's just one statement, which
     # we pass on to filter() as args.
     if statements:

From 4103ab49c9c6922e89f89a25fc3b2b5b461c1bcb Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 14 Nov 2021 15:36:06 -0800
Subject: [PATCH 569/844] housekeep(fastapi): rework aurweb.db session API

Changes:
-------
- Add aurweb.db.get_session()
    - Returns aurweb.db's global `session` instance
    - Provides us a way to change the implementation of the session
      instance without interrupting user code.
- Use aurweb.db.get_session() in session API methods
- Add docstrings to session API methods
- Refactor aurweb.db.delete
    - Normalize aurweb.db.delete to an alias of session.delete
- Refresh instances in places we depend on their non-PK columns
  being up to date.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py                  |  8 ++-
 aurweb/db.py                    | 89 ++++++++++++++++++++-------------
 aurweb/models/ban.py            |  9 ++--
 aurweb/models/user.py           |  2 +-
 aurweb/packages/util.py         | 18 +++++--
 aurweb/ratelimit.py             |  4 +-
 aurweb/routers/accounts.py      | 49 ++++++++----------
 aurweb/routers/packages.py      | 68 +++++++++++++------------
 aurweb/rpc.py                   | 31 ++++++++++--
 aurweb/scripts/popupdate.py     |  2 +-
 aurweb/scripts/rendercomment.py | 12 +++--
 aurweb/testing/__init__.py      | 10 ++--
 aurweb/users/__init__.py        |  0
 aurweb/users/util.py            | 19 +++++++
 aurweb/util.py                  |  1 +
 test/test_account_type.py       |  4 +-
 test/test_db.py                 |  6 +--
 test/test_dependency_type.py    |  4 +-
 test/test_packages_util.py      |  6 +++
 test/test_ratelimit.py          |  2 +-
 test/test_relation_type.py      |  2 +-
 test/test_request_type.py       |  4 +-
 22 files changed, 212 insertions(+), 138 deletions(-)
 create mode 100644 aurweb/users/__init__.py
 create mode 100644 aurweb/users/util.py

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 38754db0..98a43fd5 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -13,7 +13,7 @@ from starlette.requests import HTTPConnection
 
 import aurweb.config
 
-from aurweb import l10n, util
+from aurweb import db, l10n, util
 from aurweb.models import Session, User
 from aurweb.models.account_type import ACCOUNT_TYPE_ID
 from aurweb.templates import make_variable_context, render_template
@@ -98,14 +98,12 @@ class AnonymousUser:
 
 class BasicAuthBackend(AuthenticationBackend):
     async def authenticate(self, conn: HTTPConnection):
-        from aurweb.db import session
-
         sid = conn.cookies.get("AURSID")
         if not sid:
             return (None, AnonymousUser())
 
         now_ts = datetime.utcnow().timestamp()
-        record = session.query(Session).filter(
+        record = db.query(Session).filter(
             and_(Session.SessionID == sid,
                  Session.LastUpdateTS >= now_ts)).first()
 
@@ -116,7 +114,7 @@ class BasicAuthBackend(AuthenticationBackend):
         # At this point, we cannot have an invalid user if the record
         # exists, due to ForeignKey constraints in the schema upheld
         # by mysqlclient.
-        user = session.query(User).filter(User.ID == record.UsersID).first()
+        user = db.query(User).filter(User.ID == record.UsersID).first()
         user.nonce = util.make_nonce()
         user.authenticated = True
 
diff --git a/aurweb/db.py b/aurweb/db.py
index c1e80751..39232d5a 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -2,10 +2,10 @@ import functools
 import math
 import re
 
-from typing import Iterable
+from typing import Iterable, NewType
 
 from sqlalchemy import event
-from sqlalchemy.orm import scoped_session
+from sqlalchemy.orm import Query, scoped_session
 
 import aurweb.config
 import aurweb.util
@@ -22,6 +22,9 @@ session = None
 # Global introspected object memo.
 introspected = dict()
 
+# A mocked up type.
+Base = NewType("aurweb.models.declarative_base.Base", "Base")
+
 
 def make_random_value(table: str, column: str):
     """ Generate a unique, random value for a string column in a table.
@@ -58,55 +61,69 @@ def make_random_value(table: str, column: str):
     return string
 
 
-def query(model, *args, **kwargs):
-    return session.query(model).filter(*args, **kwargs)
+def get_session():
+    """ Return aurweb.db's global session. """
+    return session
 
 
-def create(model, *args, **kwargs):
-    instance = model(*args, **kwargs)
+def refresh(model: Base) -> Base:
+    """ Refresh the session's knowledge of `model`. """
+    get_session().refresh(model)
+    return model
+
+
+def query(Model: Base, *args, **kwargs) -> Query:
+    """
+    Perform an ORM query against the database session.
+
+    This method also runs Query.filter on the resulting model
+    query with *args and **kwargs.
+
+    :param Model: Declarative ORM class
+    """
+    return get_session().query(Model).filter(*args, **kwargs)
+
+
+def create(Model: Base, *args, **kwargs) -> Base:
+    """
+    Create a record and add() it to the database session.
+
+    :param Model: Declarative ORM class
+    :return: Model instance
+    """
+    instance = Model(*args, **kwargs)
     return add(instance)
 
 
-def delete(model, *args, **kwargs):
-    instance = session.query(model).filter(*args, **kwargs)
-    for record in instance:
-        session.delete(record)
+def delete(model: Base) -> None:
+    """
+    Delete a set of records found by Query.filter(*args, **kwargs).
+
+    :param Model: Declarative ORM class
+    """
+    get_session().delete(model)
 
 
-def delete_all(iterable: Iterable):
-    with begin():
-        for obj in iterable:
-            session.delete(obj)
+def delete_all(iterable: Iterable) -> None:
+    """ Delete each instance found in `iterable`. """
+    session_ = get_session()
+    aurweb.util.apply_all(iterable, session_.delete)
 
 
-def rollback():
-    session.rollback()
+def rollback() -> None:
+    """ Rollback the database session. """
+    get_session().rollback()
 
 
-def add(model):
-    session.add(model)
+def add(model: Base) -> Base:
+    """ Add `model` to the database session. """
+    get_session().add(model)
     return model
 
 
 def begin():
-    """ Begin an SQLAlchemy SessionTransaction.
-
-    This context is **required** to perform an modifications to the
-    database.
-
-    Example:
-
-        with db.begin():
-            object = db.create(...)
-        # On __exit__, db.commit() is run.
-
-        with db.begin():
-            object = db.delete(...)
-        # On __exit__, db.commit() is run.
-
-    :return: A new SessionTransaction based on session
-    """
-    return session.begin()
+    """ Begin an SQLAlchemy SessionTransaction. """
+    return get_session().begin()
 
 
 def get_sqlalchemy_url():
diff --git a/aurweb/models/ban.py b/aurweb/models/ban.py
index a70be7b9..0fcb6d2e 100644
--- a/aurweb/models/ban.py
+++ b/aurweb/models/ban.py
@@ -1,6 +1,6 @@
 from fastapi import Request
 
-from aurweb import schema
+from aurweb import db, schema
 from aurweb.models.declarative import Base
 
 
@@ -10,11 +10,10 @@ class Ban(Base):
     __mapper_args__ = {"primary_key": [__table__.c.IPAddress]}
 
     def __init__(self, **kwargs):
-        self.IPAddress = kwargs.get("IPAddress")
-        self.BanTS = kwargs.get("BanTS")
+        super().__init__(**kwargs)
 
 
 def is_banned(request: Request):
-    from aurweb.db import session
     ip = request.client.host
-    return session.query(Ban).filter(Ban.IPAddress == ip).first() is not None
+    exists = db.query(Ban).filter(Ban.IPAddress == ip).exists()
+    return db.query(exists).scalar()
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 8db34c38..43910db9 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -146,7 +146,7 @@ class User(Base):
         self.authenticated = False
         if self.session:
             with db.begin():
-                db.session.delete(self.session)
+                db.delete(self.session)
 
     def is_trusted_user(self):
         return self.AccountType.ID in {
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index cdec26f3..78f5bf18 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -110,18 +110,26 @@ def get_pkg_or_base(
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     instance = db.query(cls).filter(cls.Name == name).first()
-    if cls == models.PackageBase and not instance:
+    if not instance:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
-    return instance
+    return db.refresh(instance)
 
 
-def get_pkgbase_comment(
-        pkgbase: models.PackageBase, id: int) -> models.PackageComment:
+def get_pkgbase_comment(pkgbase: models.PackageBase, id: int) \
+        -> models.PackageComment:
     comment = pkgbase.comments.filter(models.PackageComment.ID == id).first()
     if not comment:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
-    return comment
+    return db.refresh(comment)
+
+
+def get_pkgreq_by_id(id: int):
+    pkgreq = db.query(models.PackageRequest).filter(
+        models.PackageRequest.ID == id).first()
+    if not pkgreq:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
+    return db.refresh(pkgreq)
 
 
 @register_filter("out_of_date")
diff --git a/aurweb/ratelimit.py b/aurweb/ratelimit.py
index e306f7a7..a71cb1cc 100644
--- a/aurweb/ratelimit.py
+++ b/aurweb/ratelimit.py
@@ -40,8 +40,10 @@ def _update_ratelimit_db(request: Request):
     now = int(datetime.utcnow().timestamp())
     time_to_delete = now - window_length
 
+    records = db.query(ApiRateLimit).filter(
+        ApiRateLimit.WindowStart < time_to_delete)
     with db.begin():
-        db.delete(ApiRateLimit, ApiRateLimit.WindowStart < time_to_delete)
+        db.delete_all(records)
 
     host = request.client.host
     record = db.query(ApiRateLimit, ApiRateLimit.IP == host).first()
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 83c16ed0..aca322b5 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -4,7 +4,7 @@ import typing
 from datetime import datetime
 from http import HTTPStatus
 
-from fastapi import APIRouter, Form, HTTPException, Request
+from fastapi import APIRouter, Form, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from sqlalchemy import and_, func, or_
 
@@ -20,6 +20,7 @@ from aurweb.models.account_type import (DEVELOPER, DEVELOPER_ID, TRUSTED_USER, T
 from aurweb.models.ssh_pub_key import get_fingerprint
 from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
+from aurweb.users.util import get_user_by_name
 
 router = APIRouter()
 logger = logging.get_logger(__name__)
@@ -49,6 +50,7 @@ async def passreset_post(request: Request,
         return render_template(request, "passreset.html", context,
                                status_code=HTTPStatus.NOT_FOUND)
 
+    db.refresh(user)
     if resetkey:
         context["resetkey"] = resetkey
 
@@ -83,7 +85,7 @@ async def passreset_post(request: Request,
         with db.begin():
             user.ResetKey = str()
             if user.session:
-                db.session.delete(user.session)
+                db.delete(user.session)
             user.update_password(password)
 
         # Render ?step=complete.
@@ -458,15 +460,15 @@ def cannot_edit(request, user):
 
 @router.get("/account/{username}/edit", response_class=HTMLResponse)
 @auth_required(True, redirect="/account/{username}")
-async def account_edit(request: Request,
-                       username: str):
+async def account_edit(request: Request, username: str):
     user = db.query(models.User, models.User.Username == username).first()
+
     response = cannot_edit(request, user)
     if response:
         return response
 
     context = await make_variable_context(request, "Accounts")
-    context["user"] = user
+    context["user"] = db.refresh(user)
 
     context = make_account_form_context(context, request, user, dict())
     return render_template(request, "account/edit.html", context)
@@ -497,16 +499,14 @@ async def account_edit_post(request: Request,
                             ON: bool = Form(default=False),  # Owner Notify
                             T: int = Form(default=None),
                             passwd: str = Form(default=str())):
-    from aurweb.db import session
-
-    user = session.query(models.User).filter(
+    user = db.query(models.User).filter(
         models.User.Username == username).first()
     response = cannot_edit(request, user)
     if response:
         return response
 
     context = await make_variable_context(request, "Accounts")
-    context["user"] = user
+    context["user"] = db.refresh(user)
 
     args = dict(await request.form())
     context = make_account_form_context(context, request, user, args)
@@ -575,7 +575,7 @@ async def account_edit_post(request: Request,
                 user.ssh_pub_key.Fingerprint = fingerprint
         elif user.ssh_pub_key:
             # Else, if the user has a public key already, delete it.
-            session.delete(user.ssh_pub_key)
+            db.delete(user.ssh_pub_key)
 
     if T and T != user.AccountTypeID:
         with db.begin():
@@ -617,27 +617,16 @@ account_template = (
                status_code=HTTPStatus.UNAUTHORIZED)
 async def account(request: Request, username: str):
     _ = l10n.get_translator_for_request(request)
-    context = await make_variable_context(request,
-                                          _("Account") + " " + username)
-
-    user = db.query(models.User, models.User.Username == username).first()
-    if not user:
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
-
-    context["user"] = user
-
+    context = await make_variable_context(
+        request, _("Account") + " " + username)
+    context["user"] = get_user_by_name(username)
     return render_template(request, "account/show.html", context)
 
 
 @router.get("/account/{username}/comments")
 @auth_required(redirect="/account/{username}/comments")
 async def account_comments(request: Request, username: str):
-    user = db.query(models.User).filter(
-        models.User.Username == username
-    ).first()
-    if not user:
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
-
+    user = get_user_by_name(username)
     context = make_context(request, "Accounts")
     context["username"] = username
     context["comments"] = user.package_comments.order_by(
@@ -725,7 +714,7 @@ async def accounts_post(request: Request,
 
     # Finally, order and truncate our users for the current page.
     users = query.order_by(*order_by).limit(pp).offset(offset)
-    context["users"] = users
+    context["users"] = util.apply_all(users, db.refresh)
 
     return render_template(request, "account/index.html", context)
 
@@ -751,6 +740,9 @@ async def terms_of_service(request: Request):
     unaccepted = db.query(models.Term).filter(
         ~models.Term.ID.in_(db.query(models.AcceptedTerm.TermsID))).all()
 
+    for record in (diffs + unaccepted):
+        db.refresh(record)
+
     # Translate the 'Terms of Service' part of our page title.
     _ = l10n.get_translator_for_request(request)
     title = f"AUR {_('Terms of Service')}"
@@ -782,18 +774,21 @@ async def terms_of_service_post(request: Request,
         # We already did the database filters here, so let's just use
         # them instead of reiterating the process in terms_of_service.
         accept_needed = sorted(unaccepted + diffs)
-        return render_terms_of_service(request, context, accept_needed)
+        return render_terms_of_service(
+            request, context, util.apply_all(accept_needed, db.refresh))
 
     with db.begin():
         # For each term we found, query for the matching accepted term
         # and update its Revision to the term's current Revision.
         for term in diffs:
+            db.refresh(term)
             accepted_term = request.user.accepted_terms.filter(
                 models.AcceptedTerm.TermsID == term.ID).first()
             accepted_term.Revision = term.Revision
 
         # For each term that was never accepted, accept it!
         for term in unaccepted:
+            db.refresh(term)
             db.create(models.AcceptedTerm, User=request.user,
                       Term=term, Revision=term.Revision)
 
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 0949909e..07e8af72 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -4,7 +4,7 @@ from typing import Any, Dict, List
 
 from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse
-from sqlalchemy import and_, case
+from sqlalchemy import case
 
 import aurweb.filters
 import aurweb.packages.util
@@ -15,9 +15,9 @@ from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
 from aurweb.models.request_type import DELETION_ID, MERGE, MERGE_ID
 from aurweb.packages.search import PackageSearch
-from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
+from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, get_pkgreq_by_id, query_notified, query_voted
 from aurweb.scripts import notify, popupdate
-from aurweb.scripts.rendercomment import update_comment_render
+from aurweb.scripts.rendercomment import update_comment_render_fastapi
 from aurweb.templates import make_context, make_variable_context, render_raw_template, render_template
 
 logger = logging.get_logger(__name__)
@@ -92,7 +92,10 @@ async def packages_get(request: Request, context: Dict[str, Any],
 
     # Insert search results into the context.
     results = search.results()
-    context["packages"] = results.limit(per_page).offset(offset)
+
+    packages = results.limit(per_page).offset(offset)
+    util.apply_all(packages, db.refresh)
+    context["packages"] = packages
     context["packages_voted"] = query_voted(
         context.get("packages"), request.user)
     context["packages_notified"] = query_notified(
@@ -132,6 +135,7 @@ def create_request_if_missing(requests: List[models.PackageRequest],
                            ClosedTS=now,
                            Closer=user)
         requests.append(pkgreq)
+    return pkgreq
 
 
 def delete_package(deleter: models.User, package: models.Package):
@@ -147,8 +151,9 @@ def delete_package(deleter: models.User, package: models.Package):
         ).first()
 
         with db.begin():
-            create_request_if_missing(
+            pkgreq = create_request_if_missing(
                 requests, reqtype, deleter, package)
+        db.refresh(pkgreq)
 
         bases_to_delete.append(package.PackageBase)
 
@@ -171,8 +176,9 @@ def delete_package(deleter: models.User, package: models.Package):
         )
 
     # Perform all the deletions.
-    db.delete_all([package])
-    db.delete_all(bases_to_delete)
+    with db.begin():
+        db.delete(package)
+        db.delete_all(bases_to_delete)
 
     # Send out all the notifications.
     util.apply_all(notifications, lambda n: n.send())
@@ -221,8 +227,7 @@ async def make_single_context(request: Request,
 async def package(request: Request, name: str) -> Response:
     # Get the Package.
     pkg = get_pkg_or_base(name, models.Package)
-    pkgbase = (get_pkg_or_base(name, models.PackageBase)
-               if not pkg else pkg.PackageBase)
+    pkgbase = pkg.PackageBase
 
     # Add our base information.
     context = await make_single_context(request, pkgbase)
@@ -312,7 +317,7 @@ async def pkgbase_comments_post(
             db.create(models.PackageNotification,
                       User=request.user,
                       PackageBase=pkgbase)
-    update_comment_render(comment.ID)
+    update_comment_render_fastapi(comment)
 
     # Redirect to the pkgbase page.
     return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{comment.ID}",
@@ -374,7 +379,7 @@ async def pkgbase_comment_post(
                 db.create(models.PackageNotification,
                           User=request.user,
                           PackageBase=pkgbase)
-    update_comment_render(db_comment.ID)
+    update_comment_render_fastapi(db_comment)
 
     if not next:
         next = f"/pkgbase/{pkgbase.Name}"
@@ -539,7 +544,7 @@ def remove_users(pkgbase, usernames):
                     conn, comaintainer.User.ID, pkgbase.ID
                 )
             )
-            db.session.delete(comaintainer)
+            db.delete(comaintainer)
 
     # Send out notifications if need be.
     for notify_ in notifications:
@@ -679,14 +684,8 @@ async def requests(request: Request,
 @router.get("/pkgbase/{name}/request")
 @auth_required(True, redirect="/pkgbase/{name}/request")
 async def package_request(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, models.PackageBase)
     context = await make_variable_context(request, "Submit Request")
-
-    pkgbase = db.query(models.PackageBase).filter(
-        models.PackageBase.Name == name).first()
-
-    if not pkgbase:
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
-
     context["pkgbase"] = pkgbase
     return render_template(request, "pkgbase/request.html", context)
 
@@ -729,6 +728,7 @@ async def pkgbase_request_post(request: Request, name: str,
             ]
             return render_template(request, "pkgbase/request.html", context)
 
+        db.refresh(target)
         if target.ID == pkgbase.ID:
             # TODO: This error needs to be translated.
             context["errors"] = [
@@ -767,8 +767,7 @@ async def pkgbase_request_post(request: Request, name: str,
 @router.get("/requests/{id}/close")
 @auth_required(True, redirect="/requests/{id}/close")
 async def requests_close(request: Request, id: int):
-    pkgreq = db.query(models.PackageRequest).filter(
-        models.PackageRequest.ID == id).first()
+    pkgreq = get_pkgreq_by_id(id)
     if not request.user.is_elevated() and request.user != pkgreq.User:
         # Request user doesn't have permission here: redirect to '/'.
         return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
@@ -783,8 +782,7 @@ async def requests_close(request: Request, id: int):
 async def requests_close_post(request: Request, id: int,
                               reason: int = Form(default=0),
                               comments: str = Form(default=str())):
-    pkgreq = db.query(models.PackageRequest).filter(
-        models.PackageRequest.ID == id).first()
+    pkgreq = get_pkgreq_by_id(id)
     if not request.user.is_elevated() and request.user != pkgreq.User:
         # Request user doesn't have permission here: redirect to '/'.
         return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
@@ -823,13 +821,17 @@ async def pkgbase_keywords(request: Request, name: str,
     keywords = set(keywords.split(" "))
 
     # Delete all keywords which are not supplied by the user.
-    with db.begin():
-        db.delete(models.PackageKeyword,
-                  and_(models.PackageKeyword.PackageBaseID == pkgbase.ID,
-                       ~models.PackageKeyword.Keyword.in_(keywords)))
+    other_keywords = pkgbase.keywords.filter(
+        ~models.PackageKeyword.Keyword.in_(keywords))
+    other_keyword_strings = [kwd.Keyword for kwd in other_keywords]
 
-    existing_keywords = set(kwd.Keyword for kwd in pkgbase.keywords.all())
+    existing_keywords = set(
+        kwd.Keyword for kwd in
+        pkgbase.keywords.filter(
+            ~models.PackageKeyword.Keyword.in_(other_keyword_strings))
+    )
     with db.begin():
+        db.delete_all(other_keywords)
         for keyword in keywords.difference(existing_keywords):
             db.create(models.PackageKeyword,
                       PackageBase=pkgbase,
@@ -940,7 +942,7 @@ def pkgbase_unnotify_instance(request: Request, pkgbase: models.PackageBase):
     has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
     if has_cred and notif:
         with db.begin():
-            db.session.delete(notif)
+            db.delete(notif)
 
 
 @router.post("/pkgbase/{name}/unnotify")
@@ -988,7 +990,7 @@ async def pkgbase_unvote(request: Request, name: str):
     has_cred = request.user.has_credential("CRED_PKGBASE_VOTE")
     if has_cred and vote:
         with db.begin():
-            db.session.delete(vote)
+            db.delete(vote)
 
         # Update NumVotes/Popularity.
         conn = db.ConnectionExecutor(db.get_engine().raw_connection())
@@ -1015,7 +1017,7 @@ def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
         if co:
             with db.begin():
                 pkgbase.Maintainer = co.User
-                db.session.delete(co)
+                db.delete(co)
         else:
             pkgbase.Maintainer = None
 
@@ -1463,8 +1465,8 @@ def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
         with db.begin():
             # Delete pkgbase and its packages now that everything's merged.
             for pkg in pkgbase.packages:
-                db.session.delete(pkg)
-            db.session.delete(pkgbase)
+                db.delete(pkg)
+            db.delete(pkgbase)
 
             # Accept merge requests related to this pkgbase and target.
             for pkgreq in requests:
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 4ab005af..03662790 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -1,5 +1,5 @@
 from collections import defaultdict
-from typing import Any, Dict, List
+from typing import Any, Callable, Dict, List, NewType
 
 from sqlalchemy import and_
 
@@ -25,6 +25,10 @@ REL_TYPES = {
 }
 
 
+DataGenerator = NewType("DataGenerator",
+                        Callable[[models.Package], Dict[str, Any]])
+
+
 class RPCError(Exception):
     pass
 
@@ -188,15 +192,32 @@ class RPC:
         self._update_json_relations(package, data)
         return data
 
-    def _handle_multiinfo_type(self, args: List[str] = [], **kwargs):
+    def _assemble_json_data(self, packages: List[models.Package],
+                            data_generator: DataGenerator) \
+            -> List[Dict[str, Any]]:
+        """
+        Assemble JSON data out of a list of packages.
+
+        :param packages: A list of Package instances or a Package ORM query
+        :param data_generator: Generator callable of single-Package JSON data
+        """
+        output = []
+        for pkg in packages:
+            db.refresh(pkg)
+            output.append(data_generator(pkg))
+        return output
+
+    def _handle_multiinfo_type(self, args: List[str] = [], **kwargs) \
+            -> List[Dict[str, Any]]:
         self._enforce_args(args)
         args = set(args)
         packages = db.query(models.Package).filter(
             models.Package.Name.in_(args))
-        return [self._get_info_json_data(pkg) for pkg in packages]
+        return self._assemble_json_data(packages, self._get_info_json_data)
 
     def _handle_search_type(self, by: str = defaults.RPC_SEARCH_BY,
-                            args: List[str] = []):
+                            args: List[str] = []) \
+            -> List[Dict[str, Any]]:
         # If `by` isn't maintainer and we don't have any args, raise an error.
         # In maintainer's case, return all orphans if there are no args,
         # so we need args to pass through to the handler without errors.
@@ -212,7 +233,7 @@ class RPC:
 
         max_results = config.getint("options", "max_rpc_results")
         results = search.results().limit(max_results)
-        return [self._get_json_data(pkg) for pkg in results]
+        return self._assemble_json_data(results, self._get_json_data)
 
     def _handle_msearch_type(self, args: List[str] = [], **kwargs):
         return self._handle_search_type(by="m", args=args)
diff --git a/aurweb/scripts/popupdate.py b/aurweb/scripts/popupdate.py
index fa82208d..db4ba170 100755
--- a/aurweb/scripts/popupdate.py
+++ b/aurweb/scripts/popupdate.py
@@ -29,7 +29,7 @@ def run_single(conn, pkgbase):
 
     conn.commit()
     conn.close()
-    aurweb.db.session.refresh(pkgbase)
+    aurweb.db.refresh(pkgbase)
 
 
 def main():
diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index a00448d8..efa5357f 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -129,9 +129,14 @@ def save_rendered_comment(conn, commentid, html):
                  [html, commentid])
 
 
-def update_comment_render(commentid):
-    conn = aurweb.db.Connection()
+def update_comment_render_fastapi(comment):
+    conn = aurweb.db.ConnectionExecutor(
+        aurweb.db.get_engine().raw_connection())
+    update_comment_render(conn, comment.ID)
+    aurweb.db.refresh(comment)
 
+
+def update_comment_render(conn, commentid):
     text, pkgbase = get_comment(conn, commentid)
     html = markdown.markdown(text, extensions=[
         'fenced_code',
@@ -152,7 +157,8 @@ def update_comment_render(commentid):
 
 def main():
     commentid = int(sys.argv[1])
-    update_comment_render(commentid)
+    conn = aurweb.db.Connection()
+    update_comment_render(conn, commentid)
 
 
 if __name__ == '__main__':
diff --git a/aurweb/testing/__init__.py b/aurweb/testing/__init__.py
index 65d34253..2dd377e1 100644
--- a/aurweb/testing/__init__.py
+++ b/aurweb/testing/__init__.py
@@ -19,7 +19,7 @@ def references_graph(table):
         "regexp_1": r'(?i)\s+references\s+("|\')?',
         "regexp_2": r'("|\')?\s*\(',
     }
-    cursor = aurweb.db.session.execute(query, params=params)
+    cursor = aurweb.db.get_session().execute(query, params=params)
     return [row[0] for row in cursor.fetchall()]
 
 
@@ -51,7 +51,7 @@ def setup_test_db(*args):
     db_backend = aurweb.config.get("database", "backend")
 
     if db_backend != "sqlite":  # pragma: no cover
-        aurweb.db.session.execute("SET FOREIGN_KEY_CHECKS = 0")
+        aurweb.db.get_session().execute("SET FOREIGN_KEY_CHECKS = 0")
     else:
         # We're using sqlite, setup tables to be deleted without violating
         # foreign key constraints by graphing references.
@@ -59,10 +59,10 @@ def setup_test_db(*args):
             references_graph(table) for table in tables))
 
     for table in tables:
-        aurweb.db.session.execute(f"DELETE FROM {table}")
+        aurweb.db.get_session().execute(f"DELETE FROM {table}")
 
     if db_backend != "sqlite":  # pragma: no cover
-        aurweb.db.session.execute("SET FOREIGN_KEY_CHECKS = 1")
+        aurweb.db.get_session().execute("SET FOREIGN_KEY_CHECKS = 1")
 
     # Expunge all objects from SQLAlchemy's IdentityMap.
-    aurweb.db.session.expunge_all()
+    aurweb.db.get_session().expunge_all()
diff --git a/aurweb/users/__init__.py b/aurweb/users/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/aurweb/users/util.py b/aurweb/users/util.py
new file mode 100644
index 00000000..e9635f08
--- /dev/null
+++ b/aurweb/users/util.py
@@ -0,0 +1,19 @@
+from http import HTTPStatus
+
+from fastapi import HTTPException
+
+from aurweb import db
+from aurweb.models import User
+
+
+def get_user_by_name(username: str) -> User:
+    """
+    Query a user by its username.
+
+    :param username: User.Username
+    :return: User instance
+    """
+    user = db.query(User).filter(User.Username == username).first()
+    if not user:
+        raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
+    return db.refresh(user)
diff --git a/aurweb/util.py b/aurweb/util.py
index 88142cbc..1c2042fa 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -155,6 +155,7 @@ def get_ssh_fingerprints():
 def apply_all(iterable: Iterable, fn: Callable):
     for item in iterable:
         fn(item)
+    return iterable
 
 
 def sanitize_params(offset: str, per_page: str) -> Tuple[int, int]:
diff --git a/test/test_account_type.py b/test/test_account_type.py
index 86e68253..12472348 100644
--- a/test/test_account_type.py
+++ b/test/test_account_type.py
@@ -20,7 +20,7 @@ def setup():
     yield account_type
 
     with begin():
-        delete(AccountType, AccountType.ID == account_type.ID)
+        delete(account_type)
 
 
 def test_account_type():
@@ -50,4 +50,4 @@ def test_user_account_type_relationship():
     # This must be deleted here to avoid foreign key issues when
     # deleting the temporary AccountType in the fixture.
     with begin():
-        delete(User, User.ID == user.ID)
+        delete(user)
diff --git a/test/test_db.py b/test/test_db.py
index 7798d2f6..8283a957 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -279,13 +279,13 @@ def test_connection_execute_paramstyle_unsupported():
 
 def test_create_delete():
     with db.begin():
-        db.create(AccountType, AccountType="test")
+        account_type = db.create(AccountType, AccountType="test")
 
     record = db.query(AccountType, AccountType.AccountType == "test").first()
     assert record is not None
 
     with db.begin():
-        db.delete(AccountType, AccountType.AccountType == "test")
+        db.delete(account_type)
 
     record = db.query(AccountType, AccountType.AccountType == "test").first()
     assert record is None
@@ -306,7 +306,7 @@ def test_add_commit():
 
     # Remove the record.
     with db.begin():
-        db.delete(AccountType, AccountType.ID == account_type.ID)
+        db.delete(account_type)
 
 
 def test_connection_executor_mysql_paramstyle():
diff --git a/test/test_dependency_type.py b/test/test_dependency_type.py
index 4d555123..cb8dece4 100644
--- a/test/test_dependency_type.py
+++ b/test/test_dependency_type.py
@@ -24,7 +24,7 @@ def test_dependency_type_creation():
     assert bool(dependency_type.ID)
     assert dependency_type.Name == "Test Type"
     with begin():
-        delete(DependencyType, DependencyType.ID == dependency_type.ID)
+        delete(dependency_type)
 
 
 def test_dependency_type_null_name_uses_default():
@@ -32,4 +32,4 @@ def test_dependency_type_null_name_uses_default():
         dependency_type = create(DependencyType)
     assert dependency_type.Name == str()
     with begin():
-        delete(DependencyType, DependencyType.ID == dependency_type.ID)
+        delete(dependency_type)
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index 1396734b..622c08c2 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -2,6 +2,7 @@ from datetime import datetime
 
 import pytest
 
+from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
 from aurweb import asgi, db
@@ -98,3 +99,8 @@ def test_query_notified(maintainer: User, package: Package):
     query = db.query(Package).filter(Package.ID == package.ID).all()
     query_notified = util.query_notified(query, maintainer)
     assert query_notified[package.PackageBase.ID]
+
+
+def test_pkgreq_by_id_not_found():
+    with pytest.raises(HTTPException):
+        util.get_pkgreq_by_id(0)
diff --git a/test/test_ratelimit.py b/test/test_ratelimit.py
index 2634b714..0a72a7e4 100644
--- a/test/test_ratelimit.py
+++ b/test/test_ratelimit.py
@@ -103,7 +103,7 @@ def test_ratelimit_db(get: mock.MagicMock, getboolean: mock.MagicMock,
 
     # Delete the ApiRateLimit record.
     with db.begin():
-        db.delete(ApiRateLimit)
+        db.delete(db.query(ApiRateLimit).first())
 
     # Should be good to go again!
     assert not check_ratelimit(request)
diff --git a/test/test_relation_type.py b/test/test_relation_type.py
index fbc22c71..d2dabceb 100644
--- a/test/test_relation_type.py
+++ b/test/test_relation_type.py
@@ -18,7 +18,7 @@ def test_relation_type_creation():
     assert relation_type.Name == "test-relation"
 
     with db.begin():
-        db.delete(RelationType, RelationType.ID == relation_type.ID)
+        db.delete(relation_type)
 
 
 def test_relation_types():
diff --git a/test/test_request_type.py b/test/test_request_type.py
index 8d21c2d9..0db24921 100644
--- a/test/test_request_type.py
+++ b/test/test_request_type.py
@@ -18,7 +18,7 @@ def test_request_type_creation():
     assert request_type.Name == "Test Request"
 
     with db.begin():
-        db.delete(RequestType, RequestType.ID == request_type.ID)
+        db.delete(request_type)
 
 
 def test_request_type_null_name_returns_empty_string():
@@ -29,7 +29,7 @@ def test_request_type_null_name_returns_empty_string():
     assert request_type.Name == str()
 
     with db.begin():
-        db.delete(RequestType, RequestType.ID == request_type.ID)
+        db.delete(request_type)
 
 
 def test_request_type_name_display():

From 12400147fc0e1f3bed2bc54a92c4de76cf8312f2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 14 Nov 2021 16:02:00 -0800
Subject: [PATCH 570/844] fix: initialize engine and session in util/adduser.py

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 util/adduser.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/adduser.py b/util/adduser.py
index 7e35d13d..1853869a 100644
--- a/util/adduser.py
+++ b/util/adduser.py
@@ -33,6 +33,7 @@ def parse_args():
 def main():
     args = parse_args()
 
+    db.get_engine()
     type = db.query(AccountType,
                     AccountType.AccountType == args.type).first()
     with db.begin():

From 9424341b55bf55b4b064cfc2b8e4d89536901e69 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 14 Nov 2021 23:33:58 -0800
Subject: [PATCH 571/844] fix(docker): fix cgit css config

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml        | 2 ++
 docker/cgit-entrypoint.sh | 1 +
 2 files changed, 3 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2fba1305..bda4ddfb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -112,6 +112,7 @@ services:
     environment:
       - AUR_CONFIG=/aurweb/conf/config
       - CGIT_CLONE_PREFIX=${AURWEB_PHP_PREFIX}
+      - CGIT_CSS=/css/cgit.css
     entrypoint: /docker/cgit-entrypoint.sh
     command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
@@ -131,6 +132,7 @@ services:
     environment:
       - AUR_CONFIG=/aurweb/conf/config
       - CGIT_CLONE_PREFIX=${AURWEB_FASTAPI_PREFIX}
+      - CGIT_CSS=/static/css/cgit.css
     entrypoint: /docker/cgit-entrypoint.sh
     command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
diff --git a/docker/cgit-entrypoint.sh b/docker/cgit-entrypoint.sh
index 3615ade5..f9ca86c0 100755
--- a/docker/cgit-entrypoint.sh
+++ b/docker/cgit-entrypoint.sh
@@ -8,5 +8,6 @@ sed -ri "s|clone-prefix=.*|clone-prefix=${CGIT_CLONE_PREFIX}|" /etc/cgitrc
 sed -ri 's|header=.*|header=/aurweb/web/template/cgit/header.html|' /etc/cgitrc
 sed -ri 's|footer=.*|footer=/aurweb/web/template/cgit/footer.html|' /etc/cgitrc
 sed -ri 's|repo\.path=.*|repo.path=/aurweb/aur.git|' /etc/cgitrc
+sed -ri "s|^(css)=.*$|\1=${CGIT_CSS}|" /etc/cgitrc
 
 exec "$@"

From 7f6d9966e585626da181a6e642e1a73710f2f817 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 14 Nov 2021 16:02:00 -0800
Subject: [PATCH 572/844] fix: initialize engine and session in util/adduser.py

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 util/adduser.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/adduser.py b/util/adduser.py
index 7e35d13d..1853869a 100644
--- a/util/adduser.py
+++ b/util/adduser.py
@@ -33,6 +33,7 @@ def parse_args():
 def main():
     args = parse_args()
 
+    db.get_engine()
     type = db.query(AccountType,
                     AccountType.AccountType == args.type).first()
     with db.begin():

From b0b05df19341f5c4a75a78b69b3abc08d61fc238 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 16 Nov 2021 21:10:53 -0800
Subject: [PATCH 573/844] fix(fastapi): pin markdown to 3.3.4

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 2 +-
 pyproject.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 37e2f8f9..550a91fa 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1003,7 +1003,7 @@ h11 = ">=0.9.0,<1"
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.10"
-content-hash = "356b37d545d78b8aa1e1939f42522207bcf79526abe8193308c5a2955897d6fd"
+content-hash = "844618f499e19d6d20f8479d165be3f60495bfa66fcb1f462256b101f9d395f9"
 
 [metadata.files]
 aiofiles = [
diff --git a/pyproject.toml b/pyproject.toml
index 1d4c858c..7b2e9ef3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -74,7 +74,7 @@ alembic = "^1.7.4"
 mysqlclient = "^2.0.3"
 Authlib = "^0.15.5"
 Jinja2 = "^3.0.2"
-Markdown = "^3.3.4"
+Markdown = "3.3.4"
 Werkzeug = "^2.0.2"
 SQLAlchemy = "^1.4.26"
 

From cea9104efb3c496230bee60f6b76be42a8719c61 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 16 Nov 2021 01:45:32 -0800
Subject: [PATCH 574/844] feat(poetry): add pytest-xdist

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 67 ++++++++++++++++++++++++++++++++++++++++++++------
 pyproject.toml |  1 +
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 550a91fa..8d42cc50 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -53,7 +53,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"]
 name = "atomicwrites"
 version = "1.4.0"
 description = "Atomic file writes."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
@@ -61,7 +61,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 name = "attrs"
 version = "21.2.0"
 description = "Classes Without Boilerplate"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
@@ -234,6 +234,17 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
 dnspython = ">=1.15.0"
 idna = ">=2.0.0"
 
+[[package]]
+name = "execnet"
+version = "1.9.0"
+description = "execnet: rapid multi-Python deployment"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.extras]
+testing = ["pre-commit"]
+
 [[package]]
 name = "fakeredis"
 version = "1.6.1"
@@ -432,7 +443,7 @@ python-versions = ">=3.5"
 name = "iniconfig"
 version = "1.1.1"
 description = "iniconfig: brain-dead simple config-ini parsing"
-category = "dev"
+category = "main"
 optional = false
 python-versions = "*"
 
@@ -575,7 +586,7 @@ python-versions = "*"
 name = "pluggy"
 version = "1.0.0"
 description = "plugin and hook calling mechanisms for python"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 
@@ -639,7 +650,7 @@ python-versions = ">=3.5"
 name = "py"
 version = "1.11.0"
 description = "library with cross-python path, ini-parsing, io, code, log facilities"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
@@ -705,7 +716,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 name = "pytest"
 version = "6.2.5"
 description = "pytest: simple powerful testing with Python"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 
@@ -751,6 +762,18 @@ pytest = ">=4.6"
 [package.extras]
 testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
 
+[[package]]
+name = "pytest-forked"
+version = "1.3.0"
+description = "run tests in isolated forked subprocesses"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.dependencies]
+py = "*"
+pytest = ">=3.10"
+
 [[package]]
 name = "pytest-tap"
 version = "3.3"
@@ -763,6 +786,24 @@ python-versions = "*"
 pytest = ">=3.0"
 "tap.py" = ">=3.0,<4.0"
 
+[[package]]
+name = "pytest-xdist"
+version = "2.4.0"
+description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+execnet = ">=1.1"
+pytest = ">=6.0.0"
+pytest-forked = "*"
+
+[package.extras]
+psutil = ["psutil (>=3.0)"]
+setproctitle = ["setproctitle"]
+testing = ["filelock"]
+
 [[package]]
 name = "python-dateutil"
 version = "2.8.2"
@@ -1003,7 +1044,7 @@ h11 = ">=0.9.0,<1"
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.10"
-content-hash = "844618f499e19d6d20f8479d165be3f60495bfa66fcb1f462256b101f9d395f9"
+content-hash = "6ab137fb829b2a6d49552c4864d00be04a2d58d80a872f3cd3b9e5cc67f95b9d"
 
 [metadata.files]
 aiofiles = [
@@ -1200,6 +1241,10 @@ email-validator = [
     {file = "email_validator-1.1.3-py2.py3-none-any.whl", hash = "sha256:5675c8ceb7106a37e40e2698a57c056756bf3f272cfa8682a4f87ebd95d8440b"},
     {file = "email_validator-1.1.3.tar.gz", hash = "sha256:aa237a65f6f4da067119b7df3f13e89c25c051327b2b5b66dc075f33d62480d7"},
 ]
+execnet = [
+    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
+    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
+]
 fakeredis = [
     {file = "fakeredis-1.6.1-py3-none-any.whl", hash = "sha256:5eb1516f1fe1813e9da8f6c482178fc067af09f53de587ae03887ef5d9d13024"},
     {file = "fakeredis-1.6.1.tar.gz", hash = "sha256:0d06a9384fb79da9f2164ce96e34eb9d4e2ea46215070805ea6fd3c174590b47"},
@@ -1609,10 +1654,18 @@ pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
     {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"},
 ]
+pytest-forked = [
+    {file = "pytest-forked-1.3.0.tar.gz", hash = "sha256:6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"},
+    {file = "pytest_forked-1.3.0-py2.py3-none-any.whl", hash = "sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815"},
+]
 pytest-tap = [
     {file = "pytest-tap-3.3.tar.gz", hash = "sha256:5f0919a147cf0396b2f10d64d365a0bf8062e06543e93c675c9d37f5605e983c"},
     {file = "pytest_tap-3.3-py3-none-any.whl", hash = "sha256:4fbbc0e090c2e94f6199bee4e4f68ab3c5e176b37a72a589ad84e0f72a2fce55"},
 ]
+pytest-xdist = [
+    {file = "pytest-xdist-2.4.0.tar.gz", hash = "sha256:89b330316f7fc475f999c81b577c2b926c9569f3d397ae432c0c2e2496d61ff9"},
+    {file = "pytest_xdist-2.4.0-py3-none-any.whl", hash = "sha256:7b61ebb46997a0820a263553179d6d1e25a8c50d8a8620cd1aa1e20e3be99168"},
+]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
diff --git a/pyproject.toml b/pyproject.toml
index 7b2e9ef3..d296fb4e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -84,6 +84,7 @@ gunicorn = "^20.1.0"
 Hypercorn = "^0.11.2"
 mysql-connector = "^2.2.9"
 prometheus-fastapi-instrumentator = "^5.7.1"
+pytest-xdist = "^2.4.0"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^4.0.1"

From 40b21203ed8b1cd833fa0333ebf3d1985567fcbe Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 16 Nov 2021 01:46:07 -0800
Subject: [PATCH 575/844] feat(poetry): add filelock

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 18 +++++++++++++++++-
 pyproject.toml |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index 8d42cc50..ab559b77 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -300,6 +300,18 @@ python-versions = "*"
 lxml = "*"
 python-dateutil = "*"
 
+[[package]]
+name = "filelock"
+version = "3.3.2"
+description = "A platform independent file lock."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"]
+testing = ["covdefaults (>=1.2.0)", "coverage (>=4)", "pytest (>=4)", "pytest-cov", "pytest-timeout (>=1.4.2)"]
+
 [[package]]
 name = "flake8"
 version = "4.0.1"
@@ -1044,7 +1056,7 @@ h11 = ">=0.9.0,<1"
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.10"
-content-hash = "6ab137fb829b2a6d49552c4864d00be04a2d58d80a872f3cd3b9e5cc67f95b9d"
+content-hash = "ca42bd35717062d6784025ed3956423502ac66adba059ccc080bcaaa666651cd"
 
 [metadata.files]
 aiofiles = [
@@ -1253,6 +1265,10 @@ fastapi = []
 feedgen = [
     {file = "feedgen-0.9.0.tar.gz", hash = "sha256:8e811bdbbed6570034950db23a4388453628a70e689a6e8303ccec430f5a804a"},
 ]
+filelock = [
+    {file = "filelock-3.3.2-py3-none-any.whl", hash = "sha256:bb2a1c717df74c48a2d00ed625e5a66f8572a3a30baacb7657add1d7bac4097b"},
+    {file = "filelock-3.3.2.tar.gz", hash = "sha256:7afc856f74fa7006a289fd10fa840e1eebd8bbff6bffb69c26c54a0512ea8cf8"},
+]
 flake8 = [
     {file = "flake8-4.0.1-py2.py3-none-any.whl", hash = "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d"},
     {file = "flake8-4.0.1.tar.gz", hash = "sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d"},
diff --git a/pyproject.toml b/pyproject.toml
index d296fb4e..8d14735a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -85,6 +85,7 @@ Hypercorn = "^0.11.2"
 mysql-connector = "^2.2.9"
 prometheus-fastapi-instrumentator = "^5.7.1"
 pytest-xdist = "^2.4.0"
+filelock = "^3.3.2"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^4.0.1"

From 0abdf8d468579c5e98ddac29c5f97ec1e546bd5e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 00:22:52 -0800
Subject: [PATCH 576/844] fix(fastapi): close connection used for initdb

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/initdb.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aurweb/initdb.py b/aurweb/initdb.py
index 9a063ba4..a4a9f621 100644
--- a/aurweb/initdb.py
+++ b/aurweb/initdb.py
@@ -46,7 +46,9 @@ def run(args):
 
     engine = aurweb.db.get_engine(echo=(args.verbose >= 1))
     aurweb.schema.metadata.create_all(engine)
-    feed_initial_data(engine.connect())
+    conn = engine.connect()
+    feed_initial_data(conn)
+    conn.close()
 
     if args.use_alembic:
         alembic.command.stamp(alembic_config, 'head')

From 07aac768d633288d61abd85d055629cfe65800b2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 00:27:44 -0800
Subject: [PATCH 577/844] change(fastapi): remove sqlite support

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py    |  6 ++++++
 test/test_asgi.py | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 16de771e..aafb00b2 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -48,6 +48,12 @@ async def app_startup():
         "TEST_RECURSION_LIMIT", sys.getrecursionlimit()))
     sys.setrecursionlimit(recursion_limit)
 
+    backend = aurweb.config.get("database", "backend")
+    if backend not in aurweb.db.DRIVERS:
+        raise ValueError(
+            f"The configured database backend ({backend}) is unsupported. "
+            f"Supported backends: {str(aurweb.db.DRIVERS.keys())}")
+
     session_secret = aurweb.config.get("fastapi", "session_secret")
     if not session_secret:
         raise Exception("[fastapi] session_secret must not be empty")
diff --git a/test/test_asgi.py b/test/test_asgi.py
index b8856741..fa2df5a1 100644
--- a/test/test_asgi.py
+++ b/test/test_asgi.py
@@ -45,3 +45,20 @@ async def test_asgi_http_exception_handler():
     response = await aurweb.asgi.http_exception_handler(None, exc)
     assert response.body.decode() == \
         f"<h1>{exc.status_code} {phrase}</h1><p>{exc.detail}</p>"
+
+
+@pytest.mark.asyncio
+async def test_asgi_app_unsupported_backends():
+    config_get = aurweb.config.get
+
+    # Test that the previously supported "sqlite" backend is now
+    # unsupported by FastAPI.
+    def mock_sqlite_backend(section: str, key: str):
+        if section == "database" and key == "backend":
+            return "sqlite"
+        return config_get(section, key)
+
+    with mock.patch("aurweb.config.get", side_effect=mock_sqlite_backend):
+        expr = r"^.*\(sqlite\) is unsupported.*$"
+        with pytest.raises(ValueError, match=expr):
+            await aurweb.asgi.app_startup()

From fa43f6bc3ebebff7d97f3361ec07a61e92bd1ce5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 00:33:41 -0800
Subject: [PATCH 578/844] change(aurweb): add parallel tests and improve
 aurweb.db

This change utilizes pytest-xdist to perform a multiproc test
run and reworks aurweb.db's code. We no longer use a global
engine, session or Session, but we now use a memo of engines
and sessions as they are requested, based on the PYTEST_CURRENT_TEST
environment variable, which is available during testing.

Additionally, this change strips several SQLite components
out of the Python code-base.

SQLite is still compatible with PHP and sharness tests, but
not with our FastAPI implementation.

More changes:
------------
- Remove use of aurweb.db.session global in other code.
- Use new aurweb.db.name() dynamic db name function in env.py.
- Added 'addopts' to pytest.ini which utilizes multiprocessing.
    - Highly recommended to leave this be or modify `-n auto` to
      `-n {cpu_threads}` where cpu_threads is at least 2.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py                      | 251 +++++++++++++++++++++---------
 aurweb/routers/auth.py            |   6 +-
 aurweb/routers/packages.py        |   8 +-
 aurweb/schema.py                  |   4 +-
 aurweb/testing/__init__.py        |  68 ++++----
 migrations/env.py                 |   8 +-
 pytest.ini                        |   6 +
 test/conftest.py                  | 178 +++++++++++++++++++++
 test/test_accepted_term.py        |  37 ++---
 test/test_account_type.py         |  54 ++++---
 test/test_accounts_routes.py      |   9 +-
 test/test_api_rate_limit.py       |  19 +--
 test/test_auth.py                 |  26 ++--
 test/test_auth_routes.py          |   5 +-
 test/test_ban.py                  |   9 +-
 test/test_cache.py                |   7 +-
 test/test_captcha.py              |   7 +
 test/test_db.py                   | 110 +------------
 test/test_dependency_type.py      |   5 +-
 test/test_group.py                |   9 +-
 test/test_homepage.py             |  11 +-
 test/test_html.py                 |   5 +-
 test/test_initdb.py               |   9 ++
 test/test_license.py              |   9 +-
 test/test_official_provider.py    |  23 +--
 test/test_package.py              |   5 +-
 test/test_package_base.py         |   5 +-
 test/test_package_blacklist.py    |  16 +-
 test/test_package_comaintainer.py |  28 ++--
 test/test_package_comment.py      |  59 +++----
 test/test_package_dependency.py   |  95 +++--------
 test/test_package_group.py        |  37 ++---
 test/test_package_keyword.py      |  37 ++---
 test/test_package_license.py      |  38 ++---
 test/test_package_notification.py |  25 ++-
 test/test_package_relation.py     |  90 +++--------
 test/test_package_request.py      | 107 +++++--------
 test/test_package_source.py       |   2 +-
 test/test_package_vote.py         |  29 ++--
 test/test_packages_routes.py      |  23 +--
 test/test_packages_util.py        |  17 +-
 test/test_popupdate.py            |   7 +
 test/test_ratelimit.py            |  20 ++-
 test/test_relation_type.py        |   5 +-
 test/test_request_type.py         |   5 +-
 test/test_routes.py               |  12 +-
 test/test_rpc.py                  |   8 +-
 test/test_rss.py                  |   8 +-
 test/test_session.py              |   5 +-
 test/test_ssh_pub_key.py          |  14 +-
 test/test_term.py                 |  18 +--
 test/test_trusted_user_routes.py  |   5 +-
 test/test_tu_vote.py              |  43 +++--
 test/test_tu_voteinfo.py          |   5 +-
 test/test_user.py                 |  14 +-
 55 files changed, 781 insertions(+), 884 deletions(-)
 create mode 100644 test/conftest.py

diff --git a/aurweb/db.py b/aurweb/db.py
index 39232d5a..b8b49e40 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -1,29 +1,34 @@
 import functools
+import hashlib
 import math
+import os
 import re
 
 from typing import Iterable, NewType
 
-from sqlalchemy import event
-from sqlalchemy.orm import Query, scoped_session
+import sqlalchemy
+
+from sqlalchemy import create_engine, event
+from sqlalchemy.engine.base import Engine
+from sqlalchemy.engine.url import URL
+from sqlalchemy.orm import Query, Session, SessionTransaction, scoped_session, sessionmaker
 
 import aurweb.config
 import aurweb.util
 
-# See get_engine.
-engine = None
+from aurweb import logging
 
-# ORM Session class.
-Session = None
+logger = logging.get_logger(__name__)
 
-# Global ORM Session object.
-session = None
+DRIVERS = {
+    "mysql": "mysql+mysqldb"
+}
 
 # Global introspected object memo.
 introspected = dict()
 
-# A mocked up type.
-Base = NewType("aurweb.models.declarative_base.Base", "Base")
+# Some types we don't get access to in this module.
+Base = NewType("Base", "aurweb.models.declarative_base.Base")
 
 
 def make_random_value(table: str, column: str):
@@ -56,14 +61,85 @@ def make_random_value(table: str, column: str):
     length = col.type.length
 
     string = aurweb.util.make_random_string(length)
-    while session.query(table).filter(column == string).first():
+    while query(table).filter(column == string).first():
         string = aurweb.util.make_random_string(length)
     return string
 
 
-def get_session():
+def test_name() -> str:
+    """
+    Return the unhashed database name.
+
+    The unhashed database name is determined (lower = higher priority) by:
+    -------------------------------------------
+    1. {test_suite} portion of PYTEST_CURRENT_TEST
+    2. aurweb.config.get("database", "name")
+
+    During `pytest` runs, the PYTEST_CURRENT_TEST environment variable
+    is set to the current test in the format `{test_suite}::{test_func}`.
+
+    This allows tests to use a suite-specific database for its runs,
+    which decouples database state from test suites.
+
+    :return: Unhashed database name
+    """
+    db = os.environ.get("PYTEST_CURRENT_TEST",
+                        aurweb.config.get("database", "name"))
+    return db.split(":")[0]
+
+
+def name() -> str:
+    """
+    Return sanitized database name that can be used for tests or production.
+
+    If test_name() starts with "test/", the database name is SHA-1 hashed,
+    prefixed with 'db', and returned. Otherwise, test_name() is passed
+    through and not hashed at all.
+
+    :return: SHA1-hashed database name prefixed with 'db'
+    """
+    dbname = test_name()
+    if not dbname.startswith("test/"):
+        return dbname
+    sha1 = hashlib.sha1(dbname.encode()).hexdigest()
+    return "db" + sha1
+
+
+# Module-private global memo used to store SQLAlchemy sessions.
+_sessions = dict()
+
+
+def get_session(engine: Engine = None) -> Session:
     """ Return aurweb.db's global session. """
-    return session
+    dbname = name()
+
+    global _sessions
+    if dbname not in _sessions:
+
+        if not engine:  # pragma: no cover
+            engine = get_engine()
+
+        Session = scoped_session(
+            sessionmaker(autocommit=True, autoflush=False, bind=engine))
+        _sessions[dbname] = Session()
+
+        # If this is the first grab of this session, log out the
+        # database name used.
+        raw_dbname = test_name()
+        logger.debug(f"DBName({raw_dbname}): {dbname}")
+
+    return _sessions.get(dbname)
+
+
+def pop_session(dbname: str) -> None:
+    """
+    Pop a Session out of the private _sessions memo.
+
+    :param dbname: Database name
+    :raises KeyError: When `dbname` does not exist in the memo
+    """
+    global _sessions
+    _sessions.pop(dbname)
 
 
 def refresh(model: Base) -> Base:
@@ -121,41 +197,40 @@ def add(model: Base) -> Base:
     return model
 
 
-def begin():
+def begin() -> SessionTransaction:
     """ Begin an SQLAlchemy SessionTransaction. """
     return get_session().begin()
 
 
-def get_sqlalchemy_url():
+def get_sqlalchemy_url() -> URL:
     """
-    Build an SQLAlchemy for use with create_engine based on the aurweb configuration.
-    """
-    import sqlalchemy
+    Build an SQLAlchemy URL for use with create_engine.
 
-    constructor = sqlalchemy.engine.url.URL
+    :return: sqlalchemy.engine.url.URL
+    """
+    constructor = URL
 
     parts = sqlalchemy.__version__.split('.')
     major = int(parts[0])
     minor = int(parts[1])
     if major == 1 and minor >= 4:  # pragma: no cover
-        constructor = sqlalchemy.engine.url.URL.create
+        constructor = URL.create
 
     aur_db_backend = aurweb.config.get('database', 'backend')
     if aur_db_backend == 'mysql':
-        if aurweb.config.get_with_fallback('database', 'port', fallback=None):
-            port = aurweb.config.get('database', 'port')
-            param_query = None
-        else:
-            port = None
-            param_query = {
-                'unix_socket': aurweb.config.get('database', 'socket')
-            }
+        param_query = {}
+        port = aurweb.config.get_with_fallback("database", "port", None)
+        if not port:
+            param_query["unix_socket"] = aurweb.config.get(
+                "database", "socket")
+
         return constructor(
-            'mysql+mysqldb',
+            DRIVERS.get(aur_db_backend),
             username=aurweb.config.get('database', 'user'),
-            password=aurweb.config.get('database', 'password'),
+            password=aurweb.config.get_with_fallback('database', 'password',
+                                                     fallback=None),
             host=aurweb.config.get('database', 'host'),
-            database=aurweb.config.get('database', 'name'),
+            database=name(),
             port=port,
             query=param_query
         )
@@ -168,58 +243,83 @@ def get_sqlalchemy_url():
         raise ValueError('unsupported database backend')
 
 
-def get_engine(echo: bool = False):
+def sqlite_regexp(regex, item) -> bool:  # pragma: no cover
+    """ Method which mimics SQL's REGEXP for SQLite. """
+    return bool(re.search(regex, str(item)))
+
+
+def setup_sqlite(engine: Engine) -> None:  # pragma: no cover
+    """ Perform setup for an SQLite engine. """
+    @event.listens_for(engine, "connect")
+    def do_begin(conn, record):
+        create_deterministic_function = functools.partial(
+            conn.create_function,
+            deterministic=True
+        )
+        create_deterministic_function("REGEXP", 2, sqlite_regexp)
+
+
+# Module-private global memo used to store SQLAlchemy engines.
+_engines = dict()
+
+
+def get_engine(dbname: str = None, echo: bool = False) -> Engine:
     """
-    Return the global SQLAlchemy engine.
+    Return the SQLAlchemy engine for `dbname`.
 
     The engine is created on the first call to get_engine and then stored in the
     `engine` global variable for the next calls.
+
+    :param dbname: Database name (default: aurweb.db.name())
+    :param echo: Flag passed through to sqlalchemy.create_engine
+    :return: SQLAlchemy Engine instance
     """
-    from sqlalchemy import create_engine
-    from sqlalchemy.orm import sessionmaker
+    if not dbname:
+        dbname = name()
 
-    global engine, session, Session
-
-    if engine is None:
+    global _engines
+    if dbname not in _engines:
+        db_backend = aurweb.config.get("database", "backend")
         connect_args = dict()
 
-        db_backend = aurweb.config.get("database", "backend")
-        if db_backend == "sqlite":
-            # check_same_thread is for a SQLite technicality
-            # https://fastapi.tiangolo.com/tutorial/sql-databases/#note
+        is_sqlite = bool(db_backend == "sqlite")
+        if is_sqlite:  # pragma: no cover
             connect_args["check_same_thread"] = False
 
-        engine = create_engine(get_sqlalchemy_url(),
-                               connect_args=connect_args,
-                               echo=echo)
+        kwargs = {
+            "echo": echo,
+            "connect_args": connect_args
+        }
+        _engines[dbname] = create_engine(get_sqlalchemy_url(), **kwargs)
 
-        Session = scoped_session(
-            sessionmaker(autocommit=True, autoflush=False, bind=engine))
-        session = Session()
+        if is_sqlite:  # pragma: no cover
+            setup_sqlite(_engines.get(dbname))
 
-        if db_backend == "sqlite":
-            # For SQLite, we need to add some custom functions as
-            # they are used in the reference graph method.
-            def regexp(regex, item):
-                return bool(re.search(regex, str(item)))
-
-            @event.listens_for(engine, "connect")
-            def do_begin(conn, record):
-                create_deterministic_function = functools.partial(
-                    conn.create_function,
-                    deterministic=True
-                )
-                create_deterministic_function("REGEXP", 2, regexp)
-
-    return engine
+    return _engines.get(dbname)
 
 
-def kill_engine():
-    global engine, Session, session
-    if engine:
-        session.close()
-        engine.dispose()
-    engine = Session = session = None
+def pop_engine(dbname: str) -> None:
+    """
+    Pop an Engine out of the private _engines memo.
+
+    :param dbname: Database name
+    :raises KeyError: When `dbname` does not exist in the memo
+    """
+    global _engines
+    _engines.pop(dbname)
+
+
+def kill_engine() -> None:
+    """ Close the current session and dispose of the engine. """
+    dbname = name()
+
+    session = get_session()
+    session.close()
+    pop_session(dbname)
+
+    engine = get_engine()
+    engine.dispose()
+    pop_engine(dbname)
 
 
 def connect():
@@ -248,7 +348,9 @@ class ConnectionExecutor:
     def paramstyle(self):
         return self._paramstyle
 
-    def execute(self, query, params=()):
+    def execute(self, query, params=()):  # pragma: no cover
+        # TODO: SQLite support has been removed in FastAPI. It remains
+        # here to fund its support for PHP until it is removed.
         if self._paramstyle in ('format', 'pyformat'):
             query = query.replace('%', '%%').replace('?', '%s')
         elif self._paramstyle == 'qmark':
@@ -278,16 +380,19 @@ class Connection:
         if aur_db_backend == 'mysql':
             import MySQLdb
             aur_db_host = aurweb.config.get('database', 'host')
-            aur_db_name = aurweb.config.get('database', 'name')
+            aur_db_name = name()
             aur_db_user = aurweb.config.get('database', 'user')
-            aur_db_pass = aurweb.config.get('database', 'password')
+            aur_db_pass = aurweb.config.get_with_fallback(
+                'database', 'password', str())
             aur_db_socket = aurweb.config.get('database', 'socket')
             self._conn = MySQLdb.connect(host=aur_db_host,
                                          user=aur_db_user,
                                          passwd=aur_db_pass,
                                          db=aur_db_name,
                                          unix_socket=aur_db_socket)
-        elif aur_db_backend == 'sqlite':
+        elif aur_db_backend == 'sqlite':  # pragma: no cover
+            # TODO: SQLite support has been removed in FastAPI. It remains
+            # here to fund its support for PHP until it is removed.
             import sqlite3
             aur_db_name = aurweb.config.get('database', 'name')
             self._conn = sqlite3.connect(aur_db_name)
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index b8e83c7d..055f0dca 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -6,7 +6,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 
 import aurweb.config
 
-from aurweb import cookies
+from aurweb import cookies, db
 from aurweb.auth import auth_required
 from aurweb.l10n import get_translator_for_request
 from aurweb.models import User
@@ -45,9 +45,7 @@ async def login_post(request: Request,
         raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
                             detail=_("Bad Referer header."))
 
-    from aurweb.db import session
-
-    user = session.query(User).filter(User.Username == user).first()
+    user = db.query(User).filter(User.Username == user).first()
     if not user:
         return await login_template(request, next,
                                     errors=["Bad username or password."])
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 07e8af72..c8ceb275 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -1014,12 +1014,12 @@ def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
             models.PackageComaintainer.Priority.asc()
         ).limit(1).first()
 
-        if co:
-            with db.begin():
+        with db.begin():
+            if co:
                 pkgbase.Maintainer = co.User
                 db.delete(co)
-        else:
-            pkgbase.Maintainer = None
+            else:
+                pkgbase.Maintainer = None
 
     notif.send()
 
diff --git a/aurweb/schema.py b/aurweb/schema.py
index fb8f0dee..43db920d 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -16,13 +16,13 @@ db_backend = aurweb.config.get("database", "backend")
 
 
 @compiles(TINYINT, 'sqlite')
-def compile_tinyint_sqlite(type_, compiler, **kw):
+def compile_tinyint_sqlite(type_, compiler, **kw):  # pragma: no cover
     """TINYINT is not supported on SQLite. Substitute it with INTEGER."""
     return 'INTEGER'
 
 
 @compiles(BIGINT, 'sqlite')
-def compile_bigint_sqlite(type_, compiler, **kw):
+def compile_bigint_sqlite(type_, compiler, **kw):  # pragma: no cover
     """
     For SQLite's AUTOINCREMENT to work on BIGINT columns, we need to map BIGINT
     to INTEGER. Aside from that, BIGINT is the same as INTEGER for SQLite.
diff --git a/aurweb/testing/__init__.py b/aurweb/testing/__init__.py
index 2dd377e1..8261051d 100644
--- a/aurweb/testing/__init__.py
+++ b/aurweb/testing/__init__.py
@@ -1,26 +1,6 @@
-from itertools import chain
-
 import aurweb.db
 
-
-def references_graph(table):
-    """ Taken from Django's sqlite3/operations.py. """
-    query = """
-    WITH tables AS (
-    SELECT :table name
-    UNION
-    SELECT sqlite_master.name
-    FROM sqlite_master
-    JOIN tables ON (sql REGEXP :regexp_1 || tables.name || :regexp_2)
-    ) SELECT name FROM tables;
-    """
-    params = {
-        "table": table,
-        "regexp_1": r'(?i)\s+references\s+("|\')?',
-        "regexp_2": r'("|\')?\s*\(',
-    }
-    cursor = aurweb.db.get_session().execute(query, params=params)
-    return [row[0] for row in cursor.fetchall()]
+from aurweb import models
 
 
 def setup_test_db(*args):
@@ -47,22 +27,38 @@ def setup_test_db(*args):
     aurweb.db.get_engine()
 
     tables = list(args)
+    if not tables:
+        tables = [
+            models.AcceptedTerm.__tablename__,
+            models.ApiRateLimit.__tablename__,
+            models.Ban.__tablename__,
+            models.Group.__tablename__,
+            models.License.__tablename__,
+            models.OfficialProvider.__tablename__,
+            models.Package.__tablename__,
+            models.PackageBase.__tablename__,
+            models.PackageBlacklist.__tablename__,
+            models.PackageComaintainer.__tablename__,
+            models.PackageComment.__tablename__,
+            models.PackageDependency.__tablename__,
+            models.PackageGroup.__tablename__,
+            models.PackageKeyword.__tablename__,
+            models.PackageLicense.__tablename__,
+            models.PackageNotification.__tablename__,
+            models.PackageRelation.__tablename__,
+            models.PackageRequest.__tablename__,
+            models.PackageSource.__tablename__,
+            models.PackageVote.__tablename__,
+            models.Session.__tablename__,
+            models.SSHPubKey.__tablename__,
+            models.Term.__tablename__,
+            models.TUVote.__tablename__,
+            models.TUVoteInfo.__tablename__,
+            models.User.__tablename__,
+        ]
 
-    db_backend = aurweb.config.get("database", "backend")
-
-    if db_backend != "sqlite":  # pragma: no cover
-        aurweb.db.get_session().execute("SET FOREIGN_KEY_CHECKS = 0")
-    else:
-        # We're using sqlite, setup tables to be deleted without violating
-        # foreign key constraints by graphing references.
-        tables = set(chain.from_iterable(
-            references_graph(table) for table in tables))
-
+    aurweb.db.get_session().execute("SET FOREIGN_KEY_CHECKS = 0")
     for table in tables:
         aurweb.db.get_session().execute(f"DELETE FROM {table}")
-
-    if db_backend != "sqlite":  # pragma: no cover
-        aurweb.db.get_session().execute("SET FOREIGN_KEY_CHECKS = 1")
-
-    # Expunge all objects from SQLAlchemy's IdentityMap.
+    aurweb.db.get_session().execute("SET FOREIGN_KEY_CHECKS = 1")
     aurweb.db.get_session().expunge_all()
diff --git a/migrations/env.py b/migrations/env.py
index 7130d141..774ecdeb 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -41,8 +41,8 @@ def run_migrations_offline():
     script output.
 
     """
-    db_name = aurweb.config.get("database", "name")
-    logging.info(f"Performing offline migration on database '{db_name}'.")
+    dbname = aurweb.db.name()
+    logging.info(f"Performing offline migration on database '{dbname}'.")
     context.configure(
         url=aurweb.db.get_sqlalchemy_url(),
         target_metadata=target_metadata,
@@ -61,8 +61,8 @@ def run_migrations_online():
     and associate a connection with the context.
 
     """
-    db_name = aurweb.config.get("database", "name")
-    logging.info(f"Performing online migration on database '{db_name}'.")
+    dbname = aurweb.db.name()
+    logging.info(f"Performing online migration on database '{dbname}'.")
     connectable = sqlalchemy.create_engine(
         aurweb.db.get_sqlalchemy_url(),
         poolclass=sqlalchemy.pool.NullPool,
diff --git a/pytest.ini b/pytest.ini
index 510447c9..9f70a2bd 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -8,3 +8,9 @@
 #         https://bugs.python.org/issue45097
 filterwarnings =
     ignore::DeprecationWarning:asyncio.base_events
+
+# Build in coverage and pytest-xdist multiproc testing.
+addopts = --cov=aurweb --cov-append --dist load --dist loadfile -n auto
+
+# Our pytest units are located in the ./test/ directory.
+testpaths = test
diff --git a/test/conftest.py b/test/conftest.py
new file mode 100644
index 00000000..47d9ca4b
--- /dev/null
+++ b/test/conftest.py
@@ -0,0 +1,178 @@
+"""
+pytest configuration.
+
+The conftest.py file is used to define pytest-global fixtures
+or actions run before tests.
+
+Module scoped fixtures:
+----------------------
+- setup_database
+- db_session (depends: setup_database)
+
+Function scoped fixtures:
+------------------------
+- db_test (depends: db_session)
+
+Tests in aurweb which access the database **must** use the `db_test`
+function fixture. Most database tests simply require this fixture in
+an autouse=True setup fixture, or for fixtures used in DB tests example:
+
+    # In scenarios which there are no other database fixtures
+    # or other database fixtures dependency paths don't always
+    # hit `db_test`.
+    @pytest.fixture(autouse=True)
+    def setup(db_test):
+        return
+
+    # In scenarios where we can embed the `db_test` fixture in
+    # specific fixtures that already exist.
+    @pytest.fixture
+    def user(db_test):
+        with db.begin():
+            user = db.create(User, ...)
+        yield user
+
+The `db_test` fixture triggers our module-level database fixtures,
+then clears the database for each test function run in that module.
+It is done this way because migration has a large cost; migrating
+ahead of each function takes too long when compared to this method.
+"""
+import pytest
+
+from filelock import FileLock
+from sqlalchemy import create_engine
+from sqlalchemy.engine import URL
+from sqlalchemy.engine.base import Engine
+from sqlalchemy.orm import scoped_session
+
+import aurweb.config
+import aurweb.db
+
+from aurweb import initdb, logging, testing
+
+logger = logging.get_logger(__name__)
+
+
+def test_engine() -> Engine:
+    """
+    Return a privileged SQLAlchemy engine with no database.
+
+    This method is particularly useful for providing an engine that
+    can be used to create and drop databases from an SQL server.
+
+    :return: SQLAlchemy Engine instance (not connected to a database)
+    """
+    unix_socket = aurweb.config.get_with_fallback("database", "socket", None)
+    kwargs = {
+        "username": aurweb.config.get("database", "user"),
+        "password": aurweb.config.get_with_fallback(
+            "database", "password", None),
+        "host": aurweb.config.get("database", "host"),
+        "port": aurweb.config.get_with_fallback("database", "port", None),
+        "query": {
+            "unix_socket": unix_socket
+        }
+    }
+
+    backend = aurweb.config.get("database", "backend")
+    driver = aurweb.db.DRIVERS.get(backend)
+    return create_engine(URL.create(driver, **kwargs))
+
+
+class AlembicArgs:
+    """
+    Masquerade an ArgumentParser like structure.
+
+    This structure is needed to pass conftest-specific arguments
+    to initdb.run duration database creation.
+    """
+    verbose = False
+    use_alembic = True
+
+
+def _create_database(engine: Engine, dbname: str) -> None:
+    """
+    Create a test database.
+
+    :param engine: Engine returned by test_engine()
+    :param dbname: Database name to create
+    """
+    conn = engine.connect()
+    conn.execute(f"CREATE DATABASE {dbname}")
+    conn.close()
+    initdb.run(AlembicArgs)
+
+
+def _drop_database(engine: Engine, dbname: str) -> None:
+    """
+    Drop a test database.
+
+    :param engine: Engine returned by test_engine()
+    :param dbname: Database name to drop
+    """
+    aurweb.schema.metadata.drop_all(bind=engine)
+    conn = engine.connect()
+    conn.execute(f"DROP DATABASE {dbname}")
+    conn.close()
+
+
+@pytest.fixture(scope="module")
+def setup_database(tmp_path_factory: pytest.fixture,
+                   worker_id: pytest.fixture) -> None:
+    """ Create and drop a database for the suite this fixture is used in. """
+    engine = test_engine()
+    dbname = aurweb.db.name()
+
+    if worker_id == "master":  # pragma: no cover
+        # If we're not running tests through multiproc pytest-xdist.
+        yield _create_database(engine, dbname)
+        _drop_database(engine, dbname)
+        return
+
+    root_tmp_dir = tmp_path_factory.getbasetemp().parent
+    fn = root_tmp_dir / dbname
+
+    with FileLock(str(fn) + ".lock"):
+        if fn.is_file():
+            # If the data file exists, skip database creation.
+            yield
+        else:
+            # Otherwise, create the data file and create the database.
+            fn.write_text("1")
+            yield _create_database(engine, dbname)
+            _drop_database(engine, dbname)
+
+
+@pytest.fixture(scope="module")
+def db_session(setup_database: pytest.fixture) -> scoped_session:
+    """
+    Yield a database session based on aurweb.db.name().
+
+    The returned session is popped out of persistence after the test is run.
+    """
+    # After the test runs, aurweb.db.name() ends up returning the
+    # configured database, because PYTEST_CURRENT_TEST is removed.
+    dbname = aurweb.db.name()
+    session = aurweb.db.get_session()
+    yield session
+
+    # Close the session and pop it.
+    session.close()
+    aurweb.db.pop_session(dbname)
+
+
+@pytest.fixture
+def db_test(db_session: scoped_session) -> None:
+    """
+    Database test fixture.
+
+    This fixture should be included in any tests which access the
+    database. It ensures that a test database is created and
+    alembic migrated, takes care of dropping the database when
+    the module is complete, and runs setup_test_db() to clear out
+    tables for each test.
+
+    Tests using this fixture should access the database
+    session via aurweb.db.get_session().
+    """
+    testing.setup_test_db()
diff --git a/test/test_accepted_term.py b/test/test_accepted_term.py
index cd8bd7af..de18c61a 100644
--- a/test/test_accepted_term.py
+++ b/test/test_accepted_term.py
@@ -2,38 +2,33 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query
+from aurweb import db
 from aurweb.models.accepted_term import AcceptedTerm
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.term import Term
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = term = accepted_term = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    global user, term, accepted_term
+def setup(db_test):
+    global user, term
 
-    setup_test_db("Users", "AcceptedTerms", "Terms")
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
-
-    term = create(Term, Description="Test term", URL="https://test.term")
+        term = db.create(Term, Description="Test term",
+                         URL="https://test.term")
 
     yield term
 
-    # Eradicate any terms we created.
-    setup_test_db("AcceptedTerms", "Terms")
-
 
 def test_accepted_term():
-    accepted_term = create(AcceptedTerm, User=user, Term=term)
+    with db.begin():
+        accepted_term = db.create(AcceptedTerm, User=user, Term=term)
 
     # Make sure our AcceptedTerm relationships got initialized properly.
     assert accepted_term.User == user
@@ -42,14 +37,10 @@ def test_accepted_term():
 
 
 def test_accepted_term_null_user_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(AcceptedTerm, Term=term)
-    session.rollback()
+        AcceptedTerm(Term=term)
 
 
 def test_accepted_term_null_term_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(AcceptedTerm, User=user)
-    session.rollback()
+        AcceptedTerm(User=user)
diff --git a/test/test_account_type.py b/test/test_account_type.py
index 12472348..1d71f878 100644
--- a/test/test_account_type.py
+++ b/test/test_account_type.py
@@ -1,31 +1,29 @@
 import pytest
 
-from aurweb.db import begin, create, delete, query
+from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
-
-account_type = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db("Users")
-
-    global account_type
-
-    with begin():
-        account_type = create(AccountType, AccountType="TestUser")
-
-    yield account_type
-
-    with begin():
-        delete(account_type)
+def setup(db_test):
+    return
 
 
-def test_account_type():
+@pytest.fixture
+def account_type() -> AccountType:
+    with db.begin():
+        account_type_ = db.create(AccountType, AccountType="TestUser")
+
+    yield account_type_
+
+    with db.begin():
+        db.delete(account_type_)
+
+
+def test_account_type(account_type):
     """ Test creating an AccountType, and reading its columns. """
-    # Make sure it got created and was given an ID.
+    # Make sure it got db.created and was given an ID.
     assert bool(account_type.ID)
 
     # Next, test our string functions.
@@ -34,20 +32,20 @@ def test_account_type():
         "<AccountType(ID='%s', AccountType='TestUser')>" % (
         account_type.ID)
 
-    record = query(AccountType,
-                   AccountType.AccountType == "TestUser").first()
+    record = db.query(AccountType,
+                      AccountType.AccountType == "TestUser").first()
     assert account_type == record
 
 
-def test_user_account_type_relationship():
-    with begin():
-        user = create(User, Username="test", Email="test@example.org",
-                      RealName="Test User", Passwd="testPassword",
-                      AccountType=account_type)
+def test_user_account_type_relationship(account_type):
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountType=account_type)
 
     assert user.AccountType == account_type
 
-    # This must be deleted here to avoid foreign key issues when
+    # This must be db.deleted here to avoid foreign key issues when
     # deleting the temporary AccountType in the fixture.
-    with begin():
-        delete(user)
+    with db.begin():
+        db.delete(user)
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 5e855daf..e828f70f 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -20,7 +20,6 @@ from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.term import Term
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 from aurweb.testing.html import get_errors
 from aurweb.testing.requests import Request
 
@@ -50,11 +49,9 @@ def make_ssh_pubkey():
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user
 
-    setup_test_db("Users", "Sessions", "Bans", "Terms", "AcceptedTerms")
-
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
 
@@ -65,10 +62,6 @@ def setup():
 
     yield user
 
-    # Remove term records so other tests don't get them
-    # and falsely redirect.
-    setup_test_db("Terms", "AcceptedTerms")
-
 
 @pytest.fixture
 def tu_user():
diff --git a/test/test_api_rate_limit.py b/test/test_api_rate_limit.py
index 25cb3e0f..82805ecf 100644
--- a/test/test_api_rate_limit.py
+++ b/test/test_api_rate_limit.py
@@ -3,19 +3,18 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.db import create
 from aurweb.models.api_rate_limit import ApiRateLimit
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db("ApiRateLimit")
+def setup(db_test):
+    return
 
 
 def test_api_rate_key_creation():
     with db.begin():
-        rate = create(ApiRateLimit, IP="127.0.0.1", Requests=10, WindowStart=1)
+        rate = db.create(ApiRateLimit, IP="127.0.0.1", Requests=10,
+                         WindowStart=1)
     assert rate.IP == "127.0.0.1"
     assert rate.Requests == 10
     assert rate.WindowStart == 1
@@ -23,19 +22,15 @@ def test_api_rate_key_creation():
 
 def test_api_rate_key_ip_default():
     with db.begin():
-        api_rate_limit = create(ApiRateLimit, Requests=10, WindowStart=1)
+        api_rate_limit = db.create(ApiRateLimit, Requests=10, WindowStart=1)
     assert api_rate_limit.IP == str()
 
 
 def test_api_rate_key_null_requests_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(ApiRateLimit, IP="127.0.0.1", WindowStart=1)
-    db.rollback()
+        ApiRateLimit(IP="127.0.0.1", WindowStart=1)
 
 
 def test_api_rate_key_null_window_start_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(ApiRateLimit, IP="127.0.0.1", Requests=1)
-    db.rollback()
+        ApiRateLimit(IP="127.0.0.1", Requests=1)
diff --git a/test/test_auth.py b/test/test_auth.py
index 7aea17a0..08eaac0b 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -6,28 +6,22 @@ from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
 from aurweb.auth import AnonymousUser, BasicAuthBackend, account_type_required, has_credential
-from aurweb.db import create, query
-from aurweb.models.account_type import USER, USER_ID, AccountType
+from aurweb.models.account_type import USER, USER_ID
 from aurweb.models.session import Session
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
 
 user = backend = request = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, backend, request
 
-    setup_test_db("Users", "Sessions")
-
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
     with db.begin():
-        user = create(User, Username="test", Email="test@example.com",
-                      RealName="Test User", Passwd="testPassword",
-                      AccountType=account_type)
+        user = db.create(User, Username="test", Email="test@example.com",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
 
     backend = BasicAuthBackend()
     request = Request()
@@ -56,10 +50,8 @@ async def test_auth_backend_invalid_user_id():
     # Create a new session with a fake user id.
     now_ts = datetime.utcnow().timestamp()
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(Session, UsersID=666, SessionID="realSession",
-                   LastUpdateTS=now_ts + 5)
-    db.rollback()
+        Session(UsersID=666, SessionID="realSession",
+                LastUpdateTS=now_ts + 5)
 
 
 @pytest.mark.asyncio
@@ -68,8 +60,8 @@ async def test_basic_auth_backend():
     # equal the real_user.
     now_ts = datetime.utcnow().timestamp()
     with db.begin():
-        create(Session, UsersID=user.ID, SessionID="realSession",
-               LastUpdateTS=now_ts + 5)
+        db.create(Session, UsersID=user.ID, SessionID="realSession",
+                  LastUpdateTS=now_ts + 5)
     request.cookies["AURSID"] = "realSession"
     _, result = await backend.authenticate(request)
     assert result == user
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index 39afc6f9..a0bb8a7c 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -13,7 +13,6 @@ from aurweb.db import begin, create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.session import Session
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 # Some test global constants.
 TEST_USERNAME = "test"
@@ -27,11 +26,9 @@ user = client = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, client
 
-    setup_test_db("Users", "Sessions", "Bans")
-
     account_type = query(AccountType,
                          AccountType.AccountType == "User").first()
 
diff --git a/test/test_ban.py b/test/test_ban.py
index f96e9d14..2c705410 100644
--- a/test/test_ban.py
+++ b/test/test_ban.py
@@ -9,18 +9,15 @@ from sqlalchemy import exc as sa_exc
 from aurweb import db
 from aurweb.db import create
 from aurweb.models.ban import Ban, is_banned
-from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
 
 ban = request = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global ban, request
 
-    setup_test_db("Bans")
-
     ts = datetime.utcnow() + timedelta(seconds=30)
     with db.begin():
         ban = create(Ban, IPAddress="127.0.0.1", BanTS=ts)
@@ -33,8 +30,6 @@ def test_ban():
 
 
 def test_invalid_ban():
-    from aurweb.db import session
-
     with pytest.raises(sa_exc.IntegrityError):
         bad_ban = Ban(BanTS=datetime.utcnow())
 
@@ -44,7 +39,7 @@ def test_invalid_ban():
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", sa_exc.SAWarning)
             with db.begin():
-                session.add(bad_ban)
+                db.add(bad_ban)
 
     # Since we got a transaction failure, we need to rollback.
     db.rollback()
diff --git a/test/test_cache.py b/test/test_cache.py
index 35346e52..b49ee386 100644
--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -3,14 +3,11 @@ import pytest
 from aurweb import cache, db
 from aurweb.models.account_type import USER_ID
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db(
-        User.__tablename__
-    )
+def setup(db_test):
+    return
 
 
 class StubRedis:
diff --git a/test/test_captcha.py b/test/test_captcha.py
index ec19dee9..e5f8c71a 100644
--- a/test/test_captcha.py
+++ b/test/test_captcha.py
@@ -1,8 +1,15 @@
 import hashlib
 
+import pytest
+
 from aurweb import captcha
 
 
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    return
+
+
 def test_captcha_salts():
     """ Make sure we can get some captcha salts. """
     salts = captcha.get_captcha_salts()
diff --git a/test/test_db.py b/test/test_db.py
index 8283a957..f36fff2c 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -12,7 +12,6 @@ import aurweb.initdb
 
 from aurweb import db
 from aurweb.models.account_type import AccountType
-from aurweb.testing import setup_test_db
 
 
 class Args:
@@ -96,16 +95,10 @@ def make_temp_mysql_config():
 
 
 @pytest.fixture(autouse=True)
-def setup_db():
+def setup(db_test):
     if os.path.exists("/tmp/aurweb.sqlite3"):
         os.remove("/tmp/aurweb.sqlite3")
 
-    # In various places in this test, we reinitialize the engine.
-    # Make sure we kill the previous engine before initializing
-    # it via setup_test_db().
-    aurweb.db.kill_engine()
-    setup_test_db()
-
 
 def test_sqlalchemy_sqlite_url():
     tmpctx, tmp = make_temp_sqlite_config()
@@ -159,24 +152,6 @@ def test_sqlalchemy_unknown_backend():
 def test_db_connects_without_fail():
     """ This only tests the actual config supplied to pytest. """
     db.connect()
-    assert db.engine is not None
-
-
-def test_connection_class_sqlite_without_fail():
-    tmpctx, tmp = make_temp_sqlite_config()
-    with tmpctx:
-        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
-            aurweb.config.rehash()
-
-            aurweb.db.kill_engine()
-            aurweb.initdb.run(Args())
-
-            conn = db.Connection()
-            cur = conn.execute(
-                "SELECT AccountType FROM AccountTypes WHERE ID = ?", (1,))
-            account_type = cur.fetchone()[0]
-            assert account_type == "User"
-        aurweb.config.rehash()
 
 
 def test_connection_class_unsupported_backend():
@@ -200,83 +175,6 @@ def test_connection_mysql():
         aurweb.config.rehash()
 
 
-@mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
-@mock.patch.object(sqlite3, "paramstyle", "qmark")
-def test_connection_sqlite():
-    db.Connection()
-
-
-@mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
-@mock.patch.object(sqlite3, "paramstyle", "format")
-def test_connection_execute_paramstyle_format():
-    tmpctx, tmp = make_temp_sqlite_config()
-
-    with tmpctx:
-        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
-            aurweb.config.rehash()
-
-            aurweb.db.kill_engine()
-            aurweb.initdb.run(Args())
-
-            # Test SQLite route of clearing tables.
-            setup_test_db("Users", "Bans")
-
-            conn = db.Connection()
-
-            # First, test ? to %s format replacement.
-            account_types = conn\
-                .execute("SELECT * FROM AccountTypes WHERE AccountType = ?",
-                         ["User"]).fetchall()
-            assert account_types == \
-                ["SELECT * FROM AccountTypes WHERE AccountType = %s", ["User"]]
-
-            # Test other format replacement.
-            account_types = conn\
-                .execute("SELECT * FROM AccountTypes WHERE AccountType = %",
-                         ["User"]).fetchall()
-            assert account_types == \
-                ["SELECT * FROM AccountTypes WHERE AccountType = %%", ["User"]]
-        aurweb.config.rehash()
-
-
-@mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
-@mock.patch.object(sqlite3, "paramstyle", "qmark")
-def test_connection_execute_paramstyle_qmark():
-    tmpctx, tmp = make_temp_sqlite_config()
-
-    with tmpctx:
-        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
-            aurweb.config.rehash()
-
-            aurweb.db.kill_engine()
-            aurweb.initdb.run(Args())
-
-            conn = db.Connection()
-            # We don't modify anything when using qmark, so test equality.
-            account_types = conn\
-                .execute("SELECT * FROM AccountTypes WHERE AccountType = ?",
-                         ["User"]).fetchall()
-            assert account_types == \
-                ["SELECT * FROM AccountTypes WHERE AccountType = ?", ["User"]]
-        aurweb.config.rehash()
-
-
-@mock.patch("sqlite3.connect", mock.MagicMock(return_value=DBConnection()))
-@mock.patch.object(sqlite3, "paramstyle", "unsupported")
-def test_connection_execute_paramstyle_unsupported():
-    tmpctx, tmp = make_temp_sqlite_config()
-    with tmpctx:
-        with mock.patch.dict(os.environ, {"AUR_CONFIG": tmp}):
-            aurweb.config.rehash()
-            conn = db.Connection()
-            with pytest.raises(ValueError, match="unsupported paramstyle"):
-                conn.execute(
-                    "SELECT * FROM AccountTypes WHERE AccountType = ?",
-                    ["User"]
-                ).fetchall()
-        aurweb.config.rehash()
-
-
 def test_create_delete():
     with db.begin():
         account_type = db.create(AccountType, AccountType="test")
@@ -318,3 +216,9 @@ def test_connection_executor_mysql_paramstyle():
 def test_connection_executor_sqlite_paramstyle():
     executor = db.ConnectionExecutor(None, backend="sqlite")
     assert executor.paramstyle() == sqlite3.paramstyle
+
+
+def test_name_without_pytest_current_test():
+    with mock.patch.dict("os.environ", {}, clear=True):
+        dbname = aurweb.db.name()
+    assert dbname == aurweb.config.get("database", "name")
diff --git a/test/test_dependency_type.py b/test/test_dependency_type.py
index cb8dece4..c5afd38d 100644
--- a/test/test_dependency_type.py
+++ b/test/test_dependency_type.py
@@ -2,12 +2,11 @@ import pytest
 
 from aurweb.db import begin, create, delete, query
 from aurweb.models.dependency_type import DependencyType
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db()
+def setup(db_test):
+    return
 
 
 def test_dependency_types():
diff --git a/test/test_group.py b/test/test_group.py
index cea69b68..82b82464 100644
--- a/test/test_group.py
+++ b/test/test_group.py
@@ -4,12 +4,11 @@ from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
 from aurweb.models.group import Group
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db("Groups")
+def setup(db_test):
+    return
 
 
 def test_group_creation():
@@ -21,6 +20,4 @@ def test_group_creation():
 
 def test_group_null_name_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(Group)
-    db.rollback()
+        Group()
diff --git a/test/test_homepage.py b/test/test_homepage.py
index 5c678b71..2e6d53c9 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -18,7 +18,6 @@ from aurweb.models.package_request import PackageRequest
 from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
 from aurweb.redis import redis_connection
-from aurweb.testing import setup_test_db
 from aurweb.testing.html import parse_root
 from aurweb.testing.requests import Request
 
@@ -26,14 +25,8 @@ client = TestClient(app)
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    yield setup_test_db(
-        User.__tablename__,
-        Package.__tablename__,
-        PackageBase.__tablename__,
-        PackageComaintainer.__tablename__,
-        PackageRequest.__tablename__
-    )
+def setup(db_test):
+    return
 
 
 @pytest.fixture
diff --git a/test/test_html.py b/test/test_html.py
index 8e7cb2d1..db47c5e5 100644
--- a/test/test_html.py
+++ b/test/test_html.py
@@ -8,14 +8,13 @@ from fastapi.testclient import TestClient
 from aurweb import asgi, db
 from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID, AccountType
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 from aurweb.testing.html import get_errors, get_successes, parse_root
 from aurweb.testing.requests import Request
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db(User.__tablename__)
+def setup(db_test):
+    return
 
 
 @pytest.fixture
diff --git a/test/test_initdb.py b/test/test_initdb.py
index c7d29ee2..44681d8e 100644
--- a/test/test_initdb.py
+++ b/test/test_initdb.py
@@ -1,3 +1,5 @@
+import pytest
+
 import aurweb.config
 import aurweb.db
 import aurweb.initdb
@@ -5,6 +7,11 @@ import aurweb.initdb
 from aurweb.models.account_type import AccountType
 
 
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    return
+
+
 class Args:
     use_alembic = True
     verbose = True
@@ -15,6 +22,8 @@ def test_run():
     aurweb.db.kill_engine()
     metadata.drop_all(aurweb.db.get_engine())
     aurweb.initdb.run(Args())
+
+    # Check that constant table rows got added via initdb.
     record = aurweb.db.query(AccountType,
                              AccountType.AccountType == "User").first()
     assert record is not None
diff --git a/test/test_license.py b/test/test_license.py
index 2c52f058..b34bd260 100644
--- a/test/test_license.py
+++ b/test/test_license.py
@@ -4,12 +4,11 @@ from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
 from aurweb.models.license import License
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db("Licenses")
+def setup(db_test):
+    return
 
 
 def test_license_creation():
@@ -21,6 +20,4 @@ def test_license_creation():
 
 def test_license_null_name_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(License)
-    db.rollback()
+        License()
diff --git a/test/test_official_provider.py b/test/test_official_provider.py
index 0aa4f1d1..9287ea2d 100644
--- a/test/test_official_provider.py
+++ b/test/test_official_provider.py
@@ -4,12 +4,11 @@ from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
 from aurweb.models.official_provider import OfficialProvider
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db("OfficialProviders")
+def setup(db_test):
+    return
 
 
 def test_official_provider_creation():
@@ -53,26 +52,14 @@ def test_official_provider_cs():
 
 def test_official_provider_null_name_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(OfficialProvider,
-                      Repo="some-repo",
-                      Provides="some-provides")
-    db.rollback()
+        OfficialProvider(Repo="some-repo", Provides="some-provides")
 
 
 def test_official_provider_null_repo_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(OfficialProvider,
-                      Name="some-name",
-                      Provides="some-provides")
-    db.rollback()
+        OfficialProvider(Name="some-name", Provides="some-provides")
 
 
 def test_official_provider_null_provides_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(OfficialProvider,
-                      Name="some-name",
-                      Repo="some-repo")
-    db.rollback()
+        OfficialProvider(Name="some-name", Repo="some-repo")
diff --git a/test/test_package.py b/test/test_package.py
index 112ca9b4..c2afa660 100644
--- a/test/test_package.py
+++ b/test/test_package.py
@@ -8,17 +8,14 @@ from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = package = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase, package
 
-    setup_test_db("Packages", "PackageBases", "Users")
-
     account_type = db.query(AccountType,
                             AccountType.AccountType == "User").first()
 
diff --git a/test/test_package_base.py b/test/test_package_base.py
index 2bc6278f..8e4b2edf 100644
--- a/test/test_package_base.py
+++ b/test/test_package_base.py
@@ -8,17 +8,14 @@ from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user
 
-    setup_test_db("Users", "PackageBases")
-
     account_type = db.query(AccountType,
                             AccountType.AccountType == "User").first()
     with db.begin():
diff --git a/test/test_package_blacklist.py b/test/test_package_blacklist.py
index 93f15de7..6f4c36d7 100644
--- a/test/test_package_blacklist.py
+++ b/test/test_package_blacklist.py
@@ -6,20 +6,18 @@ from aurweb import db
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_blacklist import PackageBlacklist
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase
 
-    setup_test_db("PackageBlacklist", "PackageBases", "Users")
-
-    user = db.create(User, Username="test", Email="test@example.org",
-                     RealName="Test User", Passwd="testPassword")
-    pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword")
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_blacklist_creation():
@@ -31,6 +29,4 @@ def test_package_blacklist_creation():
 
 def test_package_blacklist_null_name_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(PackageBlacklist)
-    db.rollback()
+        PackageBlacklist()
diff --git a/test/test_package_comaintainer.py b/test/test_package_comaintainer.py
index cba99ba0..ff74cddf 100644
--- a/test/test_package_comaintainer.py
+++ b/test/test_package_comaintainer.py
@@ -2,29 +2,28 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, rollback
+from aurweb import db
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase
 
-    setup_test_db("Users", "PackageBases", "PackageComaintainers")
-
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword")
-    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword")
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_comaintainer_creation():
-    package_comaintainer = create(PackageComaintainer, User=user,
-                                  PackageBase=pkgbase, Priority=5)
+    with db.begin():
+        package_comaintainer = db.create(PackageComaintainer, User=user,
+                                         PackageBase=pkgbase, Priority=5)
     assert bool(package_comaintainer)
     assert package_comaintainer.User == user
     assert package_comaintainer.PackageBase == pkgbase
@@ -33,17 +32,14 @@ def test_package_comaintainer_creation():
 
 def test_package_comaintainer_null_user_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageComaintainer, PackageBase=pkgbase, Priority=1)
-    rollback()
+        PackageComaintainer(PackageBase=pkgbase, Priority=1)
 
 
 def test_package_comaintainer_null_pkgbase_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageComaintainer, User=user, Priority=1)
-    rollback()
+        PackageComaintainer(User=user, Priority=1)
 
 
 def test_package_comaintainer_null_priority_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageComaintainer, User=user, PackageBase=pkgbase)
-    rollback()
+        PackageComaintainer(User=user, PackageBase=pkgbase)
diff --git a/test/test_package_comment.py b/test/test_package_comment.py
index 60f0333d..b00e08c3 100644
--- a/test/test_package_comment.py
+++ b/test/test_package_comment.py
@@ -2,70 +2,55 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import begin, create, query, rollback
-from aurweb.models.account_type import AccountType
+from aurweb import db
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_comment import PackageComment
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db("PackageBases", "PackageComments", "Users")
-
+def setup(db_test):
     global user, pkgbase
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    with begin():
-        user = create(User, Username="test", Email="test@example.org",
-                      RealName="Test User", Passwd="testPassword",
-                      AccountType=account_type)
-        pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_comment_creation():
-    with begin():
-        package_comment = create(PackageComment,
-                                 PackageBase=pkgbase,
-                                 User=user,
-                                 Comments="Test comment.",
-                                 RenderedComment="Test rendered comment.")
+    with db.begin():
+        package_comment = db.create(PackageComment, PackageBase=pkgbase,
+                                    User=user, Comments="Test comment.",
+                                    RenderedComment="Test rendered comment.")
     assert bool(package_comment.ID)
 
 
 def test_package_comment_null_package_base_raises_exception():
     with pytest.raises(IntegrityError):
-        with begin():
-            create(PackageComment, User=user, Comments="Test comment.",
-                   RenderedComment="Test rendered comment.")
-    rollback()
+        PackageComment(User=user, Comments="Test comment.",
+                       RenderedComment="Test rendered comment.")
 
 
 def test_package_comment_null_user_raises_exception():
     with pytest.raises(IntegrityError):
-        with begin():
-            create(PackageComment, PackageBase=pkgbase,
-                   Comments="Test comment.",
-                   RenderedComment="Test rendered comment.")
-    rollback()
+        PackageComment(PackageBase=pkgbase,
+                       Comments="Test comment.",
+                       RenderedComment="Test rendered comment.")
 
 
 def test_package_comment_null_comments_raises_exception():
     with pytest.raises(IntegrityError):
-        with begin():
-            create(PackageComment, PackageBase=pkgbase, User=user,
-                   RenderedComment="Test rendered comment.")
-    rollback()
+        PackageComment(PackageBase=pkgbase, User=user,
+                       RenderedComment="Test rendered comment.")
 
 
 def test_package_comment_null_renderedcomment_defaults():
-    with begin():
-        record = create(PackageComment,
-                        PackageBase=pkgbase,
-                        User=user,
-                        Comments="Test comment.")
+    with db.begin():
+        record = db.create(PackageComment, PackageBase=pkgbase,
+                           User=user, Comments="Test comment.")
     assert record.RenderedComment == str()
diff --git a/test/test_package_dependency.py b/test/test_package_dependency.py
index 2ddef68e..e6125669 100644
--- a/test/test_package_dependency.py
+++ b/test/test_package_dependency.py
@@ -3,117 +3,70 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.db import create, query
-from aurweb.models.account_type import AccountType
-from aurweb.models.dependency_type import DependencyType
+from aurweb.models.account_type import USER_ID
+from aurweb.models.dependency_type import CHECKDEPENDS_ID, DEPENDS_ID, MAKEDEPENDS_ID, OPTDEPENDS_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = package = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase, package
 
-    setup_test_db("Users", "PackageBases", "Packages", "PackageDepends")
-
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-
     with db.begin():
-        user = create(User, Username="test", Email="test@example.org",
-                      RealName="Test User", Passwd="testPassword",
-                      AccountType=account_type)
-        pkgbase = create(PackageBase,
-                         Name="test-package",
-                         Maintainer=user)
-        package = create(Package,
-                         PackageBase=pkgbase,
-                         Name=pkgbase.Name,
-                         Description="Test description.",
-                         URL="https://test.package")
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+        pkgbase = db.create(PackageBase,
+                            Name="test-package",
+                            Maintainer=user)
+        package = db.create(Package,
+                            PackageBase=pkgbase,
+                            Name=pkgbase.Name,
+                            Description="Test description.",
+                            URL="https://test.package")
 
 
 def test_package_dependencies():
-    depends = query(DependencyType, DependencyType.Name == "depends").first()
-
     with db.begin():
-        pkgdep = create(PackageDependency, Package=package,
-                        DependencyType=depends,
-                        DepName="test-dep")
+        pkgdep = db.create(PackageDependency, Package=package,
+                           DepTypeID=DEPENDS_ID, DepName="test-dep")
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
-    assert pkgdep.DependencyType == depends
-    assert pkgdep in depends.package_dependencies
     assert pkgdep in package.package_dependencies
 
-    makedepends = query(DependencyType,
-                        DependencyType.Name == "makedepends").first()
     with db.begin():
-        pkgdep.DependencyType = makedepends
-    assert pkgdep.DepName == "test-dep"
-    assert pkgdep.Package == package
-    assert pkgdep.DependencyType == makedepends
-    assert pkgdep in makedepends.package_dependencies
-    assert pkgdep in package.package_dependencies
+        pkgdep.DepTypeID = MAKEDEPENDS_ID
 
-    checkdepends = query(DependencyType,
-                         DependencyType.Name == "checkdepends").first()
     with db.begin():
-        pkgdep.DependencyType = checkdepends
-    assert pkgdep.DepName == "test-dep"
-    assert pkgdep.Package == package
-    assert pkgdep.DependencyType == checkdepends
-    assert pkgdep in checkdepends.package_dependencies
-    assert pkgdep in package.package_dependencies
+        pkgdep.DepTypeID = CHECKDEPENDS_ID
 
-    optdepends = query(DependencyType,
-                       DependencyType.Name == "optdepends").first()
     with db.begin():
-        pkgdep.DependencyType = optdepends
-    assert pkgdep.DepName == "test-dep"
-    assert pkgdep.Package == package
-    assert pkgdep.DependencyType == optdepends
-    assert pkgdep in optdepends.package_dependencies
-    assert pkgdep in package.package_dependencies
+        pkgdep.DepTypeID = OPTDEPENDS_ID
 
     assert not pkgdep.is_package()
 
     with db.begin():
-        base = create(PackageBase, Name=pkgdep.DepName, Maintainer=user)
-        create(Package, PackageBase=base, Name=pkgdep.DepName)
+        base = db.create(PackageBase, Name=pkgdep.DepName, Maintainer=user)
+        db.create(Package, PackageBase=base, Name=pkgdep.DepName)
 
     assert pkgdep.is_package()
 
 
 def test_package_dependencies_null_package_raises_exception():
-    depends = query(DependencyType, DependencyType.Name == "depends").first()
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageDependency,
-                   DependencyType=depends,
-                   DepName="test-dep")
-    db.rollback()
+        PackageDependency(DepTypeID=DEPENDS_ID, DepName="test-dep")
 
 
 def test_package_dependencies_null_dependency_type_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageDependency,
-                   Package=package,
-                   DepName="test-dep")
-    db.rollback()
+        PackageDependency(Package=package, DepName="test-dep")
 
 
 def test_package_dependencies_null_depname_raises_exception():
-    depends = query(DependencyType, DependencyType.Name == "depends").first()
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageDependency,
-                   Package=package,
-                   DependencyType=depends)
-    db.rollback()
+        PackageDependency(DepTypeID=DEPENDS_ID, Package=package)
diff --git a/test/test_package_group.py b/test/test_package_group.py
index 0e6e41e3..2c91e0b1 100644
--- a/test/test_package_group.py
+++ b/test/test_package_group.py
@@ -2,51 +2,44 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query
-from aurweb.models.account_type import AccountType
+from aurweb import db
+from aurweb.models.account_type import USER_ID
 from aurweb.models.group import Group
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_group import PackageGroup
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = group = pkgbase = package = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, group, pkgbase, package
 
-    setup_test_db("Users", "PackageBases", "Packages",
-                  "Groups", "PackageGroups")
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+        group = db.create(Group, Name="Test Group")
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
-
-    group = create(Group, Name="Test Group")
-    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
-    package = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+        package = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
 
 
 def test_package_group():
-    package_group = create(PackageGroup, Package=package, Group=group)
+    with db.begin():
+        package_group = db.create(PackageGroup, Package=package, Group=group)
     assert package_group.Group == group
     assert package_group.Package == package
 
 
 def test_package_group_null_package_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(PackageGroup, Group=group)
-    session.rollback()
+        PackageGroup(Group=group)
 
 
 def test_package_group_null_group_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(PackageGroup, Package=package)
-    session.rollback()
+        PackageGroup(Package=package)
diff --git a/test/test_package_keyword.py b/test/test_package_keyword.py
index 316e7ca8..88ccb734 100644
--- a/test/test_package_keyword.py
+++ b/test/test_package_keyword.py
@@ -2,44 +2,37 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query
-from aurweb.models.account_type import AccountType
+from aurweb import db
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_keyword import PackageKeyword
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase
 
-    setup_test_db("Users", "PackageBases", "PackageKeywords")
-
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
-    pkgbase = create(PackageBase,
-                     Name="beautiful-package",
-                     Maintainer=user)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+        pkgbase = db.create(PackageBase,
+                            Name="beautiful-package",
+                            Maintainer=user)
 
 
 def test_package_keyword():
-    pkg_keyword = create(PackageKeyword,
-                         PackageBase=pkgbase,
-                         Keyword="test")
+    with db.begin():
+        pkg_keyword = db.create(PackageKeyword,
+                                PackageBase=pkgbase,
+                                Keyword="test")
     assert pkg_keyword in pkgbase.keywords
     assert pkgbase == pkg_keyword.PackageBase
 
 
 def test_package_keyword_null_pkgbase_raises_exception():
-    from aurweb.db import session
-
     with pytest.raises(IntegrityError):
-        create(PackageKeyword,
-               Keyword="test")
-    session.rollback()
+        PackageKeyword(Keyword="test")
diff --git a/test/test_package_license.py b/test/test_package_license.py
index f7654dee..965d0c6f 100644
--- a/test/test_package_license.py
+++ b/test/test_package_license.py
@@ -2,51 +2,45 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query
-from aurweb.models.account_type import AccountType
+from aurweb import db
+from aurweb.models.account_type import USER_ID
 from aurweb.models.license import License
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_license import PackageLicense
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = license = pkgbase = package = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, license, pkgbase, package
 
-    setup_test_db("Users", "PackageBases", "Packages",
-                  "Licenses", "PackageLicenses")
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+        license = db.create(License, Name="Test License")
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=account_type)
-
-    license = create(License, Name="Test License")
-    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
-    package = create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+        package = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
 
 
 def test_package_license():
-    package_license = create(PackageLicense, Package=package, License=license)
+    with db.begin():
+        package_license = db.create(PackageLicense, Package=package,
+                                    License=license)
     assert package_license.License == license
     assert package_license.Package == package
 
 
 def test_package_license_null_package_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(PackageLicense, License=license)
-    session.rollback()
+        PackageLicense(License=license)
 
 
 def test_package_license_null_license_raises_exception():
-    from aurweb.db import session
     with pytest.raises(IntegrityError):
-        create(PackageLicense, Package=package)
-    session.rollback()
+        PackageLicense(Package=package)
diff --git a/test/test_package_notification.py b/test/test_package_notification.py
index 2898a904..2e505dd8 100644
--- a/test/test_package_notification.py
+++ b/test/test_package_notification.py
@@ -2,29 +2,28 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, rollback
+from aurweb import db
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase
 
-    setup_test_db("Users", "PackageBases", "PackageNotifications")
-
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword")
-    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword")
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_notification_creation():
-    package_notification = create(PackageNotification, User=user,
-                                  PackageBase=pkgbase)
+    with db.begin():
+        package_notification = db.create(
+            PackageNotification, User=user, PackageBase=pkgbase)
     assert bool(package_notification)
     assert package_notification.User == user
     assert package_notification.PackageBase == pkgbase
@@ -32,11 +31,9 @@ def test_package_notification_creation():
 
 def test_package_notification_null_user_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageNotification, PackageBase=pkgbase)
-    rollback()
+        PackageNotification(PackageBase=pkgbase)
 
 
 def test_package_notification_null_pkgbase_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageNotification, User=user)
-    rollback()
+        PackageNotification(User=user)
diff --git a/test/test_package_relation.py b/test/test_package_relation.py
index edb67078..e5f7f453 100644
--- a/test/test_package_relation.py
+++ b/test/test_package_relation.py
@@ -1,103 +1,63 @@
 import pytest
 
-from sqlalchemy.exc import IntegrityError, OperationalError
+from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.db import create, query
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_relation import PackageRelation
-from aurweb.models.relation_type import RelationType
+from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = package = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase, package
 
-    setup_test_db("Users", "PackageBases", "Packages", "PackageRelations")
-
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-
     with db.begin():
-        user = create(User, Username="test", Email="test@example.org",
-                      RealName="Test User", Passwd="testPassword",
-                      AccountType=account_type)
-        pkgbase = create(PackageBase,
-                         Name="test-package",
-                         Maintainer=user)
-        package = create(Package,
-                         PackageBase=pkgbase,
-                         Name=pkgbase.Name,
-                         Description="Test description.",
-                         URL="https://test.package")
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+        pkgbase = db.create(PackageBase,
+                            Name="test-package",
+                            Maintainer=user)
+        package = db.create(Package,
+                            PackageBase=pkgbase,
+                            Name=pkgbase.Name,
+                            Description="Test description.",
+                            URL="https://test.package")
 
 
 def test_package_relation():
-    conflicts = query(RelationType, RelationType.Name == "conflicts").first()
-
     with db.begin():
-        pkgrel = create(PackageRelation, Package=package,
-                        RelationType=conflicts,
-                        RelName="test-relation")
+        pkgrel = db.create(PackageRelation, Package=package,
+                           RelTypeID=CONFLICTS_ID,
+                           RelName="test-relation")
+
     assert pkgrel.RelName == "test-relation"
     assert pkgrel.Package == package
-    assert pkgrel.RelationType == conflicts
-    assert pkgrel in conflicts.package_relations
     assert pkgrel in package.package_relations
 
-    provides = query(RelationType, RelationType.Name == "provides").first()
     with db.begin():
-        pkgrel.RelationType = provides
-    assert pkgrel.RelName == "test-relation"
-    assert pkgrel.Package == package
-    assert pkgrel.RelationType == provides
-    assert pkgrel in provides.package_relations
-    assert pkgrel in package.package_relations
+        pkgrel.RelTypeID = PROVIDES_ID
 
-    replaces = query(RelationType, RelationType.Name == "replaces").first()
     with db.begin():
-        pkgrel.RelationType = replaces
-    assert pkgrel.RelName == "test-relation"
-    assert pkgrel.Package == package
-    assert pkgrel.RelationType == replaces
-    assert pkgrel in replaces.package_relations
-    assert pkgrel in package.package_relations
+        pkgrel.RelTypeID = REPLACES_ID
 
 
 def test_package_relation_null_package_raises_exception():
-    conflicts = query(RelationType, RelationType.Name == "conflicts").first()
-    assert conflicts is not None
-
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageRelation,
-                   RelationType=conflicts,
-                   RelName="test-relation")
-    db.rollback()
+        PackageRelation(RelTypeID=CONFLICTS_ID, RelName="test-relation")
 
 
 def test_package_relation_null_relation_type_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageRelation,
-                   Package=package,
-                   RelName="test-relation")
-    db.rollback()
+        PackageRelation(Package=package, RelName="test-relation")
 
 
 def test_package_relation_null_relname_raises_exception():
-    depends = query(RelationType, RelationType.Name == "conflicts").first()
-    assert depends is not None
-
-    with pytest.raises((OperationalError, IntegrityError)):
-        with db.begin():
-            create(PackageRelation,
-                   Package=package,
-                   RelationType=depends)
-    db.rollback()
+    with pytest.raises(IntegrityError):
+        PackageRelation(Package=package, RelTypeID=CONFLICTS_ID)
diff --git a/test/test_package_request.py b/test/test_package_request.py
index 1589ffc2..4b5dfb2b 100644
--- a/test/test_package_request.py
+++ b/test/test_package_request.py
@@ -5,41 +5,35 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.db import create, query, rollback
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_request import (ACCEPTED, ACCEPTED_ID, CLOSED, CLOSED_ID, PENDING, PENDING_ID, REJECTED,
                                            REJECTED_ID, PackageRequest)
-from aurweb.models.request_type import RequestType
+from aurweb.models.request_type import MERGE_ID
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase
 
-    setup_test_db("PackageRequests", "PackageBases", "Users")
-
     with db.begin():
-        user = create(User, Username="test", Email="test@example.org",
-                      RealName="Test User", Passwd="testPassword")
-        pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_request_creation():
-    request_type = query(RequestType, RequestType.Name == "merge").first()
-    assert request_type.Name == "merge"
-
     with db.begin():
-        package_request = create(PackageRequest, RequestType=request_type,
-                                 User=user, PackageBase=pkgbase,
-                                 PackageBaseName=pkgbase.Name,
-                                 Comments=str(), ClosureComment=str())
+        package_request = db.create(PackageRequest, ReqTypeID=MERGE_ID,
+                                    User=user, PackageBase=pkgbase,
+                                    PackageBaseName=pkgbase.Name,
+                                    Comments=str(), ClosureComment=str())
 
     assert bool(package_request.ID)
-    assert package_request.RequestType == request_type
     assert package_request.User == user
     assert package_request.PackageBase == pkgbase
     assert package_request.PackageBaseName == pkgbase.Name
@@ -47,22 +41,18 @@ def test_package_request_creation():
     assert package_request.ClosureComment == str()
 
     # Make sure that everything is cross-referenced with relationships.
-    assert package_request in request_type.package_requests
     assert package_request in user.package_requests
     assert package_request in pkgbase.requests
 
 
 def test_package_request_closed():
-    request_type = query(RequestType, RequestType.Name == "merge").first()
-    assert request_type.Name == "merge"
-
     ts = int(datetime.utcnow().timestamp())
     with db.begin():
-        package_request = create(PackageRequest, RequestType=request_type,
-                                 User=user, PackageBase=pkgbase,
-                                 PackageBaseName=pkgbase.Name,
-                                 Closer=user, ClosedTS=ts,
-                                 Comments=str(), ClosureComment=str())
+        package_request = db.create(PackageRequest, ReqTypeID=MERGE_ID,
+                                    User=user, PackageBase=pkgbase,
+                                    PackageBaseName=pkgbase.Name,
+                                    Closer=user, ClosedTS=ts,
+                                    Comments=str(), ClosureComment=str())
 
     assert package_request.Closer == user
     assert package_request.ClosedTS == ts
@@ -73,73 +63,54 @@ def test_package_request_closed():
 
 def test_package_request_null_request_type_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageRequest, User=user, PackageBase=pkgbase,
-                   PackageBaseName=pkgbase.Name,
-                   Comments=str(), ClosureComment=str())
-    rollback()
+        PackageRequest(User=user, PackageBase=pkgbase,
+                       PackageBaseName=pkgbase.Name,
+                       Comments=str(), ClosureComment=str())
 
 
 def test_package_request_null_user_raises_exception():
-    request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageRequest, RequestType=request_type,
-                   PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
-                   Comments=str(), ClosureComment=str())
-    rollback()
+        PackageRequest(ReqTypeID=MERGE_ID,
+                       PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+                       Comments=str(), ClosureComment=str())
 
 
 def test_package_request_null_package_base_raises_exception():
-    request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageRequest, RequestType=request_type,
-                   User=user, PackageBaseName=pkgbase.Name,
-                   Comments=str(), ClosureComment=str())
-    rollback()
+        PackageRequest(ReqTypeID=MERGE_ID,
+                       User=user, PackageBaseName=pkgbase.Name,
+                       Comments=str(), ClosureComment=str())
 
 
 def test_package_request_null_package_base_name_raises_exception():
-    request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageRequest, RequestType=request_type,
-                   User=user, PackageBase=pkgbase,
-                   Comments=str(), ClosureComment=str())
-    rollback()
+        PackageRequest(ReqTypeID=MERGE_ID,
+                       User=user, PackageBase=pkgbase,
+                       Comments=str(), ClosureComment=str())
 
 
 def test_package_request_null_comments_raises_exception():
-    request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageRequest, RequestType=request_type, User=user,
-                   PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
-                   ClosureComment=str())
-    rollback()
+        PackageRequest(ReqTypeID=MERGE_ID, User=user,
+                       PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+                       ClosureComment=str())
 
 
 def test_package_request_null_closure_comment_raises_exception():
-    request_type = query(RequestType, RequestType.Name == "merge").first()
     with pytest.raises(IntegrityError):
-        with db.begin():
-            create(PackageRequest, RequestType=request_type, User=user,
-                   PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
-                   Comments=str())
-    rollback()
+        PackageRequest(ReqTypeID=MERGE_ID, User=user,
+                       PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
+                       Comments=str())
 
 
 def test_package_request_status_display():
     """ Test status_display() based on the Status column value. """
-    request_type = query(RequestType, RequestType.Name == "merge").first()
-
     with db.begin():
-        pkgreq = create(PackageRequest, RequestType=request_type,
-                        User=user, PackageBase=pkgbase,
-                        PackageBaseName=pkgbase.Name,
-                        Comments=str(), ClosureComment=str(),
-                        Status=PENDING_ID)
+        pkgreq = db.create(PackageRequest, ReqTypeID=MERGE_ID,
+                           User=user, PackageBase=pkgbase,
+                           PackageBaseName=pkgbase.Name,
+                           Comments=str(), ClosureComment=str(),
+                           Status=PENDING_ID)
     assert pkgreq.status_display() == PENDING
 
     with db.begin():
diff --git a/test/test_package_source.py b/test/test_package_source.py
index d1adcf9c..b83c9d48 100644
--- a/test/test_package_source.py
+++ b/test/test_package_source.py
@@ -14,7 +14,7 @@ user = pkgbase = package = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase, package
 
     setup_test_db("PackageSources", "Packages", "PackageBases", "Users")
diff --git a/test/test_package_vote.py b/test/test_package_vote.py
index cb15e217..d1ec203b 100644
--- a/test/test_package_vote.py
+++ b/test/test_package_vote.py
@@ -4,30 +4,30 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, rollback
+from aurweb import db
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, pkgbase
 
-    setup_test_db("Users", "PackageBases", "PackageVotes")
-
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword")
-    pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword")
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
 
 
 def test_package_vote_creation():
     ts = int(datetime.utcnow().timestamp())
-    package_vote = create(PackageVote, User=user, PackageBase=pkgbase,
-                          VoteTS=ts)
+
+    with db.begin():
+        package_vote = db.create(PackageVote, User=user,
+                                 PackageBase=pkgbase, VoteTS=ts)
     assert bool(package_vote)
     assert package_vote.User == user
     assert package_vote.PackageBase == pkgbase
@@ -36,17 +36,14 @@ def test_package_vote_creation():
 
 def test_package_vote_null_user_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageVote, PackageBase=pkgbase, VoteTS=1)
-    rollback()
+        PackageVote(PackageBase=pkgbase, VoteTS=1)
 
 
 def test_package_vote_null_pkgbase_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageVote, User=user, VoteTS=1)
-    rollback()
+        PackageVote(User=user, VoteTS=1)
 
 
 def test_package_vote_null_votets_raises_exception():
     with pytest.raises(IntegrityError):
-        create(PackageVote, User=user, PackageBase=pkgbase)
-    rollback()
+        PackageVote(User=user, PackageBase=pkgbase)
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 1bdb3ea3..02c22d9d 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -28,7 +28,6 @@ from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID, RelationType
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, RequestType
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 from aurweb.testing.html import get_errors, get_successes, parse_root
 from aurweb.testing.requests import Request
 
@@ -65,21 +64,8 @@ def create_package_rel(package: Package,
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db(
-        User.__tablename__,
-        Package.__tablename__,
-        PackageBase.__tablename__,
-        PackageDependency.__tablename__,
-        PackageRelation.__tablename__,
-        PackageKeyword.__tablename__,
-        PackageVote.__tablename__,
-        PackageNotification.__tablename__,
-        PackageComaintainer.__tablename__,
-        PackageComment.__tablename__,
-        PackageRequest.__tablename__,
-        OfficialProvider.__tablename__
-    )
+def setup(db_test):
+    return
 
 
 @pytest.fixture
@@ -91,12 +77,11 @@ def client() -> TestClient:
 @pytest.fixture
 def user() -> User:
     """ Yield a user. """
-    account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
     with db.begin():
         user = db.create(User, Username="test",
                          Email="test@example.org",
                          Passwd="testPassword",
-                         AccountType=account_type)
+                         AccountTypeID=USER_ID)
     yield user
 
 
@@ -1173,7 +1158,7 @@ def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
         PackageNotification.UserID == maintainer.ID
     ).first()
     with db.begin():
-        db.session.delete(db_notif)
+        db.delete(db_notif)
 
     # Now, let's edit the comment we just created.
     comment_id = int(headers[0].attrib["id"].split("-")[-1])
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index 622c08c2..cd0982b2 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -6,7 +6,7 @@ from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
 from aurweb import asgi, db
-from aurweb.models.account_type import USER_ID, AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -15,29 +15,20 @@ from aurweb.models.package_vote import PackageVote
 from aurweb.models.user import User
 from aurweb.packages import util
 from aurweb.redis import kill_redis
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db(
-        User.__tablename__,
-        Package.__tablename__,
-        PackageBase.__tablename__,
-        PackageVote.__tablename__,
-        PackageNotification.__tablename__,
-        OfficialProvider.__tablename__
-    )
+def setup(db_test):
+    return
 
 
 @pytest.fixture
 def maintainer() -> User:
-    account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
     with db.begin():
         maintainer = db.create(User, Username="test_maintainer",
                                Email="test_maintainer@examepl.org",
                                Passwd="testPassword",
-                               AccountType=account_type)
+                               AccountTypeID=USER_ID)
     yield maintainer
 
 
diff --git a/test/test_popupdate.py b/test/test_popupdate.py
index 93f86f10..ce3f9f11 100644
--- a/test/test_popupdate.py
+++ b/test/test_popupdate.py
@@ -1,5 +1,12 @@
+import pytest
+
 from aurweb.scripts import popupdate
 
 
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    return
+
+
 def test_popupdate():
     popupdate.main()
diff --git a/test/test_ratelimit.py b/test/test_ratelimit.py
index 0a72a7e4..859adea9 100644
--- a/test/test_ratelimit.py
+++ b/test/test_ratelimit.py
@@ -8,15 +8,14 @@ from aurweb import config, db, logging
 from aurweb.models import ApiRateLimit
 from aurweb.ratelimit import check_ratelimit
 from aurweb.redis import redis_connection
-from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
 
 logger = logging.get_logger(__name__)
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db(ApiRateLimit.__tablename__)
+def setup(db_test):
+    return
 
 
 @pytest.fixture
@@ -31,27 +30,36 @@ def pipeline():
     yield pipeline
 
 
+config_getint = config.getint
+
+
 def mock_config_getint(section: str, key: str):
     if key == "request_limit":
         return 4
     elif key == "window_length":
         return 100
-    return config.getint(section, key)
+    return config_getint(section, key)
+
+
+config_getboolean = config.getboolean
 
 
 def mock_config_getboolean(return_value: int = 0):
     def fn(section: str, key: str):
         if section == "ratelimit" and key == "cache":
             return return_value
-        return config.getboolean(section, key)
+        return config_getboolean(section, key)
     return fn
 
 
+config_get = config.get
+
+
 def mock_config_get(return_value: str = "none"):
     def fn(section: str, key: str):
         if section == "options" and key == "cache":
             return return_value
-        return config.get(section, key)
+        return config_get(section, key)
     return fn
 
 
diff --git a/test/test_relation_type.py b/test/test_relation_type.py
index d2dabceb..263ae1ec 100644
--- a/test/test_relation_type.py
+++ b/test/test_relation_type.py
@@ -2,12 +2,11 @@ import pytest
 
 from aurweb import db
 from aurweb.models.relation_type import RelationType
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db()
+def setup(db_test):
+    return
 
 
 def test_relation_type_creation():
diff --git a/test/test_request_type.py b/test/test_request_type.py
index 0db24921..0bc86319 100644
--- a/test/test_request_type.py
+++ b/test/test_request_type.py
@@ -2,12 +2,11 @@ import pytest
 
 from aurweb import db
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID, RequestType
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db()
+def setup(db_test):
+    return
 
 
 def test_request_type_creation():
diff --git a/test/test_routes.py b/test/test_routes.py
index e3f69d7a..32f507f3 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -10,27 +10,21 @@ from fastapi.testclient import TestClient
 
 from aurweb import db
 from aurweb.asgi import app
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
 
 user = client = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, client
 
-    setup_test_db("Users", "Sessions")
-
-    account_type = db.query(AccountType,
-                            AccountType.AccountType == "User").first()
-
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
-                         AccountType=account_type)
+                         AccountTypeID=USER_ID)
 
     client = TestClient(app)
 
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 055baa33..f20c9b02 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -26,7 +26,6 @@ from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import RelationType
 from aurweb.models.user import User
 from aurweb.redis import redis_connection
-from aurweb.testing import setup_test_db
 
 
 def make_request(path, headers: Dict[str, str] = {}):
@@ -35,11 +34,8 @@ def make_request(path, headers: Dict[str, str] = {}):
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    # Set up tables.
-    setup_test_db("Users", "PackageBases", "Packages", "Licenses",
-                  "PackageDepends", "PackageRelations", "PackageLicenses",
-                  "PackageKeywords", "PackageVotes", "ApiRateLimit")
+def setup(db_test):
+    # TODO: Rework this into organized fixtures.
 
     # Create test package details.
     with begin():
diff --git a/test/test_rss.py b/test/test_rss.py
index 40607ade..7123fbf1 100644
--- a/test/test_rss.py
+++ b/test/test_rss.py
@@ -12,17 +12,13 @@ from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 logger = logging.get_logger(__name__)
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db(
-        Package.__tablename__,
-        PackageBase.__tablename__,
-        User.__tablename__)
+def setup(db_test):
+    return
 
 
 @pytest.fixture
diff --git a/test/test_session.py b/test/test_session.py
index 4e6f4db4..7d3037a1 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -8,17 +8,14 @@ from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.session import Session, generate_unique_sid
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 account_type = user = session = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global account_type, user, session
 
-    setup_test_db("Users", "Sessions")
-
     account_type = db.query(AccountType,
                             AccountType.AccountType == "User").first()
     with db.begin():
diff --git a/test/test_ssh_pub_key.py b/test/test_ssh_pub_key.py
index 12a3e1ce..bb787759 100644
--- a/test/test_ssh_pub_key.py
+++ b/test/test_ssh_pub_key.py
@@ -1,10 +1,9 @@
 import pytest
 
 from aurweb import db
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 TEST_SSH_PUBKEY = """
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCycoCi5yGCvSclH2wmNBUuwsYEzRZZBJaQquRc4ysl+Tg+/jiDkR3Zn9fIznC4KnFoyrIHzkKuePZ3bNDYwkZxkJKoWBCh4hXKDXSm87FMN0+VDC+1QxF/z0XaAGr/P6f4XukabyddypBdnHcZiplbw+YOSqcAE2TCqOlSXwNMOcF9U89UsR/Q9i9I52hlvU0q8+fZVGhou1KCowFSnHYtrr5KYJ04CXkJ13DkVf3+pjQWyrByvBcf1hGEaczlgfobrrv/y96jDhgfXucxliNKLdufDPPkii3LhhsNcDmmI1VZ3v0irKvd9WZuauqloobY84zEFcDTyjn0hxGjVeYFejm4fBnvjga0yZXORuWksdNfXWLDxFk6MDDd1jF0ExRbP+OxDuU4IVyIuDL7S3cnbf2YjGhkms/8voYT2OBE7FwNlfv98Kr0NUp51zpf55Arxn9j0Rz9xTA7FiODQgCn6iQ0SDtzUNL0IKTCw26xJY5gzMxbfpvzPQGeulx/ioM= kevr@volcano
@@ -14,21 +13,16 @@ user = ssh_pub_key = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, ssh_pub_key
 
-    setup_test_db("Users", "SSHPubKeys")
-
-    account_type = db.query(AccountType,
-                            AccountType.AccountType == "User").first()
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
-                         AccountType=account_type)
+                         AccountTypeID=USER_ID)
 
     with db.begin():
-        ssh_pub_key = db.create(SSHPubKey,
-                                UserID=user.ID,
+        ssh_pub_key = db.create(SSHPubKey, UserID=user.ID,
                                 Fingerprint="testFingerprint",
                                 PubKey="testPubKey")
 
diff --git a/test/test_term.py b/test/test_term.py
index 3f28311f..bfa73a76 100644
--- a/test/test_term.py
+++ b/test/test_term.py
@@ -4,17 +4,11 @@ from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
 from aurweb.models.term import Term
-from aurweb.testing import setup_test_db
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db("Terms")
-
-    yield None
-
-    # Wipe em out just in case records are leftover.
-    setup_test_db("Terms")
+def setup(db_test):
+    return
 
 
 def test_term_creation():
@@ -29,13 +23,9 @@ def test_term_creation():
 
 def test_term_null_description_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(Term, URL="https://fake_url.io")
-    db.rollback()
+        Term(URL="https://fake_url.io")
 
 
 def test_term_null_url_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(Term, Description="Term description")
-    db.rollback()
+        Term(Description="Term description")
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index 0579247e..43a3443b 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -14,7 +14,6 @@ from aurweb.models.account_type import AccountType
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
 
 DATETIME_REGEX = r'^[0-9]{4}-[0-9]{2}-[0-9]{2}$'
@@ -76,8 +75,8 @@ def assert_past_vote_html(row, expected):
 
 
 @pytest.fixture(autouse=True)
-def setup():
-    setup_test_db("TU_Votes", "TU_VoteInfo", "Users")
+def setup(db_test):
+    return
 
 
 @pytest.fixture
diff --git a/test/test_tu_vote.py b/test/test_tu_vote.py
index 9ff4a8d9..1dd33387 100644
--- a/test/test_tu_vote.py
+++ b/test/test_tu_vote.py
@@ -4,53 +4,48 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import create, query, rollback
-from aurweb.models.account_type import AccountType
+from aurweb import db
+from aurweb.models.account_type import TRUSTED_USER_ID
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = tu_voteinfo = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user, tu_voteinfo
 
-    setup_test_db("Users", "TU_VoteInfo", "TU_Votes")
-
-    tu_type = query(AccountType,
-                    AccountType.AccountType == "Trusted User").first()
-    user = create(User, Username="test", Email="test@example.org",
-                  RealName="Test User", Passwd="testPassword",
-                  AccountType=tu_type)
-
     ts = int(datetime.utcnow().timestamp())
-    tu_voteinfo = create(TUVoteInfo,
-                         Agenda="Blah blah.",
-                         User=user.Username,
-                         Submitted=ts, End=ts + 5,
-                         Quorum=0.5,
-                         Submitter=user)
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=TRUSTED_USER_ID)
+
+        tu_voteinfo = db.create(TUVoteInfo,
+                                Agenda="Blah blah.",
+                                User=user.Username,
+                                Submitted=ts, End=ts + 5,
+                                Quorum=0.5,
+                                Submitter=user)
 
 
 def test_tu_vote_creation():
-    tu_vote = create(TUVote, User=user, VoteInfo=tu_voteinfo)
+    with db.begin():
+        tu_vote = db.create(TUVote, User=user, VoteInfo=tu_voteinfo)
+
     assert tu_vote.VoteInfo == tu_voteinfo
     assert tu_vote.User == user
-
     assert tu_vote in user.tu_votes
     assert tu_vote in tu_voteinfo.tu_votes
 
 
 def test_tu_vote_null_user_raises_exception():
     with pytest.raises(IntegrityError):
-        create(TUVote, VoteInfo=tu_voteinfo)
-    rollback()
+        TUVote(VoteInfo=tu_voteinfo)
 
 
 def test_tu_vote_null_voteinfo_raises_exception():
     with pytest.raises(IntegrityError):
-        create(TUVote, User=user)
-    rollback()
+        TUVote(User=user)
diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index b60e2e6a..5926fbf9 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -9,17 +9,14 @@ from aurweb.db import create, query, rollback
 from aurweb.models.account_type import AccountType
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 
 user = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global user
 
-    setup_test_db("Users", "PackageBases", "TU_VoteInfo")
-
     tu_type = query(AccountType,
                     AccountType.AccountType == "Trusted User").first()
     with db.begin():
diff --git a/test/test_user.py b/test/test_user.py
index 771611d8..07f10487 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -19,27 +19,15 @@ from aurweb.models.package_vote import PackageVote
 from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
 from aurweb.testing.requests import Request
 
 account_type = user = None
 
 
 @pytest.fixture(autouse=True)
-def setup():
+def setup(db_test):
     global account_type, user
 
-    setup_test_db(
-        User.__tablename__,
-        Session.__tablename__,
-        Ban.__tablename__,
-        SSHPubKey.__tablename__,
-        Package.__tablename__,
-        PackageBase.__tablename__,
-        PackageVote.__tablename__,
-        PackageNotification.__tablename__
-    )
-
     account_type = db.query(AccountType,
                             AccountType.AccountType == "User").first()
 

From fa26c8078b5dd305fcc62e349a2856ddd29d0b68 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 00:44:35 -0800
Subject: [PATCH 579/844] fix(docker): modify db configuration for new tests

A user that can create databases is now required for tests,
we use the 'root' user in Docker.

Added docker services:
---------------------
- mariadb_test - host localhost:13307

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.defaults              |  2 +-
 conf/config.dev                   |  7 ++--
 docker-compose.yml                | 65 ++++++++++++++-----------------
 docker/fastapi-entrypoint.sh      |  4 ++
 docker/mariadb-entrypoint.sh      | 15 +++----
 docker/mariadb-init-entrypoint.sh |  2 +
 docker/php-entrypoint.sh          |  7 +++-
 docker/scripts/run-php.sh         |  3 --
 docker/scripts/run-pytests.sh     | 11 +-----
 docker/scripts/run-tests.sh       |  6 ---
 docker/test-mysql-entrypoint.sh   |  9 -----
 docker/tests-entrypoint.sh        |  1 -
 12 files changed, 53 insertions(+), 79 deletions(-)

diff --git a/conf/config.defaults b/conf/config.defaults
index c29d7045..68e235be 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -5,7 +5,7 @@ socket = /var/run/mysqld/mysqld.sock
 ;port = 3306
 name = AUR
 user = aur
-password = aur
+;password = aur
 
 [options]
 username_min_len = 3
diff --git a/conf/config.dev b/conf/config.dev
index 9467615e..e97f6f12 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -6,7 +6,8 @@
 ; development-specific options too.
 
 [database]
-; Options: mysql, sqlite.
+; PHP options: mysql, sqlite.
+; FastAPI options: mysql.
 backend = mysql
 
 ; If using sqlite, set name to the database file path.
@@ -14,8 +15,8 @@ name = aurweb
 
 ; MySQL database information. User defaults to root for containerized
 ; testing with mysqldb. This should be set to a non-root user.
-user = aur
-password = aur
+user = root
+;password = aur
 host = localhost
 ;port = 3306
 socket = /var/run/mysqld/mysqld.sock
diff --git a/docker-compose.yml b/docker-compose.yml
index bda4ddfb..c39d38bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,6 +77,24 @@ services:
       mariadb:
         condition: service_healthy
 
+  mariadb_test:
+    # Test database.
+    image: aurweb:latest
+    init: true
+    environment:
+      - MARIADB_PRIVILEGED=1
+    entrypoint: /docker/mariadb-entrypoint.sh
+    command: /usr/bin/mysqld_safe --datadir=/var/lib/mysql
+    ports:
+      # This will expose mariadbd on 127.0.0.1:13307 in the host.
+      # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
+      - "13307:3306"
+    volumes:
+      - mariadb_test_run:/var/run/mysqld # Bind socket in this volume.
+    healthcheck:
+      test: "bash /docker/health/mariadb.sh"
+      interval: 3s
+
   git:
     image: aurweb:latest
     init: true
@@ -254,10 +272,9 @@ services:
     stdin_open: true
     tty: true
     depends_on:
-      git:
+      mariadb_test:
         condition: service_healthy
     volumes:
-      - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
@@ -280,34 +297,12 @@ services:
     stdin_open: true
     tty: true
     depends_on:
-      mariadb_init:
-        condition: service_started
+      mariadb_test:
+        condition: service_healthy
+    tmpfs:
+      - /tmp
     volumes:
-      - mariadb_run:/var/run/mysqld
-      - git_data:/aurweb/aur.git
-      - ./cache:/cache
-      - ./aurweb:/aurweb/aurweb
-      - ./migrations:/aurweb/migrations
-      - ./test:/aurweb/test
-      - ./web/html:/aurweb/web/html
-      - ./web/template:/aurweb/web/template
-      - ./web/lib:/aurweb/web/lib
-      - ./templates:/aurweb/templates
-
-  pytest-sqlite:
-    image: aurweb:latest
-    profiles: ["dev"]
-    init: true
-    environment:
-      - AUR_CONFIG=conf/config.sqlite
-      - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
-      - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
-    entrypoint: /docker/test-sqlite-entrypoint.sh
-    command: setup-sqlite.sh run-pytests.sh clean
-    stdin_open: true
-    tty: true
-    volumes:
-      - git_data:/aurweb/aur.git
+      - mariadb_test_run:/var/run/mysqld
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
@@ -325,16 +320,15 @@ services:
       - AUR_CONFIG=conf/config
       - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
       - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
-    entrypoint: /docker/tests-entrypoint.sh
-    command: setup-sqlite.sh run-tests.sh
+    entrypoint: /docker/test-mysql-entrypoint.sh
+    command: /docker/scripts/run-tests.sh
     stdin_open: true
     tty: true
     depends_on:
-      mariadb_init:
-        condition: service_started
+      mariadb_test:
+        condition: service_healthy
     volumes:
-      - mariadb_run:/var/run/mysqld
-      - git_data:/aurweb/aur.git
+      - mariadb_test_run:/var/run/mysqld
       - ./cache:/cache
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
@@ -345,6 +339,7 @@ services:
       - ./templates:/aurweb/templates
 
 volumes:
+  mariadb_test_run: {}
   mariadb_run: {} # Share /var/run/mysqld/mysqld.sock
   mariadb_data: {} # Share /var/lib/mysql
   git_data: {} # Share aurweb/aur.git
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index f4ceaafa..9df6382d 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -5,6 +5,10 @@ set -eou pipefail
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
 
+# Change database user/password.
+sed -ri "s/^;?(user) = .*$/\1 = aur/" conf/config
+sed -ri "s/^;?(password) = .*$/\1 = aur/" conf/config
+
 sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_FASTAPI_PREFIX};" conf/config
 
 # Setup Redis for FastAPI.
diff --git a/docker/mariadb-entrypoint.sh b/docker/mariadb-entrypoint.sh
index e1ebfa6a..a00f6106 100755
--- a/docker/mariadb-entrypoint.sh
+++ b/docker/mariadb-entrypoint.sh
@@ -13,23 +13,18 @@ done
 
 # Configure databases.
 DATABASE="aurweb" # Persistent database for fastapi/php-fpm.
-TEST_DB="aurweb_test" # Test database (ephemereal).
 
 echo "Taking care of primary database '${DATABASE}'..."
 mysql -u root -e "CREATE USER IF NOT EXISTS 'aur'@'localhost' IDENTIFIED BY 'aur';"
 mysql -u root -e "CREATE USER IF NOT EXISTS 'aur'@'%' IDENTIFIED BY 'aur';"
 mysql -u root -e "CREATE DATABASE IF NOT EXISTS $DATABASE;"
-mysql -u root -e "GRANT ALL ON ${DATABASE}.* TO 'aur'@'localhost';"
-mysql -u root -e "GRANT ALL ON ${DATABASE}.* TO 'aur'@'%';"
 
-# Drop and create our test database.
-echo "Dropping test database '$TEST_DB'..."
-mysql -u root -e "DROP DATABASE IF EXISTS $TEST_DB;"
-mysql -u root -e "CREATE DATABASE $TEST_DB;"
-mysql -u root -e "GRANT ALL ON ${TEST_DB}.* TO 'aur'@'localhost';"
-mysql -u root -e "GRANT ALL ON ${TEST_DB}.* TO 'aur'@'%';"
+mysql -u root -e "CREATE USER IF NOT EXISTS 'aur'@'%' IDENTIFIED BY 'aur';"
+mysql -u root -e "GRANT ALL ON aurweb.* TO 'aur'@'localhost';"
+mysql -u root -e "GRANT ALL ON aurweb.* TO 'aur'@'%';"
 
-echo "Created new '$TEST_DB'!"
+mysql -u root -e "CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY 'aur';"
+mysql -u root -e "GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION;"
 
 mysqladmin -uroot shutdown
 
diff --git a/docker/mariadb-init-entrypoint.sh b/docker/mariadb-init-entrypoint.sh
index 413227b9..6df98e4f 100755
--- a/docker/mariadb-init-entrypoint.sh
+++ b/docker/mariadb-init-entrypoint.sh
@@ -4,6 +4,8 @@ set -eou pipefail
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
+sed -ri "s/^;?(user) = .*$/\1 = aur/g" conf/config
+sed -ri "s/^;?(password) = .*$/\1 = aur/g" conf/config
 
 python -m aurweb.initdb 2>/dev/null || /bin/true
 
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 274f8e17..05b76408 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -9,14 +9,19 @@ done
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
 
-sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_PHP_PREFIX};" conf/config
+# Change database user/password.
+sed -ri "s/^;?(user) = .*$/\1 = aur/" conf/config
+sed -ri "s/^;?(password) = .*$/\1 = aur/" conf/config
 
 # Enable memcached.
 sed -ri 's/^(cache) = .+$/\1 = memcache/' conf/config
 
+# Setup various location configurations.
+sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_PHP_PREFIX};" conf/config
 sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_PHP_PREFIX}/%s.git|" conf/config.defaults
 sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults
 
+# Listen on :9000.
 sed -ri 's/^(listen).*/\1 = 0.0.0.0:9000/' /etc/php/php-fpm.d/www.conf
 sed -ri 's/^;?(clear_env).*/\1 = no/' /etc/php/php-fpm.d/www.conf
 
diff --git a/docker/scripts/run-php.sh b/docker/scripts/run-php.sh
index 22346b47..b86f8ce5 100755
--- a/docker/scripts/run-php.sh
+++ b/docker/scripts/run-php.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 set -eou pipefail
 
-# Initialize the new database; ignore errors.
-python -m aurweb.initdb 2>/dev/null || /bin/true
-
 exec php-fpm --fpm-config /etc/php/php-fpm.conf --nodaemonize
diff --git a/docker/scripts/run-pytests.sh b/docker/scripts/run-pytests.sh
index ee546fb7..b8f695df 100755
--- a/docker/scripts/run-pytests.sh
+++ b/docker/scripts/run-pytests.sh
@@ -25,17 +25,8 @@ done
 rm -rf $PROMETHEUS_MULTIPROC_DIR
 mkdir -p $PROMETHEUS_MULTIPROC_DIR
 
-# Initialize the new database; ignore errors.
-python -m aurweb.initdb 2>/dev/null || \
-    (echo "Error: aurweb.initdb failed; already initialized?" && /bin/true)
-
-# Run test_initdb ahead of time, which clears out the database,
-# in case of previous failures which stopped the test suite before
-# finishing the ends of some test fixtures.
-eatmydata -- pytest test/test_initdb.py
-
 # Run pytest with optional targets in front of it.
-eatmydata -- make -C test "${PARAMS[@]}" pytest
+pytest
 
 # By default, report coverage and move it into cache.
 if [ $COVERAGE -eq 1 ]; then
diff --git a/docker/scripts/run-tests.sh b/docker/scripts/run-tests.sh
index 3181a623..45c7835f 100755
--- a/docker/scripts/run-tests.sh
+++ b/docker/scripts/run-tests.sh
@@ -12,12 +12,6 @@ bash $dir/run-sharness.sh
 # Pass --silence to avoid reporting coverage. We will do that below.
 bash $dir/run-pytests.sh --no-coverage
 
-# Export SQLite aurweb configuration.
-export AUR_CONFIG=conf/config.sqlite
-
-# Run Python tests.
-bash $dir/run-pytests.sh --no-coverage
-
 make -C test coverage
 
 # /cache is mounted as a volume. Copy coverage into it.
diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
index 7be3626b..a46b2572 100755
--- a/docker/test-mysql-entrypoint.sh
+++ b/docker/test-mysql-entrypoint.sh
@@ -1,17 +1,8 @@
 #!/bin/bash
 set -eou pipefail
 
-DB_NAME="aurweb_test"
-
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config
 
-# The port can be excluded from use if properly using
-# volumes to share the mysql socket from the mariadb service.
-# Example port sed:
-# sed -i "s/^;?(port = .+)$/\1/" conf/config
-
-# Continue onto the main command.
 exec "$@"
diff --git a/docker/tests-entrypoint.sh b/docker/tests-entrypoint.sh
index ca3d3d9a..145bee6e 100755
--- a/docker/tests-entrypoint.sh
+++ b/docker/tests-entrypoint.sh
@@ -3,6 +3,5 @@ set -eou pipefail
 dir="$(dirname $0)"
 
 bash $dir/test-mysql-entrypoint.sh
-bash $dir/test-sqlite-entrypoint.sh
 
 exec "$@"

From a025118344ff857f5eab7a869b56b952cb46e6d8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 00:47:33 -0800
Subject: [PATCH 580/844] change(docker): get python-poetry from arch instead
 of poetry

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/install-deps.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index d64340e3..ad0157f8 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -8,9 +8,7 @@ pacman -Syu --noconfirm --noprogressbar \
     --cachedir .pkg-cache git gpgme nginx redis openssh \
       mariadb mariadb-libs cgit-aurweb uwsgi uwsgi-plugin-cgi \
       php php-fpm memcached php-memcached python-pip pyalpm \
-      python-srcinfo curl libeatmydata cronie
-
-# https://python-poetry.org/docs/ Installation section.
-curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
+      python-srcinfo curl libeatmydata cronie python-poetry \
+      python-poetry-core
 
 exec "$@"

From 60f63876c42b5900cfa7af3442d4feaced3c88c4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 00:48:31 -0800
Subject: [PATCH 581/844] change(.gitignore): ignore archives

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e3201e94..8388694c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ schema/aur-schema-sqlite.sql
 test/test-results/
 test/trash directory*
 web/locale/*/
+web/html/*.gz
 
 # Do not stage compiled asciidoc: make -C doc
 doc/rpc.html

From fb92fb509b4a5769154096969cbfb90f8f69e798 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 00:49:00 -0800
Subject: [PATCH 582/844] change(fastapi): use sys.getrecursionlimit() + 1000
 as default

Without the increment, we've seen tests failed due to recursion
errors caused by starlette's base middleware. Just make it safe
in case nobody supplies TEST_RECURSION_LIMIT.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index aafb00b2..b399cfb1 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -45,7 +45,7 @@ async def app_startup():
     # when running test suites.
     # TODO: Find a proper fix to this issue.
     recursion_limit = int(os.environ.get(
-        "TEST_RECURSION_LIMIT", sys.getrecursionlimit()))
+        "TEST_RECURSION_LIMIT", sys.getrecursionlimit() + 1000))
     sys.setrecursionlimit(recursion_limit)
 
     backend = aurweb.config.get("database", "backend")

From a5c0c47e5b82334b6416b13ffcc0f2948377b582 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 00:59:10 -0800
Subject: [PATCH 583/844] change(.gitlab-ci): adapt for new conftest

No longer do we need to create any database in .gitlab-ci.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1590bf34..739c9408 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,14 +22,11 @@ test:
     - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
     - 'until : > /dev/tcp/127.0.0.1/3306; do sleep 1s; done'
     - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
-    - ./docker/test-sqlite-entrypoint.sh # Create sqlite AUR_CONFIG.
     - make -C po all install
-    - python -m aurweb.initdb # Initialize MySQL tables.
-    - AUR_CONFIG=conf/config.sqlite python -m aurweb.initdb
     - make -C test clean
   script:
-    - make -C test sh pytest # sharness tests use sqlite & pytest w/ mysql.
-    - AUR_CONFIG=conf/config.sqlite make -C test pytest
+    - make -C test sh # sharness tests use sqlite.
+    - pytest # Run pytest suites.
     - make -C test coverage # Produce coverage reports.
     - flake8 --count aurweb # Assert no flake8 violations in aurweb.
     - flake8 --count test # Assert no flake8 violations in test.
@@ -65,8 +62,11 @@ deploy:
     # Set secure login config for aurweb.
     - sed -ri "s/^(disable_http_login).*$/\1 = 1/" conf/config.dev
     - docker-compose build
-    - docker system prune -f
     - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d
+    - docker image prune -f
+    - docker container prune -f
+    - docker volume prune -f
+
   environment:
     name: development
     url: https://aur-dev.archlinux.org

From 912b7e0c118c5717d96fc2770770be8b91b2f81e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 02:19:43 -0800
Subject: [PATCH 584/844] fix(docker): fix database user/password for
 git-entrypoint

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/git-entrypoint.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index 3fee426a..296c1e47 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -42,6 +42,9 @@ EOF
 cp -vf conf/config.dev $AUR_CONFIG
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" $AUR_CONFIG
 
+sed -ri "s/^;?(user) = .*$/\1 = aur/" $AUR_CONFIG
+sed -ri "s/^;?(password) = .*$/\1 = aur/" $AUR_CONFIG
+
 AUR_CONFIG_DEFAULTS="${AUR_CONFIG}.defaults"
 
 if [[ "$AUR_CONFIG_DEFAULTS" != "/aurweb/conf/config.defaults" ]]; then

From abe8c0630c52bc5694f9284347045ae353c67507 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 3 Nov 2021 19:34:20 -0700
Subject: [PATCH 585/844] fix(rpc): improve type=info performance

Now, we use an equivalent query to PHP's query, yet we grab
every piece of data we need for all packages asked for in one
database query.

At this time, local benchmarks have shown a slight performance
improvement when compared to PHP.

fastapi 262 requests/sec
php 250 requests/sec

Extras:

- Moved RPCError to the aurweb.exceptions module

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/exceptions.py |   4 +
 aurweb/rpc.py        | 220 +++++++++++++++++++++++++++----------------
 2 files changed, 141 insertions(+), 83 deletions(-)

diff --git a/aurweb/exceptions.py b/aurweb/exceptions.py
index 62015284..82628b0a 100644
--- a/aurweb/exceptions.py
+++ b/aurweb/exceptions.py
@@ -73,3 +73,7 @@ class NotVotedException(AurwebException):
 class InvalidArgumentsException(AurwebException):
     def __init__(self, msg):
         super(InvalidArgumentsException, self).__init__(msg)
+
+
+class RPCError(AurwebException):
+    pass
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 03662790..c70ddf1a 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -1,38 +1,28 @@
 from collections import defaultdict
-from typing import Any, Callable, Dict, List, NewType
+from typing import Any, Callable, Dict, List, NewType, Union
 
-from sqlalchemy import and_
+from sqlalchemy import and_, literal
 
 import aurweb.config as config
 
 from aurweb import db, defaults, models, util
-from aurweb.models import dependency_type, relation_type
+from aurweb.exceptions import RPCError
 from aurweb.packages.search import RPCSearch
 
-# Define dependency type mappings from ID to RPC-compatible keys.
-DEP_TYPES = {
-    dependency_type.DEPENDS_ID: "Depends",
-    dependency_type.MAKEDEPENDS_ID: "MakeDepends",
-    dependency_type.CHECKDEPENDS_ID: "CheckDepends",
-    dependency_type.OPTDEPENDS_ID: "OptDepends"
+TYPE_MAPPING = {
+    "depends": "Depends",
+    "makedepends": "MakeDepends",
+    "checkdepends": "CheckDepends",
+    "optdepends": "OptDepends",
+    "conflicts": "Conflicts",
+    "provides": "Provides",
+    "replaces": "Replaces",
 }
 
-# Define relationship type mappings from ID to RPC-compatible keys.
-REL_TYPES = {
-    relation_type.CONFLICTS_ID: "Conflicts",
-    relation_type.PROVIDES_ID: "Provides",
-    relation_type.REPLACES_ID: "Replaces"
-}
-
-
 DataGenerator = NewType("DataGenerator",
                         Callable[[models.Package], Dict[str, Any]])
 
 
-class RPCError(Exception):
-    pass
-
-
 class RPC:
     """ RPC API handler class.
 
@@ -76,11 +66,11 @@ class RPC:
     # A mapping of by aliases.
     BY_ALIASES = {"name-desc": "nd", "name": "n", "maintainer": "m"}
 
-    def __init__(self, version: int = 0, type: str = None):
+    def __init__(self, version: int = 0, type: str = None) -> "RPC":
         self.version = version
-        self.type = type
+        self.type = RPC.TYPE_ALIASES.get(type, type)
 
-    def error(self, message: str) -> dict:
+    def error(self, message: str) -> Dict[str, Any]:
         return {
             "version": self.version,
             "results": [],
@@ -89,7 +79,7 @@ class RPC:
             "error": message
         }
 
-    def _verify_inputs(self, by: str = [], args: List[str] = []):
+    def _verify_inputs(self, by: str = [], args: List[str] = []) -> None:
         if self.version is None:
             raise RPCError("Please specify an API version.")
 
@@ -105,39 +95,11 @@ class RPC:
         if self.type not in RPC.EXPOSED_TYPES:
             raise RPCError("Incorrect request type specified.")
 
-    def _enforce_args(self, args: List[str]):
+    def _enforce_args(self, args: List[str]) -> None:
         if not args:
             raise RPCError("No request type/data specified.")
 
-    def _update_json_depends(self, package: models.Package,
-                             data: Dict[str, Any]):
-        # Walk through all related PackageDependencies and produce
-        # the appropriate dict entries.
-        for dep in package.package_dependencies:
-            if dep.DepTypeID in DEP_TYPES:
-                key = DEP_TYPES.get(dep.DepTypeID)
-
-                display = dep.DepName
-                if dep.DepCondition:
-                    display += dep.DepCondition
-
-                data[key].append(display)
-
-    def _update_json_relations(self, package: models.Package,
-                               data: Dict[str, Any]):
-        # Walk through all related PackageRelations and produce
-        # the appropriate dict entries.
-        for rel in package.package_relations:
-            if rel.RelTypeID in REL_TYPES:
-                key = REL_TYPES.get(rel.RelTypeID)
-
-                display = rel.RelName
-                if rel.RelCondition:
-                    display += rel.RelCondition
-
-                data[key].append(display)
-
-    def _get_json_data(self, package: models.Package):
+    def _get_json_data(self, package: models.Package) -> Dict[str, Any]:
         """ Produce dictionary data of one Package that can be JSON-serialized.
 
         :param package: Package instance
@@ -175,21 +137,21 @@ class RPC:
 
         return data
 
-    def _get_info_json_data(self, package: models.Package):
+    def _get_info_json_data(self, package: models.Package) -> Dict[str, Any]:
         data = self._get_json_data(package)
 
-        # Add licenses and keywords to info output.
+        # All info results have _at least_ an empty list of
+        # License and Keywords.
         data.update({
-            "License": [
-                lic.License.Name for lic in package.package_licenses
-            ],
-            "Keywords": [
-                keyword.Keyword for keyword in package.PackageBase.keywords
-            ]
+            "License": [],
+            "Keywords": []
         })
 
-        self._update_json_depends(package, data)
-        self._update_json_relations(package, data)
+        # If we actually got extra_info records, update data with
+        # them for this particular package.
+        if self.extra_info:
+            data.update(self.extra_info.get(package.ID, {}))
+
         return data
 
     def _assemble_json_data(self, packages: List[models.Package],
@@ -211,13 +173,97 @@ class RPC:
             -> List[Dict[str, Any]]:
         self._enforce_args(args)
         args = set(args)
-        packages = db.query(models.Package).filter(
+
+        packages = db.query(models.Package).join(models.PackageBase).filter(
             models.Package.Name.in_(args))
+        ids = {pkg.ID for pkg in packages}
+
+        # Aliases for 80-width.
+        Package = models.Package
+        PackageKeyword = models.PackageKeyword
+
+        subqueries = [
+            # PackageDependency
+            db.query(
+                models.PackageDependency
+            ).join(models.DependencyType).filter(
+                models.PackageDependency.PackageID.in_(ids)
+            ).with_entities(
+                models.PackageDependency.PackageID.label("ID"),
+                models.DependencyType.Name.label("Type"),
+                models.PackageDependency.DepName.label("Name"),
+                models.PackageDependency.DepCondition.label("Cond")
+            ).distinct().order_by("ID"),
+
+            # PackageRelation
+            db.query(
+                models.PackageRelation
+            ).join(models.RelationType).filter(
+                models.PackageRelation.PackageID.in_(ids)
+            ).with_entities(
+                models.PackageRelation.PackageID.label("ID"),
+                models.RelationType.Name.label("Type"),
+                models.PackageRelation.RelName.label("Name"),
+                models.PackageRelation.RelCondition.label("Cond")
+            ).distinct().order_by("ID"),
+
+            # Groups
+            db.query(models.PackageGroup).join(
+                models.Group,
+                and_(models.PackageGroup.GroupID == models.Group.ID,
+                     models.PackageGroup.PackageID.in_(ids))
+            ).with_entities(
+                models.PackageGroup.PackageID.label("ID"),
+                literal("Groups").label("Type"),
+                models.Group.Name.label("Name"),
+                literal(str()).label("Cond")
+            ).distinct().order_by("ID"),
+
+            # Licenses
+            db.query(models.PackageLicense).join(
+                models.License,
+                models.PackageLicense.LicenseID == models.License.ID
+            ).filter(
+                models.PackageLicense.PackageID.in_(ids)
+            ).with_entities(
+                models.PackageLicense.PackageID.label("ID"),
+                literal("License").label("Type"),
+                models.License.Name.label("Name"),
+                literal(str()).label("Cond")
+            ).distinct().order_by("ID"),
+
+            # Keywords
+            db.query(models.PackageKeyword).join(
+                models.Package,
+                and_(Package.PackageBaseID == PackageKeyword.PackageBaseID,
+                     Package.ID.in_(ids))
+            ).with_entities(
+                models.Package.ID.label("ID"),
+                literal("Keywords").label("Type"),
+                models.PackageKeyword.Keyword.label("Name"),
+                literal(str()).label("Cond")
+            ).distinct().order_by("ID")
+        ]
+
+        # Union all subqueries together.
+        query = subqueries[0].union_all(*subqueries[1:])
+
+        # Store our extra information in a class-wise dictionary,
+        # which contains package id -> extra info dict mappings.
+        self.extra_info = defaultdict(lambda: defaultdict(list))
+        for record in query:
+            type_ = TYPE_MAPPING.get(record.Type, record.Type)
+
+            name = record.Name
+            if record.Cond:
+                name += record.Cond
+
+            self.extra_info[record.ID][type_].append(name)
+
         return self._assemble_json_data(packages, self._get_info_json_data)
 
     def _handle_search_type(self, by: str = defaults.RPC_SEARCH_BY,
-                            args: List[str] = []) \
-            -> List[Dict[str, Any]]:
+                            args: List[str] = []) -> List[Dict[str, Any]]:
         # If `by` isn't maintainer and we don't have any args, raise an error.
         # In maintainer's case, return all orphans if there are no args,
         # so we need args to pass through to the handler without errors.
@@ -235,10 +281,12 @@ class RPC:
         results = search.results().limit(max_results)
         return self._assemble_json_data(results, self._get_json_data)
 
-    def _handle_msearch_type(self, args: List[str] = [], **kwargs):
+    def _handle_msearch_type(self, args: List[str] = [], **kwargs)\
+            -> List[Dict[str, Any]]:
         return self._handle_search_type(by="m", args=args)
 
-    def _handle_suggest_type(self, args: List[str] = [], **kwargs):
+    def _handle_suggest_type(self, args: List[str] = [], **kwargs)\
+            -> List[str]:
         if not args:
             return []
 
@@ -251,7 +299,8 @@ class RPC:
         ).order_by(models.Package.Name.asc()).limit(20)
         return [pkg.Name for pkg in packages]
 
-    def _handle_suggest_pkgbase_type(self, args: List[str] = [], **kwargs):
+    def _handle_suggest_pkgbase_type(self, args: List[str] = [], **kwargs)\
+            -> List[str]:
         if not args:
             return []
 
@@ -261,7 +310,19 @@ class RPC:
         ).order_by(models.PackageBase.Name.asc()).limit(20)
         return [pkg.Name for pkg in packages]
 
-    def handle(self, by: str = defaults.RPC_SEARCH_BY, args: List[str] = []):
+    def _is_suggestion(self) -> bool:
+        return self.type.startswith("suggest")
+
+    def _handle_callback(self, by: str, args: List[str])\
+            -> Union[List[Dict[str, Any]], List[str]]:
+        # Get a handle to our callback and trap an RPCError with
+        # an empty list of results based on callback's execution.
+        callback = getattr(self, f"_handle_{self.type.replace('-', '_')}_type")
+        results = callback(by=by, args=args)
+        return results
+
+    def handle(self, by: str = defaults.RPC_SEARCH_BY, args: List[str] = [])\
+            -> Union[List[Dict[str, Any]], Dict[str, Any]]:
         """ Request entrypoint. A router should pass v, type and args
         to this function and expect an output dictionary to be returned.
 
@@ -269,10 +330,6 @@ class RPC:
         :param type: RPC type argument
         :param args: Deciphered list of arguments based on arg/arg[] inputs
         """
-        # Convert type aliased types.
-        if self.type in RPC.TYPE_ALIASES:
-            self.type = RPC.TYPE_ALIASES.get(self.type)
-
         # Prepare our output data dictionary with some basic keys.
         data = {"version": self.version, "type": self.type}
 
@@ -283,20 +340,17 @@ class RPC:
             return self.error(str(exc))
 
         # Convert by to its aliased value if it has one.
-        if by in RPC.BY_ALIASES:
-            by = RPC.BY_ALIASES.get(by)
+        by = RPC.BY_ALIASES.get(by, by)
 
-        # Get a handle to our callback and trap an RPCError with
-        # an empty list of results based on callback's execution.
-        callback = getattr(self, f"_handle_{self.type.replace('-', '_')}_type")
+        # Process the requested handler.
         try:
-            results = callback(by=by, args=args)
+            results = self._handle_callback(by, args)
         except RPCError as exc:
             return self.error(str(exc))
 
         # These types are special: we produce a different kind of
         # successful JSON output: a list of results.
-        if self.type in ("suggest", "suggest-pkgbase"):
+        if self._is_suggestion():
             return results
 
         # Return JSON output.

From ccf50cbdf5135978dbb86e2c37e04b72911d4732 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 3 Nov 2021 19:36:08 -0700
Subject: [PATCH 586/844] change: rework test_rpc's TestClient usage into a
 fixture

This is the first step on our path to reworking the test
suite in general.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_rpc.py | 186 ++++++++++++++++++++++++++++-------------------
 1 file changed, 113 insertions(+), 73 deletions(-)

diff --git a/test/test_rpc.py b/test/test_rpc.py
index f20c9b02..a4cdb5da 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -1,7 +1,6 @@
 import re
 
 from http import HTTPStatus
-from typing import Dict
 from unittest import mock
 
 import orjson
@@ -10,8 +9,7 @@ import pytest
 from fastapi.testclient import TestClient
 from redis.client import Pipeline
 
-from aurweb import config, db, scripts
-from aurweb.asgi import app
+from aurweb import asgi, config, db, scripts
 from aurweb.db import begin, create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.dependency_type import DependencyType
@@ -28,9 +26,9 @@ from aurweb.models.user import User
 from aurweb.redis import redis_connection
 
 
-def make_request(path, headers: Dict[str, str] = {}):
-    with TestClient(app) as request:
-        return request.get(path, headers=headers)
+@pytest.fixture
+def client() -> TestClient:
+    yield TestClient(app=asgi.app)
 
 
 @pytest.fixture(autouse=True)
@@ -205,7 +203,7 @@ def pipeline():
     yield pipeline
 
 
-def test_rpc_singular_info():
+def test_rpc_singular_info(client: TestClient):
     # Define expected response.
     expected_data = {
         "version": 5,
@@ -239,7 +237,9 @@ def test_rpc_singular_info():
     }
 
     # Make dummy request.
-    response_arg = make_request("/rpc/?v=5&type=info&arg=chungy-chungus&arg=big-chungus")
+    with client as request:
+        response_arg = request.get(
+            "/rpc/?v=5&type=info&arg=chungy-chungus&arg=big-chungus")
 
     # Load  request response into Python dictionary.
     response_info_arg = orjson.loads(response_arg.content.decode())
@@ -254,9 +254,10 @@ def test_rpc_singular_info():
     assert response_info_arg == expected_data
 
 
-def test_rpc_nonexistent_package():
+def test_rpc_nonexistent_package(client: TestClient):
     # Make dummy request.
-    response = make_request("/rpc/?v=5&type=info&arg=nonexistent-package")
+    with client as request:
+        response = request.get("/rpc/?v=5&type=info&arg=nonexistent-package")
 
     # Load request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -265,10 +266,12 @@ def test_rpc_nonexistent_package():
     assert response_data["resultcount"] == 0
 
 
-def test_rpc_multiinfo():
+def test_rpc_multiinfo(client: TestClient):
     # Make dummy request.
     request_packages = ["big-chungus", "chungy-chungus"]
-    response = make_request("/rpc/?v=5&type=info&arg[]=big-chungus&arg[]=chungy-chungus")
+    with client as request:
+        response = request.get(
+            "/rpc/?v=5&type=info&arg[]=big-chungus&arg[]=chungy-chungus")
 
     # Load request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -280,13 +283,20 @@ def test_rpc_multiinfo():
     assert request_packages == []
 
 
-def test_rpc_mixedargs():
+def test_rpc_mixedargs(client: TestClient):
     # Make dummy request.
     response1_packages = ["gluggly-chungus"]
     response2_packages = ["gluggly-chungus", "chungy-chungus"]
 
-    response1 = make_request("/rpc/?v=5&arg[]=big-chungus&arg=gluggly-chungus&type=info")
-    response2 = make_request("/rpc/?v=5&arg=big-chungus&arg[]=gluggly-chungus&type=info&arg[]=chungy-chungus")
+    with client as request:
+        response1 = request.get(
+            "/rpc?v=5&arg[]=big-chungus&arg=gluggly-chungus&type=info")
+    assert response1.status_code == int(HTTPStatus.OK)
+
+    with client as request:
+        response2 = request.get(
+            "/rpc?v=5&arg=big-chungus&arg[]=gluggly-chungus&type=info&arg[]=chungy-chungus")
+    assert response1.status_code == int(HTTPStatus.OK)
 
     # Load request response into Python dictionary.
     response1_data = orjson.loads(response1.content.decode())
@@ -303,7 +313,7 @@ def test_rpc_mixedargs():
         assert i == []
 
 
-def test_rpc_no_dependencies():
+def test_rpc_no_dependencies(client: TestClient):
     """This makes sure things like 'MakeDepends' get removed from JSON strings
     when they don't have set values."""
 
@@ -330,7 +340,8 @@ def test_rpc_no_dependencies():
     }
 
     # Make dummy request.
-    response = make_request("/rpc/?v=5&type=info&arg=chungy-chungus")
+    with client as request:
+        response = request.get("/rpc/?v=5&type=info&arg=chungy-chungus")
     response_data = orjson.loads(response.content.decode())
 
     # Remove inconsistent keys.
@@ -340,7 +351,7 @@ def test_rpc_no_dependencies():
     assert response_data == expected_response
 
 
-def test_rpc_bad_type():
+def test_rpc_bad_type(client: TestClient):
     # Define expected response.
     expected_data = {
         'version': 5,
@@ -351,7 +362,8 @@ def test_rpc_bad_type():
     }
 
     # Make dummy request.
-    response = make_request("/rpc/?v=5&type=invalid-type&arg=big-chungus")
+    with client as request:
+        response = request.get("/rpc/?v=5&type=invalid-type&arg=big-chungus")
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -360,7 +372,7 @@ def test_rpc_bad_type():
     assert expected_data == response_data
 
 
-def test_rpc_bad_version():
+def test_rpc_bad_version(client: TestClient):
     # Define expected response.
     expected_data = {
         'version': 0,
@@ -371,7 +383,8 @@ def test_rpc_bad_version():
     }
 
     # Make dummy request.
-    response = make_request("/rpc/?v=0&type=info&arg=big-chungus")
+    with client as request:
+        response = request.get("/rpc/?v=0&type=info&arg=big-chungus")
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -380,7 +393,7 @@ def test_rpc_bad_version():
     assert expected_data == response_data
 
 
-def test_rpc_no_version():
+def test_rpc_no_version(client: TestClient):
     # Define expected response.
     expected_data = {
         'version': None,
@@ -391,7 +404,8 @@ def test_rpc_no_version():
     }
 
     # Make dummy request.
-    response = make_request("/rpc/?type=info&arg=big-chungus")
+    with client as request:
+        response = request.get("/rpc/?type=info&arg=big-chungus")
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -400,7 +414,7 @@ def test_rpc_no_version():
     assert expected_data == response_data
 
 
-def test_rpc_no_type():
+def test_rpc_no_type(client: TestClient):
     # Define expected response.
     expected_data = {
         'version': 5,
@@ -411,7 +425,8 @@ def test_rpc_no_type():
     }
 
     # Make dummy request.
-    response = make_request("/rpc/?v=5&arg=big-chungus")
+    with client as request:
+        response = request.get("/rpc/?v=5&arg=big-chungus")
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -420,7 +435,7 @@ def test_rpc_no_type():
     assert expected_data == response_data
 
 
-def test_rpc_no_args():
+def test_rpc_no_args(client: TestClient):
     # Define expected response.
     expected_data = {
         'version': 5,
@@ -431,7 +446,8 @@ def test_rpc_no_args():
     }
 
     # Make dummy request.
-    response = make_request("/rpc/?v=5&type=info")
+    with client as request:
+        response = request.get("/rpc/?v=5&type=info")
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -440,9 +456,10 @@ def test_rpc_no_args():
     assert expected_data == response_data
 
 
-def test_rpc_no_maintainer():
+def test_rpc_no_maintainer(client: TestClient):
     # Make dummy request.
-    response = make_request("/rpc/?v=5&type=info&arg=woogly-chungus")
+    with client as request:
+        response = request.get("/rpc/?v=5&type=info&arg=woogly-chungus")
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -451,33 +468,39 @@ def test_rpc_no_maintainer():
     assert response_data["results"][0]["Maintainer"] is None
 
 
-def test_rpc_suggest_pkgbase():
-    response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+def test_rpc_suggest_pkgbase(client: TestClient):
+    with client as request:
+        response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
     data = response.json()
     assert data == ["big-chungus"]
 
-    response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=chungy")
+    with client as request:
+        response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=chungy")
     data = response.json()
     assert data == ["chungy-chungus"]
 
     # Test no arg supplied.
-    response = make_request("/rpc?v=5&type=suggest-pkgbase")
+    with client as request:
+        response = request.get("/rpc?v=5&type=suggest-pkgbase")
     data = response.json()
     assert data == []
 
 
-def test_rpc_suggest():
-    response = make_request("/rpc?v=5&type=suggest&arg=other")
+def test_rpc_suggest(client: TestClient):
+    with client as request:
+        response = request.get("/rpc?v=5&type=suggest&arg=other")
     data = response.json()
     assert data == ["other-pkg"]
 
     # Test non-existent Package.
-    response = make_request("/rpc?v=5&type=suggest&arg=nonexistent")
+    with client as request:
+        response = request.get("/rpc?v=5&type=suggest&arg=nonexistent")
     data = response.json()
     assert data == []
 
     # Test no arg supplied.
-    response = make_request("/rpc?v=5&type=suggest")
+    with client as request:
+        response = request.get("/rpc?v=5&type=suggest")
     data = response.json()
     assert data == []
 
@@ -491,14 +514,17 @@ def mock_config_getint(section: str, key: str):
 
 
 @mock.patch("aurweb.config.getint", side_effect=mock_config_getint)
-def test_rpc_ratelimit(getint: mock.MagicMock, pipeline: Pipeline):
+def test_rpc_ratelimit(getint: mock.MagicMock, client: TestClient,
+                       pipeline: Pipeline):
     for i in range(4):
         # The first 4 requests should be good.
-        response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+        with client as request:
+            response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
         assert response.status_code == int(HTTPStatus.OK)
 
     # The fifth request should be banned.
-    response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+    with client as request:
+        response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
     assert response.status_code == int(HTTPStatus.TOO_MANY_REQUESTS)
 
     # Delete the cached records.
@@ -508,26 +534,32 @@ def test_rpc_ratelimit(getint: mock.MagicMock, pipeline: Pipeline):
     assert one and two
 
     # The new first request should be good.
-    response = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+    with client as request:
+        response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_rpc_etag():
-    response1 = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
-    response2 = make_request("/rpc?v=5&type=suggest-pkgbase&arg=big")
+def test_rpc_etag(client: TestClient):
+    with client as request:
+        response1 = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
+
+    with client as request:
+        response2 = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
     assert response1.headers.get("ETag") is not None
     assert response1.headers.get("ETag") != str()
     assert response1.headers.get("ETag") == response2.headers.get("ETag")
 
 
-def test_rpc_search_arg_too_small():
-    response = make_request("/rpc?v=5&type=search&arg=b")
+def test_rpc_search_arg_too_small(client: TestClient):
+    with client as request:
+        response = request.get("/rpc?v=5&type=search&arg=b")
     assert response.status_code == int(HTTPStatus.OK)
     assert response.json().get("error") == "Query arg too small."
 
 
-def test_rpc_search():
-    response = make_request("/rpc?v=5&type=search&arg=big")
+def test_rpc_search(client: TestClient):
+    with client as request:
+        response = request.get("/rpc?v=5&type=search&arg=big")
     assert response.status_code == int(HTTPStatus.OK)
 
     data = response.json()
@@ -539,17 +571,18 @@ def test_rpc_search():
     # Test the If-None-Match headers.
     etag = response.headers.get("ETag").strip('"')
     headers = {"If-None-Match": etag}
-    response = make_request("/rpc?v=5&type=search&arg=big", headers=headers)
+    response = request.get("/rpc?v=5&type=search&arg=big", headers=headers)
     assert response.status_code == int(HTTPStatus.NOT_MODIFIED)
     assert response.content == b''
 
     # No args on non-m by types return an error.
-    response = make_request("/rpc?v=5&type=search")
+    response = request.get("/rpc?v=5&type=search")
     assert response.json().get("error") == "No request type/data specified."
 
 
-def test_rpc_msearch():
-    response = make_request("/rpc?v=5&type=msearch&arg=user1")
+def test_rpc_msearch(client: TestClient):
+    with client as request:
+        response = request.get("/rpc?v=5&type=msearch&arg=user1")
     data = response.json()
 
     # user1 maintains 4 packages; assert that we got them all.
@@ -564,73 +597,80 @@ def test_rpc_msearch():
     assert names == expected_results
 
     # Search for a non-existent maintainer, giving us zero packages.
-    response = make_request("/rpc?v=5&type=msearch&arg=blah-blah")
+    response = request.get("/rpc?v=5&type=msearch&arg=blah-blah")
     data = response.json()
     assert data.get("resultcount") == 0
 
     # A missing arg still succeeds, but it returns all orphans.
     # Just verify that we receive no error and the orphaned result.
-    response = make_request("/rpc?v=5&type=msearch")
+    response = request.get("/rpc?v=5&type=msearch")
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
     assert result.get("Name") == "woogly-chungus"
 
 
-def test_rpc_search_depends():
-    response = make_request(
-        "/rpc?v=5&type=search&by=depends&arg=chungus-depends")
+def test_rpc_search_depends(client: TestClient):
+    with client as request:
+        response = request.get(
+            "/rpc?v=5&type=search&by=depends&arg=chungus-depends")
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
     assert result.get("Name") == "big-chungus"
 
 
-def test_rpc_search_makedepends():
-    response = make_request(
-        "/rpc?v=5&type=search&by=makedepends&arg=chungus-makedepends")
+def test_rpc_search_makedepends(client: TestClient):
+    with client as request:
+        response = request.get(
+            "/rpc?v=5&type=search&by=makedepends&arg=chungus-makedepends")
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
     assert result.get("Name") == "big-chungus"
 
 
-def test_rpc_search_optdepends():
-    response = make_request(
-        "/rpc?v=5&type=search&by=optdepends&arg=chungus-optdepends")
+def test_rpc_search_optdepends(client: TestClient):
+    with client as request:
+        response = request.get(
+            "/rpc?v=5&type=search&by=optdepends&arg=chungus-optdepends")
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
     assert result.get("Name") == "big-chungus"
 
 
-def test_rpc_search_checkdepends():
-    response = make_request(
-        "/rpc?v=5&type=search&by=checkdepends&arg=chungus-checkdepends")
+def test_rpc_search_checkdepends(client: TestClient):
+    with client as request:
+        response = request.get(
+            "/rpc?v=5&type=search&by=checkdepends&arg=chungus-checkdepends")
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
     assert result.get("Name") == "big-chungus"
 
 
-def test_rpc_incorrect_by():
-    response = make_request("/rpc?v=5&type=search&by=fake&arg=big")
+def test_rpc_incorrect_by(client: TestClient):
+    with client as request:
+        response = request.get("/rpc?v=5&type=search&by=fake&arg=big")
     assert response.json().get("error") == "Incorrect by field specified."
 
 
-def test_rpc_jsonp_callback():
+def test_rpc_jsonp_callback(client: TestClient):
     """ Test the callback parameter.
 
     For end-to-end verification, the `examples/jsonp.html` file can be
     used to submit jsonp callback requests to the RPC.
     """
-    response = make_request(
-        "/rpc?v=5&type=search&arg=big&callback=jsonCallback")
+    with client as request:
+        response = request.get(
+            "/rpc?v=5&type=search&arg=big&callback=jsonCallback")
     assert response.headers.get("content-type") == "text/javascript"
     assert re.search(r'^/\*\*/jsonCallback\(.*\)$', response.text) is not None
 
     # Test an invalid callback name; we get an application/json error.
-    response = make_request(
-        "/rpc?v=5&type=search&arg=big&callback=jsonCallback!")
+    with client as request:
+        response = request.get(
+            "/rpc?v=5&type=search&arg=big&callback=jsonCallback!")
     assert response.headers.get("content-type") == "application/json"
     assert response.json().get("error") == "Invalid callback name."

From 94972841d6c6330503cdf33d53336c1bd47f9469 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 04:36:39 -0800
Subject: [PATCH 587/844] change(fastapi): decouple error logic from
 process_account_form

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/exceptions.py         |   9 ++
 aurweb/routers/accounts.py   | 209 ++++++++---------------------------
 aurweb/users/validate.py     | 204 ++++++++++++++++++++++++++++++++++
 test/test_accounts_routes.py |  25 ++++-
 4 files changed, 278 insertions(+), 169 deletions(-)
 create mode 100644 aurweb/users/validate.py

diff --git a/aurweb/exceptions.py b/aurweb/exceptions.py
index 82628b0a..31212676 100644
--- a/aurweb/exceptions.py
+++ b/aurweb/exceptions.py
@@ -1,3 +1,6 @@
+from typing import Any
+
+
 class AurwebException(Exception):
     pass
 
@@ -77,3 +80,9 @@ class InvalidArgumentsException(AurwebException):
 
 class RPCError(AurwebException):
     pass
+
+
+class ValidationError(AurwebException):
+    def __init__(self, data: Any, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.data = data
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index aca322b5..47483acc 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -6,20 +6,20 @@ from http import HTTPStatus
 
 from fastapi import APIRouter, Form, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
-from sqlalchemy import and_, func, or_
+from sqlalchemy import and_, or_
 
 import aurweb.config
 
-from aurweb import cookies, db, l10n, logging, models, time, util
+from aurweb import cookies, db, l10n, logging, models, util
 from aurweb.auth import account_type_required, auth_required
-from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
+from aurweb.captcha import get_captcha_salts
+from aurweb.exceptions import ValidationError
 from aurweb.l10n import get_translator_for_request
-from aurweb.models import account_type
-from aurweb.models.account_type import (DEVELOPER, DEVELOPER_ID, TRUSTED_USER, TRUSTED_USER_AND_DEV, TRUSTED_USER_AND_DEV_ID,
-                                        TRUSTED_USER_ID, USER_ID)
+from aurweb.models import account_type as at
 from aurweb.models.ssh_pub_key import get_fingerprint
 from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
+from aurweb.users import validate
 from aurweb.users.util import get_user_by_name
 
 router = APIRouter()
@@ -126,146 +126,31 @@ def process_account_form(request: Request, user: models.User, args: dict):
     # Get a local translator.
     _ = get_translator_for_request(request)
 
-    host = request.client.host
-    ban = db.query(models.Ban, models.Ban.IPAddress == host).first()
-    if ban:
-        return (False, [
-            "Account registration has been disabled for your "
-            "IP address, probably due to sustained spam attacks. "
-            "Sorry for the inconvenience."
-        ])
+    checks = [
+        validate.is_banned,
+        validate.invalid_user_password,
+        validate.invalid_fields,
+        validate.invalid_suspend_permission,
+        validate.invalid_username,
+        validate.invalid_password,
+        validate.invalid_email,
+        validate.invalid_backup_email,
+        validate.invalid_homepage,
+        validate.invalid_pgp_key,
+        validate.invalid_ssh_pubkey,
+        validate.invalid_language,
+        validate.invalid_timezone,
+        validate.username_in_use,
+        validate.email_in_use,
+        validate.invalid_account_type,
+        validate.invalid_captcha
+    ]
 
-    if request.user.is_authenticated():
-        if not request.user.valid_password(args.get("passwd", None)):
-            return (False, ["Invalid password."])
-
-    email = args.get("E", None)
-    username = args.get("U", None)
-
-    if not email or not username:
-        return (False, ["Missing a required field."])
-
-    inactive = args.get("J", False)
-    if not request.user.is_elevated() and inactive != bool(user.InactivityTS):
-        return (False, ["You do not have permission to suspend accounts."])
-
-    username_min_len = aurweb.config.getint("options", "username_min_len")
-    username_max_len = aurweb.config.getint("options", "username_max_len")
-    if not util.valid_username(args.get("U")):
-        return (False, [
-            "The username is invalid.",
-            [
-                _("It must be between %s and %s characters long") % (
-                    username_min_len, username_max_len),
-                "Start and end with a letter or number",
-                "Can contain only one period, underscore or hyphen.",
-            ]
-        ])
-
-    password = args.get("P", None)
-    if password:
-        confirmation = args.get("C", None)
-        if not util.valid_password(password):
-            return (False, [
-                _("Your password must be at least %s characters.") % (
-                    username_min_len)
-            ])
-        elif not confirmation:
-            return (False, ["Please confirm your new password."])
-        elif password != confirmation:
-            return (False, ["Password fields do not match."])
-
-    backup_email = args.get("BE", None)
-    homepage = args.get("HP", None)
-    pgp_key = args.get("K", None)
-    ssh_pubkey = args.get("PK", None)
-    language = args.get("L", None)
-    timezone = args.get("TZ", None)
-
-    def username_exists(username):
-        return and_(models.User.ID != user.ID,
-                    func.lower(models.User.Username) == username.lower())
-
-    def email_exists(email):
-        return and_(models.User.ID != user.ID,
-                    func.lower(models.User.Email) == email.lower())
-
-    if not util.valid_email(email):
-        return (False, ["The email address is invalid."])
-    elif backup_email and not util.valid_email(backup_email):
-        return (False, ["The backup email address is invalid."])
-    elif homepage and not util.valid_homepage(homepage):
-        return (False, [
-            "The home page is invalid, please specify the full HTTP(s) URL."])
-    elif pgp_key and not util.valid_pgp_fingerprint(pgp_key):
-        return (False, ["The PGP key fingerprint is invalid."])
-    elif ssh_pubkey and not util.valid_ssh_pubkey(ssh_pubkey):
-        return (False, ["The SSH public key is invalid."])
-    elif language and language not in l10n.SUPPORTED_LANGUAGES:
-        return (False, ["Language is not currently supported."])
-    elif timezone and timezone not in time.SUPPORTED_TIMEZONES:
-        return (False, ["Timezone is not currently supported."])
-    elif db.query(models.User, username_exists(username)).first():
-        # If the username already exists...
-        return (False, [
-            _("The username, %s%s%s, is already in use.") % (
-                "<strong>", username, "</strong>")
-        ])
-    elif db.query(models.User, email_exists(email)).first():
-        # If the email already exists...
-        return (False, [
-            _("The address, %s%s%s, is already in use.") % (
-                "<strong>", email, "</strong>")
-        ])
-
-    def ssh_fingerprint_exists(fingerprint):
-        return and_(models.SSHPubKey.UserID != user.ID,
-                    models.SSHPubKey.Fingerprint == fingerprint)
-
-    if ssh_pubkey:
-        fingerprint = get_fingerprint(ssh_pubkey.strip().rstrip())
-        if fingerprint is None:
-            return (False, ["The SSH public key is invalid."])
-
-        if db.query(models.SSHPubKey,
-                    ssh_fingerprint_exists(fingerprint)).first():
-            return (False, [
-                _("The SSH public key, %s%s%s, is already in use.") % (
-                    "<strong>", fingerprint, "</strong>")
-            ])
-
-    T = int(args.get("T", user.AccountTypeID))
-    if T != user.AccountTypeID:
-        if T not in account_type.ACCOUNT_TYPE_NAME:
-            return (False,
-                    ["Invalid account type provided."])
-        elif not request.user.is_elevated():
-            return (False,
-                    ["You do not have permission to change account types."])
-
-        credential_checks = {
-            DEVELOPER_ID: request.user.is_developer,
-            TRUSTED_USER_AND_DEV_ID: request.user.is_developer,
-            TRUSTED_USER_ID: request.user.is_elevated,
-            USER_ID: request.user.is_elevated
-        }
-        credential_check = credential_checks.get(T)
-
-        if not credential_check():
-            name = account_type.ACCOUNT_TYPE_NAME.get(T)
-            error = _("You do not have permission to change "
-                      "this user's account type to %s.") % name
-            return (False, [error])
-
-    captcha_salt = args.get("captcha_salt", None)
-    if captcha_salt and captcha_salt not in get_captcha_salts():
-        return (False, ["This CAPTCHA has expired. Please try again."])
-
-    captcha = args.get("captcha", None)
-    if captcha:
-        answer = get_captcha_answer(get_captcha_token(captcha_salt))
-        if captcha != answer:
-            return (False, ["The entered CAPTCHA answer is invalid."])
+    try:
+        for check in checks:
+            check(**args, request=request, user=user, _=_)
+    except ValidationError as exc:
+        return (False, exc.data)
 
     return (True, [])
 
@@ -286,16 +171,16 @@ def make_account_form_context(context: dict,
     context = copy.copy(context)
 
     context["account_types"] = [
-        (USER_ID, "Normal User"),
-        (TRUSTED_USER_ID, TRUSTED_USER)
+        (at.USER_ID, "Normal User"),
+        (at.TRUSTED_USER_ID, at.TRUSTED_USER)
     ]
 
     user_account_type_id = context.get("account_types")[0][0]
 
     if request.user.has_credential("CRED_ACCOUNT_EDIT_DEV"):
-        context["account_types"].append((DEVELOPER_ID, DEVELOPER))
-        context["account_types"].append((TRUSTED_USER_AND_DEV_ID,
-                                         TRUSTED_USER_AND_DEV))
+        context["account_types"].append((at.DEVELOPER_ID, at.DEVELOPER))
+        context["account_types"].append((at.TRUSTED_USER_AND_DEV_ID,
+                                         at.TRUSTED_USER_AND_DEV))
 
     if request.user.is_authenticated():
         context["username"] = args.get("U", user.Username)
@@ -389,12 +274,10 @@ async def account_register_post(request: Request,
                                 captcha: str = Form(default=None),
                                 captcha_salt: str = Form(...)):
     context = await make_variable_context(request, "Register")
-
     args = dict(await request.form())
+
     context = make_account_form_context(context, request, None, args)
-
     ok, errors = process_account_form(request, request.user, args)
-
     if not ok:
         # If the field values given do not meet the requirements,
         # return HTTP 400 with an error.
@@ -636,9 +519,9 @@ async def account_comments(request: Request, username: str):
 
 @router.get("/accounts")
 @auth_required(True, redirect="/accounts")
-@account_type_required({account_type.TRUSTED_USER,
-                        account_type.DEVELOPER,
-                        account_type.TRUSTED_USER_AND_DEV})
+@account_type_required({at.TRUSTED_USER,
+                        at.DEVELOPER,
+                        at.TRUSTED_USER_AND_DEV})
 async def accounts(request: Request):
     context = make_context(request, "Accounts")
     return render_template(request, "account/search.html", context)
@@ -646,9 +529,9 @@ async def accounts(request: Request):
 
 @router.post("/accounts")
 @auth_required(True, redirect="/accounts")
-@account_type_required({account_type.TRUSTED_USER,
-                        account_type.DEVELOPER,
-                        account_type.TRUSTED_USER_AND_DEV})
+@account_type_required({at.TRUSTED_USER,
+                        at.DEVELOPER,
+                        at.TRUSTED_USER_AND_DEV})
 async def accounts_post(request: Request,
                         O: int = Form(default=0),  # Offset
                         SB: str = Form(default=str()),  # Sort By
@@ -680,10 +563,10 @@ async def accounts_post(request: Request,
 
     # Convert parameter T to an AccountType ID.
     account_types = {
-        "u": account_type.USER_ID,
-        "t": account_type.TRUSTED_USER_ID,
-        "d": account_type.DEVELOPER_ID,
-        "td": account_type.TRUSTED_USER_AND_DEV_ID
+        "u": at.USER_ID,
+        "t": at.TRUSTED_USER_ID,
+        "d": at.DEVELOPER_ID,
+        "td": at.TRUSTED_USER_AND_DEV_ID
     }
     account_type_id = account_types.get(T, None)
 
diff --git a/aurweb/users/validate.py b/aurweb/users/validate.py
new file mode 100644
index 00000000..4959e316
--- /dev/null
+++ b/aurweb/users/validate.py
@@ -0,0 +1,204 @@
+"""
+Validation functions for account registration and edit fields.
+Each of these functions extracts a subset of keyword arguments
+out of form data from /account/register or /account/{username}/edit.
+
+All functions in this module raise aurweb.exceptions.ValidationError
+when encountering invalid criteria and return silently otherwise.
+"""
+from typing import List, Optional, Tuple
+
+from fastapi import Request
+from sqlalchemy import and_
+
+from aurweb import config, db, l10n, models, time, util
+from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
+from aurweb.exceptions import ValidationError
+from aurweb.models import account_type as at
+from aurweb.models.account_type import ACCOUNT_TYPE_NAME
+from aurweb.models.ssh_pub_key import get_fingerprint
+
+
+def invalid_fields(E: str = str(), U: str = str(), **kwargs) \
+        -> Optional[Tuple[bool, List[str]]]:
+    if not E or not U:
+        raise ValidationError(["Missing a required field."])
+
+
+def invalid_suspend_permission(request: Request = None,
+                               user: models.User = None,
+                               J: bool = False,
+                               **kwargs) \
+        -> Optional[Tuple[bool, List[str]]]:
+    if not request.user.is_elevated() and J != bool(user.InactivityTS):
+        raise ValidationError([
+            "You do not have permission to suspend accounts."])
+
+
+def invalid_username(request: Request = None, U: str = str(), _=None,
+                     **kwargs):
+    if not util.valid_username(U):
+        username_min_len = config.getint("options", "username_min_len")
+        username_max_len = config.getint("options", "username_max_len")
+        raise ValidationError([
+            "The username is invalid.",
+            [
+                _("It must be between %s and %s characters long") % (
+                    username_min_len, username_max_len),
+                "Start and end with a letter or number",
+                "Can contain only one period, underscore or hyphen.",
+            ]
+        ])
+
+
+def invalid_password(P: str = str(), C: str = str(),
+                     _: l10n.Translator = None, **kwargs) -> None:
+    if P:
+        if not util.valid_password(P):
+            username_min_len = config.getint(
+                "options", "username_min_len")
+            raise ValidationError([
+                _("Your password must be at least %s characters.") % (
+                    username_min_len)
+            ])
+        elif not C:
+            raise ValidationError(["Please confirm your new password."])
+        elif P != C:
+            raise ValidationError(["Password fields do not match."])
+
+
+def is_banned(request: Request = None, **kwargs) -> None:
+    host = request.client.host
+    exists = db.query(models.Ban, models.Ban.IPAddress == host).exists()
+    if db.query(exists).scalar():
+        raise ValidationError([
+            "Account registration has been disabled for your "
+            "IP address, probably due to sustained spam attacks. "
+            "Sorry for the inconvenience."
+        ])
+
+
+def invalid_user_password(request: Request = None, passwd: str = str(),
+                          **kwargs) -> None:
+    if request.user.is_authenticated():
+        if not request.user.valid_password(passwd):
+            raise ValidationError(["Invalid password."])
+
+
+def invalid_email(E: str = str(), **kwargs) -> None:
+    if not util.valid_email(E):
+        raise ValidationError(["The email address is invalid."])
+
+
+def invalid_backup_email(BE: str = str(), **kwargs) -> None:
+    if BE and not util.valid_email(BE):
+        raise ValidationError(["The backup email address is invalid."])
+
+
+def invalid_homepage(HP: str = str(), **kwargs) -> None:
+    if HP and not util.valid_homepage(HP):
+        raise ValidationError([
+            "The home page is invalid, please specify the full HTTP(s) URL."])
+
+
+def invalid_pgp_key(K: str = str(), **kwargs) -> None:
+    if K and not util.valid_pgp_fingerprint(K):
+        raise ValidationError(["The PGP key fingerprint is invalid."])
+
+
+def invalid_ssh_pubkey(PK: str = str(), user: models.User = None,
+                       _: l10n.Translator = None, **kwargs) -> None:
+    if PK:
+        invalid_exc = ValidationError(["The SSH public key is invalid."])
+        if not util.valid_ssh_pubkey(PK):
+            raise invalid_exc
+
+        fingerprint = get_fingerprint(PK.strip().rstrip())
+        if not fingerprint:
+            raise invalid_exc
+
+        exists = db.query(models.SSHPubKey).filter(
+            and_(models.SSHPubKey.UserID != user.ID,
+                 models.SSHPubKey.Fingerprint == fingerprint)
+        ).exists()
+        if db.query(exists).scalar():
+            raise ValidationError([
+                _("The SSH public key, %s%s%s, is already in use.") % (
+                    "<strong>", fingerprint, "</strong>")
+            ])
+
+
+def invalid_language(L: str = str(), **kwargs) -> None:
+    if L and L not in l10n.SUPPORTED_LANGUAGES:
+        raise ValidationError(["Language is not currently supported."])
+
+
+def invalid_timezone(TZ: str = str(), **kwargs) -> None:
+    if TZ and TZ not in time.SUPPORTED_TIMEZONES:
+        raise ValidationError(["Timezone is not currently supported."])
+
+
+def username_in_use(U: str = str(), user: models.User = None,
+                    _: l10n.Translator = None, **kwargs) -> None:
+    exists = db.query(models.User).filter(
+        and_(models.User.ID != user.ID,
+             models.User.Username == U)
+    ).exists()
+    if db.query(exists).scalar():
+        # If the username already exists...
+        raise ValidationError([
+            _("The username, %s%s%s, is already in use.") % (
+                "<strong>", U, "</strong>")
+        ])
+
+
+def email_in_use(E: str = str(), user: models.User = None,
+                 _: l10n.Translator = None, **kwargs) -> None:
+    exists = db.query(models.User).filter(
+        and_(models.User.ID != user.ID,
+             models.User.Email == E)
+    ).exists()
+    if db.query(exists).scalar():
+        # If the email already exists...
+        raise ValidationError([
+            _("The address, %s%s%s, is already in use.") % (
+                "<strong>", E, "</strong>")
+        ])
+
+
+def invalid_account_type(T: int = None, request: Request = None,
+                         user: models.User = None,
+                         _: l10n.Translator = None,
+                         **kwargs) -> None:
+    if T is not None and (T := int(T)) != user.AccountTypeID:
+        if T not in ACCOUNT_TYPE_NAME:
+            raise ValidationError(["Invalid account type provided."])
+        elif not request.user.is_elevated():
+            raise ValidationError([
+                "You do not have permission to change account types."])
+
+        credential_checks = {
+            at.USER_ID: request.user.is_trusted_user,
+            at.TRUSTED_USER_ID: request.user.is_trusted_user,
+            at.DEVELOPER_ID: lambda: request.user.is_developer(),
+            at.TRUSTED_USER_AND_DEV_ID: (lambda: request.user.is_trusted_user()
+                                         and request.user.is_developer())
+        }
+        credential_check = credential_checks.get(T)
+
+        if not credential_check():
+            name = ACCOUNT_TYPE_NAME.get(T)
+            error = _("You do not have permission to change "
+                      "this user's account type to %s.") % name
+            raise ValidationError([error])
+
+
+def invalid_captcha(captcha_salt: str = None, captcha: str = None, **kwargs) \
+        -> None:
+    if captcha_salt and captcha_salt not in get_captcha_salts():
+        raise ValidationError(["This CAPTCHA has expired. Please try again."])
+
+    if captcha:
+        answer = get_captcha_answer(get_captcha_token(captcha_salt))
+        if captcha != answer:
+            raise ValidationError(["The entered CAPTCHA answer is invalid."])
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index e828f70f..be929e97 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -1035,12 +1035,25 @@ def test_post_account_edit_account_types():
     # Make sure it got changed to USER_ID as we intended.
     assert user.AccountTypeID == USER_ID
 
-    # Change user to a Developer.
+    # Change user to a TU & Dev, which can change themselves to a Developer.
     with db.begin():
-        user.AccountTypeID = DEVELOPER_ID
+        user.AccountTypeID = TRUSTED_USER_AND_DEV_ID
 
-    # As a developer, we can absolutely change all account types.
-    # For example, from DEVELOPER_ID to TRUSTED_USER_AND_DEV_ID:
+    # As a TU & Dev, we can absolutely change all account types.
+    # For example, from TRUSTED_USER_AND_DEV_ID to DEVELOPER_ID:
+    post_data = {
+        "U": user.Username,
+        "E": user.Email,
+        "T": DEVELOPER_ID,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(endpoint, data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert user.AccountTypeID == DEVELOPER_ID
+
+    # But we can't change a user to a Trusted User & Developer when
+    # we're just a Developer.
     post_data = {
         "U": user.Username,
         "E": user.Email,
@@ -1049,8 +1062,8 @@ def test_post_account_edit_account_types():
     }
     with client as request:
         resp = request.post(endpoint, data=post_data, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-    assert user.AccountTypeID == TRUSTED_USER_AND_DEV_ID
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    assert user.AccountTypeID == DEVELOPER_ID
 
 
 def test_get_account():

From 303585cdbf50ffa70c7bc6f579c17d5e6bc08a42 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 05:40:11 -0800
Subject: [PATCH 588/844] change(fastapi): decouple update logic from account
 edit

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py |  85 ++++------------------------
 aurweb/users/update.py     | 110 +++++++++++++++++++++++++++++++++++++
 aurweb/util.py             |   7 +++
 3 files changed, 128 insertions(+), 74 deletions(-)
 create mode 100644 aurweb/users/update.py

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 47483acc..02a7f4c6 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -1,7 +1,6 @@
 import copy
 import typing
 
-from datetime import datetime
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, Request
@@ -19,7 +18,7 @@ from aurweb.models import account_type as at
 from aurweb.models.ssh_pub_key import get_fingerprint
 from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
-from aurweb.users import validate
+from aurweb.users import update, validate
 from aurweb.users.util import get_user_by_name
 
 router = APIRouter()
@@ -405,79 +404,17 @@ async def account_edit_post(request: Request,
         return render_template(request, "account/edit.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
-    # Set all updated fields as needed.
-    with db.begin():
-        user.Username = U or user.Username
-        user.Email = E or user.Email
-        user.HideEmail = bool(H)
-        user.BackupEmail = BE or user.BackupEmail
-        user.RealName = R or user.RealName
-        user.Homepage = HP or user.Homepage
-        user.IRCNick = I or user.IRCNick
-        user.PGPKey = K or user.PGPKey
-        user.Suspended = J
-        user.InactivityTS = int(datetime.utcnow().timestamp()) * int(J)
+    updates = [
+        update.simple,
+        update.language,
+        update.timezone,
+        update.ssh_pubkey,
+        update.account_type,
+        update.password
+    ]
 
-    # If we update the language, update the cookie as well.
-    if L and L != user.LangPreference:
-        request.cookies["AURLANG"] = L
-        with db.begin():
-            user.LangPreference = L
-        context["language"] = L
-
-    # If we update the timezone, also update the cookie.
-    if TZ and TZ != user.Timezone:
-        with db.begin():
-            user.Timezone = TZ
-        request.cookies["AURTZ"] = TZ
-        context["timezone"] = TZ
-
-    with db.begin():
-        user.CommentNotify = bool(CN)
-        user.UpdateNotify = bool(UN)
-        user.OwnershipNotify = bool(ON)
-
-    # If a PK is given, compare it against the target user's PK.
-    with db.begin():
-        if PK:
-            # Get the second token in the public key, which is the actual key.
-            pubkey = PK.strip().rstrip()
-            parts = pubkey.split(" ")
-            if len(parts) == 3:
-                # Remove the host part.
-                pubkey = parts[0] + " " + parts[1]
-            fingerprint = get_fingerprint(pubkey)
-            if not user.ssh_pub_key:
-                # No public key exists, create one.
-                user.ssh_pub_key = models.SSHPubKey(UserID=user.ID,
-                                                    PubKey=pubkey,
-                                                    Fingerprint=fingerprint)
-            elif user.ssh_pub_key.PubKey != pubkey:
-                # A public key already exists, update it.
-                user.ssh_pub_key.PubKey = pubkey
-                user.ssh_pub_key.Fingerprint = fingerprint
-        elif user.ssh_pub_key:
-            # Else, if the user has a public key already, delete it.
-            db.delete(user.ssh_pub_key)
-
-    if T and T != user.AccountTypeID:
-        with db.begin():
-            user.AccountTypeID = T
-
-    if P and not user.valid_password(P):
-        # Remove the fields we consumed for passwords.
-        context["P"] = context["C"] = str()
-
-        # If a password was given and it doesn't match the user's, update it.
-        with db.begin():
-            user.update_password(P)
-
-        if user == request.user:
-            remember_me = request.cookies.get("AURREMEMBER", False)
-
-            # If the target user is the request user, login with
-            # the updated password to update the Session record.
-            user.login(request, P, cookies.timeout(remember_me))
+    for f in updates:
+        f(**args, request=request, user=user, context=context)
 
     if not errors:
         context["complete"] = True
diff --git a/aurweb/users/update.py b/aurweb/users/update.py
new file mode 100644
index 00000000..60a6184e
--- /dev/null
+++ b/aurweb/users/update.py
@@ -0,0 +1,110 @@
+from datetime import datetime
+from typing import Any, Dict
+
+from fastapi import Request
+
+from aurweb import cookies, db, models
+from aurweb.models.ssh_pub_key import get_fingerprint
+from aurweb.util import strtobool
+
+
+def simple(U: str = str(), E: str = str(), H: bool = False,
+           BE: str = str(), R: str = str(), HP: str = str(),
+           I: str = str(), K: str = str(), J: bool = False,
+           CN: bool = False, UN: bool = False, ON: bool = False,
+           user: models.User = None,
+           **kwargs) -> None:
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        user.Username = U or user.Username
+        user.Email = E or user.Email
+        user.HideEmail = strtobool(H)
+        user.BackupEmail = BE or user.BackupEmail
+        user.RealName = R or user.RealName
+        user.Homepage = HP or user.Homepage
+        user.IRCNick = I or user.IRCNick
+        user.PGPKey = K or user.PGPKey
+        user.Suspended = strtobool(J)
+        user.InactivityTS = now * int(strtobool(J))
+        user.CommentNotify = strtobool(CN)
+        user.UpdateNotify = strtobool(UN)
+        user.OwnershipNotify = strtobool(ON)
+
+
+def language(L: str = str(),
+             request: Request = None,
+             user: models.User = None,
+             context: Dict[str, Any] = {},
+             **kwargs) -> None:
+    if L and L != user.LangPreference:
+        with db.begin():
+            user.LangPreference = L
+        context["language"] = L
+
+
+def timezone(TZ: str = str(),
+             request: Request = None,
+             user: models.User = None,
+             context: Dict[str, Any] = {},
+             **kwargs) -> None:
+    if TZ and TZ != user.Timezone:
+        with db.begin():
+            user.Timezone = TZ
+        context["language"] = TZ
+
+
+def ssh_pubkey(PK: str = str(),
+               user: models.User = None,
+               **kwargs) -> None:
+    # If a PK is given, compare it against the target user's PK.
+    if PK:
+        # Get the second token in the public key, which is the actual key.
+        pubkey = PK.strip().rstrip()
+        parts = pubkey.split(" ")
+        if len(parts) == 3:
+            # Remove the host part.
+            pubkey = parts[0] + " " + parts[1]
+        fingerprint = get_fingerprint(pubkey)
+        if not user.ssh_pub_key:
+            # No public key exists, create one.
+            with db.begin():
+                db.create(models.SSHPubKey, UserID=user.ID,
+                          PubKey=pubkey, Fingerprint=fingerprint)
+        elif user.ssh_pub_key.PubKey != pubkey:
+            # A public key already exists, update it.
+            with db.begin():
+                user.ssh_pub_key.PubKey = pubkey
+                user.ssh_pub_key.Fingerprint = fingerprint
+    elif user.ssh_pub_key:
+        # Else, if the user has a public key already, delete it.
+        with db.begin():
+            db.delete(user.ssh_pub_key)
+
+
+def account_type(T: int = None,
+                 user: models.User = None,
+                 **kwargs) -> None:
+    if T is not None and (T := int(T)) != user.AccountTypeID:
+        with db.begin():
+            user.AccountTypeID = T
+
+
+def password(P: str = str(),
+             request: Request = None,
+             user: models.User = None,
+             context: Dict[str, Any] = {},
+             **kwargs) -> None:
+    if P and not user.valid_password(P):
+        # Remove the fields we consumed for passwords.
+        context["P"] = context["C"] = str()
+
+        # If a password was given and it doesn't match the user's, update it.
+        with db.begin():
+            user.update_password(P)
+
+        if user == request.user:
+            remember_me = request.cookies.get("AURREMEMBER", False)
+
+            # If the target user is the request user, login with
+            # the updated password to update the Session record.
+            user.login(request, P, cookies.timeout(remember_me))
diff --git a/aurweb/util.py b/aurweb/util.py
index 1c2042fa..b95fc6a3 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -7,6 +7,7 @@ import secrets
 import string
 
 from datetime import datetime
+from distutils.util import strtobool as _strtobool
 from typing import Any, Callable, Dict, Iterable, Tuple
 from urllib.parse import urlencode, urlparse
 from zoneinfo import ZoneInfo
@@ -170,3 +171,9 @@ def sanitize_params(offset: str, per_page: str) -> Tuple[int, int]:
         per_page = defaults.PP
 
     return (offset, per_page)
+
+
+def strtobool(value: str) -> bool:
+    if isinstance(value, str):
+        return _strtobool(value)
+    return value

From 2892d21ff173af8f484274b1b175447be2ae4bab Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 05:47:22 -0800
Subject: [PATCH 589/844] remove global aurweb.models flake8 F401 ignore

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/__init__.py | 60 +++++++++++++++++++--------------------
 setup.cfg                 |  1 -
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/aurweb/models/__init__.py b/aurweb/models/__init__.py
index b430acd2..a06077ad 100644
--- a/aurweb/models/__init__.py
+++ b/aurweb/models/__init__.py
@@ -1,31 +1,31 @@
 """ Collection of all aurweb SQLAlchemy declarative models. """
-from .accepted_term import AcceptedTerm
-from .account_type import AccountType
-from .api_rate_limit import ApiRateLimit
-from .ban import Ban
-from .dependency_type import DependencyType
-from .group import Group
-from .license import License
-from .official_provider import OfficialProvider
-from .package import Package
-from .package_base import PackageBase
-from .package_blacklist import PackageBlacklist
-from .package_comaintainer import PackageComaintainer
-from .package_comment import PackageComment
-from .package_dependency import PackageDependency
-from .package_group import PackageGroup
-from .package_keyword import PackageKeyword
-from .package_license import PackageLicense
-from .package_notification import PackageNotification
-from .package_relation import PackageRelation
-from .package_request import PackageRequest
-from .package_source import PackageSource
-from .package_vote import PackageVote
-from .relation_type import RelationType
-from .request_type import RequestType
-from .session import Session
-from .ssh_pub_key import SSHPubKey
-from .term import Term
-from .tu_vote import TUVote
-from .tu_voteinfo import TUVoteInfo
-from .user import User
+from .accepted_term import AcceptedTerm  # noqa: F401
+from .account_type import AccountType  # noqa: F401
+from .api_rate_limit import ApiRateLimit  # noqa: F401
+from .ban import Ban  # noqa: F401
+from .dependency_type import DependencyType  # noqa: F401
+from .group import Group  # noqa: F401
+from .license import License  # noqa: F401
+from .official_provider import OfficialProvider  # noqa: F401
+from .package import Package  # noqa: F401
+from .package_base import PackageBase  # noqa: F401
+from .package_blacklist import PackageBlacklist  # noqa: F401
+from .package_comaintainer import PackageComaintainer  # noqa: F401
+from .package_comment import PackageComment  # noqa: F401
+from .package_dependency import PackageDependency  # noqa: F401
+from .package_group import PackageGroup  # noqa: F401
+from .package_keyword import PackageKeyword  # noqa: F401
+from .package_license import PackageLicense  # noqa: F401
+from .package_notification import PackageNotification  # noqa: F401
+from .package_relation import PackageRelation  # noqa: F401
+from .package_request import PackageRequest  # noqa: F401
+from .package_source import PackageSource  # noqa: F401
+from .package_vote import PackageVote  # noqa: F401
+from .relation_type import RelationType  # noqa: F401
+from .request_type import RequestType  # noqa: F401
+from .session import Session  # noqa: F401
+from .ssh_pub_key import SSHPubKey  # noqa: F401
+from .term import Term  # noqa: F401
+from .tu_vote import TUVote  # noqa: F401
+from .tu_voteinfo import TUVoteInfo  # noqa: F401
+from .user import User  # noqa: F401
diff --git a/setup.cfg b/setup.cfg
index 7c64a01f..cec1bcf5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,6 @@ per-file-ignores =
     aurweb/routers/accounts.py:C901
     test/test_ssh_pub_key.py:E501
     aurweb/routers/packages.py:E741
-    aurweb/models/__init__.py:F401
 
 [isort]
 line_length = 127

From 2df7187514a64d0e0ff88130562a9fc95c0f6611 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 05:48:43 -0800
Subject: [PATCH 590/844] fix global test_ssh_pub_key E501 flake8 violation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 setup.cfg                | 1 -
 test/test_ssh_pub_key.py | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index cec1bcf5..997bf4b7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,7 +30,6 @@ ignore = E741, W503, W504
 #
 per-file-ignores =
     aurweb/routers/accounts.py:C901
-    test/test_ssh_pub_key.py:E501
     aurweb/routers/packages.py:E741
 
 [isort]
diff --git a/test/test_ssh_pub_key.py b/test/test_ssh_pub_key.py
index bb787759..e17af5a7 100644
--- a/test/test_ssh_pub_key.py
+++ b/test/test_ssh_pub_key.py
@@ -6,7 +6,14 @@ from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
 from aurweb.models.user import User
 
 TEST_SSH_PUBKEY = """
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCycoCi5yGCvSclH2wmNBUuwsYEzRZZBJaQquRc4ysl+Tg+/jiDkR3Zn9fIznC4KnFoyrIHzkKuePZ3bNDYwkZxkJKoWBCh4hXKDXSm87FMN0+VDC+1QxF/z0XaAGr/P6f4XukabyddypBdnHcZiplbw+YOSqcAE2TCqOlSXwNMOcF9U89UsR/Q9i9I52hlvU0q8+fZVGhou1KCowFSnHYtrr5KYJ04CXkJ13DkVf3+pjQWyrByvBcf1hGEaczlgfobrrv/y96jDhgfXucxliNKLdufDPPkii3LhhsNcDmmI1VZ3v0irKvd9WZuauqloobY84zEFcDTyjn0hxGjVeYFejm4fBnvjga0yZXORuWksdNfXWLDxFk6MDDd1jF0ExRbP+OxDuU4IVyIuDL7S3cnbf2YjGhkms/8voYT2OBE7FwNlfv98Kr0NUp51zpf55Arxn9j0Rz9xTA7FiODQgCn6iQ0SDtzUNL0IKTCw26xJY5gzMxbfpvzPQGeulx/ioM= kevr@volcano
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCycoCi5yGCvSclH2wmNBUuwsYEzRZZBJaQquRc4y\
+sl+Tg+/jiDkR3Zn9fIznC4KnFoyrIHzkKuePZ3bNDYwkZxkJKoWBCh4hXKDXSm87FMN0+VDC+1QxF/\
+z0XaAGr/P6f4XukabyddypBdnHcZiplbw+YOSqcAE2TCqOlSXwNMOcF9U89UsR/Q9i9I52hlvU0q8+\
+fZVGhou1KCowFSnHYtrr5KYJ04CXkJ13DkVf3+pjQWyrByvBcf1hGEaczlgfobrrv/y96jDhgfXucx\
+liNKLdufDPPkii3LhhsNcDmmI1VZ3v0irKvd9WZuauqloobY84zEFcDTyjn0hxGjVeYFejm4fBnvjg\
+a0yZXORuWksdNfXWLDxFk6MDDd1jF0ExRbP+OxDuU4IVyIuDL7S3cnbf2YjGhkms/8voYT2OBE7FwN\
+lfv98Kr0NUp51zpf55Arxn9j0Rz9xTA7FiODQgCn6iQ0SDtzUNL0IKTCw26xJY5gzMxbfpvzPQGeul\
+x/ioM= kevr@volcano
 """
 
 user = ssh_pub_key = None

From 672af707ad34a014b1119a9104db4050b706678b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 05:49:08 -0800
Subject: [PATCH 591/844] remove C901 and E741 per-file-ignores exclusion

We no longer have C901 violations and we're already ignoring
E741 (short variable names) in the overall `ignore` option.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 setup.cfg | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 997bf4b7..08be9186 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,19 +19,6 @@ max-complexity = 10
 #   do this, so we're ignoring it here.
 ignore = E741, W503, W504
 
-# aurweb/routers/accounts.py
-#   Ignore over-reaching complexity.
-#   TODO: This should actually be addressed so we do not ignore C901.
-#
-# test/test_ssh_pub_key.py
-#   E501 is detected due to our >127 width test constant. Ignore it.
-#   Due to this, line width should _always_ be looked at in code reviews.
-#   Anything like this should be questioned.
-#
-per-file-ignores =
-    aurweb/routers/accounts.py:C901
-    aurweb/routers/packages.py:E741
-
 [isort]
 line_length = 127
 lines_between_types = 1

From dbe5cb4a33066c90333c32aab077081fec3ba426 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 18 Nov 2021 16:42:26 -0800
Subject: [PATCH 592/844] fix(fastapi): only include comment-edit.js where
 needed

Closes: #178

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/account/comments.html | 3 +++
 templates/packages/show.html    | 3 +++
 templates/partials/head.html    | 3 ---
 templates/pkgbase.html          | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/templates/account/comments.html b/templates/account/comments.html
index 95585180..8dff53e4 100644
--- a/templates/account/comments.html
+++ b/templates/account/comments.html
@@ -17,6 +17,9 @@
                 </h3>
             </div>
 
+            <!-- On-the-fly comment editing functions -->
+            <script type="text/javascript" src="/static/js/comment-edit.js"></script>
+
             {% for comment in comments %}
                 {% include "partials/account/comment.html" %}
             {% endfor %}
diff --git a/templates/packages/show.html b/templates/packages/show.html
index fbc9c0ea..25083020 100644
--- a/templates/packages/show.html
+++ b/templates/packages/show.html
@@ -15,6 +15,9 @@
         </div>
     </div>
 
+    <!-- On-the-fly comment editing functions -->
+    <script type="text/javascript" src="/static/js/comment-edit.js"></script>
+
     {% set pkgname = package.Name %}
     {% set pkgbase_id = pkgbase.ID %}
     {% include "partials/packages/comments.html" %}
diff --git a/templates/partials/head.html b/templates/partials/head.html
index 21c79887..8bfde020 100644
--- a/templates/partials/head.html
+++ b/templates/partials/head.html
@@ -15,8 +15,5 @@
     <!-- Include local typeahead -->
     <script type="text/javascript" src="/static/js/typeahead.js"></script>
 
-    <!-- On-the-fly comment editing functions -->
-    <script type="text/javascript" src="/static/js/comment-edit.js"></script>
-
     <title>AUR ({{ language }}) - {{ title | tr }}</title>
 </head>
diff --git a/templates/pkgbase.html b/templates/pkgbase.html
index 315cdf67..cdf23c35 100644
--- a/templates/pkgbase.html
+++ b/templates/pkgbase.html
@@ -14,6 +14,9 @@
         </div>
     </div>
 
+    <!-- On-the-fly comment editing functions -->
+    <script type="text/javascript" src="/static/js/comment-edit.js"></script>
+
     {% set pkgname = result.Name %}
     {% set pkgbase_id = result.ID %}
     {% set comments = comments %}

From 7739b2178ec01828666daf271e8451852af22d2e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 18 Nov 2021 16:43:10 -0800
Subject: [PATCH 593/844] fix(fastapi): fix comment edit image sources

These were using the old comment image sources. Slipped in
due to cache and not checking without cache.

Fixed them to use src="/static/images/...".

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/comment_actions.html | 10 +++++-----
 web/html/js/comment-edit.js             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/partials/comment_actions.html b/templates/partials/comment_actions.html
index b21b90bd..b8ccf945 100644
--- a/templates/partials/comment_actions.html
+++ b/templates/partials/comment_actions.html
@@ -12,7 +12,7 @@
                        value="{{ request.url.path }}" />
                 <input type="image"
                        class="delete-comment"
-                       src="/images/x.min.svg"
+                       src="/static/images/x.min.svg"
                        width="11"
                        height="11"
                        alt="{{ 'Delete comment' | tr }}"
@@ -29,7 +29,7 @@
            class="edit-comment"
            title="{{ 'Edit comment' | tr }}"
         >
-            <img src="/images/pencil.min.svg" alt="{{ 'Edit comment' | tr }}"
+            <img src="/static/images/pencil.min.svg" alt="{{ 'Edit comment' | tr }}"
                  width="11" height="11">
         </a>
 
@@ -57,7 +57,7 @@
                     <input type="hidden" name="next" value="{{ request.url.path }}" />
                     <input type="image"
                            class="pin-comment"
-                           src="/images/unpin.min.svg"
+                           src="/static/images/unpin.min.svg"
                            alt="{{ 'Unpin comment' | tr }}"
                            title="{{ 'Unpin comment' | tr }}"
                            name="submit"
@@ -73,7 +73,7 @@
                     <input type="hidden" name="next" value="{{ request.url.path }}" />
                     <input type="image"
                            class="pin-comment"
-                           src="/images/pin.min.svg"
+                           src="/static/images/pin.min.svg"
                            alt="{{ 'Pin comment' | tr }}"
                            title="{{ 'Pin comment' | tr }}"
                            name="submit"
@@ -91,7 +91,7 @@
                 <input type="hidden" name="next" value="{{ request.url.path }}" />
                 <input type="image"
                        class="undelete-comment"
-                       src="/images/action-undo.min.svg"
+                       src="/static/images/action-undo.min.svg"
                        alt="{{ 'Undelete comment' | tr }}"
                        title="{{ 'Undelete comment' | tr }}"
                        name="submit" value="1" width="11" height="11" />
diff --git a/web/html/js/comment-edit.js b/web/html/js/comment-edit.js
index 4898c8d4..23ffdd34 100644
--- a/web/html/js/comment-edit.js
+++ b/web/html/js/comment-edit.js
@@ -1,6 +1,6 @@
 function add_busy_indicator(sibling) {
     const img = document.createElement('img');
-    img.src = "/images/ajax-loader.gif";
+    img.src = "/static/images/ajax-loader.gif";
     img.classList.add('ajax-loader');
     img.style.height = 11;
     img.style.width = 16;

From a348cdaac3a36c53ed4e9355f977cf63c4052801 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 18 Nov 2021 16:44:13 -0800
Subject: [PATCH 594/844] housekeep(fastapi): cleanup unneeded jinja set
 statement

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/pkgbase.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/pkgbase.html b/templates/pkgbase.html
index cdf23c35..05583494 100644
--- a/templates/pkgbase.html
+++ b/templates/pkgbase.html
@@ -19,6 +19,5 @@
 
     {% set pkgname = result.Name %}
     {% set pkgbase_id = result.ID %}
-    {% set comments = comments %}
     {% include "partials/packages/comments.html" %}
 {% endblock %}

From 7f981b9ed7d0ce90d23d4051d743accd0228b515 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 18 Nov 2021 21:15:57 -0800
Subject: [PATCH 595/844] fix(fastapi): utilize auto_{orphan,deletion}_age

Didn't get this in when the initial request port went down;
here it is.

Auto-accept orphan requests when the package has been out of
date for longer than auto_orphan_age.

Auto-accept deletion requests by the package's maintainer
if the package has been uploaded within auto_deletion_age
seconds ago.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/validate.py  | 34 +++++++++++++++++++
 aurweb/routers/packages.py   | 65 ++++++++++++++++++------------------
 test/test_packages_routes.py | 43 +++++++++++++++++++++++-
 3 files changed, 109 insertions(+), 33 deletions(-)
 create mode 100644 aurweb/packages/validate.py

diff --git a/aurweb/packages/validate.py b/aurweb/packages/validate.py
new file mode 100644
index 00000000..e730e98b
--- /dev/null
+++ b/aurweb/packages/validate.py
@@ -0,0 +1,34 @@
+from typing import Any, Dict
+
+from aurweb import db, models
+from aurweb.exceptions import ValidationError
+
+
+def request(pkgbase: models.PackageBase,
+            type: str, comments: str, merge_into: str,
+            context: Dict[str, Any]) -> None:
+    if not comments:
+        raise ValidationError(["The comment field must not be empty."])
+
+    if type == "merge":
+        # Perform merge-related checks.
+        if not merge_into:
+            # TODO: This error needs to be translated.
+            raise ValidationError(
+                ['The "Merge into" field must not be empty.'])
+
+        target = db.query(models.PackageBase).filter(
+            models.PackageBase.Name == merge_into
+        ).first()
+        if not target:
+            # TODO: This error needs to be translated.
+            raise ValidationError([
+                "The package base you want to merge into does not exist."
+            ])
+
+        db.refresh(target)
+        if target.ID == pkgbase.ID:
+            # TODO: This error needs to be translated.
+            raise ValidationError([
+                "You cannot merge a package base into itself."
+            ])
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index c8ceb275..dfb8e108 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -11,9 +11,11 @@ import aurweb.packages.util
 
 from aurweb import db, defaults, l10n, logging, models, util
 from aurweb.auth import auth_required
+from aurweb.exceptions import ValidationError
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
 from aurweb.models.request_type import DELETION_ID, MERGE, MERGE_ID
+from aurweb.packages import validate
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, get_pkgreq_by_id, query_notified, query_voted
 from aurweb.scripts import notify, popupdate
@@ -153,7 +155,7 @@ def delete_package(deleter: models.User, package: models.Package):
         with db.begin():
             pkgreq = create_request_if_missing(
                 requests, reqtype, deleter, package)
-        db.refresh(pkgreq)
+            pkgreq.Status = ACCEPTED_ID
 
         bases_to_delete.append(package.PackageBase)
 
@@ -707,35 +709,13 @@ async def pkgbase_request_post(request: Request, name: str,
         return render_template(request, "pkgbase/request.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
-    if not comments:
-        context["errors"] = ["The comment field must not be empty."]
+    try:
+        validate.request(pkgbase, type, comments, merge_into, context)
+    except ValidationError as exc:
+        logger.error(f"Request Validation Error: {str(exc.data)}")
+        context["errors"] = exc.data
         return render_template(request, "pkgbase/request.html", context)
 
-    if type == "merge":
-        # Perform merge-related checks.
-        if not merge_into:
-            # TODO: This error needs to be translated.
-            context["errors"] = ['The "Merge into" field must not be empty.']
-            return render_template(request, "pkgbase/request.html", context)
-
-        target = db.query(models.PackageBase).filter(
-            models.PackageBase.Name == merge_into
-        ).first()
-        if not target:
-            # TODO: This error needs to be translated.
-            context["errors"] = [
-                "The package base you want to merge into does not exist."
-            ]
-            return render_template(request, "pkgbase/request.html", context)
-
-        db.refresh(target)
-        if target.ID == pkgbase.ID:
-            # TODO: This error needs to be translated.
-            context["errors"] = [
-                "You cannot merge a package base into itself."
-            ]
-            return render_template(request, "pkgbase/request.html", context)
-
     # All good. Create a new PackageRequest based on the given type.
     now = int(datetime.utcnow().timestamp())
     reqtype = db.query(models.RequestType).filter(
@@ -748,16 +728,37 @@ async def pkgbase_request_post(request: Request, name: str,
                            PackageBase=pkgbase,
                            PackageBaseName=pkgbase.Name,
                            MergeBaseName=merge_into,
-                           Comments=comments, ClosureComment=str())
+                           Comments=comments,
+                           ClosureComment=str())
 
-    # Prepare notification object.
     conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-    notify_ = notify.RequestOpenNotification(
+    # Prepare notification object.
+    notif = notify.RequestOpenNotification(
         conn, request.user.ID, pkgreq.ID, reqtype.Name,
         pkgreq.PackageBase.ID, merge_into=merge_into or None)
 
     # Send the notification now that we're out of the DB scope.
-    notify_.send()
+    notif.send()
+
+    auto_orphan_age = aurweb.config.getint("options", "auto_orphan_age")
+    auto_delete_age = aurweb.config.getint("options", "auto_delete_age")
+
+    flagged = pkgbase.OutOfDateTS and pkgbase.OutOfDateTS >= auto_orphan_age
+    is_maintainer = pkgbase.Maintainer == request.user
+    outdated = now - pkgbase.SubmittedTS <= auto_delete_age
+
+    if type == "orphan" and flagged:
+        with db.begin():
+            pkgbase.Maintainer = None
+            pkgreq.Status = ACCEPTED_ID
+        db.refresh(pkgreq)
+        notif = notify.RequestCloseNotification(
+            conn, request.user.ID, pkgreq.ID, pkgreq.status_display())
+        notif.send()
+    elif type == "deletion" and is_maintainer and outdated:
+        packages = pkgbase.packages.all()
+        for package in packages:
+            delete_package(request.user, package)
 
     # Redirect the submitting user to /packages.
     return RedirectResponse("/packages",
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 02c22d9d..64ee38d0 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -10,7 +10,7 @@ import pytest
 from fastapi.testclient import TestClient
 from sqlalchemy import and_
 
-from aurweb import asgi, db, defaults
+from aurweb import asgi, config, db, defaults
 from aurweb.models import License, PackageLicense
 from aurweb.models.account_type import USER_ID, AccountType
 from aurweb.models.dependency_type import DependencyType
@@ -1536,6 +1536,24 @@ def test_pkgbase_request_post_deletion(client: TestClient, user: User,
     assert pkgreq.Comments == "We want to delete this."
 
 
+def test_pkgbase_request_post_maintainer_deletion(
+        client: TestClient, maintainer: User, package: Package):
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "deletion",
+            "comments": "We want to delete this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = db.query(PackageRequest).filter(
+        PackageRequest.PackageBaseName == pkgbasename
+    ).first()
+    assert pkgreq.Status == ACCEPTED_ID
+
+
 def test_pkgbase_request_post_orphan(client: TestClient, user: User,
                                      package: Package):
     endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
@@ -1556,6 +1574,29 @@ def test_pkgbase_request_post_orphan(client: TestClient, user: User,
     assert pkgreq.Comments == "We want to disown this."
 
 
+def test_pkgbase_request_post_auto_orphan(client: TestClient, user: User,
+                                          package: Package):
+    now = int(datetime.utcnow().timestamp())
+    auto_orphan_age = config.getint("options", "auto_orphan_age")
+    with db.begin():
+        package.PackageBase.OutOfDateTS = now - auto_orphan_age - 1
+
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "orphan",
+            "comments": "We want to disown this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = db.query(PackageRequest).filter(
+        PackageRequest.PackageBaseID == package.PackageBase.ID
+    ).first()
+    assert pkgreq is not None
+    assert pkgreq.Status == ACCEPTED_ID
+
+
 def test_pkgbase_request_post_merge(client: TestClient, user: User,
                                     package: Package):
     with db.begin():

From f897411ddf7849123a3df72ae841b27a81bd12bf Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 18 Nov 2021 21:17:40 -0800
Subject: [PATCH 596/844] change(fastapi): let conftest bypass create database
 errors

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/conftest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/conftest.py b/test/conftest.py
index 47d9ca4b..aa44831a 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -43,6 +43,7 @@ from filelock import FileLock
 from sqlalchemy import create_engine
 from sqlalchemy.engine import URL
 from sqlalchemy.engine.base import Engine
+from sqlalchemy.exc import OperationalError
 from sqlalchemy.orm import scoped_session
 
 import aurweb.config
@@ -98,7 +99,10 @@ def _create_database(engine: Engine, dbname: str) -> None:
     :param dbname: Database name to create
     """
     conn = engine.connect()
-    conn.execute(f"CREATE DATABASE {dbname}")
+    try:
+        conn.execute(f"CREATE DATABASE {dbname}")
+    except OperationalError:  # pragma: no cover
+        pass
     conn.close()
     initdb.run(AlembicArgs)
 

From 008a8824ceb7f243f58c7d228f7cd9c1152d7386 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 13:19:34 -0800
Subject: [PATCH 597/844] housekeep(fastapi): simplify
 package_base_comaintainers_post

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py    | 88 ++++++++++++++++++++++++++++++++++++--
 aurweb/routers/packages.py | 73 ++-----------------------------
 2 files changed, 88 insertions(+), 73 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 78f5bf18..7c48f4e4 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -4,13 +4,14 @@ from typing import Dict, List, Union
 
 import orjson
 
-from fastapi import HTTPException
+from fastapi import HTTPException, Request
 from sqlalchemy import and_, orm
 
-from aurweb import db, models
+from aurweb import db, l10n, models, util
 from aurweb.models.official_provider import OFFICIAL_BASE
 from aurweb.models.relation_type import PROVIDES_ID
 from aurweb.redis import redis_connection
+from aurweb.scripts import notify
 from aurweb.templates import register_filter
 
 
@@ -223,6 +224,85 @@ def query_notified(query: List[models.Package],
     ).filter(
         models.PackageNotification.UserID == user.ID
     )
-    for notify in notified:
-        output[notify.PackageBase.ID] = True
+    for notif in notified:
+        output[notif.PackageBase.ID] = True
     return output
+
+
+def remove_comaintainers(pkgbase: models.PackageBase,
+                         usernames: List[str]) -> None:
+    """
+    Remove comaintainers from `pkgbase`.
+
+    :param pkgbase: PackageBase instance
+    :param usernames: Iterable of username strings
+    :return: None
+    """
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    notifications = []
+    with db.begin():
+        for username in usernames:
+            # We know that the users we passed here are in the DB.
+            # No need to check for their existence.
+            comaintainer = pkgbase.comaintainers.join(models.User).filter(
+                models.User.Username == username
+            ).first()
+            notifications.append(
+                notify.ComaintainerRemoveNotification(
+                    conn, comaintainer.User.ID, pkgbase.ID
+                )
+            )
+            db.delete(comaintainer)
+
+    # Send out notifications if need be.
+    util.apply_all(notifications, lambda n: n.send())
+
+
+def add_comaintainers(request: Request, pkgbase: models.PackageBase,
+                      priority: int, usernames: List[str]) -> None:
+    """
+    Add comaintainers to `pkgbase`.
+
+    :param request: FastAPI request
+    :param pkgbase: PackageBase instance
+    :param priority: Initial priority value
+    :param usernames: Iterable of username strings
+    :return: None on success, an error string on failure
+    """
+
+    # First, perform a check against all usernames given; for each
+    # username, add its related User object to memo.
+    _ = l10n.get_translator_for_request(request)
+    memo = {}
+    for username in usernames:
+        user = db.query(models.User).filter(
+            models.User.Username == username).first()
+        if not user:
+            return _("Invalid user name: %s") % username
+        memo[username] = user
+
+    # Alright, now that we got past the check, add them all to the DB.
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+    notifications = []
+    with db.begin():
+        for username in usernames:
+            user = memo.get(username)
+            if pkgbase.Maintainer == user:
+                # Already a maintainer. Move along.
+                continue
+
+            # If we get here, our user model object is in the memo.
+            comaintainer = db.create(
+                models.PackageComaintainer,
+                PackageBase=pkgbase,
+                User=user,
+                Priority=priority)
+            priority += 1
+
+            notifications.append(
+                notify.ComaintainerAddNotification(
+                    conn, comaintainer.User.ID, pkgbase.ID)
+            )
+
+    # Send out notifications.
+    util.apply_all(notifications, lambda n: n.send())
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index dfb8e108..23f44ee3 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -15,6 +15,7 @@ from aurweb.exceptions import ValidationError
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
 from aurweb.models.request_type import DELETION_ID, MERGE, MERGE_ID
+from aurweb.packages import util as pkgutil
 from aurweb.packages import validate
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, get_pkgreq_by_id, query_notified, query_voted
@@ -531,28 +532,6 @@ async def package_base_comaintainers(request: Request, name: str) -> Response:
     return render_template(request, "pkgbase/comaintainers.html", context)
 
 
-def remove_users(pkgbase, usernames):
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-    notifications = []
-    with db.begin():
-        for username in usernames:
-            # We know that the users we passed here are in the DB.
-            # No need to check for their existence.
-            comaintainer = pkgbase.comaintainers.join(models.User).filter(
-                models.User.Username == username
-            ).first()
-            notifications.append(
-                notify.ComaintainerRemoveNotification(
-                    conn, comaintainer.User.ID, pkgbase.ID
-                )
-            )
-            db.delete(comaintainer)
-
-    # Send out notifications if need be.
-    for notify_ in notifications:
-        notify_.send()
-
-
 @router.post("/pkgbase/{name}/comaintainers")
 @auth_required(True, redirect="/pkgbase/{name}/comaintainers")
 async def package_base_comaintainers_post(
@@ -573,7 +552,7 @@ async def package_base_comaintainers_post(
     users.remove(str())  # Remove any empty strings from the set.
     records = {c.User.Username for c in pkgbase.comaintainers}
 
-    remove_users(pkgbase, records.difference(users))
+    pkgutil.remove_comaintainers(pkgbase, records.difference(users))
 
     # Default priority (lowest value; most preferred).
     priority = 1
@@ -590,52 +569,8 @@ async def package_base_comaintainers_post(
     if last_priority:
         priority = last_priority.Priority + 1
 
-    def add_users(usernames):
-        """ Add users as comaintainers to pkgbase.
-
-        :param usernames: An iterable of username strings
-        :return: None on success, an error string on failure. """
-        nonlocal request, pkgbase, priority
-
-        # First, perform a check against all usernames given; for each
-        # username, add its related User object to memo.
-        _ = l10n.get_translator_for_request(request)
-        memo = {}
-        for username in usernames:
-            user = db.query(models.User).filter(
-                models.User.Username == username).first()
-            if not user:
-                return _("Invalid user name: %s") % username
-            memo[username] = user
-
-        # Alright, now that we got past the check, add them all to the DB.
-        conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-        notifications = []
-        with db.begin():
-            for username in usernames:
-                user = memo.get(username)
-                if pkgbase.Maintainer == user:
-                    # Already a maintainer. Move along.
-                    continue
-
-                # If we get here, our user model object is in the memo.
-                comaintainer = db.create(
-                    models.PackageComaintainer,
-                    PackageBase=pkgbase,
-                    User=user,
-                    Priority=priority)
-                priority += 1
-
-                notifications.append(
-                    notify.ComaintainerAddNotification(
-                        conn, comaintainer.User.ID, pkgbase.ID)
-                )
-
-        # Send out notifications.
-        for notify_ in notifications:
-            notify_.send()
-
-    error = add_users(users.difference(records))
+    error = pkgutil.add_comaintainers(request, pkgbase, priority,
+                                      users.difference(records))
     if error:
         context = make_context(request, "Manage Co-maintainers")
         context["pkgbase"] = pkgbase

From 0b5d08801615c3afa604d15d0f5db4f03d600b3d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 13:18:48 -0800
Subject: [PATCH 598/844] fix(fastapi): catch ProgrammingError instead of
 OperationalError in conftest

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/conftest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index aa44831a..db2e5997 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -43,7 +43,7 @@ from filelock import FileLock
 from sqlalchemy import create_engine
 from sqlalchemy.engine import URL
 from sqlalchemy.engine.base import Engine
-from sqlalchemy.exc import OperationalError
+from sqlalchemy.exc import ProgrammingError
 from sqlalchemy.orm import scoped_session
 
 import aurweb.config
@@ -101,7 +101,7 @@ def _create_database(engine: Engine, dbname: str) -> None:
     conn = engine.connect()
     try:
         conn.execute(f"CREATE DATABASE {dbname}")
-    except OperationalError:  # pragma: no cover
+    except ProgrammingError:  # pragma: no cover
         pass
     conn.close()
     initdb.run(AlembicArgs)

From 191198ca41a10358804a5d1cdc37a35ca9be7bd6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 13:31:09 -0800
Subject: [PATCH 599/844] housekeep(fastapi): simplify aurweb.spawn.stop()

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/spawn.py | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 6d553dde..568a8a1d 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -18,6 +18,8 @@ import tempfile
 import time
 import urllib
 
+from typing import Iterable, List
+
 import aurweb.config
 import aurweb.schema
 
@@ -127,17 +129,15 @@ def start():
     spawn_child(["nginx", "-p", temporary_dir, "-c", generate_nginx_config()])
 
 
-def stop():
+def _kill_children(children: Iterable, exceptions: List[Exception] = []) \
+        -> List[Exception]:
     """
-    Stop all the child processes.
+    Kill each process found in `children`.
 
-    If an exception occurs during the process, the process continues anyway
-    because we don’t want to leave runaway processes around, and all the
-    exceptions are finally raised as a single ProcessExceptions.
+    :param children: Iterable of child processes
+    :param exceptions: Exception memo
+    :return: `exceptions`
     """
-    global children
-    atexit.unregister(stop)
-    exceptions = []
     for p in children:
         try:
             p.terminate()
@@ -145,6 +145,18 @@ def stop():
                 print(f":: Sent SIGTERM to {p.args}", file=sys.stderr)
         except Exception as e:
             exceptions.append(e)
+    return exceptions
+
+
+def _wait_for_children(children: Iterable, exceptions: List[Exception] = []) \
+        -> List[Exception]:
+    """
+    Wait for each process to end found in `children`.
+
+    :param children: Iterable of child processes
+    :param exceptions: Exception memo
+    :return: `exceptions`
+    """
     for p in children:
         try:
             rc = p.wait()
@@ -154,6 +166,24 @@ def stop():
                 raise Exception(f"Process {p.args} exited with {rc}")
         except Exception as e:
             exceptions.append(e)
+    return exceptions
+
+
+def stop() -> None:
+    """
+    Stop all the child processes.
+
+    If an exception occurs during the process, the process continues anyway
+    because we don’t want to leave runaway processes around, and all the
+    exceptions are finally raised as a single ProcessExceptions.
+
+    :raises: ProcessException
+    :return: None
+    """
+    global children
+    atexit.unregister(stop)
+    exceptions = _kill_children(children)
+    exceptions = _wait_for_children(children, exceptions)
     children = []
     if exceptions:
         raise ProcessExceptions("Errors terminating the child processes:",

From 82ca4ad9a0c399e25a2369509df005ba5a5c6860 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 15:33:19 -0800
Subject: [PATCH 600/844] feat: check php configuration in aurweb.spawn

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/spawn.py | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 568a8a1d..ecb759a5 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -23,11 +23,16 @@ from typing import Iterable, List
 import aurweb.config
 import aurweb.schema
 
+from aurweb.exceptions import AurwebException
+
 children = []
 temporary_dir = None
 verbosity = 0
 asgi_backend = ''
 
+PHP_BINARY = os.environ.get("PHP_BINARY", "php")
+PHP_MODULES = ["pdo_mysql", "pdo_sqlite"]
+
 
 class ProcessExceptions(Exception):
     """
@@ -42,6 +47,35 @@ class ProcessExceptions(Exception):
         super().__init__("\n- ".join(messages))
 
 
+def validate_php_config() -> None:
+    """
+    Perform a validation check against PHP_BINARY's configuration.
+
+    AurwebException is raised here if checks fail to pass. We require
+    the 'pdo_mysql' and 'pdo_sqlite' modules to be enabled.
+
+    :raises: AurwebException
+    :return: None
+    """
+    try:
+        proc = subprocess.Popen([PHP_BINARY, "-m"],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE)
+        out, _ = proc.communicate()
+    except FileNotFoundError:
+        raise AurwebException(f"Unable to locate the '{PHP_BINARY}' "
+                              "executable.")
+
+    assert proc.returncode == 0, ("Received non-zero error code "
+                                  f"{proc.returncode} from '{PHP_BINARY}'.")
+
+    modules = out.decode().splitlines()
+    for module in PHP_MODULES:
+        if module not in modules:
+            raise AurwebException(
+                f"PHP does not have the '{module}' module enabled.")
+
+
 def generate_nginx_config():
     """
     Generate an nginx configuration based on aurweb's configuration.
@@ -199,6 +233,13 @@ if __name__ == '__main__':
     parser.add_argument('-b', '--backend', choices=['hypercorn', 'uvicorn'], default='hypercorn',
                         help='asgi backend used to launch the python server')
     args = parser.parse_args()
+
+    try:
+        validate_php_config()
+    except AurwebException as exc:
+        print(f"error: {str(exc)}")
+        sys.exit(1)
+
     verbosity = args.verbose
     asgi_backend = args.backend
     with tempfile.TemporaryDirectory(prefix="aurweb-") as tmpdirname:

From 47d0df76e6f377a360903f48a96bb32e54884dfc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 15:37:47 -0800
Subject: [PATCH 601/844] feat: support gunicorn in aurweb.spawn

This also comes with a -w|--workers argument that allows
the caller to set the number of gunicorn workers.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/spawn.py | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index ecb759a5..5b4dbe94 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -29,6 +29,7 @@ children = []
 temporary_dir = None
 verbosity = 0
 asgi_backend = ''
+workers = 1
 
 PHP_BINARY = os.environ.get("PHP_BINARY", "php")
 PHP_MODULES = ["pdo_mysql", "pdo_sqlite"]
@@ -152,12 +153,25 @@ def start():
     spawn_child(["php", "-S", php_address, "-t", htmldir])
 
     # FastAPI
-    host, port = aurweb.config.get("fastapi", "bind_address").rsplit(":", 1)
-    if asgi_backend == "hypercorn":
-        portargs = ["-b", f"{host}:{port}"]
-    elif asgi_backend == "uvicorn":
-        portargs = ["--host", host, "--port", port]
-    spawn_child(["python", "-m", asgi_backend] + portargs + ["aurweb.asgi:app"])
+    fastapi_host, fastapi_port = aurweb.config.get(
+        "fastapi", "bind_address").rsplit(":", 1)
+
+    # Logging config.
+    aurwebdir = aurweb.config.get("options", "aurwebdir")
+    fastapi_log_config = os.path.join(aurwebdir, "logging.conf")
+
+    backend_args = {
+        "hypercorn": ["-b", f"{fastapi_host}:{fastapi_port}"],
+        "uvicorn": ["--host", fastapi_host, "--port", fastapi_port],
+        "gunicorn": ["--bind", f"{fastapi_host}:{fastapi_port}",
+                     "-k", "uvicorn.workers.UvicornWorker",
+                     "-w", str(workers)]
+    }
+    backend_args = backend_args.get(asgi_backend)
+    spawn_child([
+        "python", "-m", asgi_backend,
+        "--log-config", fastapi_log_config,
+    ] + backend_args + ["aurweb.asgi:app"])
 
     # nginx
     spawn_child(["nginx", "-p", temporary_dir, "-c", generate_nginx_config()])
@@ -230,8 +244,11 @@ if __name__ == '__main__':
         description='Start aurweb\'s test server.')
     parser.add_argument('-v', '--verbose', action='count', default=0,
                         help='increase verbosity')
-    parser.add_argument('-b', '--backend', choices=['hypercorn', 'uvicorn'], default='hypercorn',
+    choices = ['hypercorn', 'gunicorn', 'uvicorn']
+    parser.add_argument('-b', '--backend', choices=choices, default='uvicorn',
                         help='asgi backend used to launch the python server')
+    parser.add_argument("-w", "--workers", default=1, type=int,
+                        help="number of workers to use in gunicorn")
     args = parser.parse_args()
 
     try:
@@ -242,6 +259,7 @@ if __name__ == '__main__':
 
     verbosity = args.verbose
     asgi_backend = args.backend
+    workers = args.workers
     with tempfile.TemporaryDirectory(prefix="aurweb-") as tmpdirname:
         temporary_dir = tmpdirname
         start()

From 19191fa8b56c47d256b2c8992853d96f82cabc5a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 15:38:20 -0800
Subject: [PATCH 602/844] fix: update nginx config in aurweb.spawn

Host a specific FastAPI nginx frontend as well as a PHP
nginx frontend, configurable by the (PHP|FASTAPI)_NGINX_PORT
environment variables.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/spawn.py | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/aurweb/spawn.py b/aurweb/spawn.py
index 5b4dbe94..46f2f021 100644
--- a/aurweb/spawn.py
+++ b/aurweb/spawn.py
@@ -16,7 +16,6 @@ import subprocess
 import sys
 import tempfile
 import time
-import urllib
 
 from typing import Iterable, List
 
@@ -33,6 +32,8 @@ workers = 1
 
 PHP_BINARY = os.environ.get("PHP_BINARY", "php")
 PHP_MODULES = ["pdo_mysql", "pdo_sqlite"]
+PHP_NGINX_PORT = int(os.environ.get("PHP_NGINX_PORT", 8001))
+FASTAPI_NGINX_PORT = int(os.environ.get("FASTAPI_NGINX_PORT", 8002))
 
 
 class ProcessExceptions(Exception):
@@ -83,8 +84,10 @@ def generate_nginx_config():
     The file is generated under `temporary_dir`.
     Returns the path to the created configuration file.
     """
-    aur_location = aurweb.config.get("options", "aur_location")
-    aur_location_parts = urllib.parse.urlsplit(aur_location)
+    php_bind = aurweb.config.get("php", "bind_address")
+    php_host = php_bind.split(":")[0]
+    fastapi_bind = aurweb.config.get("fastapi", "bind_address")
+    fastapi_host = fastapi_bind.split(":")[0]
     config_path = os.path.join(temporary_dir, "nginx.conf")
     config = open(config_path, "w")
     # We double nginx's braces because they conflict with Python's f-strings.
@@ -101,12 +104,23 @@ def generate_nginx_config():
             uwsgi_temp_path {os.path.join(temporary_dir, "uwsgi")};
             scgi_temp_path {os.path.join(temporary_dir, "scgi")};
             server {{
-                listen {aur_location_parts.netloc};
+                listen {php_host}:{PHP_NGINX_PORT};
                 location / {{
-                    proxy_pass http://{aurweb.config.get("php", "bind_address")};
+                    proxy_pass http://{php_bind};
                 }}
-                location /sso {{
-                    proxy_pass http://{aurweb.config.get("fastapi", "bind_address")};
+            }}
+            server {{
+                listen {fastapi_host}:{FASTAPI_NGINX_PORT};
+                location / {{
+                    try_files $uri @proxy_to_app;
+                }}
+                location @proxy_to_app {{
+                    proxy_set_header Host $http_host;
+                    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+                    proxy_set_header X-Forwarded-Proto $scheme;
+                    proxy_redirect off;
+                    proxy_buffering off;
+                    proxy_pass http://{fastapi_bind};
                 }}
             }}
         }}
@@ -149,6 +163,7 @@ def start():
 
     # PHP
     php_address = aurweb.config.get("php", "bind_address")
+    php_host = php_address.split(":")[0]
     htmldir = aurweb.config.get("php", "htmldir")
     spawn_child(["php", "-S", php_address, "-t", htmldir])
 
@@ -176,6 +191,18 @@ def start():
     # nginx
     spawn_child(["nginx", "-p", temporary_dir, "-c", generate_nginx_config()])
 
+    print(f"""
+ > Started nginx.
+ >
+ >      PHP backend: http://{php_address}
+ >  FastAPI backend: http://{fastapi_host}:{fastapi_port}
+ >
+ >     PHP frontend: http://{php_host}:{PHP_NGINX_PORT}
+ > FastAPI frontend: http://{fastapi_host}:{FASTAPI_NGINX_PORT}
+ >
+ > Frontends are hosted via nginx and should be preferred.
+""")
+
 
 def _kill_children(children: Iterable, exceptions: List[Exception] = []) \
         -> List[Exception]:

From 233d25b1c3434221871a7ccb04a7897c3213c33d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 15:39:15 -0800
Subject: [PATCH 603/844] feat: add test_spawn, an aurweb.spawn test

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_spawn.py | 149 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 test/test_spawn.py

diff --git a/test/test_spawn.py b/test/test_spawn.py
new file mode 100644
index 00000000..195eb897
--- /dev/null
+++ b/test/test_spawn.py
@@ -0,0 +1,149 @@
+import os
+import tempfile
+
+from typing import Tuple
+from unittest import mock
+
+import pytest
+
+import aurweb.config
+import aurweb.spawn
+
+from aurweb.exceptions import AurwebException
+
+# Some os.environ overrides we use in this suite.
+TEST_ENVIRONMENT = {
+    "PHP_NGINX_PORT": "8001",
+    "FASTAPI_NGINX_PORT": "8002"
+}
+
+
+class FakeProcess:
+    """ Fake a subprocess.Popen return object. """
+
+    returncode = 0
+    stdout = b''
+    stderr = b''
+
+    def __init__(self, *args, **kwargs):
+        """ We need this constructor to remain compatible with Popen. """
+        pass
+
+    def communicate(self) -> Tuple[bytes, bytes]:
+        return (self.stdout, self.stderr)
+
+    def terminate(self) -> None:
+        raise Exception("Fake termination.")
+
+    def wait(self) -> int:
+        return self.returncode
+
+
+class MockFakeProcess:
+    """ FakeProcess construction helper to be used in mocks. """
+
+    def __init__(self, return_code: int = 0, stdout: bytes = b'',
+                 stderr: bytes = b''):
+        self.returncode = return_code
+        self.stdout = stdout
+        self.stderr = stderr
+
+    def process(self, *args, **kwargs) -> FakeProcess:
+        proc = FakeProcess()
+        proc.returncode = self.returncode
+        proc.stdout = self.stdout
+        proc.stderr = self.stderr
+        return proc
+
+
+@mock.patch("aurweb.spawn.PHP_BINARY", "does-not-exist")
+def test_spawn():
+    match = r"^Unable to locate the '.*' executable\.$"
+    with pytest.raises(AurwebException, match=match):
+        aurweb.spawn.validate_php_config()
+
+
+@mock.patch("subprocess.Popen", side_effect=MockFakeProcess(1).process)
+def test_spawn_non_zero_php_binary(fake_process: FakeProcess):
+    match = r"^Received non-zero error code.*$"
+    with pytest.raises(AssertionError, match=match):
+        aurweb.spawn.validate_php_config()
+
+
+def test_spawn_missing_modules():
+    side_effect = MockFakeProcess(stdout=b"pdo_sqlite").process
+    with mock.patch("subprocess.Popen", side_effect=side_effect):
+        match = r"PHP does not have the 'pdo_mysql' module enabled\.$"
+        with pytest.raises(AurwebException, match=match):
+            aurweb.spawn.validate_php_config()
+
+    side_effect = MockFakeProcess(stdout=b"pdo_mysql").process
+    with mock.patch("subprocess.Popen", side_effect=side_effect):
+        match = r"PHP does not have the 'pdo_sqlite' module enabled\.$"
+        with pytest.raises(AurwebException, match=match):
+            aurweb.spawn.validate_php_config()
+
+
+@mock.patch.dict("os.environ", TEST_ENVIRONMENT)
+def test_spawn_generate_nginx_config():
+    ctx = tempfile.TemporaryDirectory()
+    with ctx and mock.patch("aurweb.spawn.temporary_dir", ctx.name):
+        aurweb.spawn.generate_nginx_config()
+        nginx_config_path = os.path.join(ctx.name, "nginx.conf")
+        with open(nginx_config_path) as f:
+            nginx_config = f.read().rstrip()
+
+    php_address = aurweb.config.get("php", "bind_address")
+    php_host = php_address.split(":")[0]
+    fastapi_address = aurweb.config.get("fastapi", "bind_address")
+    fastapi_host = fastapi_address.split(":")[0]
+    expected_content = [
+        f'listen {php_host}:{TEST_ENVIRONMENT.get("PHP_NGINX_PORT")}',
+        f"proxy_pass http://{php_address}",
+        f'listen {fastapi_host}:{TEST_ENVIRONMENT.get("FASTAPI_NGINX_PORT")}',
+        f"proxy_pass http://{fastapi_address}"
+    ]
+    for expected in expected_content:
+        assert expected in nginx_config
+
+
+@mock.patch("aurweb.spawn.asgi_backend", "uvicorn")
+@mock.patch("aurweb.spawn.verbosity", 1)
+@mock.patch("aurweb.spawn.workers", 1)
+def test_spawn_start_stop():
+    ctx = tempfile.TemporaryDirectory()
+    with ctx and mock.patch("aurweb.spawn.temporary_dir", ctx.name):
+        aurweb.spawn.start()
+        aurweb.spawn.stop()
+
+
+@mock.patch("aurweb.spawn.asgi_backend", "uvicorn")
+@mock.patch("aurweb.spawn.verbosity", 1)
+@mock.patch("aurweb.spawn.workers", 1)
+@mock.patch("aurweb.spawn.children", [MockFakeProcess().process()])
+def test_spawn_start_noop_with_children():
+    aurweb.spawn.start()
+
+
+@mock.patch("aurweb.spawn.asgi_backend", "uvicorn")
+@mock.patch("aurweb.spawn.verbosity", 1)
+@mock.patch("aurweb.spawn.workers", 1)
+@mock.patch("aurweb.spawn.children", [MockFakeProcess().process()])
+def test_spawn_stop_terminate_failure():
+    ctx = tempfile.TemporaryDirectory()
+    with ctx and mock.patch("aurweb.spawn.temporary_dir", ctx.name):
+        match = r"^Errors terminating the child processes"
+        with pytest.raises(aurweb.spawn.ProcessExceptions, match=match):
+            aurweb.spawn.stop()
+
+
+@mock.patch("aurweb.spawn.asgi_backend", "uvicorn")
+@mock.patch("aurweb.spawn.verbosity", 1)
+@mock.patch("aurweb.spawn.workers", 1)
+@mock.patch("aurweb.spawn.children", [MockFakeProcess(1).process()])
+def test_spawn_stop_wait_failure():
+    ctx = tempfile.TemporaryDirectory()
+    with ctx and mock.patch("aurweb.spawn.temporary_dir", ctx.name):
+        match = r"^Errors terminating the child processes"
+        with pytest.raises(aurweb.spawn.ProcessExceptions, match=match):
+            aurweb.spawn.stop()

From ba3ef742ceec27a2667d579ef78eb0fc36f1a364 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 18:40:32 -0800
Subject: [PATCH 604/844] feat(docker): allow user-customizable ssh host keys

There is a new ./data bind mount used here. If ssh_host_* keys are
in ./data when the git service starts, they'll override the
container-generated host keys.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.aur-dev.yml | 1 +
 docker/git-entrypoint.sh   | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index 1db306cc..484f353a 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -18,6 +18,7 @@ services:
     restart: always
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
+      - ./data:/aurweb/data
       - cache:/cache
 
   smartgit:
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index 296c1e47..4d15bcb9 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -60,6 +60,13 @@ sed -ri "s|^(ssh-cmdline) = .+|\1 = $ssh_cmdline|" $AUR_CONFIG_DEFAULTS
 # Setup SSH Keys.
 ssh-keygen -A
 
+# In docker-compose.aur-dev.yml, we bind ./data to /aurweb/data.
+# Production users wishing to include their own SSH keys should
+# supply them in ./data.
+if [ -d /aurweb/data ]; then
+    find /aurweb/data -type f -name 'ssh_host_*' -exec cp -vf "{}" /etc/ssh/ \;
+fi
+
 # Taken from INSTALL.
 mkdir -pv $GIT_REPO
 

From a1e547c057da8a2391c94a6d51c7c04fe37ad71b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 19:03:35 -0800
Subject: [PATCH 605/844] feat(docker): allow configurable SSH_CMDLINE in git
 service

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.aur-dev.yml | 4 ++++
 docker-compose.yml         | 1 +
 docker/git-entrypoint.sh   | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index 484f353a..62109deb 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -16,6 +16,10 @@ services:
 
   git:
     restart: always
+    environment:
+      - AUR_CONFIG=/aurweb/conf/config
+      # SSH_CMDLINE should be updated to production's ssh cmdline.
+      - SSH_CMDLINE=${SSH_CMDLINE:-ssh ssh://aur@localhost:2222}
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
       - ./data:/aurweb/data
diff --git a/docker-compose.yml b/docker-compose.yml
index c39d38bf..26b7d62c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -100,6 +100,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=/aurweb/conf/config
+      - SSH_CMDLINE=${SSH_CMDLINE:-ssh ssh://aur@localhost:2222}
     entrypoint: /docker/git-entrypoint.sh
     command: /docker/scripts/run-sshd.sh
     ports:
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index 4d15bcb9..cfa1879b 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -54,8 +54,8 @@ fi
 # Set some defaults needed for pathing and ssh uris.
 sed -ri "s|^(repo-path) = .+|\1 = /aurweb/aur.git/|" $AUR_CONFIG_DEFAULTS
 
-ssh_cmdline='ssh ssh://aur@localhost:2222'
-sed -ri "s|^(ssh-cmdline) = .+|\1 = $ssh_cmdline|" $AUR_CONFIG_DEFAULTS
+# SSH_CMDLINE can be provided via override in docker-compose.aur-dev.yml.
+sed -ri "s|^(ssh-cmdline) = .+$|\1 = ${SSH_CMDLINE}|" $AUR_CONFIG_DEFAULTS
 
 # Setup SSH Keys.
 ssh-keygen -A

From c7feecd4b83fde3aa0e1a1e392035be8fb32385e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 19:34:33 -0800
Subject: [PATCH 606/844] housekeep(docker): remove configuration regexes in
 the nginx service

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/nginx-entrypoint.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
index 63307948..a58e67b7 100755
--- a/docker/nginx-entrypoint.sh
+++ b/docker/nginx-entrypoint.sh
@@ -11,17 +11,6 @@ KEY=/cache/production.key.pem
 DEST_CERT=/etc/ssl/certs/web.cert.pem
 DEST_KEY=/etc/ssl/private/web.key.pem
 
-# Setup a config for our mysql db.
-cp -vf conf/config.dev conf/config
-sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-sed -ri 's/^(host) = .+/\1 = mariadb/' conf/config
-sed -ri 's/^(user) = .+/\1 = aur/' conf/config
-sed -ri 's/^;?(password) = .+/\1 = aur/' conf/config
-
-# Setup http(s) stuff.
-sed -ri "s|^(aur_location) = .+|\1 = https://localhost:8444|" conf/config
-sed -ri 's/^(disable_http_login) = .+/\1 = 1/' conf/config
-
 if [ -f "$CERT" ]; then
     cp -vf "$CERT" "$DEST_CERT"
     cp -vf "$KEY" "$DEST_KEY"

From 604901fe7475912705e040ab40a509c80d109289 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 20:00:53 -0800
Subject: [PATCH 607/844] fix(docker): fix nginx .gz match against cgit
 snapshots

This only deals with .gz files in the root of the request_uri
and now more. That is: /packages.gz goes through the nginx regex,
but now /cgit/.../snapshot/package.tar.gz is served by the cgit
block.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index c3ffd7fa..e51bd64f 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -94,7 +94,7 @@ http {
         ssl_certificate /etc/ssl/certs/web.cert.pem;
         ssl_certificate_key /etc/ssl/private/web.key.pem;
 
-        location ~ ^/.*\.gz$ {
+        location ~ ^/[^\/]+\.gz$ {
             # Override mime type to text/plain.
             types { text/plain gz; }
             default_type text/plain;

From d4d9f50b8f540062a3191e254a16f2e4497b7b8f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 20 Nov 2021 20:05:04 -0800
Subject: [PATCH 608/844] change(docker): use ./data instead of ./cache

For the `git` service, ./data is always used to provide an
optional overriding of ssh host keys. In aur-dev production
containers, most services which use the data mount use an
internal Docker `data` volume instead.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.aur-dev.yml    | 13 ++++++------
 docker-compose.override.yml   | 12 +++++------
 docker-compose.yml            |  6 +++---
 docker/ca-entrypoint.sh       | 38 +++++++++++++++++------------------
 docker/cgit-entrypoint.sh     |  2 +-
 docker/nginx-entrypoint.sh    |  8 ++++----
 docker/scripts/run-fastapi.sh | 12 +++++------
 docker/scripts/run-nginx.sh   |  2 +-
 docker/scripts/run-pytests.sh | 10 ++++-----
 docker/scripts/run-tests.sh   | 10 ++++-----
 10 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index 62109deb..ab4ff124 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   ca:
     volumes:
-      - cache:/cache
+      - data:/data
 
   memcached:
     restart: always
@@ -23,13 +23,12 @@ services:
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
       - ./data:/aurweb/data
-      - cache:/cache
 
   smartgit:
     restart: always
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
-      - cache:/cache
+      - data:/data
       - smartgit_run:/var/run/smartgit
 
   cgit-php:
@@ -48,7 +47,7 @@ services:
       - AURWEB_PHP_PREFIX=${AURWEB_PHP_PREFIX}
       - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
     volumes:
-      - cache:/cache
+      - data:/data
 
   fastapi:
     restart: always
@@ -60,13 +59,13 @@ services:
       - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
       - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
     volumes:
-      - cache:/cache
+      - data:/data
 
   nginx:
     restart: always
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
-      - cache:/cache
+      - data:/data
       - logs:/var/log/nginx
       - smartgit_run:/var/run/smartgit
 
@@ -75,5 +74,5 @@ volumes:
   mariadb_data: {} # Share /var/lib/mysql
   git_data: {} # Share aurweb/aur.git
   smartgit_run: {}
-  cache: {}
+  data: {}
   logs: {}
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 7349ac66..eae12a92 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -8,17 +8,17 @@ services:
 
   ca:
     volumes:
-      - ./cache:/cache
+      - ./data:/data
 
   git:
     volumes:
       - git_data:/aurweb/aur.git
-      - ./cache:/cache
+      - ./data:/aurweb/data
 
   smartgit:
     volumes:
       - git_data:/aurweb/aur.git
-      - ./cache:/cache
+      - ./data:/data
       - smartgit_run:/var/run/smartgit
     depends_on:
       mariadb:
@@ -26,7 +26,7 @@ services:
 
   php-fpm:
     volumes:
-      - ./cache:/cache
+      - ./data:/data
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
@@ -37,7 +37,7 @@ services:
 
   fastapi:
     volumes:
-      - ./cache:/cache
+      - ./data:/data
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
@@ -49,7 +49,7 @@ services:
   nginx:
     volumes:
       - git_data:/aurweb/aur.git
-      - ./cache:/cache
+      - ./data:/data
       - ./logs:/var/log/nginx
       - ./web/html:/aurweb/web/html
       - ./web/template:/aurweb/web/template
diff --git a/docker-compose.yml b/docker-compose.yml
index 26b7d62c..e3bfacdc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -276,7 +276,7 @@ services:
       mariadb_test:
         condition: service_healthy
     volumes:
-      - ./cache:/cache
+      - ./data:/data
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
@@ -304,7 +304,7 @@ services:
       - /tmp
     volumes:
       - mariadb_test_run:/var/run/mysqld
-      - ./cache:/cache
+      - ./data:/data
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
@@ -330,7 +330,7 @@ services:
         condition: service_healthy
     volumes:
       - mariadb_test_run:/var/run/mysqld
-      - ./cache:/cache
+      - ./data:/data
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
diff --git a/docker/ca-entrypoint.sh b/docker/ca-entrypoint.sh
index e95d267c..42d8bd14 100755
--- a/docker/ca-entrypoint.sh
+++ b/docker/ca-entrypoint.sh
@@ -1,58 +1,58 @@
 #!/bin/bash
 set -eou pipefail
 
-if [ -f /cache/ca.root.pem ]; then
+if [ -f /data/ca.root.pem ]; then
     echo "Already have certs, skipping."
     exit 0
 fi
 
 # Generate a new 2048-bit RSA key for the Root CA.
-openssl genrsa -des3 -out /cache/ca.key -passout pass:devca 2048
+openssl genrsa -des3 -out /data/ca.key -passout pass:devca 2048
 
 # Request and self-sign a new Root CA certificate, using
 # the RSA key. Output Root CA PEM-format certificate and key:
-# /cache/ca.root.pem and /cache/ca.key.pem
+# /data/ca.root.pem and /data/ca.key.pem
 openssl req -x509 -new -nodes -sha256 -days 1825 \
     -passin pass:devca \
     -subj "/C=US/ST=California/L=Authority/O=aurweb/CN=localhost" \
-    -in /cache/ca.key -out /cache/ca.root.pem -keyout /cache/ca.key.pem
+    -in /data/ca.key -out /data/ca.root.pem -keyout /data/ca.key.pem
 
 # Generate a new 2048-bit RSA key for a localhost server.
-openssl genrsa -out /cache/localhost.key 2048
+openssl genrsa -out /data/localhost.key 2048
 
 # Generate a Certificate Signing Request (CSR) for the localhost server
 # using the RSA key we generated above.
-openssl req -new -key /cache/localhost.key -passout pass:devca \
+openssl req -new -key /data/localhost.key -passout pass:devca \
     -subj "/C=US/ST=California/L=Server/O=aurweb/CN=localhost" \
-    -out /cache/localhost.csr
+    -out /data/localhost.csr
 
 # Get our CSR signed by our Root CA PEM-formatted certificate and key
-# to produce a fresh /cache/localhost.cert.pem PEM-formatted certificate.
-openssl x509 -req -in /cache/localhost.csr \
-    -CA /cache/ca.root.pem -CAkey /cache/ca.key.pem \
+# to produce a fresh /data/localhost.cert.pem PEM-formatted certificate.
+openssl x509 -req -in /data/localhost.csr \
+    -CA /data/ca.root.pem -CAkey /data/ca.key.pem \
     -CAcreateserial \
-    -out /cache/localhost.cert.pem \
+    -out /data/localhost.cert.pem \
     -days 825 -sha256 \
     -passin pass:devca \
     -extfile /docker/localhost.ext
 
-# Convert RSA key to a PEM-formatted key: /cache/localhost.key.pem
-openssl rsa -in /cache/localhost.key -text > /cache/localhost.key.pem
+# Convert RSA key to a PEM-formatted key: /data/localhost.key.pem
+openssl rsa -in /data/localhost.key -text > /data/localhost.key.pem
 
 # At the end here, our notable certificates and keys are:
-#   - /cache/ca.root.pem
-#   - /cache/ca.key.pem
-#   - /cache/localhost.key.pem
-#   - /cache/localhost.cert.pem
+#   - /data/ca.root.pem
+#   - /data/ca.key.pem
+#   - /data/localhost.key.pem
+#   - /data/localhost.cert.pem
 #
 # When running a server which uses the localhost certificate, a chain
 # should be used, starting with localhost.cert.pem:
-#   - cat /cache/localhost.cert.pem /cache/ca.root.pem > localhost.chain.pem
+#   - cat /data/localhost.cert.pem /data/ca.root.pem > localhost.chain.pem
 #
 # The Root CA (ca.root.pem) should be imported into browsers or
 # ca-certificates on machines wishing to verify localhost.
 #
 
-chmod 666 /cache/*
+chmod 666 /data/*
 
 exec "$@"
diff --git a/docker/cgit-entrypoint.sh b/docker/cgit-entrypoint.sh
index f9ca86c0..a44675e2 100755
--- a/docker/cgit-entrypoint.sh
+++ b/docker/cgit-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eou pipefail
 
-mkdir -p /var/cache/cgit
+mkdir -p /var/data/cgit
 
 cp -vf conf/cgitrc.proto /etc/cgitrc
 sed -ri "s|clone-prefix=.*|clone-prefix=${CGIT_CLONE_PREFIX}|" /etc/cgitrc
diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
index a58e67b7..6b9a6954 100755
--- a/docker/nginx-entrypoint.sh
+++ b/docker/nginx-entrypoint.sh
@@ -5,8 +5,8 @@ set -eou pipefail
 # user customization of the certificates that FastAPI uses.
 # Otherwise, fallback to localhost.{cert,key}.pem, generated by `ca`.
 
-CERT=/cache/production.cert.pem
-KEY=/cache/production.key.pem
+CERT=/data/production.cert.pem
+KEY=/data/production.key.pem
 
 DEST_CERT=/etc/ssl/certs/web.cert.pem
 DEST_KEY=/etc/ssl/private/web.key.pem
@@ -15,8 +15,8 @@ if [ -f "$CERT" ]; then
     cp -vf "$CERT" "$DEST_CERT"
     cp -vf "$KEY" "$DEST_KEY"
 else
-    cat /cache/localhost.cert.pem /cache/ca.root.pem > "$DEST_CERT"
-    cp -vf /cache/localhost.key.pem "$DEST_KEY"
+    cat /data/localhost.cert.pem /data/ca.root.pem > "$DEST_CERT"
+    cp -vf /data/localhost.key.pem "$DEST_KEY"
 fi
 
 cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index effc7fe4..ac54aedc 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-CERT=/cache/localhost.cert.pem
-KEY=/cache/localhost.key.pem
+CERT=/data/localhost.cert.pem
+KEY=/data/localhost.key.pem
 
 # If production.{cert,key}.pem exists, prefer them. This allows
 # user customization of the certificates that FastAPI uses.
-if [ -f /cache/production.cert.pem ]; then
-    CERT=/cache/production.cert.pem
+if [ -f /data/production.cert.pem ]; then
+    CERT=/data/production.cert.pem
 fi
-if [ -f /cache/production.key.pem ]; then
-    KEY=/cache/production.key.pem
+if [ -f /data/production.key.pem ]; then
+    KEY=/data/production.key.pem
 fi
 
 # By default, set FASTAPI_WORKERS to 2. In production, this should
diff --git a/docker/scripts/run-nginx.sh b/docker/scripts/run-nginx.sh
index 7780dae8..6ece3303 100755
--- a/docker/scripts/run-nginx.sh
+++ b/docker/scripts/run-nginx.sh
@@ -8,7 +8,7 @@ echo "     (cgit) : https://localhost:8444/cgit/"
 echo "  - PHP     : https://localhost:8443/"
 echo "     (cgit) : https://localhost:8443/cgit/"
 echo
-echo " Note: Copy root CA (./cache/ca.root.pem) to ca-certificates or browser."
+echo " Note: Copy root CA (./data/ca.root.pem) to ca-certificates or browser."
 echo
 echo " Thanks for using aurweb!"
 echo
diff --git a/docker/scripts/run-pytests.sh b/docker/scripts/run-pytests.sh
index b8f695df..2eadee42 100755
--- a/docker/scripts/run-pytests.sh
+++ b/docker/scripts/run-pytests.sh
@@ -32,10 +32,10 @@ pytest
 if [ $COVERAGE -eq 1 ]; then
     make -C test coverage
 
-    # /cache is mounted as a volume. Copy coverage into it.
+    # /data is mounted as a volume. Copy coverage into it.
     # Users can then sanitize the coverage locally in their
-    # aurweb root directory: ./util/fix-coverage ./cache/.coverage
-    rm -f /cache/.coverage
-    cp -v .coverage /cache/.coverage
-    chmod 666 /cache/.coverage
+    # aurweb root directory: ./util/fix-coverage ./data/.coverage
+    rm -f /data/.coverage
+    cp -v .coverage /data/.coverage
+    chmod 666 /data/.coverage
 fi
diff --git a/docker/scripts/run-tests.sh b/docker/scripts/run-tests.sh
index 45c7835f..a726c957 100755
--- a/docker/scripts/run-tests.sh
+++ b/docker/scripts/run-tests.sh
@@ -14,12 +14,12 @@ bash $dir/run-pytests.sh --no-coverage
 
 make -C test coverage
 
-# /cache is mounted as a volume. Copy coverage into it.
+# /data is mounted as a volume. Copy coverage into it.
 # Users can then sanitize the coverage locally in their
-# aurweb root directory: ./util/fix-coverage ./cache/.coverage
-rm -f /cache/.coverage
-cp -v .coverage /cache/.coverage
-chmod 666 /cache/.coverage
+# aurweb root directory: ./util/fix-coverage ./data/.coverage
+rm -f /data/.coverage
+cp -v .coverage /data/.coverage
+chmod 666 /data/.coverage
 
 # Run flake8 and isort checks.
 for dir in aurweb test migrations; do

From e8f4c9cf69161076a2cc71fcab060f664b327045 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 21 Nov 2021 00:51:05 -0800
Subject: [PATCH 609/844] fix(fastapi): remove aurweb logger definition

Both the root and aurweb loggers are included in output,
causing repeated log messages. Now, just rely on the
root logger for aurweb logging.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 logging.conf | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/logging.conf b/logging.conf
index ba41fb7b..310ac76e 100644
--- a/logging.conf
+++ b/logging.conf
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,aurweb,test,uvicorn,hypercorn,alembic
+keys=root,test,uvicorn,hypercorn,alembic
 
 [handlers]
 keys=simpleHandler,detailedHandler
@@ -9,13 +9,7 @@ keys=simpleFormatter,detailedFormatter
 
 [logger_root]
 level=INFO
-handlers=simpleHandler
-
-[logger_aurweb]
-level=DEBUG
 handlers=detailedHandler
-qualname=aurweb
-propagate=1
 
 [logger_test]
 level=DEBUG
@@ -43,13 +37,13 @@ propagate=0
 
 [handler_simpleHandler]
 class=StreamHandler
-level=DEBUG
+level=INFO
 formatter=simpleFormatter
 args=(sys.stdout,)
 
 [handler_detailedHandler]
 class=StreamHandler
-level=DEBUG
+level=INFO
 formatter=detailedFormatter
 args=(sys.stdout,)
 

From bc7bf9866ad1f7b3e0ccc9c7b00ffac5d6f72524 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 21 Nov 2021 00:48:53 -0800
Subject: [PATCH 610/844] docker: bind ./aurweb in cron service by default

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.aur-dev.yml | 6 ++++++
 docker-compose.yml         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index ab4ff124..4b522e56 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -41,6 +41,12 @@ services:
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
 
+  cron:
+    volumes:
+      # Exclude ./aurweb:/aurweb in production.
+      - mariadb_run:/var/run/mysqld
+      - archives:/var/lib/aurweb/archives
+
   php-fpm:
     restart: always
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index e3bfacdc..ea0e8d1b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,6 +176,7 @@ services:
       mariadb_init:
         condition: service_started
     volumes:
+      - ./aurweb:/aurweb/aurweb
       - mariadb_run:/var/run/mysqld
       - archives:/var/lib/aurweb/archives
 

From 41e0eaaece5df78b4f9abbb17c4ff702e854ab8a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 21 Nov 2021 21:43:14 -0800
Subject: [PATCH 611/844] fix(docker): force bind ports to localhost only

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ea0e8d1b..5ff031e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,7 +48,7 @@ services:
       test: "bash /docker/health/redis.sh"
       interval: 3s
     ports:
-      - "16379:6379"
+      - "127.0.0.1:16379:6379"
 
   mariadb:
     image: aurweb:latest
@@ -58,7 +58,7 @@ services:
     ports:
       # This will expose mariadbd on 127.0.0.1:13306 in the host.
       # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
-      - "13306:3306"
+      - "127.0.0.1:13306:3306"
     volumes:
       - mariadb_run:/var/run/mysqld # Bind socket in this volume.
       - mariadb_data:/var/lib/mysql
@@ -88,7 +88,7 @@ services:
     ports:
       # This will expose mariadbd on 127.0.0.1:13307 in the host.
       # Ex: `mysql -uaur -paur -h 127.0.0.1 -P 13306 aurweb`
-      - "13307:3306"
+      - "127.0.0.1:13307:3306"
     volumes:
       - mariadb_test_run:/var/run/mysqld # Bind socket in this volume.
     healthcheck:
@@ -104,7 +104,7 @@ services:
     entrypoint: /docker/git-entrypoint.sh
     command: /docker/scripts/run-sshd.sh
     ports:
-      - "2222:2222"
+      - "127.0.0.1:2222:2222"
     healthcheck:
       test: "bash /docker/health/sshd.sh"
       interval: 3s
@@ -141,7 +141,7 @@ services:
       git:
         condition: service_healthy
     ports:
-      - "13000:3000"
+      - "127.0.0.1:13000:3000"
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -161,7 +161,7 @@ services:
       git:
         condition: service_healthy
     ports:
-      - "13001:3000"
+      - "127.0.0.1:13001:3000"
     volumes:
       - git_data:/aurweb/aur.git
 
@@ -205,7 +205,7 @@ services:
       - mariadb_run:/var/run/mysqld
       - archives:/var/lib/aurweb/archives
     ports:
-      - "19000:9000"
+      - "127.0.0.1:19000:9000"
 
   fastapi:
     image: aurweb:latest
@@ -234,7 +234,7 @@ services:
     volumes:
       - mariadb_run:/var/run/mysqld
     ports:
-      - "18000:8000"
+      - "127.0.0.1:18000:8000"
 
   nginx:
     image: aurweb:latest
@@ -244,8 +244,8 @@ services:
     entrypoint: /docker/nginx-entrypoint.sh
     command: /docker/scripts/run-nginx.sh
     ports:
-      - "8443:8443" # PHP
-      - "8444:8444" # FastAPI
+      - "127.0.0.1:8443:8443" # PHP
+      - "127.0.0.1:8444:8444" # FastAPI
     healthcheck:
       test: "bash /docker/health/nginx.sh"
       interval: 3s

From 34747359ba599d2dda02a404d47a720b7363d367 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 21 Nov 2021 23:11:02 -0800
Subject: [PATCH 612/844] fix(docker): expose git service's 2222 through
 0.0.0.0

Other ports we use are locked to 127.0.0.1. The `git` service,
however, already promotes security in its sshd service and
can't really be abused from an external source. This simplifies
the need to forward to localhost if deploy targets want the sshd
to be available.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5ff031e4..acb5dd65 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -104,7 +104,7 @@ services:
     entrypoint: /docker/git-entrypoint.sh
     command: /docker/scripts/run-sshd.sh
     ports:
-      - "127.0.0.1:2222:2222"
+      - "2222:2222"
     healthcheck:
       test: "bash /docker/health/sshd.sh"
       interval: 3s

From e891d7c8e86b344af705580c9049d59570bed6f3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 10:18:02 -0800
Subject: [PATCH 613/844] change(docker): allow run-pytests to collect coverage

Additionally fix up the argument parsing to be a bit less
flexible.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/run-pytests.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/scripts/run-pytests.sh b/docker/scripts/run-pytests.sh
index 2eadee42..d8c093d5 100755
--- a/docker/scripts/run-pytests.sh
+++ b/docker/scripts/run-pytests.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -eou pipefail
 
 COVERAGE=1
 PARAMS=()
@@ -11,13 +10,13 @@ while [ $# -ne 0 ]; do
             COVERAGE=0
             shift
             ;;
-        -*)
-            echo "usage: $0 [--no-coverage] targets ..."
-            exit 1
+        clean)
+            rm -f .coverage
+            shift
             ;;
         *)
-            PARAMS+=("$key")
-            shift
+            echo "usage: $0 [--no-coverage] targets ..."
+            exit 1
             ;;
     esac
 done
@@ -30,7 +29,7 @@ pytest
 
 # By default, report coverage and move it into cache.
 if [ $COVERAGE -eq 1 ]; then
-    make -C test coverage
+    make -C test coverage || /bin/true
 
     # /data is mounted as a volume. Copy coverage into it.
     # Users can then sanitize the coverage locally in their

From 39fd3b891e4c3f86dad74ea8b66b516abdcf45e7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 21 Nov 2021 01:41:10 -0800
Subject: [PATCH 614/844] change: set -v for sh tests

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Makefile b/test/Makefile
index 4a8207f8..a6abc9de 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -26,6 +26,6 @@ clean:
 	rm -f ../.coverage
 
 $(T):
-	@echo "*** $@ ***"; $(SHELL) $@
+	@echo "*** $@ ***"; $(SHELL) $@ -v
 
 .PHONY: check coverage $(FOREIGN_TARGETS) clean $(T)

From 3b686c475d605309abc94d1655369ec4cf44deed Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 07:34:35 -0800
Subject: [PATCH 615/844] fix: default detailed loglevel to DEBUG

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 logging.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logging.conf b/logging.conf
index 310ac76e..3b96e827 100644
--- a/logging.conf
+++ b/logging.conf
@@ -43,7 +43,7 @@ args=(sys.stdout,)
 
 [handler_detailedHandler]
 class=StreamHandler
-level=INFO
+level=DEBUG
 formatter=detailedFormatter
 args=(sys.stdout,)
 

From 47d83244bbd415b769b151dc64de18c9b62568b9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 22:21:45 -0800
Subject: [PATCH 616/844] change(gitlab-ci): add 'fast-single-thread' tag to
 the test stage

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 739c9408..8980fa78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 image: archlinux:base-devel
-
 cache:
   key: system-v1
   paths:
@@ -13,6 +12,8 @@ variables:
 
 test:
   stage: test
+  tags:
+    - fast-single-thread
   before_script:
     - export PATH="$HOME/.poetry/bin:${PATH}"
     - ./docker/scripts/install-deps.sh

From 6bb002e70889777024384529f37907f595894bf2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 24 Nov 2021 21:23:01 -0800
Subject: [PATCH 617/844] fix: use correct u2f ssh key prefixes

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.defaults | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/config.defaults b/conf/config.defaults
index a04f21bc..dd9bfd2f 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -62,7 +62,9 @@ ECDSA = SHA256:L71Q91yHwmHPYYkJMDgj0xmUuw16qFOhJbBr1mzsiOI
 RSA = SHA256:Ju+yWiMb/2O+gKQ9RJCDqvRg7l+Q95KFAeqM5sr6l2s
 
 [auth]
-valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 sk-ssh-ecdsa@openssh.com sk-ssh-ed25519@openssh.com
+; For U2F key prefixes, see the following documentation from openssh:
+; https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.u2f
+valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 sk-ecdsa-sha2-nistp256@openssh.com sk-ecdsa-sha2-nistp256-cert-v01@openssh.com sk-ssh-ed25519@openssh.com sk-ssh-ed25519-cert-v01@openssh.com
 username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$
 git-serve-cmd = /usr/local/bin/aurweb-git-serve
 ssh-options = restrict

From 1aab9604010e9b58c7bed8586931841751bbab68 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 24 Nov 2021 21:28:29 -0800
Subject: [PATCH 618/844] fix: use corrent u2f ssh key prefixes

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 conf/config.defaults | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/config.defaults b/conf/config.defaults
index 68e235be..a589997b 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -72,7 +72,9 @@ ECDSA = SHA256:L71Q91yHwmHPYYkJMDgj0xmUuw16qFOhJbBr1mzsiOI
 RSA = SHA256:Ju+yWiMb/2O+gKQ9RJCDqvRg7l+Q95KFAeqM5sr6l2s
 
 [auth]
-valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 sk-ssh-ecdsa@openssh.com sk-ssh-ed25519@openssh.com
+; For U2F key prefixes, see the following documentation from openssh:
+; https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.u2f
+valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 sk-ecdsa-sha2-nistp256@openssh.com sk-ecdsa-sha2-nistp256-cert-v01@openssh.com sk-ssh-ed25519@openssh.com sk-ssh-ed25519-cert-v01@openssh.com
 username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$
 git-serve-cmd = /usr/bin/aurweb-git-serve
 ssh-options = restrict

From e558e979ff481148bb903ca21c7659b7ca43208d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 24 Nov 2021 21:28:49 -0800
Subject: [PATCH 619/844] fix(fastapi): check ssh key prefixes against
 configured valid-keytypes

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index b95fc6a3..62575c71 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -84,9 +84,8 @@ def valid_pgp_fingerprint(fp):
 
 
 def valid_ssh_pubkey(pk):
-    valid_prefixes = ("ssh-rsa", "ecdsa-sha2-nistp256",
-                      "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521",
-                      "ssh-ed25519")
+    valid_prefixes = aurweb.config.get("auth", "valid-keytypes")
+    valid_prefixes = set(valid_prefixes.split(" "))
 
     has_valid_prefix = False
     for prefix in valid_prefixes:

From b98159d5b90fe0fd609a694257bb25a4fa579b0e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 16:43:29 -0800
Subject: [PATCH 620/844] change(docker): use step-ca for CA + cert generation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile                        |   3 +-
 docker-compose.aur-dev.yml        |   3 +-
 docker-compose.override.yml       |  14 ---
 docker-compose.yml                |  14 ++-
 docker/ca-entrypoint.sh           | 163 +++++++++++++++++++++---------
 docker/health/ca.sh               |   2 +
 docker/nginx-entrypoint.sh        |   2 +-
 docker/scripts/install-deps.sh    |   2 +-
 docker/scripts/run-ca.sh          |   7 ++
 docker/scripts/update-step-config |  19 ++++
 10 files changed, 160 insertions(+), 69 deletions(-)
 create mode 100755 docker/health/ca.sh
 create mode 100755 docker/scripts/run-ca.sh
 create mode 100755 docker/scripts/update-step-config

diff --git a/Dockerfile b/Dockerfile
index 3c12cbf8..9af78c3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,8 @@ RUN /install-deps.sh
 
 # Copy Docker scripts
 COPY ./docker /docker
-COPY ./docker/scripts/*.sh /usr/local/bin/
+COPY ./docker/scripts/* /usr/local/bin/
+
 
 # Copy over all aurweb files.
 COPY . /aurweb
diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index 4b522e56..f27b2b19 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -70,9 +70,8 @@ services:
   nginx:
     restart: always
     volumes:
-      - ${GIT_DATA_DIR}:/aurweb/aur.git
       - data:/data
-      - logs:/var/log/nginx
+      - archives:/var/lib/aurweb/archives
       - smartgit_run:/var/run/smartgit
 
 volumes:
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index eae12a92..8c74f947 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -6,10 +6,6 @@ services:
       mariadb:
         condition: service_healthy
 
-  ca:
-    volumes:
-      - ./data:/data
-
   git:
     volumes:
       - git_data:/aurweb/aur.git
@@ -45,13 +41,3 @@ services:
       - ./web/template:/aurweb/web/template
       - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
-
-  nginx:
-    volumes:
-      - git_data:/aurweb/aur.git
-      - ./data:/data
-      - ./logs:/var/log/nginx
-      - ./web/html:/aurweb/web/html
-      - ./web/template:/aurweb/web/template
-      - ./web/lib:/aurweb/web/lib
-      - smartgit_run:/var/run/smartgit
diff --git a/docker-compose.yml b/docker-compose.yml
index acb5dd65..c1f93319 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,16 @@ services:
     image: aurweb:latest
     init: true
     entrypoint: /docker/ca-entrypoint.sh
-    command: echo
+    command: /docker/scripts/run-ca.sh
+    healthcheck:
+      test: "bash /docker/health/run-ca.sh"
+      interval: 3s
+    tmpfs:
+      - /tmp
+    volumes:
+      - ./docker:/docker
+      - ./data:/data
+      - step:/root/.step
 
   memcached:
     image: aurweb:latest
@@ -261,7 +270,9 @@ services:
       php-fpm:
         condition: service_healthy
     volumes:
+      - ./data:/data
       - archives:/var/lib/aurweb/archives
+      - smartgit_run:/var/run/smartgit
 
   sharness:
     image: aurweb:latest
@@ -347,3 +358,4 @@ volumes:
   git_data: {} # Share aurweb/aur.git
   smartgit_run: {}
   archives: {}
+  step: {}
diff --git a/docker/ca-entrypoint.sh b/docker/ca-entrypoint.sh
index 42d8bd14..d03efbbc 100755
--- a/docker/ca-entrypoint.sh
+++ b/docker/ca-entrypoint.sh
@@ -1,58 +1,123 @@
 #!/bin/bash
+# Initialize step-ca and request certificates from it.
+#
+# Certificates created by this service are meant to be used in
+# aurweb Docker's nginx service.
+#
+# If ./data/root_ca.crt is present, CA generation is skipped.
+# If ./data/${host}.{cert,key}.pem is available, host certificate
+# generation is skipped.
+#
 set -eou pipefail
 
-if [ -f /data/ca.root.pem ]; then
-    echo "Already have certs, skipping."
-    exit 0
+# /data-based variables.
+DATA_DIR="/data"
+DATA_ROOT_CA="$DATA_DIR/root_ca.crt"
+DATA_CERT="$DATA_DIR/localhost.cert.pem"
+DATA_CERT_KEY="$DATA_DIR/localhost.key.pem"
+
+# Host certificates requested from the CA (separated by spaces).
+DATA_CERT_HOSTS='localhost'
+
+# Local step paths and CA configuration values.
+STEP_DIR="$(step-cli path)"
+STEP_CA_CONFIG="$STEP_DIR/config/ca.json"
+STEP_CA_ADDR='127.0.0.1:8443'
+STEP_CA_URL='https://localhost:8443'
+STEP_CA_PROVISIONER='admin@localhost'
+
+# Password file used for both --password-file and --provisioner-password-file.
+STEP_PASSWD_FILE="$STEP_DIR/password.txt"
+
+# Hostnames supported by the CA.
+STEP_CA_NAME='aurweb'
+STEP_CA_DNS='localhost'
+
+make_password() {
+    # Create a random 20-length password and write it to $1.
+    openssl rand -hex 20 > $1
+}
+
+setup_step_ca() {
+    # Cleanup and setup step ca configuration.
+    rm -rf $STEP_DIR/*
+
+    # Initialize `step`
+    make_password "$STEP_PASSWD_FILE"
+    step-cli ca init \
+        --name="$STEP_CA_NAME" \
+        --dns="$STEP_CA_DNS" \
+        --address="$STEP_CA_ADDR" \
+        --password-file="$STEP_PASSWD_FILE" \
+        --provisioner="$STEP_CA_PROVISIONER" \
+        --provisioner-password-file="$STEP_PASSWD_FILE" \
+        --with-ca-url="$STEP_CA_URL"
+
+    # Update ca.json max TLS certificate duration to a year.
+    update-step-config "$STEP_CA_CONFIG"
+
+    # Install root_ca.crt as read/writable to /data/root_ca.crt.
+    install -m666 "$STEP_DIR/certs/root_ca.crt" "$DATA_ROOT_CA"
+}
+
+start_step_ca() {
+    # Start the step-ca web server.
+    step-ca "$STEP_CA_CONFIG" \
+        --password-file="$STEP_PASSWD_FILE" &
+    until printf "" 2>>/dev/null >>/dev/tcp/127.0.0.1/8443; do
+       sleep 1
+    done
+}
+
+kill_step_ca() {
+    # Stop the step-ca web server.
+    killall step-ca >/dev/null 2>&1 || /bin/true
+}
+
+install_step_ca() {
+    # Install step-ca certificate authority to the system.
+    step-cli certificate install "$STEP_DIR/certs/root_ca.crt"
+}
+
+step_cert_request() {
+    # Request a certificate from the step ca.
+    step-cli ca certificate \
+        --not-after=8800h \
+        --provisioner="$STEP_CA_PROVISIONER" \
+        --provisioner-password-file="$STEP_PASSWD_FILE" \
+        $1 $2 $3
+    chmod 666 /data/${1}.*.pem
+}
+
+if [ ! -f $DATA_ROOT_CA ]; then
+    setup_step_ca
+    install_step_ca
 fi
 
-# Generate a new 2048-bit RSA key for the Root CA.
-openssl genrsa -des3 -out /data/ca.key -passout pass:devca 2048
+# For all hosts separated by spaces in $DATA_CERT_HOSTS, perform a check
+# for their existence in /data and react accordingly.
+for host in $DATA_CERT_HOSTS; do
+    if [ -f /data/${host}.cert.pem ] && [ -f /data/${host}.key.pem ]; then
+        # Found an override. Move on to running the service after
+        # printing a notification to the user.
+        echo "Found '${host}.{cert,key}.pem' override, skipping..."
+        echo -n "Note: If you need to regenerate certificates, run "
+        echo '`rm -f data/*.{cert,key}.pem` before starting this service.'
+        exec "$@"
+    else
+        # Otherwise, we had a missing cert or key, so remove both.
+        rm -f /data/${host}.cert.pem
+        rm -f /data/${host}.key.pem
+    fi
+done
 
-# Request and self-sign a new Root CA certificate, using
-# the RSA key. Output Root CA PEM-format certificate and key:
-# /data/ca.root.pem and /data/ca.key.pem
-openssl req -x509 -new -nodes -sha256 -days 1825 \
-    -passin pass:devca \
-    -subj "/C=US/ST=California/L=Authority/O=aurweb/CN=localhost" \
-    -in /data/ca.key -out /data/ca.root.pem -keyout /data/ca.key.pem
+start_step_ca
+for host in $DATA_CERT_HOSTS; do
+    step_cert_request $host /data/${host}.cert.pem /data/${host}.key.pem
+done
+kill_step_ca
 
-# Generate a new 2048-bit RSA key for a localhost server.
-openssl genrsa -out /data/localhost.key 2048
-
-# Generate a Certificate Signing Request (CSR) for the localhost server
-# using the RSA key we generated above.
-openssl req -new -key /data/localhost.key -passout pass:devca \
-    -subj "/C=US/ST=California/L=Server/O=aurweb/CN=localhost" \
-    -out /data/localhost.csr
-
-# Get our CSR signed by our Root CA PEM-formatted certificate and key
-# to produce a fresh /data/localhost.cert.pem PEM-formatted certificate.
-openssl x509 -req -in /data/localhost.csr \
-    -CA /data/ca.root.pem -CAkey /data/ca.key.pem \
-    -CAcreateserial \
-    -out /data/localhost.cert.pem \
-    -days 825 -sha256 \
-    -passin pass:devca \
-    -extfile /docker/localhost.ext
-
-# Convert RSA key to a PEM-formatted key: /data/localhost.key.pem
-openssl rsa -in /data/localhost.key -text > /data/localhost.key.pem
-
-# At the end here, our notable certificates and keys are:
-#   - /data/ca.root.pem
-#   - /data/ca.key.pem
-#   - /data/localhost.key.pem
-#   - /data/localhost.cert.pem
-#
-# When running a server which uses the localhost certificate, a chain
-# should be used, starting with localhost.cert.pem:
-#   - cat /data/localhost.cert.pem /data/ca.root.pem > localhost.chain.pem
-#
-# The Root CA (ca.root.pem) should be imported into browsers or
-# ca-certificates on machines wishing to verify localhost.
-#
-
-chmod 666 /data/*
+# Set permissions to /data to rwx for everybody.
+chmod 777 /data
 
 exec "$@"
diff --git a/docker/health/ca.sh b/docker/health/ca.sh
new file mode 100755
index 00000000..3e4bbe8e
--- /dev/null
+++ b/docker/health/ca.sh
@@ -0,0 +1,2 @@
+
+exec printf "" 2>>/dev/null >>/dev/tcp/127.0.0.1/8443
diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
index 6b9a6954..1527cda7 100755
--- a/docker/nginx-entrypoint.sh
+++ b/docker/nginx-entrypoint.sh
@@ -15,7 +15,7 @@ if [ -f "$CERT" ]; then
     cp -vf "$CERT" "$DEST_CERT"
     cp -vf "$KEY" "$DEST_KEY"
 else
-    cat /data/localhost.cert.pem /data/ca.root.pem > "$DEST_CERT"
+    cat /data/localhost.cert.pem /data/root_ca.crt > "$DEST_CERT"
     cp -vf /data/localhost.key.pem "$DEST_KEY"
 fi
 
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index ad0157f8..372b6e0c 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -9,6 +9,6 @@ pacman -Syu --noconfirm --noprogressbar \
       mariadb mariadb-libs cgit-aurweb uwsgi uwsgi-plugin-cgi \
       php php-fpm memcached php-memcached python-pip pyalpm \
       python-srcinfo curl libeatmydata cronie python-poetry \
-      python-poetry-core
+      python-poetry-core step-cli step-ca
 
 exec "$@"
diff --git a/docker/scripts/run-ca.sh b/docker/scripts/run-ca.sh
new file mode 100755
index 00000000..1ef45ef7
--- /dev/null
+++ b/docker/scripts/run-ca.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+STEP_DIR="$(step-cli path)"
+STEP_PASSWD_FILE="$STEP_DIR/password.txt"
+STEP_CA_CONFIG="$STEP_DIR/config/ca.json"
+
+# Start the step-ca https server.
+exec step-ca "$STEP_CA_CONFIG" --password-file="$STEP_PASSWD_FILE"
diff --git a/docker/scripts/update-step-config b/docker/scripts/update-step-config
new file mode 100755
index 00000000..bbdb2680
--- /dev/null
+++ b/docker/scripts/update-step-config
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+import json
+import sys
+
+CA_CONFIG = sys.argv[1]
+
+with open(CA_CONFIG) as f:
+    data = json.load(f)
+
+if "authority" not in data:
+    data["authority"] = dict()
+if "claims" not in data["authority"]:
+    data["authority"]["claims"] = dict()
+
+# One year of certificate duration.
+data["authority"]["claims"] = {"maxTLSCertDuration": "8800h"}
+
+with open(CA_CONFIG, "w") as f:
+    json.dump(data, f)

From 759f18ea75a5581cefa5ca6fe323bdc56944f47a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 16:44:56 -0800
Subject: [PATCH 621/844] feat: add aurweb-config console script

This can be used to update config values for the entirety
of a config. When config values are set through this tool,
$AUR_CONFIG is overridden with a copy of the config file
with all sections and options found in $AUR_CONFIG
+ $AUR_CONFIG_DEFAULTS.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/config.py         |  12 ++++
 aurweb/scripts/config.py |  61 +++++++++++++++++++
 pyproject.toml           |   1 +
 test/test_config.py      | 125 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 199 insertions(+)
 create mode 100644 aurweb/scripts/config.py

diff --git a/aurweb/config.py b/aurweb/config.py
index aa111f15..0d0cf676 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -1,6 +1,8 @@
 import configparser
 import os
 
+from typing import Any
+
 # Publicly visible version of aurweb. This is used to display
 # aurweb versioning in the footer and must be maintained.
 # Todo: Make this dynamic/automated.
@@ -52,3 +54,13 @@ def getint(section, option, fallback=None):
 def get_section(section):
     if section in _get_parser().sections():
         return _get_parser()[section]
+
+
+def replace_key(section: str, option: str, value: Any) -> Any:
+    _get_parser().set(section, option, value)
+
+
+def save() -> None:
+    aur_config = os.environ.get("AUR_CONFIG", "/etc/aurweb/config")
+    with open(aur_config, "w") as fp:
+        _get_parser().write(fp)
diff --git a/aurweb/scripts/config.py b/aurweb/scripts/config.py
new file mode 100644
index 00000000..dd7bcf5f
--- /dev/null
+++ b/aurweb/scripts/config.py
@@ -0,0 +1,61 @@
+"""
+Perform an action on the aurweb config.
+
+When AUR_CONFIG_IMMUTABLE is set, the `set` action is noop.
+"""
+import argparse
+import configparser
+import os
+import sys
+
+import aurweb.config
+
+
+def action_set(args):
+    # If AUR_CONFIG_IMMUTABLE is defined, skip out on config setting.
+    if os.environ.get("AUR_CONFIG_IMMUTABLE", 0):
+        return
+
+    if not args.value:
+        print("error: no value provided", file=sys.stderr)
+        return
+
+    try:
+        aurweb.config.replace_key(args.section, args.option, args.value)
+        aurweb.config.save()
+    except configparser.NoSectionError:
+        print("error: no section found", file=sys.stderr)
+
+
+def action_get(args):
+    try:
+        value = aurweb.config.get(args.section, args.option)
+        print(value)
+    except (configparser.NoSectionError):
+        print("error: no section found", file=sys.stderr)
+    except (configparser.NoOptionError):
+        print("error: no option found", file=sys.stderr)
+
+
+def parse_args():
+    fmt_cls = argparse.RawDescriptionHelpFormatter
+    actions = ["get", "set"]
+    parser = argparse.ArgumentParser(
+        description="aurweb configuration tool",
+        formatter_class=lambda prog: fmt_cls(prog=prog, max_help_position=80))
+    parser.add_argument("action", choices=actions, help="script action")
+    parser.add_argument("section", help="config section")
+    parser.add_argument("option", help="config option")
+    parser.add_argument("value", nargs="?", default=0,
+                        help="config option value")
+    return parser.parse_args()
+
+
+def main():
+    args = parse_args()
+    action = getattr(sys.modules[__name__], f"action_{args.action}")
+    return action(args)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pyproject.toml b/pyproject.toml
index 8d14735a..82c439bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -108,3 +108,4 @@ aurweb-popupdate = "aurweb.scripts.popupdate:main"
 aurweb-rendercomment = "aurweb.scripts.rendercomment:main"
 aurweb-tuvotereminder = "aurweb.scripts.tuvotereminder:main"
 aurweb-usermaint = "aurweb.scripts.usermaint:main"
+aurweb-config = "aurweb.scripts.config:main"
diff --git a/test/test_config.py b/test/test_config.py
index 4f10b60d..7e9d24b5 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -1,4 +1,16 @@
+import configparser
+import io
+import os
+import re
+
+from unittest import mock
+
 from aurweb import config
+from aurweb.scripts.config import main
+
+
+def noop(*args, **kwargs) -> None:
+    return
 
 
 def test_get():
@@ -11,3 +23,116 @@ def test_getboolean():
 
 def test_getint():
     assert config.getint("options", "disable_http_login") == 0
+
+
+def mock_config_get():
+    config_get = config.get
+
+    def _mock_config_get(section: str, option: str):
+        if section == "options":
+            if option == "salt_rounds":
+                return "666"
+        return config_get(section, option)
+    return _mock_config_get
+
+
+@mock.patch("aurweb.config.get", side_effect=mock_config_get())
+def test_config_main_get(get: str):
+    stdout = io.StringIO()
+    args = ["aurweb-config", "get", "options", "salt_rounds"]
+    with mock.patch("sys.argv", args):
+        with mock.patch("sys.stdout", stdout):
+            main()
+
+    expected = "666"
+    assert stdout.getvalue().strip() == expected
+
+
+@mock.patch("aurweb.config.get", side_effect=mock_config_get())
+def test_config_main_get_unknown_section(get: str):
+    stderr = io.StringIO()
+    args = ["aurweb-config", "get", "fakeblahblah", "salt_rounds"]
+    with mock.patch("sys.argv", args):
+        with mock.patch("sys.stderr", stderr):
+            main()
+
+    # With an invalid section, we should get a usage error.
+    expected = r'^error: no section found$'
+    assert re.match(expected, stderr.getvalue().strip())
+
+
+@mock.patch("aurweb.config.get", side_effect=mock_config_get())
+def test_config_main_get_unknown_option(get: str):
+    stderr = io.StringIO()
+    args = ["aurweb-config", "get", "options", "fakeblahblah"]
+    with mock.patch("sys.argv", args):
+        with mock.patch("sys.stderr", stderr):
+            main()
+
+    expected = "error: no option found"
+    assert stderr.getvalue().strip() == expected
+
+
+@mock.patch("aurweb.config.save", side_effect=noop)
+def test_config_main_set(save: None):
+    data = None
+
+    def mock_replace_key(section: str, option: str, value: str) -> None:
+        nonlocal data
+        data = value
+
+    args = ["aurweb-config", "set", "options", "salt_rounds", "666"]
+    with mock.patch("sys.argv", args):
+        with mock.patch("aurweb.config.replace_key",
+                        side_effect=mock_replace_key):
+            main()
+
+    expected = "666"
+    assert data == expected
+
+
+def test_config_main_set_immutable():
+    data = None
+
+    def mock_replace_key(section: str, option: str, value: str) -> None:
+        nonlocal data
+        data = value
+
+    args = ["aurweb-config", "set", "options", "salt_rounds", "666"]
+    with mock.patch.dict(os.environ, {"AUR_CONFIG_IMMUTABLE": "1"}):
+        with mock.patch("sys.argv", args):
+            with mock.patch("aurweb.config.replace_key",
+                            side_effect=mock_replace_key):
+                main()
+
+    expected = None
+    assert data == expected
+
+
+def test_config_main_set_invalid_value():
+    stderr = io.StringIO()
+
+    args = ["aurweb-config", "set", "options", "salt_rounds"]
+    with mock.patch("sys.argv", args):
+        with mock.patch("sys.stderr", stderr):
+            main()
+
+    expected = "error: no value provided"
+    assert stderr.getvalue().strip() == expected
+
+
+@mock.patch("aurweb.config.save", side_effect=noop)
+def test_config_main_set_unknown_section(save: None):
+    stderr = io.StringIO()
+
+    def mock_replace_key(section: str, option: str, value: str) -> None:
+        raise configparser.NoSectionError(section=section)
+
+    args = ["aurweb-config", "set", "options", "salt_rounds", "666"]
+    with mock.patch("sys.argv", args):
+        with mock.patch("sys.stderr", stderr):
+            with mock.patch("aurweb.config.replace_key",
+                            side_effect=mock_replace_key):
+                main()
+
+    assert stderr.getvalue().strip() == "error: no section found"

From d658627e992dd0fc16e5e2aa76d52dda76de4380 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 19:10:59 -0800
Subject: [PATCH 622/844] fix(fastapi): don't redirect to login on authed
 /login

Closes #184

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/auth.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 055f0dca..c5a99419 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -24,13 +24,13 @@ async def login_template(request: Request, next: str, errors: list = None):
 
 
 @router.get("/login", response_class=HTMLResponse)
-@auth_required(False)
+@auth_required(False, login=False)
 async def login_get(request: Request, next: str = "/"):
     return await login_template(request, next)
 
 
 @router.post("/login", response_class=HTMLResponse)
-@auth_required(False)
+@auth_required(False, login=False)
 async def login_post(request: Request,
                      next: str = Form(...),
                      user: str = Form(default=str()),

From 47feb72f48cb0d1c36fffff39160e48b8e870488 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 20:04:26 -0800
Subject: [PATCH 623/844] fix(fastapi): fix SessionID (and ResetKey) generation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py               | 29 +----------------------------
 aurweb/models/session.py   |  9 ++++-----
 aurweb/models/user.py      |  4 ++++
 aurweb/routers/accounts.py |  5 +++--
 4 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index b8b49e40..70ad58d1 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -24,42 +24,15 @@ DRIVERS = {
     "mysql": "mysql+mysqldb"
 }
 
-# Global introspected object memo.
-introspected = dict()
-
 # Some types we don't get access to in this module.
 Base = NewType("Base", "aurweb.models.declarative_base.Base")
 
 
-def make_random_value(table: str, column: str):
+def make_random_value(table: str, column: str, length: int):
     """ Generate a unique, random value for a string column in a table.
 
-    This can be used to generate for example, session IDs that
-    align with the properties of the database column with regards
-    to size.
-
-    Internally, we use SQLAlchemy introspection to look at column
-    to decide which length to use for random string generation.
-
     :return: A unique string that is not in the database
     """
-    global introspected
-
-    # Make sure column is converted to a string for memo interaction.
-    scolumn = str(column)
-
-    # If the target column is not yet introspected, store its introspection
-    # object into our global `introspected` memo.
-    if scolumn not in introspected:
-        from sqlalchemy import inspect
-        target_column = scolumn.split('.')[-1]
-        col = list(filter(lambda c: c.name == target_column,
-                          inspect(table).columns))[0]
-        introspected[scolumn] = col
-
-    col = introspected.get(scolumn)
-    length = col.type.length
-
     string = aurweb.util.make_random_string(length)
     while query(table).filter(column == string).first():
         string = aurweb.util.make_random_string(length)
diff --git a/aurweb/models/session.py b/aurweb/models/session.py
index 96f88d85..7a06eddc 100644
--- a/aurweb/models/session.py
+++ b/aurweb/models/session.py
@@ -1,8 +1,7 @@
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-from aurweb import schema
-from aurweb.db import make_random_value, query
+from aurweb import db, schema
 from aurweb.models.declarative import Base
 from aurweb.models.user import User as _User
 
@@ -19,8 +18,8 @@ class Session(Base):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        user_exists = query(
-            query(_User).filter(_User.ID == self.UsersID).exists()
+        user_exists = db.query(
+            db.query(_User).filter(_User.ID == self.UsersID).exists()
         ).scalar()
         if not user_exists:
             raise IntegrityError(
@@ -31,4 +30,4 @@ class Session(Base):
 
 
 def generate_unique_sid():
-    return make_random_value(Session, Session.SessionID)
+    return db.make_random_value(Session, Session.SessionID, 32)
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 43910db9..03634a36 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -230,3 +230,7 @@ class User(Base):
     def __repr__(self):
         return "<User(ID='%s', AccountType='%s', Username='%s')>" % (
             self.ID, str(self.AccountType), self.Username)
+
+
+def generate_unique_resetkey():
+    return db.make_random_value(User, User.ResetKey, 32)
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 02a7f4c6..ddee1764 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -16,6 +16,7 @@ from aurweb.exceptions import ValidationError
 from aurweb.l10n import get_translator_for_request
 from aurweb.models import account_type as at
 from aurweb.models.ssh_pub_key import get_fingerprint
+from aurweb.models.user import generate_unique_resetkey
 from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
 from aurweb.users import update, validate
@@ -92,7 +93,7 @@ async def passreset_post(request: Request,
                                 status_code=HTTPStatus.SEE_OTHER)
 
     # If we got here, we continue with issuing a resetkey for the user.
-    resetkey = db.make_random_value(models.User, models.User.ResetKey)
+    resetkey = generate_unique_resetkey()
     with db.begin():
         user.ResetKey = resetkey
 
@@ -291,7 +292,7 @@ async def account_register_post(request: Request,
 
     # Create a user with no password with a resetkey, then send
     # an email off about it.
-    resetkey = db.make_random_value(models.User, models.User.ResetKey)
+    resetkey = generate_unique_resetkey()
 
     # By default, we grab the User account type to associate with.
     atype = db.query(models.AccountType,

From 7b0d664bc0c4d9f75abc2ed659e14ca5f66dba1c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 21:03:24 -0800
Subject: [PATCH 624/844] fix(docker): reorg ./data mounts

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.aur-dev.yml  |  3 ++-
 docker-compose.override.yml | 11 +++++++++++
 docker-compose.yml          | 10 ----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index f27b2b19..0b91dd93 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -4,6 +4,7 @@ services:
   ca:
     volumes:
       - data:/data
+      - step:/root/.step
 
   memcached:
     restart: always
@@ -22,7 +23,7 @@ services:
       - SSH_CMDLINE=${SSH_CMDLINE:-ssh ssh://aur@localhost:2222}
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
-      - ./data:/aurweb/data
+      - data:/aurweb/data
 
   smartgit:
     restart: always
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 8c74f947..1e466730 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,6 +1,11 @@
 version: "3.8"
 
 services:
+  ca:
+    volumes:
+      - ./data:/data
+      - step:/root/.step
+
   mariadb_init:
     depends_on:
       mariadb:
@@ -41,3 +46,9 @@ services:
       - ./web/template:/aurweb/web/template
       - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
+
+  nginx:
+    volumes:
+      - ./data:/data
+      - archives:/var/lib/aurweb/archives
+      - smartgit_run:/var/run/smartgit
diff --git a/docker-compose.yml b/docker-compose.yml
index c1f93319..5d8f7d78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,12 +33,6 @@ services:
     healthcheck:
       test: "bash /docker/health/run-ca.sh"
       interval: 3s
-    tmpfs:
-      - /tmp
-    volumes:
-      - ./docker:/docker
-      - ./data:/data
-      - step:/root/.step
 
   memcached:
     image: aurweb:latest
@@ -269,10 +263,6 @@ services:
         condition: service_healthy
       php-fpm:
         condition: service_healthy
-    volumes:
-      - ./data:/data
-      - archives:/var/lib/aurweb/archives
-      - smartgit_run:/var/run/smartgit
 
   sharness:
     image: aurweb:latest

From 199622c53f65260670868ca3712d2f9e30de4461 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 21:35:35 -0800
Subject: [PATCH 625/844] fix(fastapi): refresh records when fetching updated
 packages

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 7c48f4e4..55af3a34 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -167,6 +167,7 @@ def updated_packages(limit: int = 0,
     for pkg in query:
         # For each Package returned by the query, append a dict
         # containing Package columns we're interested in.
+        db.refresh(pkg)
         packages.append({
             "Name": pkg.Name,
             "Version": pkg.Version,

From 0e938209afbf25748cf95bd27b32ad2814f8d77b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 22:34:15 -0800
Subject: [PATCH 626/844] feat(aurweb-config): add unset action and simplify

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/config.py         |  7 ++++-
 aurweb/scripts/config.py | 38 ++++++++++++++++----------
 test/test_config.py      | 59 +++++++++++++++++++++++++++++++++-------
 3 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/aurweb/config.py b/aurweb/config.py
index 0d0cf676..86f8ddf7 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -56,8 +56,13 @@ def get_section(section):
         return _get_parser()[section]
 
 
-def replace_key(section: str, option: str, value: Any) -> Any:
+def unset_option(section: str, option: str) -> None:
+    _get_parser().remove_option(section, option)
+
+
+def set_option(section: str, option: str, value: Any) -> None:
     _get_parser().set(section, option, value)
+    return value
 
 
 def save() -> None:
diff --git a/aurweb/scripts/config.py b/aurweb/scripts/config.py
index dd7bcf5f..e7c91dd1 100644
--- a/aurweb/scripts/config.py
+++ b/aurweb/scripts/config.py
@@ -11,35 +11,43 @@ import sys
 import aurweb.config
 
 
-def action_set(args):
+def do_action(func, *args, save: bool = True):
     # If AUR_CONFIG_IMMUTABLE is defined, skip out on config setting.
-    if os.environ.get("AUR_CONFIG_IMMUTABLE", 0):
+    if int(os.environ.get("AUR_CONFIG_IMMUTABLE", 0)):
         return
 
+    value = None
+    try:
+        value = func(*args)
+        if save:
+            aurweb.config.save()
+    except configparser.NoSectionError:
+        print("error: no section found", file=sys.stderr)
+    except configparser.NoOptionError:
+        print("error: no option found", file=sys.stderr)
+
+    return value
+
+
+def action_set(args):
     if not args.value:
         print("error: no value provided", file=sys.stderr)
         return
+    do_action(aurweb.config.set_option, args.section, args.option, args.value)
 
-    try:
-        aurweb.config.replace_key(args.section, args.option, args.value)
-        aurweb.config.save()
-    except configparser.NoSectionError:
-        print("error: no section found", file=sys.stderr)
+
+def action_unset(args):
+    do_action(aurweb.config.unset_option, args.section, args.option)
 
 
 def action_get(args):
-    try:
-        value = aurweb.config.get(args.section, args.option)
-        print(value)
-    except (configparser.NoSectionError):
-        print("error: no section found", file=sys.stderr)
-    except (configparser.NoOptionError):
-        print("error: no option found", file=sys.stderr)
+    val = do_action(aurweb.config.get, args.section, args.option, save=False)
+    print(val)
 
 
 def parse_args():
     fmt_cls = argparse.RawDescriptionHelpFormatter
-    actions = ["get", "set"]
+    actions = ["get", "set", "unset"]
     parser = argparse.ArgumentParser(
         description="aurweb configuration tool",
         formatter_class=lambda prog: fmt_cls(prog=prog, max_help_position=80))
diff --git a/test/test_config.py b/test/test_config.py
index 7e9d24b5..b78f477c 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -5,6 +5,8 @@ import re
 
 from unittest import mock
 
+import py
+
 from aurweb import config
 from aurweb.scripts.config import main
 
@@ -77,32 +79,69 @@ def test_config_main_get_unknown_option(get: str):
 def test_config_main_set(save: None):
     data = None
 
-    def mock_replace_key(section: str, option: str, value: str) -> None:
+    def set_option(section: str, option: str, value: str) -> None:
         nonlocal data
         data = value
 
     args = ["aurweb-config", "set", "options", "salt_rounds", "666"]
     with mock.patch("sys.argv", args):
-        with mock.patch("aurweb.config.replace_key",
-                        side_effect=mock_replace_key):
+        with mock.patch("aurweb.config.set_option", side_effect=set_option):
             main()
 
     expected = "666"
     assert data == expected
 
 
+def test_config_main_set_real(tmpdir: py.path.local):
+    """
+    Test a real set_option path.
+    """
+
+    # Copy AUR_CONFIG to {tmpdir}/aur.config.
+    aur_config = os.environ.get("AUR_CONFIG")
+    tmp_aur_config = os.path.join(str(tmpdir), "aur.config")
+    with open(aur_config) as f:
+        with open(tmp_aur_config, "w") as o:
+            o.write(f.read())
+
+    # Force reset the parser. This should NOT be done publicly.
+    config._parser = None
+
+    value = 666
+    args = ["aurweb-config", "set", "options", "fake-key", str(value)]
+    with mock.patch.dict("os.environ", {"AUR_CONFIG": tmp_aur_config}):
+        with mock.patch("sys.argv", args):
+            # Run aurweb.config.main().
+            main()
+
+        # Update the config; fake-key should be set.
+        config.rehash()
+        assert config.getint("options", "fake-key") == 666
+
+        # Restore config back to normal.
+        args = ["aurweb-config", "unset", "options", "fake-key"]
+        with mock.patch("sys.argv", args):
+            main()
+
+    # Return the config back to normal.
+    config.rehash()
+
+    # fake-key should no longer exist.
+    assert config.getint("options", "fake-key") is None
+
+
 def test_config_main_set_immutable():
     data = None
 
-    def mock_replace_key(section: str, option: str, value: str) -> None:
+    def mock_set_option(section: str, option: str, value: str) -> None:
         nonlocal data
         data = value
 
     args = ["aurweb-config", "set", "options", "salt_rounds", "666"]
     with mock.patch.dict(os.environ, {"AUR_CONFIG_IMMUTABLE": "1"}):
         with mock.patch("sys.argv", args):
-            with mock.patch("aurweb.config.replace_key",
-                            side_effect=mock_replace_key):
+            with mock.patch("aurweb.config.set_option",
+                            side_effect=mock_set_option):
                 main()
 
     expected = None
@@ -121,18 +160,18 @@ def test_config_main_set_invalid_value():
     assert stderr.getvalue().strip() == expected
 
 
-@mock.patch("aurweb.config.save", side_effect=noop)
+@ mock.patch("aurweb.config.save", side_effect=noop)
 def test_config_main_set_unknown_section(save: None):
     stderr = io.StringIO()
 
-    def mock_replace_key(section: str, option: str, value: str) -> None:
+    def mock_set_option(section: str, option: str, value: str) -> None:
         raise configparser.NoSectionError(section=section)
 
     args = ["aurweb-config", "set", "options", "salt_rounds", "666"]
     with mock.patch("sys.argv", args):
         with mock.patch("sys.stderr", stderr):
-            with mock.patch("aurweb.config.replace_key",
-                            side_effect=mock_replace_key):
+            with mock.patch("aurweb.config.set_option",
+                            side_effect=mock_set_option):
                 main()
 
     assert stderr.getvalue().strip() == "error: no section found"

From f3efc18b508d505f242426911ce22231dc182e05 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 22:42:12 -0800
Subject: [PATCH 627/844] feat(docker): force test db configuration

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/test-mysql-entrypoint.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
index a46b2572..262577a6 100755
--- a/docker/test-mysql-entrypoint.sh
+++ b/docker/test-mysql-entrypoint.sh
@@ -5,4 +5,16 @@ set -eou pipefail
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
 
+# We use the root user for testing in Docker.
+# The test user must be able to create databases and drop them.
+aurweb-config set database user 'root'
+aurweb-config set database host 'localhost'
+aurweb-config set database socket '/var/run/mysqld/mysqld.sock'
+
+# Remove possibly problematic configuration options.
+# We depend on the database socket within Docker and
+# being run as the root user.
+aurweb-config unset database password
+aurweb-config unset database port
+
 exec "$@"

From 0726a08677b589136dbfce1d59990c9c744e56b0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 17:42:04 -0800
Subject: [PATCH 628/844] fix(docker): remove sqlite scripts

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/setup-sqlite.sh   |  7 -------
 docker/test-sqlite-entrypoint.sh | 16 ----------------
 2 files changed, 23 deletions(-)
 delete mode 100755 docker/scripts/setup-sqlite.sh
 delete mode 100755 docker/test-sqlite-entrypoint.sh

diff --git a/docker/scripts/setup-sqlite.sh b/docker/scripts/setup-sqlite.sh
deleted file mode 100755
index e0b8de50..00000000
--- a/docker/scripts/setup-sqlite.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Run an sqlite test. This script really just prepares sqlite
-# tests by deleting any existing databases so the test can
-# initialize cleanly.
-DB_NAME="$(grep 'name =' conf/config.sqlite | sed -r 's/^name = (.+)$/\1/')"
-rm -vf $DB_NAME
-exec "$@"
diff --git a/docker/test-sqlite-entrypoint.sh b/docker/test-sqlite-entrypoint.sh
deleted file mode 100755
index c26f6735..00000000
--- a/docker/test-sqlite-entrypoint.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -eou pipefail
-
-DB_BACKEND="sqlite"
-DB_NAME="aurweb.sqlite3"
-
-# Create an SQLite config from the default dev config.
-cp -vf conf/config.dev conf/config.sqlite
-cp -vf conf/config.defaults conf/config.sqlite.defaults
-
-# Modify it for SQLite.
-sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config.sqlite
-sed -ri "s/^(backend) = .+/\1 = ${DB_BACKEND}/" conf/config.sqlite
-sed -ri "s/^(name) = .+/\1 = ${DB_NAME}/" conf/config.sqlite
-
-exec "$@"

From 5b350bc3614f29794bdfb710893b76b3d40ba96d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 18:46:42 -0800
Subject: [PATCH 629/844] change(docker): use aurweb-config to update
 AUR_CONFIG

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/fastapi-entrypoint.sh      | 26 ++++++++++++++------------
 docker/git-entrypoint.sh          | 22 +++++++++-------------
 docker/mariadb-init-entrypoint.sh |  5 +++--
 docker/php-entrypoint.sh          | 21 +++++++++++----------
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index 9df6382d..d1519bf8 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -5,23 +5,25 @@ set -eou pipefail
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
 
-# Change database user/password.
-sed -ri "s/^;?(user) = .*$/\1 = aur/" conf/config
-sed -ri "s/^;?(password) = .*$/\1 = aur/" conf/config
+# Setup database.
+aurweb-config set database user 'aur'
+aurweb-config set database password 'aur'
+aurweb-config set database host 'localhost'
+aurweb-config set database socket '/var/lib/mysqld/mysqld.sock'
+aurweb-config unset database port
 
-sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_FASTAPI_PREFIX};" conf/config
-
-# Setup Redis for FastAPI.
-sed -ri 's/^(cache) = .+/\1 = redis/' conf/config
-sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config
+# Setup some other options.
+aurweb-config set options cache 'redis'
+aurweb-config set options redis_address 'redis://redis'
+aurweb-config set options aur_location "$AURWEB_FASTAPI_PREFIX"
+aurweb-config set options git_clone_uri_anon "${AURWEB_FASTAPI_PREFIX}/%s.git"
+aurweb-config set options git_clone_uri_priv "${AURWEB_SSHD_PREFIX}/%s.git"
 
 if [ ! -z ${COMMIT_HASH+x} ]; then
-    sed -ri "s/^;?(commit_hash) =.*$/\1 = $COMMIT_HASH/" conf/config
+    aurweb-config set devel commit_hash "$COMMIT_HASH"
 fi
 
-sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_FASTAPI_PREFIX}/%s.git|" conf/config.defaults
-sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults
-
+# Setup prometheus directory.
 rm -rf $PROMETHEUS_MULTIPROC_DIR
 mkdir -p $PROMETHEUS_MULTIPROC_DIR
 
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index cfa1879b..96f4d112 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -42,20 +42,16 @@ EOF
 cp -vf conf/config.dev $AUR_CONFIG
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" $AUR_CONFIG
 
-sed -ri "s/^;?(user) = .*$/\1 = aur/" $AUR_CONFIG
-sed -ri "s/^;?(password) = .*$/\1 = aur/" $AUR_CONFIG
+# Setup database.
+aurweb-config set database user 'aur'
+aurweb-config set database password 'aur'
+aurweb-config set database host 'localhost'
+aurweb-config set database socket '/var/lib/mysqld/mysqld.sock'
+aurweb-config unset database port
 
-AUR_CONFIG_DEFAULTS="${AUR_CONFIG}.defaults"
-
-if [[ "$AUR_CONFIG_DEFAULTS" != "/aurweb/conf/config.defaults" ]]; then
-    cp -vf conf/config.defaults $AUR_CONFIG_DEFAULTS
-fi
-
-# Set some defaults needed for pathing and ssh uris.
-sed -ri "s|^(repo-path) = .+|\1 = /aurweb/aur.git/|" $AUR_CONFIG_DEFAULTS
-
-# SSH_CMDLINE can be provided via override in docker-compose.aur-dev.yml.
-sed -ri "s|^(ssh-cmdline) = .+$|\1 = ${SSH_CMDLINE}|" $AUR_CONFIG_DEFAULTS
+# Setup some other options.
+aurweb-config set serve repo-path '/aurweb/aur.git/'
+aurweb-config set serve ssh-cmdline "$SSH_CMDLINE"
 
 # Setup SSH Keys.
 ssh-keygen -A
diff --git a/docker/mariadb-init-entrypoint.sh b/docker/mariadb-init-entrypoint.sh
index 6df98e4f..64e66a0f 100755
--- a/docker/mariadb-init-entrypoint.sh
+++ b/docker/mariadb-init-entrypoint.sh
@@ -4,8 +4,9 @@ set -eou pipefail
 # Setup a config for our mysql db.
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-sed -ri "s/^;?(user) = .*$/\1 = aur/g" conf/config
-sed -ri "s/^;?(password) = .*$/\1 = aur/g" conf/config
+
+aurweb-config set database user 'aur'
+aurweb-config set database password 'aur'
 
 python -m aurweb.initdb 2>/dev/null || /bin/true
 
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 05b76408..1756718d 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -9,17 +9,18 @@ done
 cp -vf conf/config.dev conf/config
 sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
 
-# Change database user/password.
-sed -ri "s/^;?(user) = .*$/\1 = aur/" conf/config
-sed -ri "s/^;?(password) = .*$/\1 = aur/" conf/config
+# Setup database.
+aurweb-config set database user 'aur'
+aurweb-config set database password 'aur'
+aurweb-config set database host 'localhost'
+aurweb-config set database socket '/var/lib/mysqld/mysqld.sock'
+aurweb-config unset database port
 
-# Enable memcached.
-sed -ri 's/^(cache) = .+$/\1 = memcache/' conf/config
-
-# Setup various location configurations.
-sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_PHP_PREFIX};" conf/config
-sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_PHP_PREFIX}/%s.git|" conf/config.defaults
-sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults
+# Setup some other options.
+aurweb-config set options cache 'memcache'
+aurweb-config set options aur_location "$AURWEB_PHP_PREFIX"
+aurweb-config set options git_clone_uri_anon "${AURWEB_PHP_PREFIX}/%s.git"
+aurweb-config set options git_clone_uri_priv "${AURWEB_SSHD_PREFIX}/%s.git"
 
 # Listen on :9000.
 sed -ri 's/^(listen).*/\1 = 0.0.0.0:9000/' /etc/php/php-fpm.d/www.conf

From 84beacd4274d27bf039b691a25cae7758f7d9ac2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 18:57:08 -0800
Subject: [PATCH 630/844] fix(docker): supply AUR_CONFIG_IMMUTABLE for
 docker-compose

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5d8f7d78..401193d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,6 +72,8 @@ services:
   mariadb_init:
     image: aurweb:latest
     init: true
+    environment:
+      - AUR_CONFIG_IMMUTABLE=${AUR_CONFIG_IMMUTABLE:-0}
     entrypoint: /docker/mariadb-init-entrypoint.sh
     command: echo "MariaDB tables initialized."
     volumes:
@@ -104,6 +106,7 @@ services:
     environment:
       - AUR_CONFIG=/aurweb/conf/config
       - SSH_CMDLINE=${SSH_CMDLINE:-ssh ssh://aur@localhost:2222}
+      - AUR_CONFIG_IMMUTABLE=${AUR_CONFIG_IMMUTABLE:-0}
     entrypoint: /docker/git-entrypoint.sh
     command: /docker/scripts/run-sshd.sh
     ports:
@@ -190,6 +193,7 @@ services:
       - AUR_CONFIG=/aurweb/conf/config
       - AURWEB_PHP_PREFIX=${AURWEB_PHP_PREFIX}
       - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
+      - AUR_CONFIG_IMMUTABLE=${AUR_CONFIG_IMMUTABLE:-0}
     entrypoint: /docker/php-entrypoint.sh
     command: /docker/scripts/run-php.sh
     healthcheck:
@@ -220,6 +224,7 @@ services:
       - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
       - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX}
       - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
+      - AUR_CONFIG_IMMUTABLE=${AUR_CONFIG_IMMUTABLE:-0}
     entrypoint: /docker/fastapi-entrypoint.sh
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:

From 343a306bb8dff96e3d7ab3227646f09f4125255d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 23:14:39 -0800
Subject: [PATCH 631/844] change(docker): setup AUR_CONFIG in Dockerfile

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 9af78c3e..38d3ca0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,10 @@ COPY . /aurweb
 # Working directory is aurweb root @ /aurweb.
 WORKDIR /aurweb
 
+# Copy initial config to conf/config.
+RUN cp -vf conf/config.dev conf/config
+RUN sed -i "s;YOUR_AUR_ROOT;/aurweb;g" conf/config
+
 # Install Python dependencies.
 RUN /docker/scripts/install-python-deps.sh
 

From dbeebd3b01044d508531476dc99571890e150065 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 23:15:19 -0800
Subject: [PATCH 632/844] change(fastapi): setup live database in
 mariadb-init-entrypoint.sh

Centralize database setup there and remove all copying of
config.dev from the entrypoint scripts (the Dockerfile
now does it).

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/cron-entrypoint.sh         | 28 +++++++++++++++++++++++-----
 docker/fastapi-entrypoint.sh      | 10 +---------
 docker/git-entrypoint.sh          | 10 +---------
 docker/mariadb-init-entrypoint.sh | 12 ++++++++----
 docker/php-entrypoint.sh          | 10 +---------
 docker/test-mysql-entrypoint.sh   |  4 ----
 6 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/docker/cron-entrypoint.sh b/docker/cron-entrypoint.sh
index d4173eaf..5b69ab19 100755
--- a/docker/cron-entrypoint.sh
+++ b/docker/cron-entrypoint.sh
@@ -1,12 +1,30 @@
 #!/bin/bash
 set -eou pipefail
 
-# Prepare AUR_CONFIG.
-cp -vf conf/config.dev conf/config
-sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
+# Setup the DB.
+NO_INITDB=1 /docker/mariadb-init-entrypoint.sh
 
-# Create directories we need.
-mkdir -p /aurweb/aurblup
+# Create aurblup's directory.
+AURBLUP_DIR="/aurweb/aurblup/"
+mkdir -p $AURBLUP_DIR
+
+# Setup aurblup config for Docker.
+AURBLUP_DBS='core extra community multilib testing community-testing'
+AURBLUP_SERVER='https://mirrors.kernel.org/archlinux/%s/os/x86_64'
+aurweb-config set aurblup db-path "$AURBLUP_DIR"
+aurweb-config set aurblup sync-dbs "$AURBLUP_DBS"
+aurweb-config set aurblup server "$AURBLUP_SERVER"
+
+# Setup mkpkglists config for Docker.
+ARCHIVE_DIR='/var/lib/aurweb/archives'
+aurweb-config set mkpkglists archivedir "$ARCHIVE_DIR"
+aurweb-config set mkpkglists packagesfile "$ARCHIVE_DIR/packages.gz"
+aurweb-config set mkpkglists packagesmetafile \
+    "$ARCHIVE_DIR/packages-meta-v1.json.gz"
+aurweb-config set mkpkglists packagesmetaextfile \
+    "$ARCHIVE_DIR/packages-meta-ext-v1.json.gz"
+aurweb-config set mkpkglists pkgbasefile "$ARCHIVE_DIR/pkgbase.gz"
+aurweb-config set mkpkglists userfile "$ARCHIVE_DIR/users.gz"
 
 # Install the cron configuration.
 cp /docker/config/aurweb-cron /etc/cron.d/aurweb-cron
diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh
index d1519bf8..c6597313 100755
--- a/docker/fastapi-entrypoint.sh
+++ b/docker/fastapi-entrypoint.sh
@@ -1,16 +1,8 @@
 #!/bin/bash
 set -eou pipefail
 
-# Setup a config for our mysql db.
-cp -vf conf/config.dev conf/config
-sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-
 # Setup database.
-aurweb-config set database user 'aur'
-aurweb-config set database password 'aur'
-aurweb-config set database host 'localhost'
-aurweb-config set database socket '/var/lib/mysqld/mysqld.sock'
-aurweb-config unset database port
+NO_INITDB=1 /docker/mariadb-init-entrypoint.sh
 
 # Setup some other options.
 aurweb-config set options cache 'redis'
diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh
index 96f4d112..c9f1ec30 100755
--- a/docker/git-entrypoint.sh
+++ b/docker/git-entrypoint.sh
@@ -38,16 +38,8 @@ Match User aur
     AcceptEnv AUR_OVERWRITE
 EOF
 
-# Setup a config for our mysql db.
-cp -vf conf/config.dev $AUR_CONFIG
-sed -i "s;YOUR_AUR_ROOT;$(pwd);g" $AUR_CONFIG
-
 # Setup database.
-aurweb-config set database user 'aur'
-aurweb-config set database password 'aur'
-aurweb-config set database host 'localhost'
-aurweb-config set database socket '/var/lib/mysqld/mysqld.sock'
-aurweb-config unset database port
+NO_INITDB=1 /docker/mariadb-init-entrypoint.sh
 
 # Setup some other options.
 aurweb-config set serve repo-path '/aurweb/aur.git/'
diff --git a/docker/mariadb-init-entrypoint.sh b/docker/mariadb-init-entrypoint.sh
index 64e66a0f..74980031 100755
--- a/docker/mariadb-init-entrypoint.sh
+++ b/docker/mariadb-init-entrypoint.sh
@@ -2,12 +2,16 @@
 set -eou pipefail
 
 # Setup a config for our mysql db.
-cp -vf conf/config.dev conf/config
-sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-
+aurweb-config set database name 'aurweb'
 aurweb-config set database user 'aur'
 aurweb-config set database password 'aur'
+aurweb-config set database host 'localhost'
+aurweb-config set database socket '/var/run/mysqld/mysqld.sock'
+aurweb-config unset database port
+
+if [ ! -z ${NO_INITDB+x} ]; then
+    exec "$@"
+fi
 
 python -m aurweb.initdb 2>/dev/null || /bin/true
-
 exec "$@"
diff --git a/docker/php-entrypoint.sh b/docker/php-entrypoint.sh
index 1756718d..dc1a91de 100755
--- a/docker/php-entrypoint.sh
+++ b/docker/php-entrypoint.sh
@@ -5,16 +5,8 @@ for archive in packages pkgbase users packages-meta-v1.json packages-meta-ext-v1
     ln -vsf /var/lib/aurweb/archives/${archive}.gz /aurweb/web/html/${archive}.gz
 done
 
-# Setup a config for our mysql db.
-cp -vf conf/config.dev conf/config
-sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-
 # Setup database.
-aurweb-config set database user 'aur'
-aurweb-config set database password 'aur'
-aurweb-config set database host 'localhost'
-aurweb-config set database socket '/var/lib/mysqld/mysqld.sock'
-aurweb-config unset database port
+NO_INITDB=1 /docker/mariadb-init-entrypoint.sh
 
 # Setup some other options.
 aurweb-config set options cache 'memcache'
diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
index 262577a6..1bf85b54 100755
--- a/docker/test-mysql-entrypoint.sh
+++ b/docker/test-mysql-entrypoint.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 set -eou pipefail
 
-# Setup a config for our mysql db.
-cp -vf conf/config.dev conf/config
-sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
-
 # We use the root user for testing in Docker.
 # The test user must be able to create databases and drop them.
 aurweb-config set database user 'root'

From 3a65e33abe01e6ef6ae1a246062b0fe5ed2c8f09 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 23:34:05 -0800
Subject: [PATCH 633/844] fix(gitlab-ci): prepare conf/config for setup

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8980fa78..d6d49a55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
   AUR_CONFIG: conf/config # Default MySQL config setup in before_script.
   DB_HOST: localhost
   TEST_RECURSION_LIMIT: 10000
+  CURRENT_DIR: "$(pwd)"
 
 test:
   stage: test
@@ -22,6 +23,8 @@ test:
     - ./docker/mariadb-entrypoint.sh
     - (cd '/usr' && /usr/bin/mysqld_safe --datadir='/var/lib/mysql') &
     - 'until : > /dev/tcp/127.0.0.1/3306; do sleep 1s; done'
+    - cp -v conf/config.dev conf/config
+    - sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
     - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
     - make -C po all install
     - make -C test clean

From 3efb9a57b59297fb844c75306351c2817ca2f4b0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 07:54:52 -0800
Subject: [PATCH 634/844] change(popupdate): converted to use aurweb.db ORM

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py  |  9 ++--
 aurweb/scripts/popupdate.py | 84 +++++++++++++++++++++++--------------
 test/test_rpc.py            |  5 +--
 3 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 23f44ee3..eab75e5a 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -908,8 +908,7 @@ async def pkgbase_vote(request: Request, name: str):
                       VoteTS=now)
 
         # Update NumVotes/Popularity.
-        conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-        popupdate.run_single(conn, pkgbase)
+        popupdate.run_single(pkgbase)
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=HTTPStatus.SEE_OTHER)
@@ -929,8 +928,7 @@ async def pkgbase_unvote(request: Request, name: str):
             db.delete(vote)
 
         # Update NumVotes/Popularity.
-        conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-        popupdate.run_single(conn, pkgbase)
+        popupdate.run_single(pkgbase)
 
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=HTTPStatus.SEE_OTHER)
@@ -1473,8 +1471,7 @@ async def pkgbase_merge_post(request: Request, name: str,
     pkgbase_merge_instance(request, pkgbase, target)
 
     # Run popupdate on the target.
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-    popupdate.run_single(conn, target)
+    popupdate.run_single(target)
 
     if not next:
         next = f"/pkgbase/{target.Name}"
diff --git a/aurweb/scripts/popupdate.py b/aurweb/scripts/popupdate.py
index db4ba170..e2d008f2 100755
--- a/aurweb/scripts/popupdate.py
+++ b/aurweb/scripts/popupdate.py
@@ -1,51 +1,71 @@
 #!/usr/bin/env python3
 
 from datetime import datetime
+from typing import List
 
-import aurweb.db
+from sqlalchemy import and_, func
+from sqlalchemy.sql.functions import coalesce
+from sqlalchemy.sql.functions import sum as _sum
+
+from aurweb import db
+from aurweb.models import PackageBase, PackageVote
 
 
-def run_single(conn, pkgbase):
+def run_variable(pkgbases: List[PackageBase] = []) -> None:
+    """
+    Update popularity on a list of PackageBases.
+
+    If no PackageBase is included, we update the popularity
+    of every PackageBase in the database.
+
+    :param pkgbases: List of PackageBase instances
+    """
+    now = int(datetime.utcnow().timestamp())
+
+    # NumVotes subquery.
+    votes_subq = db.get_session().query(
+        func.count("*")
+    ).select_from(PackageVote).filter(
+        PackageVote.PackageBaseID == PackageBase.ID
+    )
+
+    # Popularity subquery.
+    pop_subq = db.get_session().query(
+        coalesce(_sum(func.pow(0.98, (now - PackageVote.VoteTS) / 86400)), 0.0),
+    ).select_from(PackageVote).filter(
+        and_(PackageVote.PackageBaseID == PackageBase.ID,
+             PackageVote.VoteTS.isnot(None))
+    )
+
+    with db.begin():
+        query = db.query(PackageBase)
+
+        ids = set()
+        if pkgbases:
+            ids = {pkgbase.ID for pkgbase in pkgbases}
+            query = query.filter(PackageBase.ID.in_(ids))
+
+        query.update({
+            "NumVotes": votes_subq.scalar_subquery(),
+            "Popularity": pop_subq.scalar_subquery()
+        })
+
+
+def run_single(pkgbase: PackageBase) -> None:
     """ A single popupdate. The given pkgbase instance will be
     refreshed after the database update is done.
 
     NOTE: This function is compatible only with aurweb FastAPI.
 
-    :param conn: db.Connection[Executor]
     :param pkgbase: Instance of db.PackageBase
     """
-
-    conn.execute("UPDATE PackageBases SET NumVotes = ("
-                 "SELECT COUNT(*) FROM PackageVotes "
-                 "WHERE PackageVotes.PackageBaseID = PackageBases.ID) "
-                 "WHERE PackageBases.ID = ?", [pkgbase.ID])
-
-    now = int(datetime.utcnow().timestamp())
-    conn.execute("UPDATE PackageBases SET Popularity = ("
-                 "SELECT COALESCE(SUM(POWER(0.98, (? - VoteTS) / 86400)), 0.0) "
-                 "FROM PackageVotes WHERE PackageVotes.PackageBaseID = "
-                 "PackageBases.ID AND NOT VoteTS IS NULL) WHERE "
-                 "PackageBases.ID = ?", [now, pkgbase.ID])
-
-    conn.commit()
-    conn.close()
-    aurweb.db.refresh(pkgbase)
+    run_variable([pkgbase])
+    db.refresh(pkgbase)
 
 
 def main():
-    conn = aurweb.db.Connection()
-    conn.execute("UPDATE PackageBases SET NumVotes = ("
-                 "SELECT COUNT(*) FROM PackageVotes "
-                 "WHERE PackageVotes.PackageBaseID = PackageBases.ID)")
-
-    now = int(datetime.utcnow().timestamp())
-    conn.execute("UPDATE PackageBases SET Popularity = ("
-                 "SELECT COALESCE(SUM(POWER(0.98, (? - VoteTS) / 86400)), 0.0) "
-                 "FROM PackageVotes WHERE PackageVotes.PackageBaseID = "
-                 "PackageBases.ID AND NOT VoteTS IS NULL)", [now])
-
-    conn.commit()
-    conn.close()
+    db.get_engine()
+    run_variable()
 
 
 if __name__ == '__main__':
diff --git a/test/test_rpc.py b/test/test_rpc.py
index a4cdb5da..b61a7e4e 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -9,7 +9,7 @@ import pytest
 from fastapi.testclient import TestClient
 from redis.client import Pipeline
 
-from aurweb import asgi, config, db, scripts
+from aurweb import asgi, config, scripts
 from aurweb.db import begin, create, query
 from aurweb.models.account_type import AccountType
 from aurweb.models.dependency_type import DependencyType
@@ -187,8 +187,7 @@ def setup(db_test):
                    PackageBase=pkgbase1,
                    VoteTS=5000)
 
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-    scripts.popupdate.run_single(conn, pkgbase1)
+    scripts.popupdate.run_single(pkgbase1)
 
 
 @pytest.fixture

From 29989b7fdbb6f8a5bacfd6edef48cb66b483b722 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 08:04:33 -0800
Subject: [PATCH 635/844] change(aurblup): converted to use aurweb.db ORM

Introduces:
- aurweb.testing.alpm.AlpmDatabase
    - Used to mock up and manage a remote repository.
- templates/testing/alpm_package.j2
    - Used to generate a single ALPM package desc.
- Removed aurblup sharness test

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/aurblup.py         | 50 ++++++++++-------
 aurweb/templates.py               |  5 ++
 aurweb/testing/alpm.py            | 87 ++++++++++++++++++++++++++++++
 aurweb/util.py                    | 17 ++++++
 templates/testing/alpm_package.j2 | 16 ++++++
 test/t2400-aurblup.t              | 53 ------------------
 test/test_aurblup.py              | 90 +++++++++++++++++++++++++++++++
 7 files changed, 246 insertions(+), 72 deletions(-)
 create mode 100644 aurweb/testing/alpm.py
 create mode 100644 templates/testing/alpm_package.j2
 delete mode 100755 test/t2400-aurblup.t
 create mode 100644 test/test_aurblup.py

diff --git a/aurweb/scripts/aurblup.py b/aurweb/scripts/aurblup.py
index e32937ce..9c9059ec 100755
--- a/aurweb/scripts/aurblup.py
+++ b/aurweb/scripts/aurblup.py
@@ -4,30 +4,34 @@ import re
 
 import pyalpm
 
+from sqlalchemy import and_
+
 import aurweb.config
-import aurweb.db
 
-db_path = aurweb.config.get('aurblup', 'db-path')
-sync_dbs = aurweb.config.get('aurblup', 'sync-dbs').split(' ')
-server = aurweb.config.get('aurblup', 'server')
+from aurweb import db, util
+from aurweb.models import OfficialProvider
 
 
-def main():
+def _main(force: bool = False):
     blacklist = set()
     providers = set()
     repomap = dict()
 
+    db_path = aurweb.config.get("aurblup", "db-path")
+    sync_dbs = aurweb.config.get('aurblup', 'sync-dbs').split(' ')
+    server = aurweb.config.get('aurblup', 'server')
+
     h = pyalpm.Handle("/", db_path)
     for sync_db in sync_dbs:
         repo = h.register_syncdb(sync_db, pyalpm.SIG_DATABASE_OPTIONAL)
         repo.servers = [server.replace("%s", sync_db)]
         t = h.init_transaction()
-        repo.update(False)
+        repo.update(force)
         t.release()
 
         for pkg in repo.pkgcache:
             blacklist.add(pkg.name)
-            [blacklist.add(x) for x in pkg.replaces]
+            util.apply_all(pkg.replaces, blacklist.add)
             providers.add((pkg.name, pkg.name))
             repomap[(pkg.name, pkg.name)] = repo.name
             for provision in pkg.provides:
@@ -35,21 +39,29 @@ def main():
                 providers.add((pkg.name, provisionname))
                 repomap[(pkg.name, provisionname)] = repo.name
 
-    conn = aurweb.db.Connection()
+    with db.begin():
+        old_providers = set(
+            db.query(OfficialProvider).with_entities(
+                OfficialProvider.Name.label("Name"),
+                OfficialProvider.Provides.label("Provides")
+            ).distinct().order_by("Name").all()
+        )
 
-    cur = conn.execute("SELECT Name, Provides FROM OfficialProviders")
-    oldproviders = set(cur.fetchall())
+        for name, provides in old_providers.difference(providers):
+            db.delete_all(db.query(OfficialProvider).filter(
+                and_(OfficialProvider.Name == name,
+                     OfficialProvider.Provides == provides)
+            ))
 
-    for pkg, provides in oldproviders.difference(providers):
-        conn.execute("DELETE FROM OfficialProviders "
-                     "WHERE Name = ? AND Provides = ?", [pkg, provides])
-    for pkg, provides in providers.difference(oldproviders):
-        repo = repomap[(pkg, provides)]
-        conn.execute("INSERT INTO OfficialProviders (Name, Repo, Provides) "
-                     "VALUES (?, ?, ?)", [pkg, repo, provides])
+        for name, provides in providers.difference(old_providers):
+            repo = repomap.get((name, provides))
+            db.create(OfficialProvider, Name=name,
+                      Repo=repo, Provides=provides)
 
-    conn.commit()
-    conn.close()
+
+def main(force: bool = False):
+    db.get_engine()
+    _main(force)
 
 
 if __name__ == '__main__':
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 0039535d..a7102ae1 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -125,6 +125,11 @@ async def make_variable_context(request: Request, title: str, next: str = None):
     return context
 
 
+def base_template(path: str):
+    templates = copy.copy(_env)
+    return templates.get_template(path)
+
+
 def render_raw_template(request: Request, path: str, context: dict):
     """ Render a Jinja2 multi-lingual template with some context. """
     # Create a deep copy of our jinja2 _environment. The _environment in
diff --git a/aurweb/testing/alpm.py b/aurweb/testing/alpm.py
new file mode 100644
index 00000000..6015d859
--- /dev/null
+++ b/aurweb/testing/alpm.py
@@ -0,0 +1,87 @@
+import hashlib
+import os
+import re
+import shutil
+import subprocess
+
+from typing import List
+
+from aurweb import logging, util
+from aurweb.templates import base_template
+
+logger = logging.get_logger(__name__)
+
+
+class AlpmDatabase:
+    """
+    Fake libalpm database management class.
+
+    This class can be used to add or remove packages from a
+    test repository.
+    """
+    repo = "test"
+
+    def __init__(self, database_root: str):
+        self.root = database_root
+        self.local = os.path.join(self.root, "local")
+        self.remote = os.path.join(self.root, "remote")
+        self.repopath = os.path.join(self.remote, self.repo)
+
+        # Make directories.
+        os.makedirs(self.local)
+        os.makedirs(self.remote)
+
+    def _get_pkgdir(self, pkgname: str, pkgver: str, repo: str) -> str:
+        pkgfile = f"{pkgname}-{pkgver}-1"
+        pkgdir = os.path.join(self.remote, repo, pkgfile)
+        os.makedirs(pkgdir)
+        return pkgdir
+
+    def add(self, pkgname: str, pkgver: str, arch: str,
+            provides: List[str] = []) -> None:
+        context = {
+            "pkgname": pkgname,
+            "pkgver": pkgver,
+            "arch": arch,
+            "provides": provides
+        }
+        template = base_template("testing/alpm_package.j2")
+        pkgdir = self._get_pkgdir(pkgname, pkgver, self.repo)
+        desc = os.path.join(pkgdir, "desc")
+        with open(desc, "w") as f:
+            f.write(template.render(context))
+
+        self.compile()
+
+    def remove(self, pkgname: str):
+        files = os.listdir(self.repopath)
+        logger.info(f"Files: {files}")
+        expr = "^" + pkgname + r"-[0-9.]+-1$"
+        logger.info(f"Expression: {expr}")
+        to_delete = filter(lambda e: re.match(expr, e), files)
+
+        for target in to_delete:
+            logger.info(f"Deleting {target}")
+            path = os.path.join(self.repopath, target)
+            shutil.rmtree(path)
+
+        self.compile()
+
+    def clean(self) -> None:
+        db_file = os.path.join(self.remote, "test.db")
+        try:
+            os.remove(db_file)
+        except Exception:
+            pass
+
+    def compile(self) -> None:
+        self.clean()
+        cmdline = ["bash", "-c", "bsdtar -czvf ../test.db *"]
+        proc = subprocess.run(cmdline, cwd=self.repopath)
+        assert proc.returncode == 0, \
+            f"Bad return code while creating alpm database: {proc.returncode}"
+
+        # Print out the md5 hash value of the new test.db.
+        test_db = os.path.join(self.remote, "test.db")
+        db_hash = util.file_hash(test_db, hashlib.md5)
+        logger.debug(f"{test_db}: {db_hash}")
diff --git a/aurweb/util.py b/aurweb/util.py
index 62575c71..bf2d6e4b 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -176,3 +176,20 @@ def strtobool(value: str) -> bool:
     if isinstance(value, str):
         return _strtobool(value)
     return value
+
+
+def file_hash(filepath: str, hash_function: Callable) -> str:
+    """
+    Return a hash of filepath contents using `hash_function`.
+
+    `hash_function` can be any one of the hashlib module's hash
+    functions which implement the `hexdigest()` method -- e.g.
+    hashlib.sha1, hashlib.md5, etc.
+
+    :param filepath: Path to file you want to hash
+    :param hash_function: hashlib hash function
+    :return: hash_function(filepath_content).hexdigest()
+    """
+    with open(filepath, "rb") as f:
+        hash_ = hash_function(f.read())
+    return hash_.hexdigest()
diff --git a/templates/testing/alpm_package.j2 b/templates/testing/alpm_package.j2
new file mode 100644
index 00000000..0e741729
--- /dev/null
+++ b/templates/testing/alpm_package.j2
@@ -0,0 +1,16 @@
+%FILENAME%
+{{ pkgname }}-{{ pkgver }}-{{ arch }}.pkg.tar.xz
+
+%NAME%
+{{ pkgname }}
+
+%VERSION%
+{{ pkgver }}-1
+
+%ARCH%
+{{ arch }}
+
+{% if provides %}
+%PROVIDES%
+{{ provides | join("\n") }}
+{% endif %}
diff --git a/test/t2400-aurblup.t b/test/t2400-aurblup.t
deleted file mode 100755
index 42da6791..00000000
--- a/test/t2400-aurblup.t
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-test_description='aurblup tests'
-
-. "$(dirname "$0")/setup.sh"
-
-test_expect_success 'Test official provider update script.' '
-	mkdir -p remote/test/foobar-1.0-1 &&
-	cat <<-EOD >remote/test/foobar-1.0-1/desc &&
-	%FILENAME%
-	foobar-1.0-any.pkg.tar.xz
-
-	%NAME%
-	foobar
-
-	%VERSION%
-	1.0-1
-
-	%ARCH%
-	any
-	EOD
-	mkdir -p remote/test/foobar2-1.0-1 &&
-	cat <<-EOD >remote/test/foobar2-1.0-1/desc &&
-	%FILENAME%
-	foobar2-1.0-any.pkg.tar.xz
-
-	%NAME%
-	foobar2
-
-	%VERSION%
-	1.0-1
-
-	%ARCH%
-	any
-
-	%PROVIDES%
-	foobar3
-	foobar4
-	EOD
-	( cd remote/test && bsdtar -czf ../test.db * ) &&
-	mkdir sync &&
-	cover "$AURBLUP" &&
-	cat <<-EOD >expected &&
-	foobar|test|foobar
-	foobar2|test|foobar2
-	foobar2|test|foobar3
-	foobar2|test|foobar4
-	EOD
-	echo "SELECT Name, Repo, Provides FROM OfficialProviders ORDER BY Provides;" | sqlite3 aur.db >actual &&
-	test_cmp actual expected
-'
-
-test_done
diff --git a/test/test_aurblup.py b/test/test_aurblup.py
new file mode 100644
index 00000000..7eaae556
--- /dev/null
+++ b/test/test_aurblup.py
@@ -0,0 +1,90 @@
+import tempfile
+
+from unittest import mock
+
+import pytest
+
+from aurweb import config, db
+from aurweb.models import OfficialProvider
+from aurweb.scripts import aurblup
+from aurweb.testing.alpm import AlpmDatabase
+
+
+@pytest.fixture
+def tempdir() -> str:
+    with tempfile.TemporaryDirectory() as name:
+        yield name
+
+
+@pytest.fixture
+def alpm_db(tempdir: str) -> AlpmDatabase:
+    yield AlpmDatabase(tempdir)
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test, alpm_db: AlpmDatabase, tempdir: str) -> None:
+    config_get = config.get
+
+    def mock_config_get(section: str, key: str) -> str:
+        value = config_get(section, key)
+        if section == "aurblup":
+            if key == "db-path":
+                return alpm_db.local
+            elif key == "server":
+                return f'file://{alpm_db.remote}'
+            elif key == "sync-dbs":
+                return alpm_db.repo
+        return value
+
+    with mock.patch("aurweb.config.get", side_effect=mock_config_get):
+        config.rehash()
+        yield
+    config.rehash()
+
+
+def test_aurblup(alpm_db: AlpmDatabase):
+    # Test that we can add a package.
+    alpm_db.add("pkg", "1.0", "x86_64", provides=["pkg2", "pkg3"])
+    alpm_db.add("pkg2", "2.0", "x86_64")
+    aurblup.main()
+
+    # Test that the package got added to the database.
+    for name in ("pkg", "pkg2"):
+        pkg = db.query(OfficialProvider).filter(
+            OfficialProvider.Name == name).first()
+        assert pkg is not None
+
+    # Test that we can remove the package.
+    alpm_db.remove("pkg")
+
+    # Run aurblup again with forced repository update.
+    aurblup.main(True)
+
+    # Expect that the database got updated accordingly.
+    pkg = db.query(OfficialProvider).filter(
+        OfficialProvider.Name == "pkg").first()
+    assert pkg is None
+    pkg2 = db.query(OfficialProvider).filter(
+        OfficialProvider.Name == "pkg2").first()
+    assert pkg2 is not None
+
+
+def test_aurblup_cleanup(alpm_db: AlpmDatabase):
+    # Add a package and sync up the database.
+    alpm_db.add("pkg", "1.0", "x86_64", provides=["pkg2", "pkg3"])
+    aurblup.main()
+
+    # Now, let's insert an OfficialPackage that doesn't exist,
+    # then exercise the old provider deletion path.
+    with db.begin():
+        db.create(OfficialProvider, Name="fake package",
+                  Repo="test", Provides="package")
+
+    # Run aurblup again.
+    aurblup.main()
+
+    # Expect that the fake package got deleted because it's
+    # not in alpm_db anymore.
+    providers = db.query(OfficialProvider).filter(
+        OfficialProvider.Name == "fake package").all()
+    assert len(providers) == 0

From c59acbf6d6594971b3953807256e102dd2e740e9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 21 Nov 2021 22:37:31 -0800
Subject: [PATCH 636/844] add noop testing utility

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aurweb/testing/__init__.py b/aurweb/testing/__init__.py
index 8261051d..99671d69 100644
--- a/aurweb/testing/__init__.py
+++ b/aurweb/testing/__init__.py
@@ -62,3 +62,7 @@ def setup_test_db(*args):
         aurweb.db.get_session().execute(f"DELETE FROM {table}")
     aurweb.db.get_session().execute("SET FOREIGN_KEY_CHECKS = 1")
     aurweb.db.get_session().expunge_all()
+
+
+def noop(*args, **kwargs) -> None:
+    return

From 29c2d0de6b83a2287ffdb885d9b55aa63b1d4792 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 21 Nov 2021 00:47:48 -0800
Subject: [PATCH 637/844] change(mkpkglists): converted to use aurweb.db ORM

- Improved speed dramatically
- Removed mkpkglists sharness

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/benchmark.py          |  21 +++
 aurweb/scripts/mkpkglists.py | 282 +++++++++++++++++++++--------------
 test/t2100-mkpkglists.t      |  65 --------
 test/test_mkpkglists.py      | 215 ++++++++++++++++++++++++++
 4 files changed, 403 insertions(+), 180 deletions(-)
 create mode 100644 aurweb/benchmark.py
 delete mode 100755 test/t2100-mkpkglists.t
 create mode 100644 test/test_mkpkglists.py

diff --git a/aurweb/benchmark.py b/aurweb/benchmark.py
new file mode 100644
index 00000000..7086fb08
--- /dev/null
+++ b/aurweb/benchmark.py
@@ -0,0 +1,21 @@
+from datetime import datetime
+
+
+class Benchmark:
+    def __init__(self):
+        self.start()
+
+    def _timestamp(self) -> float:
+        """ Generate a timestamp. """
+        return float(datetime.utcnow().timestamp())
+
+    def start(self) -> int:
+        """ Start a benchmark. """
+        self.current = self._timestamp()
+        return self.current
+
+    def end(self):
+        """ Return the diff between now - start(). """
+        n = self._timestamp() - self.current
+        self.current = float(0)
+        return n
diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 307b2b12..92de7931 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -23,23 +23,28 @@ import os
 import sys
 
 from collections import defaultdict
-from decimal import Decimal
+from typing import Any, Dict
 
 import orjson
 
+from sqlalchemy import literal, orm
+
 import aurweb.config
-import aurweb.db
+
+from aurweb import db, logging, models, util
+from aurweb.benchmark import Benchmark
+from aurweb.models import Package, PackageBase, User
+
+logger = logging.get_logger("aurweb.scripts.mkpkglists")
 
 archivedir = aurweb.config.get("mkpkglists", "archivedir")
 os.makedirs(archivedir, exist_ok=True)
 
-packagesfile = aurweb.config.get('mkpkglists', 'packagesfile')
-packagesmetafile = aurweb.config.get('mkpkglists', 'packagesmetafile')
-packagesmetaextfile = aurweb.config.get('mkpkglists', 'packagesmetaextfile')
-
-pkgbasefile = aurweb.config.get('mkpkglists', 'pkgbasefile')
-
-userfile = aurweb.config.get('mkpkglists', 'userfile')
+PACKAGES = aurweb.config.get('mkpkglists', 'packagesfile')
+META = aurweb.config.get('mkpkglists', 'packagesmetafile')
+META_EXT = aurweb.config.get('mkpkglists', 'packagesmetaextfile')
+PKGBASE = aurweb.config.get('mkpkglists', 'pkgbasefile')
+USERS = aurweb.config.get('mkpkglists', 'userfile')
 
 
 TYPE_MAP = {
@@ -53,7 +58,7 @@ TYPE_MAP = {
 }
 
 
-def get_extended_dict(query: str):
+def get_extended_dict(query: orm.Query):
     """
     Produce data in the form in a single bulk SQL query:
 
@@ -74,61 +79,75 @@ def get_extended_dict(query: str):
         output[i].update(data.get(package_id))
     """
 
-    conn = aurweb.db.Connection()
-
-    cursor = conn.execute(query)
-
     data = defaultdict(lambda: defaultdict(list))
 
-    for result in cursor.fetchall():
-
+    for result in query:
         pkgid = result[0]
         key = TYPE_MAP.get(result[1], result[1])
         output = result[2]
         if result[3]:
             output += result[3]
-
-        # In all cases, we have at least an empty License list.
-        if "License" not in data[pkgid]:
-            data[pkgid]["License"] = []
-
-        # In all cases, we have at least an empty Keywords list.
-        if "Keywords" not in data[pkgid]:
-            data[pkgid]["Keywords"] = []
-
         data[pkgid][key].append(output)
 
-    conn.close()
     return data
 
 
 def get_extended_fields():
-    # Returns: [ID, Type, Name, Cond]
-    query = """
-    SELECT PackageDepends.PackageID AS ID, DependencyTypes.Name AS Type,
-           PackageDepends.DepName AS Name, PackageDepends.DepCondition AS Cond
-    FROM PackageDepends
-    LEFT JOIN DependencyTypes
-    ON DependencyTypes.ID = PackageDepends.DepTypeID
-    UNION SELECT PackageRelations.PackageID AS ID, RelationTypes.Name AS Type,
-          PackageRelations.RelName AS Name,
-          PackageRelations.RelCondition AS Cond
-    FROM PackageRelations
-    LEFT JOIN RelationTypes
-    ON RelationTypes.ID = PackageRelations.RelTypeID
-    UNION SELECT PackageGroups.PackageID AS ID, 'Groups' AS Type,
-          Groups.Name, '' AS Cond
-    FROM Groups
-    INNER JOIN PackageGroups ON PackageGroups.GroupID = Groups.ID
-    UNION SELECT PackageLicenses.PackageID AS ID, 'License' AS Type,
-          Licenses.Name, '' as Cond
-    FROM Licenses
-    INNER JOIN PackageLicenses ON PackageLicenses.LicenseID = Licenses.ID
-    UNION SELECT Packages.ID AS ID, 'Keywords' AS Type,
-          PackageKeywords.Keyword AS Name, '' as Cond
-    FROM PackageKeywords
-    INNER JOIN Packages ON Packages.PackageBaseID = PackageKeywords.PackageBaseID
-    """
+    subqueries = [
+        # PackageDependency
+        db.query(
+            models.PackageDependency
+        ).join(models.DependencyType).with_entities(
+            models.PackageDependency.PackageID.label("ID"),
+            models.DependencyType.Name.label("Type"),
+            models.PackageDependency.DepName.label("Name"),
+            models.PackageDependency.DepCondition.label("Cond")
+        ).distinct().order_by("Name"),
+
+        # PackageRelation
+        db.query(
+            models.PackageRelation
+        ).join(models.RelationType).with_entities(
+            models.PackageRelation.PackageID.label("ID"),
+            models.RelationType.Name.label("Type"),
+            models.PackageRelation.RelName.label("Name"),
+            models.PackageRelation.RelCondition.label("Cond")
+        ).distinct().order_by("Name"),
+
+        # Groups
+        db.query(models.PackageGroup).join(
+            models.Group,
+            models.PackageGroup.GroupID == models.Group.ID
+        ).with_entities(
+            models.PackageGroup.PackageID.label("ID"),
+            literal("Groups").label("Type"),
+            models.Group.Name.label("Name"),
+            literal(str()).label("Cond")
+        ).distinct().order_by("Name"),
+
+        # Licenses
+        db.query(models.PackageLicense).join(
+            models.License,
+            models.PackageLicense.LicenseID == models.License.ID
+        ).with_entities(
+            models.PackageLicense.PackageID.label("ID"),
+            literal("License").label("Type"),
+            models.License.Name.label("Name"),
+            literal(str()).label("Cond")
+        ).distinct().order_by("Name"),
+
+        # Keywords
+        db.query(models.PackageKeyword).join(
+            models.Package,
+            Package.PackageBaseID == models.PackageKeyword.PackageBaseID
+        ).with_entities(
+            models.Package.ID.label("ID"),
+            literal("Keywords").label("Type"),
+            models.PackageKeyword.Keyword.label("Name"),
+            literal(str()).label("Cond")
+        ).distinct().order_by("Name")
+    ]
+    query = subqueries[0].union_all(*subqueries[1:])
     return get_extended_dict(query)
 
 
@@ -137,89 +156,122 @@ EXTENDED_FIELD_HANDLERS = {
 }
 
 
-def is_decimal(column):
-    """ Check if an SQL column is of decimal.Decimal type. """
-    if isinstance(column, Decimal):
-        return float(column)
-    return column
+def as_dict(package: Package) -> Dict[str, Any]:
+    return {
+        "ID": package.ID,
+        "Name": package.Name,
+        "PackageBaseID": package.PackageBaseID,
+        "PackageBase": package.PackageBase,
+        "Version": package.Version,
+        "Description": package.Description,
+        "NumVotes": package.NumVotes,
+        "Popularity": float(package.Popularity),
+        "OutOfDate": package.OutOfDate,
+        "Maintainer": package.Maintainer,
+        "FirstSubmitted": package.FirstSubmitted,
+        "LastModified": package.LastModified,
+    }
 
 
-def write_archive(archive: str, output: list):
-    with gzip.open(archive, "wb") as f:
-        f.write(b"[\n")
-        for i, item in enumerate(output):
-            f.write(orjson.dumps(item))
-            if i < len(output) - 1:
-                f.write(b",")
-            f.write(b"\n")
-        f.write(b"]")
+def _main():
+    bench = Benchmark()
+    logger.info("Started re-creating archives, wait a while...")
 
-
-def main():
-    conn = aurweb.db.Connection()
-
-    # Query columns; copied from RPC.
-    columns = ("Packages.ID, Packages.Name, "
-               "PackageBases.ID AS PackageBaseID, "
-               "PackageBases.Name AS PackageBase, "
-               "Version, Description, URL, NumVotes, "
-               "Popularity, OutOfDateTS AS OutOfDate, "
-               "Users.UserName AS Maintainer, "
-               "SubmittedTS AS FirstSubmitted, "
-               "ModifiedTS AS LastModified")
-
-    # Perform query.
-    cur = conn.execute(f"SELECT {columns} FROM Packages "
-                       "LEFT JOIN PackageBases "
-                       "ON PackageBases.ID = Packages.PackageBaseID "
-                       "LEFT JOIN Users "
-                       "ON PackageBases.MaintainerUID = Users.ID "
-                       "WHERE PackageBases.PackagerUID IS NOT NULL")
+    query = db.query(Package).join(
+        PackageBase,
+        PackageBase.ID == Package.PackageBaseID
+    ).join(
+        User,
+        PackageBase.MaintainerUID == User.ID,
+        isouter=True
+    ).filter(PackageBase.PackagerUID.isnot(None)).with_entities(
+        Package.ID,
+        Package.Name,
+        PackageBase.ID.label("PackageBaseID"),
+        PackageBase.Name.label("PackageBase"),
+        Package.Version,
+        Package.Description,
+        PackageBase.NumVotes,
+        PackageBase.Popularity,
+        PackageBase.OutOfDateTS.label("OutOfDate"),
+        User.Username.label("Maintainer"),
+        PackageBase.SubmittedTS.label("FirstSubmitted"),
+        PackageBase.ModifiedTS.label("LastModified")
+    ).distinct().order_by("Name")
 
     # Produce packages-meta-v1.json.gz
     output = list()
     snapshot_uri = aurweb.config.get("options", "snapshot_uri")
-    for result in cur.fetchall():
-        item = {
-            column[0]: is_decimal(result[i])
-            for i, column in enumerate(cur.description)
-        }
-        item["URLPath"] = snapshot_uri % item.get("Name")
-        output.append(item)
+    gzips = {
+        "packages": gzip.open(PACKAGES, "wt"),
+        "meta": gzip.open(META, "wb"),
+    }
 
-    write_archive(packagesmetafile, output)
+    # Append list opening to the metafile.
+    gzips["meta"].write(b"[\n")
 
-    # Produce packages-meta-ext-v1.json.gz
+    # Produce packages.gz + packages-meta-ext-v1.json.gz
+    extended = False
     if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS:
+        gzips["meta_ext"] = gzip.open(META_EXT, "wb")
+        # Append list opening to the meta_ext file.
+        gzips.get("meta_ext").write(b"[\n")
         f = EXTENDED_FIELD_HANDLERS.get(sys.argv[1])
         data = f()
+        extended = True
 
-        default_ = {"Groups": [], "License": [], "Keywords": []}
-        for i in range(len(output)):
-            data_ = data.get(output[i].get("ID"), default_)
-            output[i].update(data_)
+    results = query.all()
+    n = len(results) - 1
+    for i, result in enumerate(results):
+        # Append to packages.gz.
+        gzips.get("packages").write(f"{result.Name}\n")
 
-        write_archive(packagesmetaextfile, output)
+        # Construct our result JSON dictionary.
+        item = as_dict(result)
+        item["URLPath"] = snapshot_uri % result.Name
 
-    # Produce packages.gz
-    with gzip.open(packagesfile, "wb") as f:
-        f.writelines([
-            bytes(x.get("Name") + "\n", "UTF-8")
-            for x in output
-        ])
+        # We stream out package json objects line per line, so
+        # we also need to include the ',' character at the end
+        # of package lines (excluding the last package).
+        suffix = b",\n" if i < n else b'\n'
+
+        # Write out to packagesmetafile
+        output.append(item)
+        gzips.get("meta").write(orjson.dumps(output[-1]) + suffix)
+
+        if extended:
+            # Write out to packagesmetaextfile.
+            data_ = data.get(result.ID, {})
+            output[-1].update(data_)
+            gzips.get("meta_ext").write(orjson.dumps(output[-1]) + suffix)
+
+    # Append the list closing to meta/meta_ext.
+    gzips.get("meta").write(b"]")
+    if extended:
+        gzips.get("meta_ext").write(b"]")
+
+    # Close gzip files.
+    util.apply_all(gzips.values(), lambda gz: gz.close())
 
     # Produce pkgbase.gz
-    with gzip.open(pkgbasefile, "w") as f:
-        cur = conn.execute("SELECT Name FROM PackageBases " +
-                           "WHERE PackagerUID IS NOT NULL")
-        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+    query = db.query(PackageBase.Name).filter(
+        PackageBase.PackagerUID.isnot(None)).all()
+    with gzip.open(PKGBASE, "wt") as f:
+        f.writelines([f"{base.Name}\n" for i, base in enumerate(query)])
 
     # Produce users.gz
-    with gzip.open(userfile, "w") as f:
-        cur = conn.execute("SELECT UserName FROM Users")
-        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+    query = db.query(User.Username).all()
+    with gzip.open(USERS, "wt") as f:
+        f.writelines([f"{user.Username}\n" for i, user in enumerate(query)])
 
-    conn.close()
+    seconds = util.number_format(bench.end(), 4)
+    logger.info(f"Completed in {seconds} seconds.")
+
+
+def main():
+    db.get_engine()
+    with db.begin():
+        _main()
 
 
 if __name__ == '__main__':
diff --git a/test/t2100-mkpkglists.t b/test/t2100-mkpkglists.t
deleted file mode 100755
index d217c4f6..00000000
--- a/test/t2100-mkpkglists.t
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-test_description='mkpkglists tests'
-
-. "$(dirname "$0")/setup.sh"
-
-test_expect_success 'Test package list generation with no packages.' '
-	echo "DELETE FROM Packages;" | sqlite3 aur.db &&
-	echo "DELETE FROM PackageBases;" | sqlite3 aur.db &&
-	cover "$MKPKGLISTS" &&
-	test $(zcat packages.gz | wc -l) -eq 0 &&
-	test $(zcat pkgbase.gz | wc -l) -eq 0
-'
-
-test_expect_success 'Test package list generation.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1, "foobar", 1, 0, 0, "");
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (2, "foobar2", 2, 0, 0, "");
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (3, "foobar3", NULL, 0, 0, "");
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (4, "foobar4", 1, 0, 0, "");
-	INSERT INTO Packages (ID, PackageBaseID, Name) VALUES (1, 1, "pkg1");
-	INSERT INTO Packages (ID, PackageBaseID, Name) VALUES (2, 1, "pkg2");
-	INSERT INTO Packages (ID, PackageBaseID, Name) VALUES (3, 1, "pkg3");
-	INSERT INTO Packages (ID, PackageBaseID, Name) VALUES (4, 2, "pkg4");
-	INSERT INTO Packages (ID, PackageBaseID, Name) VALUES (5, 3, "pkg5");
-	EOD
-	cover "$MKPKGLISTS" &&
-	cat <<-EOD >expected &&
-	foobar
-	foobar2
-	foobar4
-	EOD
-	gunzip pkgbase.gz &&
-	sed "/^#/d" pkgbase >actual &&
-	test_cmp actual expected &&
-	cat <<-EOD >expected &&
-	pkg1
-	pkg2
-	pkg3
-	pkg4
-	EOD
-	gunzip packages.gz &&
-	sed "/^#/d" packages >actual &&
-	test_cmp actual expected
-'
-
-test_expect_success 'Test user list generation.' '
-	cover "$MKPKGLISTS" &&
-	cat <<-EOD >expected &&
-	dev
-	tu
-	tu2
-	tu3
-	tu4
-	user
-	user2
-	user3
-	user4
-	EOD
-	gunzip users.gz &&
-	sed "/^#/d" users >actual &&
-	test_cmp actual expected
-'
-
-test_done
diff --git a/test/test_mkpkglists.py b/test/test_mkpkglists.py
new file mode 100644
index 00000000..ee66e4e1
--- /dev/null
+++ b/test/test_mkpkglists.py
@@ -0,0 +1,215 @@
+import json
+
+from typing import List, Union
+from unittest import mock
+
+import pytest
+
+from aurweb import config, db, util
+from aurweb.models import License, Package, PackageBase, PackageDependency, PackageLicense, User
+from aurweb.models.account_type import USER_ID
+from aurweb.models.dependency_type import DEPENDS_ID
+from aurweb.testing import noop
+
+
+class FakeFile:
+    data = str()
+    __exit__ = noop
+
+    def __init__(self, modes: str) -> "FakeFile":
+        self.modes = modes
+
+    def __enter__(self, *args, **kwargs) -> "FakeFile":
+        return self
+
+    def write(self, data: Union[str, bytes]) -> None:
+        if isinstance(data, bytes):
+            data = data.decode()
+        self.data += data
+
+    def writelines(self, dataset: List[Union[str, bytes]]) -> None:
+        util.apply_all(dataset, self.write)
+
+    def close(self) -> None:
+        return
+
+
+class MockGzipOpen:
+    def __init__(self):
+        self.gzips = dict()
+
+    def open(self, archive: str, modes: str):
+        self.gzips[archive] = FakeFile(modes)
+        return self.gzips.get(archive)
+
+    def get(self, key: str) -> FakeFile:
+        return self.gzips.get(key)
+
+    def __getitem__(self, key: str) -> FakeFile:
+        return self.get(key)
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.gzips
+
+    def data(self, archive: str):
+        return self.get(archive).data
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    config.rehash()
+
+
+@pytest.fixture
+def user() -> User:
+    with db.begin():
+        user = db.create(User, Username="test",
+                         Email="test@example.org",
+                         Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def packages(user: User) -> List[Package]:
+    output = []
+    with db.begin():
+        lic = db.create(License, Name="GPL")
+        for i in range(5):
+            # Create the package.
+            pkgbase = db.create(PackageBase, Name=f"pkgbase_{i}",
+                                Packager=user)
+            pkg = db.create(Package, PackageBase=pkgbase,
+                            Name=f"pkg_{i}")
+
+            # Create some related records.
+            db.create(PackageLicense, Package=pkg, License=lic)
+            db.create(PackageDependency, DepTypeID=DEPENDS_ID,
+                      Package=pkg, DepName=f"dep_{i}",
+                      DepCondition=">=1.0")
+
+            # Add the package to our output list.
+            output.append(pkg)
+
+    # Sort output by the package name and return it.
+    yield sorted(output, key=lambda k: k.Name)
+
+
+@mock.patch("os.makedirs", side_effect=noop)
+def test_mkpkglists_empty(makedirs: mock.MagicMock):
+    gzips = MockGzipOpen()
+    with mock.patch("gzip.open", side_effect=gzips.open):
+        from aurweb.scripts import mkpkglists
+        mkpkglists.main()
+
+    archives = config.get_section("mkpkglists")
+    archives.pop("archivedir")
+    archives.pop("packagesmetaextfile")
+
+    for archive in archives.values():
+        assert archive in gzips
+
+    # Expect that packagesfile got created, but is empty because
+    # we have no DB records.
+    packages_file = archives.get("packagesfile")
+    assert gzips.data(packages_file) == str()
+
+    # Expect that pkgbasefile got created, but is empty because
+    # we have no DB records.
+    users_file = archives.get("pkgbasefile")
+    assert gzips.data(users_file) == str()
+
+    # Expect that userfile got created, but is empty because
+    # we have no DB records.
+    users_file = archives.get("userfile")
+    assert gzips.data(users_file) == str()
+
+    # Expect that packagesmetafile got created, but is empty because
+    # we have no DB records; it's still a valid empty JSON list.
+    meta_file = archives.get("packagesmetafile")
+    assert gzips.data(meta_file) == "[\n]"
+
+
+@mock.patch("sys.argv", ["mkpkglists", "--extended"])
+@mock.patch("os.makedirs", side_effect=noop)
+def test_mkpkglists_extended_empty(makedirs: mock.MagicMock):
+    gzips = MockGzipOpen()
+    with mock.patch("gzip.open", side_effect=gzips.open):
+        from aurweb.scripts import mkpkglists
+        mkpkglists.main()
+
+    archives = config.get_section("mkpkglists")
+    archives.pop("archivedir")
+
+    for archive in archives.values():
+        assert archive in gzips
+
+    # Expect that packagesfile got created, but is empty because
+    # we have no DB records.
+    packages_file = archives.get("packagesfile")
+    assert gzips.data(packages_file) == str()
+
+    # Expect that pkgbasefile got created, but is empty because
+    # we have no DB records.
+    users_file = archives.get("pkgbasefile")
+    assert gzips.data(users_file) == str()
+
+    # Expect that userfile got created, but is empty because
+    # we have no DB records.
+    users_file = archives.get("userfile")
+    assert gzips.data(users_file) == str()
+
+    # Expect that packagesmetafile got created, but is empty because
+    # we have no DB records; it's still a valid empty JSON list.
+    meta_file = archives.get("packagesmetafile")
+    assert gzips.data(meta_file) == "[\n]"
+
+    # Expect that packagesmetafile got created, but is empty because
+    # we have no DB records; it's still a valid empty JSON list.
+    meta_file = archives.get("packagesmetaextfile")
+    assert gzips.data(meta_file) == "[\n]"
+
+
+@mock.patch("sys.argv", ["mkpkglists", "--extended"])
+@mock.patch("os.makedirs", side_effect=noop)
+def test_mkpkglists_extended(makedirs: mock.MagicMock, user: User,
+                             packages: List[Package]):
+    gzips = MockGzipOpen()
+    with mock.patch("gzip.open", side_effect=gzips.open):
+        from aurweb.scripts import mkpkglists
+        mkpkglists.main()
+
+    archives = config.get_section("mkpkglists")
+    archives.pop("archivedir")
+
+    for archive in archives.values():
+        assert archive in gzips
+
+    # Expect that packagesfile got created, but is empty because
+    # we have no DB records.
+    packages_file = archives.get("packagesfile")
+    expected = "\n".join([p.Name for p in packages]) + "\n"
+    assert gzips.data(packages_file) == expected
+
+    # Expect that pkgbasefile got created, but is empty because
+    # we have no DB records.
+    users_file = archives.get("pkgbasefile")
+    expected = "\n".join([p.PackageBase.Name for p in packages]) + "\n"
+    assert gzips.data(users_file) == expected
+
+    # Expect that userfile got created, but is empty because
+    # we have no DB records.
+    users_file = archives.get("userfile")
+    assert gzips.data(users_file) == "test\n"
+
+    # Expect that packagesmetafile got created, but is empty because
+    # we have no DB records; it's still a valid empty JSON list.
+    meta_file = archives.get("packagesmetafile")
+    data = json.loads(gzips.data(meta_file))
+    assert len(data) == 5
+
+    # Expect that packagesmetafile got created, but is empty because
+    # we have no DB records; it's still a valid empty JSON list.
+    meta_file = archives.get("packagesmetaextfile")
+    data = json.loads(gzips.data(meta_file))
+    assert len(data) == 5

From 8d5683d3f18004d44cb4277a67da12c0a88e7698 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 10:28:58 -0800
Subject: [PATCH 638/844] change(tuvotereminder): converted to use aurweb.db
 ORM

- Removed tuvotereminder sharness test.
- Added [tuvotereminder] section to config.defaults.
- Added `range_start` option to config.defaults [tuvotereminder].
- Added `range_end` option to config.defaults [tuvotereminder].

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/tuvotereminder.py |  33 ++++++----
 conf/config.defaults             |   8 +++
 test/t2200-tuvotereminder.t      |  53 ----------------
 test/test_tuvotereminder.py      | 102 +++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+), 65 deletions(-)
 delete mode 100755 test/t2200-tuvotereminder.t
 create mode 100644 test/test_tuvotereminder.py

diff --git a/aurweb/scripts/tuvotereminder.py b/aurweb/scripts/tuvotereminder.py
index eb3874e1..5e860725 100755
--- a/aurweb/scripts/tuvotereminder.py
+++ b/aurweb/scripts/tuvotereminder.py
@@ -1,27 +1,36 @@
 #!/usr/bin/env python3
 
-import subprocess
-import time
+from datetime import datetime
+
+from sqlalchemy import and_
 
 import aurweb.config
-import aurweb.db
+
+from aurweb import db
+from aurweb.models import TUVoteInfo
+from aurweb.scripts import notify
 
 notify_cmd = aurweb.config.get('notifications', 'notify-cmd')
 
 
 def main():
-    conn = aurweb.db.Connection()
+    db.get_engine()
 
-    now = int(time.time())
-    filter_from = now + 500
-    filter_to = now + 172800
+    now = int(datetime.utcnow().timestamp())
 
-    cur = conn.execute("SELECT ID FROM TU_VoteInfo " +
-                       "WHERE End >= ? AND End <= ?",
-                       [filter_from, filter_to])
+    start = aurweb.config.getint("tuvotereminder", "range_start")
+    filter_from = now + start
 
-    for vote_id in [row[0] for row in cur.fetchall()]:
-        subprocess.Popen((notify_cmd, 'tu-vote-reminder', str(vote_id))).wait()
+    end = aurweb.config.getint("tuvotereminder", "range_end")
+    filter_to = now + end
+
+    query = db.query(TUVoteInfo.ID).filter(
+        and_(TUVoteInfo.End >= filter_from,
+             TUVoteInfo.End <= filter_to)
+    )
+    for voteinfo in query:
+        notif = notify.TUVoteReminderNotification(voteinfo.ID)
+        notif.send()
 
 
 if __name__ == '__main__':
diff --git a/conf/config.defaults b/conf/config.defaults
index a589997b..082d51a5 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -121,3 +121,11 @@ commit_url = https://gitlab.archlinux.org/archlinux/aurweb/-/commits/%s
 ; Example deployment configuration step:
 ; sed -r "s/^;?(commit_hash) =.*$/\1 = $(git rev-parse HEAD)/" config
 ;commit_hash = 1234567
+
+[tuvotereminder]
+; Offsets used to determine when TUs should be reminded about
+; votes that they should make.
+; Reminders will be sent out for all votes that a TU has not yet
+; voted on based on `now + range_start <= End <= now + range_end`.
+range_start = 500
+range_end = 172800
diff --git a/test/t2200-tuvotereminder.t b/test/t2200-tuvotereminder.t
deleted file mode 100755
index 2f3836de..00000000
--- a/test/t2200-tuvotereminder.t
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-test_description='tuvotereminder tests'
-
-. "$(dirname "$0")/setup.sh"
-
-test_expect_success 'Test Trusted User vote reminders.' '
-	now=$(date -d now +%s) &&
-	tomorrow=$(date -d tomorrow +%s) &&
-	threedays=$(date -d "3 days" +%s) &&
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO TU_VoteInfo (ID, Agenda, User, Submitted, End, Quorum, SubmitterID) VALUES (1, "Lorem ipsum.", "user", 0, $now, 0.00, 2);
-	INSERT INTO TU_VoteInfo (ID, Agenda, User, Submitted, End, Quorum, SubmitterID) VALUES (2, "Lorem ipsum.", "user", 0, $tomorrow, 0.00, 2);
-	INSERT INTO TU_VoteInfo (ID, Agenda, User, Submitted, End, Quorum, SubmitterID) VALUES (3, "Lorem ipsum.", "user", 0, $tomorrow, 0.00, 2);
-	INSERT INTO TU_VoteInfo (ID, Agenda, User, Submitted, End, Quorum, SubmitterID) VALUES (4, "Lorem ipsum.", "user", 0, $threedays, 0.00, 2);
-	EOD
-	>sendmail.out &&
-	cover "$TUVOTEREMINDER" &&
-	grep -q "Proposal 2" sendmail.out &&
-	grep -q "Proposal 3" sendmail.out &&
-	test_must_fail grep -q "Proposal 1" sendmail.out &&
-	test_must_fail grep -q "Proposal 4" sendmail.out
-'
-
-test_expect_success 'Check that only TUs who did not vote receive reminders.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (1, 2);
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (2, 2);
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (3, 2);
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (4, 2);
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (1, 7);
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (3, 7);
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (2, 8);
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (4, 8);
-	INSERT INTO TU_Votes (VoteID, UserID) VALUES (1, 9);
-	EOD
-	>sendmail.out &&
-	cover "$TUVOTEREMINDER" &&
-	cat <<-EOD >expected &&
-	Subject: TU Vote Reminder: Proposal 2
-	To: tu2@localhost
-	Subject: TU Vote Reminder: Proposal 2
-	To: tu4@localhost
-	Subject: TU Vote Reminder: Proposal 3
-	To: tu3@localhost
-	Subject: TU Vote Reminder: Proposal 3
-	To: tu4@localhost
-	EOD
-	grep "^\(Subject\|To\)" sendmail.out >sendmail.parts &&
-	test_cmp sendmail.parts expected
-'
-
-test_done
diff --git a/test/test_tuvotereminder.py b/test/test_tuvotereminder.py
new file mode 100644
index 00000000..bb898e3a
--- /dev/null
+++ b/test/test_tuvotereminder.py
@@ -0,0 +1,102 @@
+from datetime import datetime
+from typing import Tuple
+
+import pytest
+
+from aurweb import config, db
+from aurweb.models import TUVote, TUVoteInfo, User
+from aurweb.models.account_type import TRUSTED_USER_ID
+from aurweb.scripts import tuvotereminder as reminder
+from aurweb.testing.email import Email
+
+aur_location = config.get("options", "aur_location")
+
+
+def create_vote(user: User, voteinfo: TUVoteInfo) -> TUVote:
+    with db.begin():
+        vote = db.create(TUVote, User=user, VoteID=voteinfo.ID)
+    return vote
+
+
+def create_user(username: str, type_id: int):
+    with db.begin():
+        user = db.create(User, AccountTypeID=type_id, Username=username,
+                         Email=f"{username}@example.org", Passwd=str())
+    return user
+
+
+def email_pieces(voteinfo: TUVoteInfo) -> Tuple[str, str]:
+    """
+    Return a (subject, content) tuple based on voteinfo.ID
+
+    :param voteinfo: TUVoteInfo instance
+    :return: tuple(subject, content)
+    """
+    subject = f"TU Vote Reminder: Proposal {voteinfo.ID}"
+    content = (f"Please remember to cast your vote on proposal {voteinfo.ID} "
+               f"[1]. The voting period\nends in less than 48 hours.\n\n"
+               f"[1] {aur_location}/tu/?id={voteinfo.ID}")
+    return (subject, content)
+
+
+@pytest.fixture
+def user(db_test) -> User:
+    yield create_user("test", TRUSTED_USER_ID)
+
+
+@pytest.fixture
+def user2() -> User:
+    yield create_user("test2", TRUSTED_USER_ID)
+
+
+@pytest.fixture
+def user3() -> User:
+    yield create_user("test3", TRUSTED_USER_ID)
+
+
+@pytest.fixture
+def voteinfo(user: User) -> TUVoteInfo:
+    now = int(datetime.utcnow().timestamp())
+    start = config.getint("tuvotereminder", "range_start")
+    with db.begin():
+        voteinfo = db.create(TUVoteInfo, Agenda="Lorem ipsum.",
+                             User=user.Username, End=(now + start + 1),
+                             Quorum=0.00, Submitter=user, Submitted=0)
+    yield voteinfo
+
+
+def test_tu_vote_reminders(user: User, user2: User, user3: User,
+                           voteinfo: TUVoteInfo):
+    reminder.main()
+    assert Email.count() == 3
+
+    emails = [Email(i).parse() for i in range(1, 4)]
+    subject, content = email_pieces(voteinfo)
+    expectations = [
+        # (to, content)
+        (user.Email, subject, content),
+        (user2.Email, subject, content),
+        (user3.Email, subject, content)
+    ]
+    for i, element in enumerate(expectations):
+        email, subject, content = element
+        assert emails[i].headers.get("To") == email
+        assert emails[i].headers.get("Subject") == subject
+        assert emails[i].body == content
+
+
+def test_tu_vote_reminders_only_unvoted(user: User, user2: User, user3: User,
+                                        voteinfo: TUVoteInfo):
+    # Vote with user2 and user3; leaving only user to be notified.
+    create_vote(user2, voteinfo)
+    create_vote(user3, voteinfo)
+
+    reminder.main()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+
+    subject, content = email_pieces(voteinfo)
+    assert email.headers.get("Subject") == subject
+    assert email.body == content

From d097799b34e5392f577db28920f8fb27b35602f3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 10:51:44 -0800
Subject: [PATCH 639/844] change(usermaint): converted to use aurweb.db ORM

- Removed usermaint sharness test

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/usermaint.py | 34 ++++++++++++-------
 test/t2700-usermaint.t      | 49 ---------------------------
 test/test_usermaint.py      | 67 +++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 61 deletions(-)
 delete mode 100755 test/t2700-usermaint.t
 create mode 100644 test/test_usermaint.py

diff --git a/aurweb/scripts/usermaint.py b/aurweb/scripts/usermaint.py
index 1621d410..aad3e8de 100755
--- a/aurweb/scripts/usermaint.py
+++ b/aurweb/scripts/usermaint.py
@@ -1,21 +1,31 @@
 #!/usr/bin/env python3
 
-import time
+from datetime import datetime
 
-import aurweb.db
+from sqlalchemy import update
+
+from aurweb import db
+from aurweb.models import User
+
+
+def _main():
+    limit_to = int(datetime.utcnow().timestamp()) - 86400 * 7
+
+    update_ = update(User).where(
+        User.LastLogin < limit_to
+    ).values(LastLoginIPAddress=None)
+    db.get_session().execute(update_)
+
+    update_ = update(User).where(
+        User.LastSSHLogin < limit_to
+    ).values(LastSSHLoginIPAddress=None)
+    db.get_session().execute(update_)
 
 
 def main():
-    conn = aurweb.db.Connection()
-
-    limit_to = int(time.time()) - 86400 * 7
-    conn.execute("UPDATE Users SET LastLoginIPAddress = NULL " +
-                 "WHERE LastLogin < ?", [limit_to])
-    conn.execute("UPDATE Users SET LastSSHLoginIPAddress = NULL " +
-                 "WHERE LastSSHLogin < ?", [limit_to])
-
-    conn.commit()
-    conn.close()
+    db.get_engine()
+    with db.begin():
+        _main()
 
 
 if __name__ == '__main__':
diff --git a/test/t2700-usermaint.t b/test/t2700-usermaint.t
deleted file mode 100755
index c119e3f4..00000000
--- a/test/t2700-usermaint.t
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-test_description='usermaint tests'
-
-. "$(dirname "$0")/setup.sh"
-
-test_expect_success 'Test removal of login IP addresses.' '
-	now=$(date -d now +%s) &&
-	threedaysago=$(date -d "3 days ago" +%s) &&
-	tendaysago=$(date -d "10 days ago" +%s) &&
-	cat <<-EOD | sqlite3 aur.db &&
-	UPDATE Users SET LastLogin = $threedaysago, LastLoginIPAddress = "1.2.3.4" WHERE ID = 1;
-	UPDATE Users SET LastLogin = $tendaysago, LastLoginIPAddress = "2.3.4.5" WHERE ID = 2;
-	UPDATE Users SET LastLogin = $now, LastLoginIPAddress = "3.4.5.6" WHERE ID = 3;
-	UPDATE Users SET LastLogin = 0, LastLoginIPAddress = "4.5.6.7" WHERE ID = 4;
-	UPDATE Users SET LastLogin = 0, LastLoginIPAddress = "5.6.7.8" WHERE ID = 5;
-	UPDATE Users SET LastLogin = $tendaysago, LastLoginIPAddress = "6.7.8.9" WHERE ID = 6;
-	EOD
-	cover "$USERMAINT" &&
-	cat <<-EOD >expected &&
-	1.2.3.4
-	3.4.5.6
-	EOD
-	echo "SELECT LastLoginIPAddress FROM Users WHERE LastLoginIPAddress IS NOT NULL;" | sqlite3 aur.db >actual &&
-	test_cmp actual expected
-'
-
-test_expect_success 'Test removal of SSH login IP addresses.' '
-	now=$(date -d now +%s) &&
-	threedaysago=$(date -d "3 days ago" +%s) &&
-	tendaysago=$(date -d "10 days ago" +%s) &&
-	cat <<-EOD | sqlite3 aur.db &&
-	UPDATE Users SET LastSSHLogin = $now, LastSSHLoginIPAddress = "1.2.3.4" WHERE ID = 1;
-	UPDATE Users SET LastSSHLogin = $threedaysago, LastSSHLoginIPAddress = "2.3.4.5" WHERE ID = 2;
-	UPDATE Users SET LastSSHLogin = $tendaysago, LastSSHLoginIPAddress = "3.4.5.6" WHERE ID = 3;
-	UPDATE Users SET LastSSHLogin = 0, LastSSHLoginIPAddress = "4.5.6.7" WHERE ID = 4;
-	UPDATE Users SET LastSSHLogin = 0, LastSSHLoginIPAddress = "5.6.7.8" WHERE ID = 5;
-	UPDATE Users SET LastSSHLogin = $tendaysago, LastSSHLoginIPAddress = "6.7.8.9" WHERE ID = 6;
-	EOD
-	cover "$USERMAINT" &&
-	cat <<-EOD >expected &&
-	1.2.3.4
-	2.3.4.5
-	EOD
-	echo "SELECT LastSSHLoginIPAddress FROM Users WHERE LastSSHLoginIPAddress IS NOT NULL;" | sqlite3 aur.db >actual &&
-	test_cmp actual expected
-'
-
-test_done
diff --git a/test/test_usermaint.py b/test/test_usermaint.py
new file mode 100644
index 00000000..f1af59e1
--- /dev/null
+++ b/test/test_usermaint.py
@@ -0,0 +1,67 @@
+from datetime import datetime
+
+import pytest
+
+from aurweb import db
+from aurweb.models import User
+from aurweb.models.account_type import USER_ID
+from aurweb.scripts import usermaint
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    return
+
+
+@pytest.fixture
+def user() -> User:
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         Passwd="testPassword", AccountTypeID=USER_ID)
+    yield user
+
+
+def test_usermaint_noop(user: User):
+    """ Last[SSH]Login isn't expired in this test: usermaint is noop. """
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        user.LastLoginIPAddress = "127.0.0.1"
+        user.LastLogin = now - 10
+        user.LastSSHLoginIPAddress = "127.0.0.1"
+        user.LastSSHLogin = now - 10
+
+    usermaint.main()
+
+    assert user.LastLoginIPAddress == "127.0.0.1"
+    assert user.LastSSHLoginIPAddress == "127.0.0.1"
+
+
+def test_usermaint(user: User):
+    """
+    In this case, we first test that only the expired record gets
+    updated, but the non-expired record remains untouched. After,
+    we update the login time on the non-expired record and exercise
+    its code path.
+    """
+
+    now = int(datetime.utcnow().timestamp())
+    limit_to = now - 86400 * 7
+    with db.begin():
+        user.LastLoginIPAddress = "127.0.0.1"
+        user.LastLogin = limit_to - 666
+        user.LastSSHLoginIPAddress = "127.0.0.1"
+        user.LastSSHLogin = now - 10
+
+    usermaint.main()
+
+    assert user.LastLoginIPAddress is None
+    assert user.LastSSHLoginIPAddress == "127.0.0.1"
+
+    with db.begin():
+        user.LastSSHLogin = limit_to - 666
+
+    usermaint.main()
+
+    assert user.LastLoginIPAddress is None
+    assert user.LastSSHLoginIPAddress is None

From f4ef02fa5b744598e366930e63adec4cdbac6706 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 11:07:31 -0800
Subject: [PATCH 640/844] fix(fastapi): fix Package's PackageBase backref
 cascade

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aurweb/models/package.py b/aurweb/models/package.py
index 8f82dadd..cfb27634 100644
--- a/aurweb/models/package.py
+++ b/aurweb/models/package.py
@@ -12,7 +12,8 @@ class Package(Base):
     __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
     PackageBase = relationship(
-        _PackageBase, backref=backref("packages", lazy="dynamic"),
+        _PackageBase, backref=backref("packages", lazy="dynamic",
+                                      cascade="all, delete"),
         foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):

From b72bd38f76ed290a4e5607dfca177dcf0c1d9864 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 11:08:15 -0800
Subject: [PATCH 641/844] change(pkgmaint): converted to use aurweb.db ORM

- Replaced time.time() usage with datetime.utcnow().timestamp()
- Removed pkgmaint sharness test

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/pkgmaint.py | 28 ++++++++++------
 test/t2300-pkgmaint.t      | 26 ---------------
 test/test_pkgmaint.py      | 65 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 36 deletions(-)
 delete mode 100755 test/t2300-pkgmaint.t
 create mode 100644 test/test_pkgmaint.py

diff --git a/aurweb/scripts/pkgmaint.py b/aurweb/scripts/pkgmaint.py
index 36da126f..b3992e5c 100755
--- a/aurweb/scripts/pkgmaint.py
+++ b/aurweb/scripts/pkgmaint.py
@@ -1,19 +1,27 @@
 #!/usr/bin/env python3
 
-import time
+from datetime import datetime
 
-import aurweb.db
+from sqlalchemy import and_
+
+from aurweb import db
+from aurweb.models import PackageBase
+
+
+def _main():
+    # One day behind.
+    limit_to = int(datetime.utcnow().timestamp()) - 86400
+
+    query = db.query(PackageBase).filter(
+        and_(PackageBase.SubmittedTS < limit_to,
+             PackageBase.PackagerUID.is_(None)))
+    db.delete_all(query)
 
 
 def main():
-    conn = aurweb.db.Connection()
-
-    limit_to = int(time.time()) - 86400
-    conn.execute("DELETE FROM PackageBases WHERE " +
-                 "SubmittedTS < ? AND PackagerUID IS NULL", [limit_to])
-
-    conn.commit()
-    conn.close()
+    db.get_engine()
+    with db.begin():
+        _main()
 
 
 if __name__ == '__main__':
diff --git a/test/t2300-pkgmaint.t b/test/t2300-pkgmaint.t
deleted file mode 100755
index 997f95b0..00000000
--- a/test/t2300-pkgmaint.t
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-test_description='pkgmaint tests'
-
-. "$(dirname "$0")/setup.sh"
-
-test_expect_success 'Test package base cleanup script.' '
-	now=$(date -d now +%s) &&
-	threedaysago=$(date -d "3 days ago" +%s) &&
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1, "foobar", 1, $now, 0, "");
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (2, "foobar2", 2, $threedaysago, 0, "");
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (3, "foobar3", NULL, $now, 0, "");
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (4, "foobar4", NULL, $threedaysago, 0, "");
-	EOD
-	cover "$PKGMAINT" &&
-	cat <<-EOD >expected &&
-	foobar
-	foobar2
-	foobar3
-	EOD
-	echo "SELECT Name FROM PackageBases;" | sqlite3 aur.db >actual &&
-	test_cmp actual expected
-'
-
-test_done
diff --git a/test/test_pkgmaint.py b/test/test_pkgmaint.py
new file mode 100644
index 00000000..921a6330
--- /dev/null
+++ b/test/test_pkgmaint.py
@@ -0,0 +1,65 @@
+from datetime import datetime
+from typing import List
+
+import pytest
+
+from aurweb import db
+from aurweb.models import Package, PackageBase, User
+from aurweb.models.account_type import USER_ID
+from aurweb.scripts import pkgmaint
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    return
+
+
+@pytest.fixture
+def user() -> User:
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         Passwd="testPassword", AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def packages(user: User) -> List[Package]:
+    output = []
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        for i in range(5):
+            pkgbase = db.create(PackageBase, Name=f"pkg_{i}",
+                                SubmittedTS=now,
+                                ModifiedTS=now)
+            pkg = db.create(Package, PackageBase=pkgbase,
+                            Name=f"pkg_{i}", Version=f"{i}.0")
+            output.append(pkg)
+    yield output
+
+
+def test_pkgmaint_noop(packages: List[Package]):
+    assert len(packages) == 5
+    pkgmaint.main()
+    packages = db.query(Package).all()
+    assert len(packages) == 5
+
+
+def test_pkgmaint(packages: List[Package]):
+    assert len(packages) == 5
+
+    # Modify the first package so it's out of date and gets deleted.
+    with db.begin():
+        # Reduce SubmittedTS by a day + 10 seconds.
+        packages[0].PackageBase.SubmittedTS -= (86400 + 10)
+
+    # Run pkgmaint.
+    pkgmaint.main()
+
+    # Query package objects again and assert that the
+    # first package was deleted but all others are intact.
+    packages = db.query(Package).all()
+    assert len(packages) == 4
+    expected = ["pkg_1", "pkg_2", "pkg_3", "pkg_4"]
+    for i, pkgname in enumerate(expected):
+        assert packages[i].Name == pkgname

From 9fb1fbe32cd2d7652f4dee9df29002a36b9ff38c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 15:00:22 -0800
Subject: [PATCH 642/844] feat(testing): add email testing utilities

Changes:
- util/sendmail now populates email files in the 'test-emails' directory.
    - util/sendmail does this in a serialized fashion based off of
      the test suite and name retrieved from PYTEST_CURRENT_TEST
      in the format: `<test_suite>_<test_function>.n.txt` where n
      is increased by one every time sendmail is run.
- pytest conftest fixtures have been added for test email setup;
  it wipes out old emails for the particular test function being run.
- New aurweb.testing.email.Email class allows developers to test
  against emails stored by util/sendmail. Simple pass the serial
  you want to test against, starting at serial = 1; e.g. Email(serial).

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/email.py | 120 ++++++++++++++++++++++++++++++++++++++++
 test/conftest.py        |  20 ++++++-
 util/sendmail           |  23 ++++++++
 3 files changed, 162 insertions(+), 1 deletion(-)
 create mode 100644 aurweb/testing/email.py

diff --git a/aurweb/testing/email.py b/aurweb/testing/email.py
new file mode 100644
index 00000000..6ff9df99
--- /dev/null
+++ b/aurweb/testing/email.py
@@ -0,0 +1,120 @@
+import base64
+import copy
+import email
+import os
+import re
+
+
+class Email:
+    """
+    An email class used for testing.
+
+    This class targets a specific serial of emails for PYTEST_CURRENT_TEST.
+    As emails are sent out with util/sendmail, the serial number increases,
+    starting at 1.
+
+    Email content sent out by aurweb is always base64-encoded. Email.parse()
+    decodes that for us and puts it into Email.body.
+
+    Example:
+
+        # Get the {test_suite}_{test_function}.1.txt email.
+        email = Email(1).parse()
+        print(email.body)
+        print(email.headers)
+
+    """
+    TEST_DIR = "test-emails"
+
+    def __init__(self, serial: int = 1):
+        self.serial = serial
+        self.content = self._get()
+
+    @staticmethod
+    def email_prefix(suite: bool = False) -> str:
+        """
+        Get the email prefix.
+
+        We find the email prefix by reducing PYTEST_CURRENT_TEST to
+        either {test_suite}_{test_function}. If `suite` is set, we
+        reduce it to {test_suite} only.
+
+        :param suite: Reduce PYTEST_CURRENT_TEST to {test_suite}
+        :return: Email prefix with '/', '.', ',', and ':' chars replaced by '_'
+        """
+        value = os.environ.get("PYTEST_CURRENT_TEST", "email").split(" ")[0]
+        if suite:
+            value = value.split(":")[0]
+        return re.sub(r'(\/|\.|,|:)', "_", value)
+
+    @staticmethod
+    def count() -> int:
+        """
+        Count the current number of emails sent from the test.
+
+        This function is **only** supported inside of pytest functions.
+        Do not use it elsewhere as data races will occur.
+
+        :return: Number of emails sent by the current test
+        """
+        files = os.listdir(Email.TEST_DIR)
+        prefix = Email.email_prefix()
+        expr = "^" + prefix + r"\.\d+\.txt$"
+        subset = filter(lambda e: re.match(expr, e), files)
+        return len(list(subset))
+
+    def _email_path(self) -> str:
+        filename = self.email_prefix() + f".{self.serial}.txt"
+        return os.path.join(Email.TEST_DIR, filename)
+
+    def _get(self) -> str:
+        """
+        Get this email's content by reading its file.
+
+        :return: Email content
+        """
+        path = self._email_path()
+        with open(path) as f:
+            return f.read()
+
+    def parse(self) -> "Email":
+        """
+        Parse this email and base64-decode the body.
+
+        This function populates Email.message, Email.headers and Email.body.
+
+        Additionally, after parsing, we write over our email file with
+        self.glue()'d content (base64-decoded). This is done for ease
+        of inspection by users.
+
+        :return: self
+        """
+        self.message = email.message_from_string(self.content)
+        self.headers = dict(self.message)
+
+        # aurweb email notifications always have base64 encoded content.
+        # Decode it here so self.body is human readable.
+        self.body = base64.b64decode(self.message.get_payload()).decode()
+
+        path = self._email_path()
+        with open(path, "w") as f:
+            f.write(self.glue())
+
+        return self
+
+    def glue(self) -> str:
+        """
+        Glue parsed content back into a complete email document, but
+        base64-decoded this time.
+
+        :return: Email document as a string
+        """
+        headers = copy.copy(self.headers)
+        del headers["Content-Transfer-Encoding"]
+
+        output = []
+        for k, v in headers.items():
+            output.append(f"{k}: {v}")
+        output.append("")
+        output.append(self.body)
+        return "\n".join(output)
diff --git a/test/conftest.py b/test/conftest.py
index db2e5997..01131109 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -37,6 +37,8 @@ then clears the database for each test function run in that module.
 It is done this way because migration has a large cost; migrating
 ahead of each function takes too long when compared to this method.
 """
+import os
+
 import pytest
 
 from filelock import FileLock
@@ -50,6 +52,7 @@ import aurweb.config
 import aurweb.db
 
 from aurweb import initdb, logging, testing
+from aurweb.testing.email import Email
 
 logger = logging.get_logger(__name__)
 
@@ -120,6 +123,18 @@ def _drop_database(engine: Engine, dbname: str) -> None:
     conn.close()
 
 
+def setup_email():
+    if not os.path.exists(Email.TEST_DIR):
+        os.makedirs(Email.TEST_DIR)
+
+    # Cleanup all email files for this test suite.
+    prefix = Email.email_prefix(suite=True)
+    files = os.listdir(Email.TEST_DIR)
+    for file in files:
+        if file.startswith(prefix):
+            os.remove(os.path.join(Email.TEST_DIR, file))
+
+
 @pytest.fixture(scope="module")
 def setup_database(tmp_path_factory: pytest.fixture,
                    worker_id: pytest.fixture) -> None:
@@ -129,6 +144,7 @@ def setup_database(tmp_path_factory: pytest.fixture,
 
     if worker_id == "master":  # pragma: no cover
         # If we're not running tests through multiproc pytest-xdist.
+        setup_email()
         yield _create_database(engine, dbname)
         _drop_database(engine, dbname)
         return
@@ -143,12 +159,13 @@ def setup_database(tmp_path_factory: pytest.fixture,
         else:
             # Otherwise, create the data file and create the database.
             fn.write_text("1")
+            setup_email()
             yield _create_database(engine, dbname)
             _drop_database(engine, dbname)
 
 
 @pytest.fixture(scope="module")
-def db_session(setup_database: pytest.fixture) -> scoped_session:
+def db_session(setup_database: None) -> scoped_session:
     """
     Yield a database session based on aurweb.db.name().
 
@@ -158,6 +175,7 @@ def db_session(setup_database: pytest.fixture) -> scoped_session:
     # configured database, because PYTEST_CURRENT_TEST is removed.
     dbname = aurweb.db.name()
     session = aurweb.db.get_session()
+
     yield session
 
     # Close the session and pop it.
diff --git a/util/sendmail b/util/sendmail
index 06bd9865..9356851a 100755
--- a/util/sendmail
+++ b/util/sendmail
@@ -1,2 +1,25 @@
 #!/bin/bash
+# Send email to temporary filesystem for tests.
+dir='test-emails'
+filename='email.txt'
+if [ ! -z ${PYTEST_CURRENT_TEST+x} ]; then
+    filename="$(echo $PYTEST_CURRENT_TEST | cut -d ' ' -f 1 | sed -r 's/(\/|\.|,|:)/_/g')"
+fi
+mkdir -p "$dir"
+
+path="${dir}/${filename}"
+serial_file="${path}.serial"
+if [ ! -f $serial_file ]; then
+    echo 0 > $serial_file
+fi
+
+# Increment and update $serial_file.
+serial=$(($(cat $serial_file) + 1))
+echo $serial > $serial_file
+
+# Use the serial we're on to mark the email file.
+# Emails have the format: PYTEST_CURRENT_TEST.s.txt
+# where s is the current serial for PYTEST_CURRENT_TEST.
+cat > "${path}.${serial}.txt"
+
 exit 0

From d8e3ca1abbac6a897f262b1eba0695f4323a13d8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 12:03:53 -0800
Subject: [PATCH 643/844] change(notify): converted to use aurweb.db ORM

- Removed notify sharness test

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py    |   7 +-
 aurweb/routers/accounts.py |   6 +-
 aurweb/routers/packages.py |  30 +-
 aurweb/scripts/notify.py   | 402 +++++++++++++----------
 aurweb/testing/smtp.py     |  42 +++
 test/t2500-notify.t        | 431 -------------------------
 test/test_notify.py        | 643 +++++++++++++++++++++++++++++++++++++
 7 files changed, 934 insertions(+), 627 deletions(-)
 create mode 100644 aurweb/testing/smtp.py
 delete mode 100755 test/t2500-notify.t
 create mode 100644 test/test_notify.py

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 55af3a34..3bb3ae5f 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -239,7 +239,6 @@ def remove_comaintainers(pkgbase: models.PackageBase,
     :param usernames: Iterable of username strings
     :return: None
     """
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     notifications = []
     with db.begin():
         for username in usernames:
@@ -250,8 +249,7 @@ def remove_comaintainers(pkgbase: models.PackageBase,
             ).first()
             notifications.append(
                 notify.ComaintainerRemoveNotification(
-                    conn, comaintainer.User.ID, pkgbase.ID
-                )
+                    comaintainer.User.ID, pkgbase.ID)
             )
             db.delete(comaintainer)
 
@@ -283,7 +281,6 @@ def add_comaintainers(request: Request, pkgbase: models.PackageBase,
         memo[username] = user
 
     # Alright, now that we got past the check, add them all to the DB.
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     notifications = []
     with db.begin():
         for username in usernames:
@@ -302,7 +299,7 @@ def add_comaintainers(request: Request, pkgbase: models.PackageBase,
 
             notifications.append(
                 notify.ComaintainerAddNotification(
-                    conn, comaintainer.User.ID, pkgbase.ID)
+                    comaintainer.User.ID, pkgbase.ID)
             )
 
     # Send out notifications.
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index ddee1764..545811f0 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -97,8 +97,7 @@ async def passreset_post(request: Request,
     with db.begin():
         user.ResetKey = resetkey
 
-    executor = db.ConnectionExecutor(db.get_engine().raw_connection())
-    ResetKeyNotification(executor, user.ID).send()
+    ResetKeyNotification(user.ID).send()
 
     # Render ?step=confirm.
     return RedirectResponse(url="/passreset?step=confirm",
@@ -323,8 +322,7 @@ async def account_register_post(request: Request,
                                                 Fingerprint=fingerprint)
 
     # Send a reset key notification to the new user.
-    executor = db.ConnectionExecutor(db.get_engine().raw_connection())
-    WelcomeNotification(executor, user.ID).send()
+    WelcomeNotification(user.ID).send()
 
     context["complete"] = True
     context["user"] = user
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index eab75e5a..b5f8478e 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -146,7 +146,6 @@ def delete_package(deleter: models.User, package: models.Package):
     requests = []
     bases_to_delete = []
 
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     # In all cases, though, just delete the Package in question.
     if package.PackageBase.packages.count() == 1:
         reqtype = db.query(models.RequestType).filter(
@@ -162,7 +161,7 @@ def delete_package(deleter: models.User, package: models.Package):
 
         # Prepare DeleteNotification.
         notifications.append(
-            notify.DeleteNotification(conn, deleter.ID, package.PackageBase.ID)
+            notify.DeleteNotification(deleter.ID, package.PackageBase.ID)
         )
 
     # For each PackageRequest created, mock up an open and close notification.
@@ -170,12 +169,12 @@ def delete_package(deleter: models.User, package: models.Package):
     for pkgreq in requests:
         notifications.append(
             notify.RequestOpenNotification(
-                conn, deleter.ID, pkgreq.ID, reqtype.Name,
+                deleter.ID, pkgreq.ID, reqtype.Name,
                 pkgreq.PackageBase.ID, merge_into=basename or None)
         )
         notifications.append(
             notify.RequestCloseNotification(
-                conn, deleter.ID, pkgreq.ID, pkgreq.status_display())
+                deleter.ID, pkgreq.ID, pkgreq.status_display())
         )
 
     # Perform all the deletions.
@@ -666,10 +665,9 @@ async def pkgbase_request_post(request: Request, name: str,
                            Comments=comments,
                            ClosureComment=str())
 
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     # Prepare notification object.
     notif = notify.RequestOpenNotification(
-        conn, request.user.ID, pkgreq.ID, reqtype.Name,
+        request.user.ID, pkgreq.ID, reqtype.Name,
         pkgreq.PackageBase.ID, merge_into=merge_into or None)
 
     # Send the notification now that we're out of the DB scope.
@@ -688,7 +686,7 @@ async def pkgbase_request_post(request: Request, name: str,
             pkgreq.Status = ACCEPTED_ID
         db.refresh(pkgreq)
         notif = notify.RequestCloseNotification(
-            conn, request.user.ID, pkgreq.ID, pkgreq.status_display())
+            request.user.ID, pkgreq.ID, pkgreq.status_display())
         notif.send()
     elif type == "deletion" and is_maintainer and outdated:
         packages = pkgbase.packages.all()
@@ -742,9 +740,8 @@ async def requests_close_post(request: Request, id: int,
         pkgreq.Status = reason
         pkgreq.ClosureComment = comments
 
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     notify_ = notify.RequestCloseNotification(
-        conn, request.user.ID, pkgreq.ID, pkgreq.status_display())
+        request.user.ID, pkgreq.ID, pkgreq.status_display())
     notify_.send()
 
     return RedirectResponse("/requests", status_code=HTTPStatus.SEE_OTHER)
@@ -936,9 +933,7 @@ async def pkgbase_unvote(request: Request, name: str):
 
 def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
     disowner = request.user
-
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-    notif = notify.DisownNotification(conn, disowner.ID, pkgbase.ID)
+    notif = notify.DisownNotification(disowner.ID, pkgbase.ID)
 
     if disowner != pkgbase.Maintainer:
         with db.begin():
@@ -1003,8 +998,7 @@ def pkgbase_adopt_instance(request: Request, pkgbase: models.PackageBase):
     with db.begin():
         pkgbase.Maintainer = request.user
 
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-    notif = notify.AdoptNotification(conn, request.user.ID, pkgbase.ID)
+    notif = notify.AdoptNotification(request.user.ID, pkgbase.ID)
     notif.send()
 
 
@@ -1366,7 +1360,7 @@ def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
                        f"{request.user.Username}.")
     rejected_closure_comment = ("Rejected because another merge request "
                                 "for the same package base was accepted.")
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
+
     if not requests:
         # If there are no requests, create one owned by request.user.
         with db.begin():
@@ -1383,7 +1377,7 @@ def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
 
         # Add a notification about the opening to our notifs array.
         notif = notify.RequestOpenNotification(
-            conn, request.user.ID, pkgreq.ID, MERGE,
+            request.user.ID, pkgreq.ID, MERGE,
             pkgbase.ID, merge_into=target.Name)
         notifs.append(notif)
 
@@ -1417,11 +1411,9 @@ def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
     for pkgreq in all_requests:
         # Create notifications for request closure.
         notif = notify.RequestCloseNotification(
-            conn, request.user.ID, pkgreq.ID, pkgreq.status_display())
+            request.user.ID, pkgreq.ID, pkgreq.status_display())
         notifs.append(notif)
 
-    conn.close()
-
     # Log this out for accountability purposes.
     logger.info(f"Trusted User '{request.user.Username}' merged "
                 f"'{pkgbasename}' into '{target.Name}'.")
diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index ba4ec9eb..e49024d9 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -7,10 +7,16 @@ import subprocess
 import sys
 import textwrap
 
+from sqlalchemy import and_, or_
+
 import aurweb.config
 import aurweb.db
 import aurweb.l10n
 
+from aurweb import db
+from aurweb.models import (PackageBase, PackageComaintainer, PackageComment, PackageNotification, PackageRequest, RequestType,
+                           TUVote, User)
+
 aur_location = aurweb.config.get('options', 'aur_location')
 
 
@@ -22,23 +28,6 @@ def headers_reply(thread_id):
     return {'In-Reply-To': thread_id, 'References': thread_id}
 
 
-def username_from_id(conn, uid):
-    cur = conn.execute('SELECT UserName FROM Users WHERE ID = ?', [uid])
-    return cur.fetchone()[0]
-
-
-def pkgbase_from_id(conn, pkgbase_id):
-    cur = conn.execute('SELECT Name FROM PackageBases WHERE ID = ?',
-                       [pkgbase_id])
-    return cur.fetchone()[0]
-
-
-def pkgbase_from_pkgreq(conn, reqid):
-    cur = conn.execute('SELECT PackageBaseID FROM PackageRequests ' +
-                       'WHERE ID = ?', [reqid])
-    return cur.fetchone()[0]
-
-
 class Notification:
     def get_refs(self):
         return ()
@@ -52,8 +41,8 @@ class Notification:
     def get_body_fmt(self, lang):
         body = ''
         for line in self.get_body(lang).splitlines():
-            if line == '-- ':
-                body += '-- \n'
+            if line == '--':
+                body += '--\n'
                 continue
             body += textwrap.fill(line, break_long_words=False) + '\n'
         for i, ref in enumerate(self.get_refs()):
@@ -103,10 +92,11 @@ class Notification:
                 user = aurweb.config.get('notifications', 'smtp-user')
                 passwd = aurweb.config.get('notifications', 'smtp-password')
 
-                if use_ssl:
-                    server = smtplib.SMTP_SSL(server_addr, server_port)
-                else:
-                    server = smtplib.SMTP(server_addr, server_port)
+                classes = {
+                    False: smtplib.SMTP,
+                    True: smtplib.SMTP_SSL,
+                }
+                server = classes[use_ssl](server_addr, server_port)
 
                 if use_starttls:
                     server.ehlo()
@@ -123,12 +113,24 @@ class Notification:
 
 
 class ResetKeyNotification(Notification):
-    def __init__(self, conn, uid):
-        cur = conn.execute('SELECT UserName, Email, BackupEmail, ' +
-                           'LangPreference, ResetKey ' +
-                           'FROM Users WHERE ID = ? AND Suspended = 0', [uid])
-        self._username, self._to, self._backup, self._lang, self._resetkey = \
-            cur.fetchone()
+    def __init__(self, uid):
+
+        user = db.query(User).filter(
+            and_(User.ID == uid, User.Suspended == 0)
+        ).with_entities(
+            User.Username,
+            User.Email,
+            User.BackupEmail,
+            User.LangPreference,
+            User.ResetKey
+        ).order_by(User.Username.asc()).first()
+
+        self._username = user.Username
+        self._to = user.Email
+        self._backup = user.BackupEmail
+        self._lang = user.LangPreference
+        self._resetkey = user.ResetKey
+
         super().__init__()
 
     def get_recipients(self):
@@ -167,21 +169,28 @@ class WelcomeNotification(ResetKeyNotification):
 
 
 class CommentNotification(Notification):
-    def __init__(self, conn, uid, pkgbase_id, comment_id):
-        self._user = username_from_id(conn, uid)
-        self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
-        cur = conn.execute('SELECT DISTINCT Users.Email, Users.LangPreference '
-                           'FROM Users INNER JOIN PackageNotifications ' +
-                           'ON PackageNotifications.UserID = Users.ID WHERE ' +
-                           'Users.CommentNotify = 1 AND ' +
-                           'PackageNotifications.UserID != ? AND ' +
-                           'PackageNotifications.PackageBaseID = ? AND ' +
-                           'Users.Suspended = 0',
-                           [uid, pkgbase_id])
-        self._recipients = cur.fetchall()
-        cur = conn.execute('SELECT Comments FROM PackageComments WHERE ID = ?',
-                           [comment_id])
-        self._text = cur.fetchone()[0]
+    def __init__(self, uid, pkgbase_id, comment_id):
+
+        self._user = db.query(User.Username).filter(
+            User.ID == uid).first().Username
+        self._pkgbase = db.query(PackageBase.Name).filter(
+            PackageBase.ID == pkgbase_id).first().Name
+
+        query = db.query(User).join(PackageNotification).filter(
+            and_(User.CommentNotify == 1,
+                 PackageNotification.UserID != uid,
+                 PackageNotification.PackageBaseID == pkgbase_id,
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email,
+            User.LangPreference
+        ).distinct()
+        self._recipients = [(u.Email, u.LangPreference) for u in query]
+
+        pkgcomment = db.query(PackageComment.Comments).filter(
+            PackageComment.ID == comment_id).first()
+        self._text = pkgcomment.Comments
+
         super().__init__()
 
     def get_recipients(self):
@@ -196,7 +205,7 @@ class CommentNotification(Notification):
         body = aurweb.l10n.translator.translate(
             '{user} [1] added the following comment to {pkgbase} [2]:',
             lang).format(user=self._user, pkgbase=self._pkgbase)
-        body += '\n\n' + self._text + '\n\n-- \n'
+        body += '\n\n' + self._text + '\n\n--\n'
         dnlabel = aurweb.l10n.translator.translate(
             'Disable notifications', lang)
         body += aurweb.l10n.translator.translate(
@@ -216,19 +225,24 @@ class CommentNotification(Notification):
 
 
 class UpdateNotification(Notification):
-    def __init__(self, conn, uid, pkgbase_id):
-        self._user = username_from_id(conn, uid)
-        self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
-        cur = conn.execute('SELECT DISTINCT Users.Email, ' +
-                           'Users.LangPreference FROM Users ' +
-                           'INNER JOIN PackageNotifications ' +
-                           'ON PackageNotifications.UserID = Users.ID WHERE ' +
-                           'Users.UpdateNotify = 1 AND ' +
-                           'PackageNotifications.UserID != ? AND ' +
-                           'PackageNotifications.PackageBaseID = ? AND ' +
-                           'Users.Suspended = 0',
-                           [uid, pkgbase_id])
-        self._recipients = cur.fetchall()
+    def __init__(self, uid, pkgbase_id):
+
+        self._user = db.query(User.Username).filter(
+            User.ID == uid).first().Username
+        self._pkgbase = db.query(PackageBase.Name).filter(
+            PackageBase.ID == pkgbase_id).first().Name
+
+        query = db.query(User).join(PackageNotification).filter(
+            and_(User.UpdateNotify == 1,
+                 PackageNotification.UserID != uid,
+                 PackageNotification.PackageBaseID == pkgbase_id,
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email,
+            User.LangPreference
+        ).distinct()
+        self._recipients = [(u.Email, u.LangPreference) for u in query]
+
         super().__init__()
 
     def get_recipients(self):
@@ -243,7 +257,7 @@ class UpdateNotification(Notification):
         body = aurweb.l10n.translator.translate(
             '{user} [1] pushed a new commit to {pkgbase} [2].',
             lang).format(user=self._user, pkgbase=self._pkgbase)
-        body += '\n\n-- \n'
+        body += '\n\n--\n'
         dnlabel = aurweb.l10n.translator.translate(
             'Disable notifications', lang)
         body += aurweb.l10n.translator.translate(
@@ -263,23 +277,30 @@ class UpdateNotification(Notification):
 
 
 class FlagNotification(Notification):
-    def __init__(self, conn, uid, pkgbase_id):
-        self._user = username_from_id(conn, uid)
-        self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
-        cur = conn.execute(
-            'SELECT DISTINCT Users.Email, ' +
-            'Users.LangPreference FROM Users ' +
-            'LEFT JOIN PackageComaintainers ' +
-            'ON PackageComaintainers.UsersID = Users.ID ' +
-            'INNER JOIN PackageBases ' +
-            'ON PackageBases.MaintainerUID = Users.ID OR ' +
-            'PackageBases.ID = PackageComaintainers.PackageBaseID ' +
-            'WHERE PackageBases.ID = ? AND ' +
-            'Users.Suspended = 0', [pkgbase_id])
-        self._recipients = cur.fetchall()
-        cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' +
-                           'ID = ?', [pkgbase_id])
-        self._text = cur.fetchone()[0]
+    def __init__(self, uid, pkgbase_id):
+
+        self._user = db.query(User.Username).filter(
+            User.ID == uid).first().Username
+        self._pkgbase = db.query(PackageBase.Name).filter(
+            PackageBase.ID == pkgbase_id).first().Name
+
+        query = db.query(User).join(PackageComaintainer, isouter=True).join(
+            PackageBase,
+            or_(PackageBase.MaintainerUID == User.ID,
+                PackageBase.ID == PackageComaintainer.PackageBaseID)
+        ).filter(
+            and_(PackageBase.ID == pkgbase_id,
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email,
+            User.LangPreference
+        ).distinct()
+        self._recipients = [(u.Email, u.LangPreference) for u in query]
+
+        pkgbase = db.query(PackageBase.FlaggerComment).filter(
+            PackageBase.ID == pkgbase_id).first()
+        self._text = pkgbase.FlaggerComment
+
         super().__init__()
 
     def get_recipients(self):
@@ -304,22 +325,28 @@ class FlagNotification(Notification):
 
 
 class OwnershipEventNotification(Notification):
-    def __init__(self, conn, uid, pkgbase_id):
-        self._user = username_from_id(conn, uid)
-        self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
-        cur = conn.execute('SELECT DISTINCT Users.Email, ' +
-                           'Users.LangPreference FROM Users ' +
-                           'INNER JOIN PackageNotifications ' +
-                           'ON PackageNotifications.UserID = Users.ID WHERE ' +
-                           'Users.OwnershipNotify = 1 AND ' +
-                           'PackageNotifications.UserID != ? AND ' +
-                           'PackageNotifications.PackageBaseID = ? AND ' +
-                           'Users.Suspended = 0',
-                           [uid, pkgbase_id])
-        self._recipients = cur.fetchall()
-        cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' +
-                           'ID = ?', [pkgbase_id])
-        self._text = cur.fetchone()[0]
+    def __init__(self, uid, pkgbase_id):
+
+        self._user = db.query(User.Username).filter(
+            User.ID == uid).first().Username
+        self._pkgbase = db.query(PackageBase.Name).filter(
+            PackageBase.ID == pkgbase_id).first().Name
+
+        query = db.query(User).join(PackageNotification).filter(
+            and_(User.OwnershipNotify == 1,
+                 PackageNotification.UserID != uid,
+                 PackageNotification.PackageBaseID == pkgbase_id,
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email,
+            User.LangPreference
+        ).distinct()
+        self._recipients = [(u.Email, u.LangPreference) for u in query]
+
+        pkgbase = db.query(PackageBase.FlaggerComment).filter(
+            PackageBase.ID == pkgbase_id).first()
+        self._text = pkgbase.FlaggerComment
+
         super().__init__()
 
     def get_recipients(self):
@@ -351,11 +378,22 @@ class DisownNotification(OwnershipEventNotification):
 
 
 class ComaintainershipEventNotification(Notification):
-    def __init__(self, conn, uid, pkgbase_id):
-        self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
-        cur = conn.execute('SELECT Email, LangPreference FROM Users ' +
-                           'WHERE ID = ? AND Suspended = 0', [uid])
-        self._to, self._lang = cur.fetchone()
+    def __init__(self, uid, pkgbase_id):
+
+        self._pkgbase = db.query(PackageBase.Name).filter(
+            PackageBase.ID == pkgbase_id).first().Name
+
+        user = db.query(User).filter(
+            and_(User.ID == uid,
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email,
+            User.LangPreference
+        ).first()
+
+        self._to = user.Email
+        self._lang = user.LangPreference
+
         super().__init__()
 
     def get_recipients(self):
@@ -385,22 +423,28 @@ class ComaintainerRemoveNotification(ComaintainershipEventNotification):
 
 
 class DeleteNotification(Notification):
-    def __init__(self, conn, uid, old_pkgbase_id, new_pkgbase_id=None):
-        self._user = username_from_id(conn, uid)
-        self._old_pkgbase = pkgbase_from_id(conn, old_pkgbase_id)
+    def __init__(self, uid, old_pkgbase_id, new_pkgbase_id=None):
+
+        self._user = db.query(User.Username).filter(
+            User.ID == uid).first().Username
+        self._old_pkgbase = db.query(PackageBase.Name).filter(
+            PackageBase.ID == old_pkgbase_id).first().Name
+
+        self._new_pkgbase = None
         if new_pkgbase_id:
-            self._new_pkgbase = pkgbase_from_id(conn, new_pkgbase_id)
-        else:
-            self._new_pkgbase = None
-        cur = conn.execute('SELECT DISTINCT Users.Email, ' +
-                           'Users.LangPreference FROM Users ' +
-                           'INNER JOIN PackageNotifications ' +
-                           'ON PackageNotifications.UserID = Users.ID WHERE ' +
-                           'PackageNotifications.UserID != ? AND ' +
-                           'PackageNotifications.PackageBaseID = ? AND ' +
-                           'Users.Suspended = 0',
-                           [uid, old_pkgbase_id])
-        self._recipients = cur.fetchall()
+            self._new_pkgbase = db.query(PackageBase.Name).filter(
+                PackageBase.ID == new_pkgbase_id).first().Name
+
+        query = db.query(User).join(PackageNotification).filter(
+            and_(PackageNotification.UserID != uid,
+                 PackageNotification.PackageBaseID == old_pkgbase_id,
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email,
+            User.LangPreference
+        ).distinct()
+        self._recipients = [(u.Email, u.LangPreference) for u in query]
+
         super().__init__()
 
     def get_recipients(self):
@@ -417,7 +461,7 @@ class DeleteNotification(Notification):
                 'Disable notifications', lang)
             return aurweb.l10n.translator.translate(
                 '{user} [1] merged {old} [2] into {new} [3].\n\n'
-                '-- \n'
+                '--\n'
                 'If you no longer wish receive notifications about the '
                 'new package, please go to [3] and click "{label}".',
                 lang).format(user=self._user, old=self._old_pkgbase,
@@ -438,26 +482,36 @@ class DeleteNotification(Notification):
 
 
 class RequestOpenNotification(Notification):
-    def __init__(self, conn, uid, reqid, reqtype, pkgbase_id, merge_into=None):
-        self._user = username_from_id(conn, uid)
-        self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
-        cur = conn.execute(
-            'SELECT DISTINCT Users.Email FROM PackageRequests ' +
-            'INNER JOIN PackageBases ' +
-            'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
-            'LEFT JOIN PackageComaintainers ' +
-            'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +
-            'INNER JOIN Users ' +
-            'ON Users.ID = PackageRequests.UsersID ' +
-            'OR Users.ID = PackageBases.MaintainerUID ' +
-            'OR Users.ID = PackageComaintainers.UsersID ' +
-            'WHERE PackageRequests.ID = ? AND ' +
-            'Users.Suspended = 0', [reqid])
+    def __init__(self, uid, reqid, reqtype, pkgbase_id, merge_into=None):
+
+        self._user = db.query(User.Username).filter(
+            User.ID == uid).first().Username
+        self._pkgbase = db.query(PackageBase.Name).filter(
+            PackageBase.ID == pkgbase_id).first().Name
+
         self._to = aurweb.config.get('options', 'aur_request_ml')
-        self._cc = [row[0] for row in cur.fetchall()]
-        cur = conn.execute('SELECT Comments FROM PackageRequests WHERE ID = ?',
-                           [reqid])
-        self._text = cur.fetchone()[0]
+
+        query = db.query(PackageRequest).join(PackageBase).join(
+            PackageComaintainer,
+            PackageComaintainer.PackageBaseID == PackageRequest.PackageBaseID,
+            isouter=True
+        ).join(
+            User,
+            or_(User.ID == PackageRequest.UsersID,
+                User.ID == PackageBase.MaintainerUID,
+                User.ID == PackageComaintainer.UsersID)
+        ).filter(
+            and_(PackageRequest.ID == reqid,
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email
+        ).distinct()
+        self._cc = [u.Email for u in query]
+
+        pkgreq = db.query(PackageRequest.Comments).filter(
+            PackageRequest.ID == reqid).first()
+
+        self._text = pkgreq.Comments
         self._reqid = int(reqid)
         self._reqtype = reqtype
         self._merge_into = merge_into
@@ -500,31 +554,41 @@ class RequestOpenNotification(Notification):
 
 
 class RequestCloseNotification(Notification):
-    def __init__(self, conn, uid, reqid, reason):
-        self._user = username_from_id(conn, uid) if int(uid) else None
+    def __init__(self, uid, reqid, reason):
+        user = db.query(User.Username).filter(User.ID == uid).first()
+        self._user = user.Username if user else None
 
-        cur = conn.execute(
-            'SELECT DISTINCT Users.Email FROM PackageRequests ' +
-            'INNER JOIN PackageBases ' +
-            'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
-            'LEFT JOIN PackageComaintainers ' +
-            'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +
-            'INNER JOIN Users ' +
-            'ON Users.ID = PackageRequests.UsersID ' +
-            'OR Users.ID = PackageBases.MaintainerUID ' +
-            'OR Users.ID = PackageComaintainers.UsersID ' +
-            'WHERE PackageRequests.ID = ? AND ' +
-            'Users.Suspended = 0', [reqid])
         self._to = aurweb.config.get('options', 'aur_request_ml')
-        self._cc = [row[0] for row in cur.fetchall()]
-        cur = conn.execute('SELECT PackageRequests.ClosureComment, ' +
-                           'RequestTypes.Name, ' +
-                           'PackageRequests.PackageBaseName ' +
-                           'FROM PackageRequests ' +
-                           'INNER JOIN RequestTypes ' +
-                           'ON RequestTypes.ID = PackageRequests.ReqTypeID ' +
-                           'WHERE PackageRequests.ID = ?', [reqid])
-        self._text, self._reqtype, self._pkgbase = cur.fetchone()
+
+        query = db.query(PackageRequest).join(PackageBase).join(
+            PackageComaintainer,
+            PackageComaintainer.PackageBaseID == PackageRequest.PackageBaseID,
+            isouter=True
+        ).join(
+            User,
+            or_(User.ID == PackageRequest.UsersID,
+                User.ID == PackageBase.MaintainerUID,
+                User.ID == PackageComaintainer.UsersID)
+        ).filter(
+            and_(PackageRequest.ID == reqid,
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email
+        ).distinct()
+        self._cc = [u.Email for u in query]
+
+        pkgreq = db.query(PackageRequest).join(RequestType).filter(
+            PackageRequest.ID == reqid
+        ).with_entities(
+            PackageRequest.ClosureComment,
+            RequestType.Name,
+            PackageRequest.PackageBaseName
+        ).first()
+
+        self._text = pkgreq.ClosureComment
+        self._reqtype = pkgreq.Name
+        self._pkgbase = pkgreq.PackageBaseName
+
         self._reqid = int(reqid)
         self._reason = reason
 
@@ -567,14 +631,19 @@ class RequestCloseNotification(Notification):
 
 
 class TUVoteReminderNotification(Notification):
-    def __init__(self, conn, vote_id):
+    def __init__(self, vote_id):
         self._vote_id = int(vote_id)
-        cur = conn.execute('SELECT Email, LangPreference FROM Users ' +
-                           'WHERE AccountTypeID IN (2, 4) AND ID NOT IN ' +
-                           '(SELECT UserID FROM TU_Votes ' +
-                           'WHERE TU_Votes.VoteID = ?) AND ' +
-                           'Users.Suspended = 0', [vote_id])
-        self._recipients = cur.fetchall()
+
+        subquery = db.query(TUVote.UserID).filter(TUVote.VoteID == vote_id)
+        query = db.query(User).filter(
+            and_(User.AccountTypeID.in_((2, 4)),
+                 ~User.ID.in_(subquery),
+                 User.Suspended == 0)
+        ).with_entities(
+            User.Email, User.LangPreference
+        )
+        self._recipients = [(u.Email, u.LangPreference) for u in query]
+
         super().__init__()
 
     def get_recipients(self):
@@ -596,6 +665,7 @@ class TUVoteReminderNotification(Notification):
 
 
 def main():
+    db.get_engine()
     action = sys.argv[1]
     action_map = {
         'send-resetkey': ResetKeyNotification,
@@ -613,14 +683,10 @@ def main():
         'tu-vote-reminder': TUVoteReminderNotification,
     }
 
-    conn = aurweb.db.Connection()
-
-    notification = action_map[action](conn, *sys.argv[2:])
+    with db.begin():
+        notification = action_map[action](*sys.argv[2:])
     notification.send()
 
-    conn.commit()
-    conn.close()
-
 
 if __name__ == '__main__':
     main()
diff --git a/aurweb/testing/smtp.py b/aurweb/testing/smtp.py
new file mode 100644
index 00000000..da64c93f
--- /dev/null
+++ b/aurweb/testing/smtp.py
@@ -0,0 +1,42 @@
+""" Fake SMTP clients that can be used for testing. """
+
+
+class FakeSMTP:
+    """ A fake version of smtplib.SMTP used for testing. """
+
+    starttls_enabled = False
+    use_ssl = False
+
+    def __init__(self):
+        self.emails = []
+        self.count = 0
+        self.ehlo_count = 0
+        self.quit_count = 0
+        self.set_debuglevel_count = 0
+        self.user = None
+        self.passwd = None
+
+    def ehlo(self) -> None:
+        self.ehlo_count += 1
+
+    def starttls(self) -> None:
+        self.starttls_enabled = True
+
+    def set_debuglevel(self, level: int = 0) -> None:
+        self.set_debuglevel_count += 1
+
+    def login(self, user: str, passwd: str) -> None:
+        self.user = user
+        self.passwd = passwd
+
+    def sendmail(self, sender: str, to: str, msg: bytes) -> None:
+        self.emails.append((sender, to, msg.decode()))
+        self.count += 1
+
+    def quit(self) -> None:
+        self.quit_count += 1
+
+
+class FakeSMTP_SSL(FakeSMTP):
+    """ A fake version of smtplib.SMTP_SSL used for testing. """
+    use_ssl = True
diff --git a/test/t2500-notify.t b/test/t2500-notify.t
deleted file mode 100755
index a908f125..00000000
--- a/test/t2500-notify.t
+++ /dev/null
@@ -1,431 +0,0 @@
-#!/bin/sh
-
-test_description='notify tests'
-
-. "$(dirname "$0")/setup.sh"
-
-test_expect_success 'Test out-of-date notifications.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	/* Use package base IDs which can be distinguished from user IDs. */
-	INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1001, "foobar", 1, 0, 0, "This is a test OOD comment.");
-	INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1002, "foobar2", 2, 0, 0, "");
-	INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1003, "foobar3", NULL, 0, 0, "");
-	INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1004, "foobar4", 1, 0, 0, "");
-	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1001, 2, 1);
-	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1001, 4, 2);
-	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1002, 3, 1);
-	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1002, 5, 2);
-	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1003, 4, 1);
-	EOD
-	>sendmail.out &&
-	cover "$NOTIFY" flag 1 1001 &&
-	cat <<-EOD >expected &&
-	Subject: AUR Out-of-date Notification for foobar
-	To: tu@localhost
-	Subject: AUR Out-of-date Notification for foobar
-	To: user2@localhost
-	Subject: AUR Out-of-date Notification for foobar
-	To: user@localhost
-	EOD
-	grep "^\(Subject\|To\)" sendmail.out >sendmail.parts &&
-	test_cmp sendmail.parts expected &&
-	cat <<-EOD | sqlite3 aur.db
-	DELETE FROM PackageComaintainers;
-	EOD
-'
-
-test_expect_success 'Test subject and body of reset key notifications.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	UPDATE Users SET ResetKey = "12345678901234567890123456789012" WHERE ID = 1;
-	EOD
-	>sendmail.out &&
-	cover "$NOTIFY" send-resetkey 1 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Password Reset
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	A password reset request was submitted for the account user associated
-	with your email address. If you wish to reset your password follow the
-	link [1] below, otherwise ignore this message and nothing will happen.
-
-	[1] https://aur.archlinux.org/passreset/?resetkey=12345678901234567890123456789012
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of welcome notifications.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	UPDATE Users SET ResetKey = "12345678901234567890123456789012" WHERE ID = 1;
-	EOD
-	>sendmail.out &&
-	cover "$NOTIFY" welcome 1 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: Welcome to the Arch User Repository
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	Welcome to the Arch User Repository! In order to set an initial
-	password for your new account, please click the link [1] below. If the
-	link does not work, try copying and pasting it into your browser.
-
-	[1] https://aur.archlinux.org/passreset/?resetkey=12345678901234567890123456789012
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of comment notifications.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	/* Use package comments IDs which can be distinguished from other IDs. */
-	INSERT INTO PackageComments (ID, PackageBaseID, UsersID, Comments, RenderedComment) VALUES (2001, 1001, 1, "This is a test comment.", "This is a test comment.");
-	INSERT INTO PackageNotifications (PackageBaseID, UserID) VALUES (1001, 2);
-	UPDATE Users SET CommentNotify = 1 WHERE ID = 2;
-	EOD
-	>sendmail.out &&
-	cover "$NOTIFY" comment 1 1001 2001 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Comment for foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	user [1] added the following comment to foobar [2]:
-
-	This is a test comment.
-
-	-- 
-	If you no longer wish to receive notifications about this package,
-	please go to the package page [2] and select "Disable notifications".
-	
-	[1] https://aur.archlinux.org/account/user/
-	[2] https://aur.archlinux.org/pkgbase/foobar/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of update notifications.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	UPDATE Users SET UpdateNotify = 1 WHERE ID = 2;
-	EOD
-	>sendmail.out &&
-	cover "$NOTIFY" update 1 1001 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Package Update: foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	user [1] pushed a new commit to foobar [2].
-
-	-- 
-	If you no longer wish to receive notifications about this package,
-	please go to the package page [2] and select "Disable notifications".
-
-	[1] https://aur.archlinux.org/account/user/
-	[2] https://aur.archlinux.org/pkgbase/foobar/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of out-of-date notifications.' '
-	>sendmail.out &&
-	cover "$NOTIFY" flag 1 1001 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Out-of-date Notification for foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	Your package foobar [1] has been flagged out-of-date by user [2]:
-
-	This is a test OOD comment.
-
-	[1] https://aur.archlinux.org/pkgbase/foobar/
-	[2] https://aur.archlinux.org/account/user/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of adopt notifications.' '
-	>sendmail.out &&
-	cover "$NOTIFY" adopt 1 1001 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Ownership Notification for foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	The package foobar [1] was adopted by user [2].
-
-	[1] https://aur.archlinux.org/pkgbase/foobar/
-	[2] https://aur.archlinux.org/account/user/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of disown notifications.' '
-	>sendmail.out &&
-	cover "$NOTIFY" disown 1 1001 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Ownership Notification for foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	The package foobar [1] was disowned by user [2].
-
-	[1] https://aur.archlinux.org/pkgbase/foobar/
-	[2] https://aur.archlinux.org/account/user/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of co-maintainer addition notifications.' '
-	>sendmail.out &&
-	cover "$NOTIFY" comaintainer-add 1 1001 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Co-Maintainer Notification for foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	You were added to the co-maintainer list of foobar [1].
-
-	[1] https://aur.archlinux.org/pkgbase/foobar/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of co-maintainer removal notifications.' '
-	>sendmail.out &&
-	cover "$NOTIFY" comaintainer-remove 1 1001 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Co-Maintainer Notification for foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	You were removed from the co-maintainer list of foobar [1].
-
-	[1] https://aur.archlinux.org/pkgbase/foobar/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of delete notifications.' '
-	>sendmail.out &&
-	cover "$NOTIFY" delete 1 1001 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Package deleted: foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	user [1] deleted foobar [2].
-
-	You will no longer receive notifications about this package.
-
-	[1] https://aur.archlinux.org/account/user/
-	[2] https://aur.archlinux.org/pkgbase/foobar/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of merge notifications.' '
-	>sendmail.out &&
-	cover "$NOTIFY" delete 1 1001 1002 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: AUR Package deleted: foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	user [1] merged foobar [2] into foobar2 [3].
-
-	-- 
-	If you no longer wish receive notifications about the new package,
-	please go to [3] and click "Disable notifications".
-
-	[1] https://aur.archlinux.org/account/user/
-	[2] https://aur.archlinux.org/pkgbase/foobar/
-	[3] https://aur.archlinux.org/pkgbase/foobar2/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test Cc, subject and body of request open notifications.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	/* Use package request IDs which can be distinguished from other IDs. */
-	INSERT INTO PackageRequests (ID, PackageBaseID, PackageBaseName, UsersID, ReqTypeID, Comments, ClosureComment) VALUES (3001, 1001, "foobar", 2, 1, "This is a request test comment.", "");
-	EOD
-	>sendmail.out &&
-	cover "$NOTIFY" request-open 1 3001 orphan 1001 &&
-	grep ^Cc: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Cc: user@localhost, tu@localhost
-	EOD
-	test_cmp actual expected &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: [PRQ#3001] Orphan Request for foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	user [1] filed an orphan request for foobar [2]:
-
-	This is a request test comment.
-
-	[1] https://aur.archlinux.org/account/user/
-	[2] https://aur.archlinux.org/pkgbase/foobar/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of request open notifications for merge requests.' '
-	>sendmail.out &&
-	cover "$NOTIFY" request-open 1 3001 merge 1001 foobar2 &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: [PRQ#3001] Merge Request for foobar
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	user [1] filed a request to merge foobar [2] into foobar2 [3]:
-
-	This is a request test comment.
-
-	[1] https://aur.archlinux.org/account/user/
-	[2] https://aur.archlinux.org/pkgbase/foobar/
-	[3] https://aur.archlinux.org/pkgbase/foobar2/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test Cc, subject and body of request close notifications.' '
-	>sendmail.out &&
-	cover "$NOTIFY" request-close 1 3001 accepted &&
-	grep ^Cc: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Cc: user@localhost, tu@localhost
-	EOD
-	test_cmp actual expected &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: [PRQ#3001] Deletion Request for foobar Accepted
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	Request #3001 has been accepted by user [1].
-
-	[1] https://aur.archlinux.org/account/user/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of request close notifications (auto-accept).' '
-	>sendmail.out &&
-	cover "$NOTIFY" request-close 0 3001 accepted &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: [PRQ#3001] Deletion Request for foobar Accepted
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	Request #3001 has been accepted automatically by the Arch User
-	Repository package request system.
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test Cc of request close notification with co-maintainer.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	/* Use package base IDs which can be distinguished from user IDs. */
-	INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1001, 3, 1);
-	EOD
-	>sendmail.out &&
-	"$NOTIFY" request-close 0 3001 accepted &&
-	grep ^Cc: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Cc: user@localhost, tu@localhost, dev@localhost
-	EOD
-	test_cmp actual expected &&
-	cat <<-EOD | sqlite3 aur.db
-	DELETE FROM PackageComaintainers;
-	EOD
-'
-
-test_expect_success 'Test subject and body of request close notifications with closure comment.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	UPDATE PackageRequests SET ClosureComment = "This is a test closure comment." WHERE ID = 3001;
-	EOD
-	>sendmail.out &&
-	cover "$NOTIFY" request-close 1 3001 accepted &&
-	grep ^Subject: sendmail.out >actual &&
-	cat <<-EOD >expected &&
-	Subject: [PRQ#3001] Deletion Request for foobar Accepted
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	Request #3001 has been accepted by user [1]:
-
-	This is a test closure comment.
-
-	[1] https://aur.archlinux.org/account/user/
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test subject and body of TU vote reminders.' '
-	>sendmail.out &&
-	cover "$NOTIFY" tu-vote-reminder 1 &&
-	grep ^Subject: sendmail.out | head -1 >actual &&
-	cat <<-EOD >expected &&
-	Subject: TU Vote Reminder: Proposal 1
-	EOD
-	test_cmp actual expected &&
-	sed -n "/^\$/,\$p" sendmail.out | head -4 | base64 -d >actual &&
-	echo >>actual &&
-	cat <<-EOD >expected &&
-	Please remember to cast your vote on proposal 1 [1]. The voting period
-	ends in less than 48 hours.
-
-	[1] https://aur.archlinux.org/tu/?id=1
-	EOD
-	test_cmp actual expected
-'
-
-test_done
diff --git a/test/test_notify.py b/test/test_notify.py
new file mode 100644
index 00000000..45a1df31
--- /dev/null
+++ b/test/test_notify.py
@@ -0,0 +1,643 @@
+from datetime import datetime
+from typing import List
+from unittest import mock
+
+import pytest
+
+from aurweb import config, db, models
+from aurweb.models import Package, PackageBase, PackageRequest, User
+from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID
+from aurweb.models.request_type import ORPHAN_ID
+from aurweb.scripts import notify, rendercomment
+from aurweb.testing.email import Email
+from aurweb.testing.smtp import FakeSMTP, FakeSMTP_SSL
+
+aur_location = config.get("options", "aur_location")
+aur_request_ml = config.get("options", "aur_request_ml")
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    return
+
+
+@pytest.fixture
+def user() -> User:
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         Passwd=str(), AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def user1() -> User:
+    with db.begin():
+        user1 = db.create(User, Username="user1", Email="user1@example.org",
+                          Passwd=str(), AccountTypeID=USER_ID)
+    yield user1
+
+
+@pytest.fixture
+def user2() -> User:
+    with db.begin():
+        user2 = db.create(User, Username="user2", Email="user2@example.org",
+                          Passwd=str(), AccountTypeID=USER_ID)
+    yield user2
+
+
+@pytest.fixture
+def pkgbases(user: User) -> List[PackageBase]:
+    now = int(datetime.utcnow().timestamp())
+
+    output = []
+    with db.begin():
+        for i in range(5):
+            output.append(
+                db.create(PackageBase, Name=f"pkgbase_{i}",
+                          Maintainer=user, SubmittedTS=now,
+                          ModifiedTS=now))
+            db.create(models.PackageNotification, PackageBase=output[-1],
+                      User=user)
+    yield output
+
+
+@pytest.fixture
+def pkgreq(user2: User, pkgbases: List[PackageBase]):
+    pkgbase = pkgbases[0]
+    with db.begin():
+        pkgreq_ = db.create(PackageRequest, PackageBase=pkgbase,
+                            PackageBaseName=pkgbase.Name, User=user2,
+                            ReqTypeID=ORPHAN_ID,
+                            Comments="This is a request test comment.",
+                            ClosureComment=str())
+    yield pkgreq_
+
+
+@pytest.fixture
+def packages(pkgbases: List[PackageBase]) -> List[Package]:
+    output = []
+    with db.begin():
+        for i, pkgbase in enumerate(pkgbases):
+            output.append(
+                db.create(Package, PackageBase=pkgbase,
+                          Name=f"pkg_{i}", Version=f"{i}.0"))
+    yield output
+
+
+def test_out_of_date(user: User, user1: User, user2: User,
+                     pkgbases: List[PackageBase]):
+    pkgbase = pkgbases[0]
+    # Create two comaintainers. We'll pass the maintainer uid to
+    # FlagNotification, so we should expect to get two emails.
+    with db.begin():
+        db.create(models.PackageComaintainer,
+                  PackageBase=pkgbase, User=user1, Priority=1)
+        db.create(models.PackageComaintainer,
+                  PackageBase=pkgbase, User=user2, Priority=2)
+
+    # Send the notification for pkgbases[0].
+    notif = notify.FlagNotification(user.ID, pkgbases[0].ID)
+    notif.send()
+
+    # Should've gotten three emails: maintainer + the two comaintainers.
+    assert Email.count() == 3
+
+    # Comaintainer 1.
+    first = Email(1).parse()
+    assert first.headers.get("To") == user1.Email
+
+    expected = f"AUR Out-of-date Notification for {pkgbase.Name}"
+    assert first.headers.get("Subject") == expected
+
+    # Comaintainer 2.
+    second = Email(2).parse()
+    assert second.headers.get("To") == user2.Email
+
+    # Maintainer.
+    third = Email(3).parse()
+    assert third.headers.get("To") == user.Email
+
+
+def test_reset(user: User):
+    with db.begin():
+        user.ResetKey = "12345678901234567890123456789012"
+
+    notif = notify.ResetKeyNotification(user.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    expected = "AUR Password Reset"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+A password reset request was submitted for the account test associated
+with your email address. If you wish to reset your password follow the
+link [1] below, otherwise ignore this message and nothing will happen.
+
+[1] {aur_location}/passreset/?resetkey=12345678901234567890123456789012\
+"""
+    assert email.body == expected
+
+
+def test_welcome(user: User):
+    with db.begin():
+        user.ResetKey = "12345678901234567890123456789012"
+
+    notif = notify.WelcomeNotification(user.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    expected = "Welcome to the Arch User Repository"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+Welcome to the Arch User Repository! In order to set an initial
+password for your new account, please click the link [1] below. If the
+link does not work, try copying and pasting it into your browser.
+
+[1] {aur_location}/passreset/?resetkey=12345678901234567890123456789012\
+"""
+    assert email.body == expected
+
+
+def test_comment(user: User, user2: User, pkgbases: List[PackageBase]):
+    pkgbase = pkgbases[0]
+
+    with db.begin():
+        comment = db.create(models.PackageComment, PackageBase=pkgbase,
+                            User=user2, Comments="This is a test comment.")
+    rendercomment.update_comment_render_fastapi(comment)
+
+    notif = notify.CommentNotification(user2.ID, pkgbase.ID, comment.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"AUR Comment for {pkgbase.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+{user2.Username} [1] added the following comment to {pkgbase.Name} [2]:
+
+This is a test comment.
+
+--
+If you no longer wish to receive notifications about this package,
+please go to the package page [2] and select "Disable notifications".
+
+[1] {aur_location}/account/{user2.Username}/
+[2] {aur_location}/pkgbase/{pkgbase.Name}/\
+"""
+    assert expected == email.body
+
+
+def test_update(user: User, user2: User, pkgbases: List[PackageBase]):
+    pkgbase = pkgbases[0]
+    with db.begin():
+        user.UpdateNotify = 1
+
+    notif = notify.UpdateNotification(user2.ID, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"AUR Package Update: {pkgbase.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+{user2.Username} [1] pushed a new commit to {pkgbase.Name} [2].
+
+--
+If you no longer wish to receive notifications about this package,
+please go to the package page [2] and select "Disable notifications".
+
+[1] {aur_location}/account/{user2.Username}/
+[2] {aur_location}/pkgbase/{pkgbase.Name}/\
+"""
+    assert expected == email.body
+
+
+def test_adopt(user: User, user2: User, pkgbases: List[PackageBase]):
+    pkgbase = pkgbases[0]
+    notif = notify.AdoptNotification(user2.ID, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"AUR Ownership Notification for {pkgbase.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+The package {pkgbase.Name} [1] was adopted by {user2.Username} [2].
+
+[1] {aur_location}/pkgbase/{pkgbase.Name}/
+[2] {aur_location}/account/{user2.Username}/\
+"""
+    assert email.body == expected
+
+
+def test_disown(user: User, user2: User, pkgbases: List[PackageBase]):
+    pkgbase = pkgbases[0]
+    notif = notify.DisownNotification(user2.ID, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"AUR Ownership Notification for {pkgbase.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+The package {pkgbase.Name} [1] was disowned by {user2.Username} [2].
+
+[1] {aur_location}/pkgbase/{pkgbase.Name}/
+[2] {aur_location}/account/{user2.Username}/\
+"""
+    assert email.body == expected
+
+
+def test_comaintainer_addition(user: User, pkgbases: List[PackageBase]):
+    # TODO: Add this in fastapi code!
+    pkgbase = pkgbases[0]
+    notif = notify.ComaintainerAddNotification(user.ID, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"AUR Co-Maintainer Notification for {pkgbase.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+You were added to the co-maintainer list of {pkgbase.Name} [1].
+
+[1] {aur_location}/pkgbase/{pkgbase.Name}/\
+"""
+    assert email.body == expected
+
+
+def test_comaintainer_removal(user: User, pkgbases: List[PackageBase]):
+    # TODO: Add this in fastapi code!
+    pkgbase = pkgbases[0]
+    notif = notify.ComaintainerRemoveNotification(user.ID, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"AUR Co-Maintainer Notification for {pkgbase.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+You were removed from the co-maintainer list of {pkgbase.Name} [1].
+
+[1] {aur_location}/pkgbase/{pkgbase.Name}/\
+"""
+    assert email.body == expected
+
+
+def test_delete(user: User, user2: User, pkgbases: List[PackageBase]):
+    pkgbase = pkgbases[0]
+    notif = notify.DeleteNotification(user2.ID, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"AUR Package deleted: {pkgbase.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+{user2.Username} [1] deleted {pkgbase.Name} [2].
+
+You will no longer receive notifications about this package.
+
+[1] {aur_location}/account/{user2.Username}/
+[2] {aur_location}/pkgbase/{pkgbase.Name}/\
+"""
+    assert email.body == expected
+
+
+def test_merge(user: User, user2: User, pkgbases: List[PackageBase]):
+    source, target = pkgbases[:2]
+    notif = notify.DeleteNotification(user2.ID, source.ID, target.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"AUR Package deleted: {source.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+{user2.Username} [1] merged {source.Name} [2] into {target.Name} [3].
+
+--
+If you no longer wish receive notifications about the new package,
+please go to [3] and click "Disable notifications".
+
+[1] {aur_location}/account/{user2.Username}/
+[2] {aur_location}/pkgbase/{source.Name}/
+[3] {aur_location}/pkgbase/{target.Name}/\
+"""
+    assert email.body == expected
+
+
+def set_tu(users: List[User]) -> User:
+    with db.begin():
+        for user in users:
+            user.AccountTypeID = TRUSTED_USER_ID
+
+
+def test_open_close_request(user: User, user2: User,
+                            pkgreq: PackageRequest,
+                            pkgbases: List[PackageBase]):
+    set_tu([user])
+    pkgbase = pkgbases[0]
+
+    # Send an open request notification.
+    notif = notify.RequestOpenNotification(
+        user2.ID, pkgreq.ID, pkgreq.RequestType.Name, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == aur_request_ml
+    assert email.headers.get("Cc") == ", ".join([user.Email, user2.Email])
+    expected = f"[PRQ#{pkgreq.ID}] Orphan Request for {pkgbase.Name}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+{user2.Username} [1] filed an orphan request for {pkgbase.Name} [2]:
+
+This is a request test comment.
+
+[1] {aur_location}/account/{user2.Username}/
+[2] {aur_location}/pkgbase/{pkgbase.Name}/\
+"""
+    assert email.body == expected
+
+    # Now send a closure notification on the pkgbase we just opened.
+    notif = notify.RequestCloseNotification(user2.ID, pkgreq.ID, "rejected")
+    notif.send()
+    assert Email.count() == 2
+
+    email = Email(2).parse()
+    assert email.headers.get("To") == aur_request_ml
+    assert email.headers.get("Cc") == ", ".join([user.Email, user2.Email])
+    expected = f"[PRQ#{pkgreq.ID}] Orphan Request for {pkgbase.Name} Rejected"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+Request #{pkgreq.ID} has been rejected by {user2.Username} [1].
+
+[1] {aur_location}/account/{user2.Username}/\
+"""
+    assert email.body == expected
+
+    # Test auto-accept.
+    notif = notify.RequestCloseNotification(0, pkgreq.ID, "accepted")
+    notif.send()
+    assert Email.count() == 3
+
+    email = Email(3).parse()
+    assert email.headers.get("To") == aur_request_ml
+    assert email.headers.get("Cc") == ", ".join([user.Email, user2.Email])
+    expected = (f"[PRQ#{pkgreq.ID}] Orphan Request for "
+                f"{pkgbase.Name} Accepted")
+    assert email.headers.get("Subject") == expected
+
+    expected = (f"Request #{pkgreq.ID} has been accepted automatically "
+                "by the Arch User Repository\npackage request system.")
+    assert email.body == expected
+
+
+def test_close_request_auto_accept():
+    pass
+
+
+def test_close_request_comaintainer_cc(user: User, user2: User,
+                                       pkgreq: PackageRequest,
+                                       pkgbases: List[PackageBase]):
+    # TODO: Check this in fastapi code!
+    pkgbase = pkgbases[0]
+    with db.begin():
+        db.create(models.PackageComaintainer, PackageBase=pkgbase,
+                  User=user2, Priority=1)
+
+    notif = notify.RequestCloseNotification(0, pkgreq.ID, "accepted")
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == aur_request_ml
+    assert email.headers.get("Cc") == ", ".join([user.Email, user2.Email])
+
+
+def test_close_request_closure_comment(user: User, user2: User,
+                                       pkgreq: PackageRequest,
+                                       pkgbases: List[PackageBase]):
+    pkgbase = pkgbases[0]
+    with db.begin():
+        pkgreq.ClosureComment = "This is a test closure comment."
+
+    notif = notify.RequestCloseNotification(user2.ID, pkgreq.ID, "accepted")
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == aur_request_ml
+    assert email.headers.get("Cc") == ", ".join([user.Email, user2.Email])
+    expected = f"[PRQ#{pkgreq.ID}] Orphan Request for {pkgbase.Name} Accepted"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+Request #{pkgreq.ID} has been accepted by {user2.Username} [1]:
+
+This is a test closure comment.
+
+[1] {aur_location}/account/{user2.Username}/\
+"""
+    assert email.body == expected
+
+
+def test_tu_vote_reminders(user: User):
+    set_tu([user])
+
+    vote_id = 1
+    notif = notify.TUVoteReminderNotification(vote_id)
+    notif.send()
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"TU Vote Reminder: Proposal {vote_id}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+Please remember to cast your vote on proposal {vote_id} [1]. The voting period
+ends in less than 48 hours.
+
+[1] {aur_location}/tu/?id={vote_id}\
+"""
+    assert email.body == expected
+
+
+def test_notify_main(user: User):
+    """ Test TU vote reminder through aurweb.notify.main(). """
+    set_tu([user])
+
+    vote_id = 1
+    args = ["aurweb-notify", "tu-vote-reminder", str(vote_id)]
+    with mock.patch("sys.argv", args):
+        notify.main()
+
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    assert email.headers.get("To") == user.Email
+    expected = f"TU Vote Reminder: Proposal {vote_id}"
+    assert email.headers.get("Subject") == expected
+
+    expected = f"""\
+Please remember to cast your vote on proposal {vote_id} [1]. The voting period
+ends in less than 48 hours.
+
+[1] {aur_location}/tu/?id={vote_id}\
+"""
+    assert email.body == expected
+
+
+# Save original config.get; we're going to mock it and need
+# to be able to fallback when we are not overriding.
+config_get = config.get
+
+
+def mock_smtp_config(cls):
+    def _mock_smtp_config(section: str, key: str):
+        if section == "notifications":
+            if key == "sendmail":
+                return cls()
+            elif key == "smtp-use-ssl":
+                return cls(0)
+            elif key == "smtp-use-starttls":
+                return cls(0)
+            elif key == "smtp-user":
+                return cls()
+            elif key == "smtp-password":
+                return cls()
+        return cls(config_get(section, key))
+    return _mock_smtp_config
+
+
+def test_smtp(user: User):
+    with db.begin():
+        user.ResetKey = "12345678901234567890123456789012"
+
+    SMTP = FakeSMTP()
+
+    get = "aurweb.config.get"
+    getboolean = "aurweb.config.getboolean"
+    with mock.patch(get, side_effect=mock_smtp_config(str)):
+        with mock.patch(getboolean, side_effect=mock_smtp_config(bool)):
+            with mock.patch("smtplib.SMTP", side_effect=lambda a, b: SMTP):
+                config.rehash()
+                notif = notify.WelcomeNotification(user.ID)
+                notif.send()
+    config.rehash()
+    assert len(SMTP.emails) == 1
+
+
+def mock_smtp_starttls_config(cls):
+    def _mock_smtp_starttls_config(section: str, key: str):
+        if section == "notifications":
+            if key == "sendmail":
+                return cls()
+            elif key == "smtp-use-ssl":
+                return cls(0)
+            elif key == "smtp-use-starttls":
+                return cls(1)
+            elif key == "smtp-user":
+                return cls("test")
+            elif key == "smtp-password":
+                return cls("password")
+        return cls(config_get(section, key))
+    return _mock_smtp_starttls_config
+
+
+def test_smtp_starttls(user: User):
+    # This test does two things: test starttls path and test
+    # path where we have a backup email.
+
+    with db.begin():
+        user.ResetKey = "12345678901234567890123456789012"
+        user.BackupEmail = "backup@example.org"
+
+    SMTP = FakeSMTP()
+
+    get = "aurweb.config.get"
+    getboolean = "aurweb.config.getboolean"
+    with mock.patch(get, side_effect=mock_smtp_starttls_config(str)):
+        with mock.patch(
+                getboolean, side_effect=mock_smtp_starttls_config(bool)):
+            with mock.patch("smtplib.SMTP", side_effect=lambda a, b: SMTP):
+                notif = notify.WelcomeNotification(user.ID)
+                notif.send()
+    assert SMTP.starttls_enabled
+    assert SMTP.user
+    assert SMTP.passwd
+
+    assert len(SMTP.emails) == 2
+    to = SMTP.emails[0][1]
+    assert to == [user.Email]
+
+    to = SMTP.emails[1][1]
+    assert to == [user.BackupEmail]
+
+
+def mock_smtp_ssl_config(cls):
+    def _mock_smtp_ssl_config(section: str, key: str):
+        if section == "notifications":
+            if key == "sendmail":
+                return cls()
+            elif key == "smtp-use-ssl":
+                return cls(1)
+            elif key == "smtp-use-starttls":
+                return cls(0)
+            elif key == "smtp-user":
+                return cls("test")
+            elif key == "smtp-password":
+                return cls("password")
+        return cls(config_get(section, key))
+    return _mock_smtp_ssl_config
+
+
+def test_smtp_ssl(user: User):
+    with db.begin():
+        user.ResetKey = "12345678901234567890123456789012"
+
+    SMTP = FakeSMTP_SSL()
+
+    get = "aurweb.config.get"
+    getboolean = "aurweb.config.getboolean"
+    with mock.patch(get, side_effect=mock_smtp_ssl_config(str)):
+        with mock.patch(getboolean, side_effect=mock_smtp_ssl_config(bool)):
+            with mock.patch("smtplib.SMTP_SSL", side_effect=lambda a, b: SMTP):
+                notif = notify.WelcomeNotification(user.ID)
+                notif.send()
+    assert len(SMTP.emails) == 1
+    assert SMTP.use_ssl
+    assert SMTP.user
+    assert SMTP.passwd
+
+
+def test_notification_defaults():
+    notif = notify.Notification()
+    assert notif.get_refs() == tuple()
+    assert notif.get_headers() == dict()
+    assert notif.get_cc() == list()

From 155aa47a1acf9143f8bce49a81f05f56f7e61042 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 25 Nov 2021 12:03:25 -0800
Subject: [PATCH 644/844] feat(poetry): add posix_ipc

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 18 +++++++++++++++++-
 pyproject.toml |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index ab559b77..d56ce458 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -619,6 +619,14 @@ dunamai = ">=1.5,<2.0"
 jinja2 = {version = ">=2.11.1,<4", markers = "python_version >= \"3.6\" and python_version < \"4.0\""}
 tomlkit = ">=0.4"
 
+[[package]]
+name = "posix-ipc"
+version = "1.0.5"
+description = "POSIX IPC primitives (semaphores, shared memory and message queues) for Python"
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "priority"
 version = "2.0.0"
@@ -1056,7 +1064,7 @@ h11 = ">=0.9.0,<1"
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.10"
-content-hash = "ca42bd35717062d6784025ed3956423502ac66adba059ccc080bcaaa666651cd"
+content-hash = "43b3dd494890ef9d419260a06ccd0190638573fdf0b92a226016f1dd5ee87579"
 
 [metadata.files]
 aiofiles = [
@@ -1555,6 +1563,14 @@ poetry-dynamic-versioning = [
     {file = "poetry-dynamic-versioning-0.13.1.tar.gz", hash = "sha256:5c0e7b22560db76812057ef95dadad662ecc63eb270145787eabe73da7c222f9"},
     {file = "poetry_dynamic_versioning-0.13.1-py3-none-any.whl", hash = "sha256:6d79f76436c624653fc06eb9bb54fb4f39b1d54362bc366ad2496855711d3a78"},
 ]
+posix-ipc = [
+    {file = "posix_ipc-1.0.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ccb36ba90efec56a1796f1566eee9561f355a4f45babbc4d18ac46fb2d0b246b"},
+    {file = "posix_ipc-1.0.5-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:613bf1afe90e84c06255ec1a6f52c9b24062492de66e5f0dbe068adf67fc3454"},
+    {file = "posix_ipc-1.0.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6095bb4faa2bba8b8d0e833b804e0aedc352d5ed921edeb715010cbcd361e038"},
+    {file = "posix_ipc-1.0.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:621918abe7ec68591c5839b0771d163a9809bc232bf413b9a681bf986ab68d4d"},
+    {file = "posix_ipc-1.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f71587ad3a50e82583987f62bfd4ac2343ab6a206d1032e3fc560e8d55fe0346"},
+    {file = "posix_ipc-1.0.5.tar.gz", hash = "sha256:6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97"},
+]
 priority = [
     {file = "priority-2.0.0-py3-none-any.whl", hash = "sha256:6f8eefce5f3ad59baf2c080a664037bb4725cd0a790d53d59ab4059288faf6aa"},
     {file = "priority-2.0.0.tar.gz", hash = "sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"},
diff --git a/pyproject.toml b/pyproject.toml
index 82c439bc..f164967c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -86,6 +86,7 @@ mysql-connector = "^2.2.9"
 prometheus-fastapi-instrumentator = "^5.7.1"
 pytest-xdist = "^2.4.0"
 filelock = "^3.3.2"
+posix-ipc = "^1.0.5"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^4.0.1"

From 4b0cb0721d8fc4fe2414e37a8a8fbf78949481a5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 22 Nov 2021 20:06:50 -0800
Subject: [PATCH 645/844] fix(conftest): use synchronization locks for
 setup_database

We were running into data race issues where the `fn.is_file()`
check would occur twice before writing the file in the `else`
clause. For this reason, a new aurweb.lock.Lock class has been
added which doubles as a thread and process lock. We can use
this elsewhere in the future, but we are also able to use it
to solve this kind of data race issue.

That being said, we still need the lock file state to tell us
when the first caller acquired the lock.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/filelock.py | 32 ++++++++++++++++++++
 test/conftest.py           | 61 +++++++++++++++++++++++---------------
 test/test_filelock.py      | 26 ++++++++++++++++
 3 files changed, 95 insertions(+), 24 deletions(-)
 create mode 100644 aurweb/testing/filelock.py
 create mode 100644 test/test_filelock.py

diff --git a/aurweb/testing/filelock.py b/aurweb/testing/filelock.py
new file mode 100644
index 00000000..3a18c153
--- /dev/null
+++ b/aurweb/testing/filelock.py
@@ -0,0 +1,32 @@
+import hashlib
+import os
+
+from typing import Callable
+
+from posix_ipc import O_CREAT, Semaphore
+
+from aurweb import logging
+
+logger = logging.get_logger(__name__)
+
+
+def default_on_create(path):
+    logger.info(f"Filelock at {path} acquired.")
+
+
+class FileLock:
+    def __init__(self, tmpdir, name: str):
+        self.root = tmpdir
+        self.path = str(self.root / name)
+        self._file = str(self.root / (f"{name}.1"))
+
+    def lock(self, on_create: Callable = default_on_create):
+        hash = hashlib.sha1(self.path.encode()).hexdigest()
+        with Semaphore(f"/{hash}-lock", flags=O_CREAT, initial_value=1):
+            retval = os.path.exists(self._file)
+            if not retval:
+                with open(self._file, "w") as f:
+                    f.write("1")
+                on_create(self.path)
+
+        return retval
diff --git a/test/conftest.py b/test/conftest.py
index 01131109..80f77c9a 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -38,10 +38,14 @@ It is done this way because migration has a large cost; migrating
 ahead of each function takes too long when compared to this method.
 """
 import os
+import pathlib
 
+from multiprocessing import Lock
+
+import py
 import pytest
 
-from filelock import FileLock
+from posix_ipc import O_CREAT, Semaphore
 from sqlalchemy import create_engine
 from sqlalchemy.engine import URL
 from sqlalchemy.engine.base import Engine
@@ -53,9 +57,13 @@ import aurweb.db
 
 from aurweb import initdb, logging, testing
 from aurweb.testing.email import Email
+from aurweb.testing.filelock import FileLock
 
 logger = logging.get_logger(__name__)
 
+# Synchronization lock for database setup.
+setup_lock = Lock()
+
 
 def test_engine() -> Engine:
     """
@@ -105,7 +113,12 @@ def _create_database(engine: Engine, dbname: str) -> None:
     try:
         conn.execute(f"CREATE DATABASE {dbname}")
     except ProgrammingError:  # pragma: no cover
-        pass
+        # The database most likely already existed if we hit
+        # a ProgrammingError. Just drop the database and try
+        # again. If at that point things still fail, any
+        # exception will be propogated up to the caller.
+        conn.execute(f"DROP DATABASE {dbname}")
+        conn.execute(f"CREATE DATABASE {dbname}")
     conn.close()
     initdb.run(AlembicArgs)
 
@@ -124,20 +137,24 @@ def _drop_database(engine: Engine, dbname: str) -> None:
 
 
 def setup_email():
-    if not os.path.exists(Email.TEST_DIR):
-        os.makedirs(Email.TEST_DIR)
+    # TODO: Fix this data race! This try/catch is ugly; why is it even
+    # racing here? Perhaps we need to multiproc + multithread lock
+    # inside of setup_database to block the check?
+    with Semaphore("/test-emails", flags=O_CREAT, initial_value=1):
+        if not os.path.exists(Email.TEST_DIR):
+            # Create the directory.
+            os.makedirs(Email.TEST_DIR)
 
-    # Cleanup all email files for this test suite.
-    prefix = Email.email_prefix(suite=True)
-    files = os.listdir(Email.TEST_DIR)
-    for file in files:
-        if file.startswith(prefix):
-            os.remove(os.path.join(Email.TEST_DIR, file))
+        # Cleanup all email files for this test suite.
+        prefix = Email.email_prefix(suite=True)
+        files = os.listdir(Email.TEST_DIR)
+        for file in files:
+            if file.startswith(prefix):
+                os.remove(os.path.join(Email.TEST_DIR, file))
 
 
 @pytest.fixture(scope="module")
-def setup_database(tmp_path_factory: pytest.fixture,
-                   worker_id: pytest.fixture) -> None:
+def setup_database(tmp_path_factory: pathlib.Path, worker_id: str) -> None:
     """ Create and drop a database for the suite this fixture is used in. """
     engine = test_engine()
     dbname = aurweb.db.name()
@@ -149,19 +166,15 @@ def setup_database(tmp_path_factory: pytest.fixture,
         _drop_database(engine, dbname)
         return
 
-    root_tmp_dir = tmp_path_factory.getbasetemp().parent
-    fn = root_tmp_dir / dbname
+    def setup(path):
+        setup_email()
+        _create_database(engine, dbname)
 
-    with FileLock(str(fn) + ".lock"):
-        if fn.is_file():
-            # If the data file exists, skip database creation.
-            yield
-        else:
-            # Otherwise, create the data file and create the database.
-            fn.write_text("1")
-            setup_email()
-            yield _create_database(engine, dbname)
-            _drop_database(engine, dbname)
+    tmpdir = tmp_path_factory.getbasetemp().parent
+    file_lock = FileLock(tmpdir, dbname)
+    file_lock.lock(on_create=setup)
+    yield  # Run the test function depending on this fixture.
+    _drop_database(engine, dbname)  # Cleanup the database.
 
 
 @pytest.fixture(scope="module")
diff --git a/test/test_filelock.py b/test/test_filelock.py
new file mode 100644
index 00000000..70aa7580
--- /dev/null
+++ b/test/test_filelock.py
@@ -0,0 +1,26 @@
+import py
+
+from _pytest.logging import LogCaptureFixture
+
+from aurweb.testing.filelock import FileLock
+
+
+def test_filelock(tmpdir: py.path.local):
+    cb_path = None
+
+    def setup(path: str):
+        nonlocal cb_path
+        cb_path = str(path)
+
+    flock = FileLock(tmpdir, "test")
+    assert not flock.lock(on_create=setup)
+    assert cb_path == str(tmpdir / "test")
+    assert flock.lock()
+
+
+def test_filelock_default(caplog: LogCaptureFixture, tmpdir: py.path.local):
+    # Test default_on_create here.
+    flock = FileLock(tmpdir, "test")
+    assert not flock.lock()
+    assert caplog.messages[0] == f"Filelock at {flock.path} acquired."
+    assert flock.lock()

From 2d0e09cd63bc2a1c0baee0727aa5ede60e3475b1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 17 Nov 2021 06:20:50 -0800
Subject: [PATCH 646/844] change(rendercomment): converted to use aurweb.db ORM

- Added aurweb.util.git_search.
    - Decoupled away from rendercomment for easier testability.
- Added aurweb.testing.git.GitRepository.
- Added templates/testing/{PKGBUILD,SRCINFO}.j2.
- Added aurweb.testing.git.GitRepository + `git` pytest fixture

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/rendercomment.py |  57 ++++-----
 aurweb/testing/git.py           | 110 +++++++++++++++++
 aurweb/util.py                  |  17 +++
 templates/testing/PKGBUILD.j2   |  14 +++
 templates/testing/SRCINFO.j2    |  10 ++
 test/conftest.py                |   6 +
 test/t2600-rendercomment.t      | 160 -------------------------
 test/test_rendercomment.py      | 202 ++++++++++++++++++++++++++++++++
 test/test_util.py               |  17 +++
 9 files changed, 398 insertions(+), 195 deletions(-)
 create mode 100644 aurweb/testing/git.py
 create mode 100644 templates/testing/PKGBUILD.j2
 create mode 100644 templates/testing/SRCINFO.j2
 delete mode 100755 test/t2600-rendercomment.t
 create mode 100644 test/test_rendercomment.py

diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index efa5357f..33349432 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -7,13 +7,11 @@ import markdown
 import pygit2
 
 import aurweb.config
-import aurweb.db
 
-from aurweb import logging
+from aurweb import db, logging, util
+from aurweb.models import PackageComment
 
 logger = logging.get_logger(__name__)
-repo_path = aurweb.config.get('serve', 'repo-path')
-commit_uri = aurweb.config.get('options', 'commit_uri')
 
 
 class LinkifyExtension(markdown.extensions.Extension):
@@ -64,6 +62,7 @@ class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor):
     """
 
     def __init__(self, md, head):
+        repo_path = aurweb.config.get('serve', 'repo-path')
         self._repo = pygit2.Repository(repo_path)
         self._head = head
         super().__init__(r'\b([0-9a-f]{7,40})\b', md)
@@ -74,13 +73,9 @@ class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor):
             # Unkwown OID; preserve the orginal text.
             return (None, None, None)
 
-        prefixlen = 12
-        while prefixlen < 40:
-            if oid[:prefixlen] in self._repo:
-                break
-            prefixlen += 1
-
         el = markdown.util.etree.Element('a')
+        commit_uri = aurweb.config.get("options", "commit_uri")
+        prefixlen = util.git_search(self._repo, oid)
         el.set('href', commit_uri % (self._head, oid[:prefixlen]))
         el.text = markdown.util.AtomicString(oid[:prefixlen])
         return (el, m.start(0), m.end(0))
@@ -116,49 +111,41 @@ class HeadingExtension(markdown.extensions.Extension):
         md.treeprocessors.register(HeadingTreeprocessor(md), 'heading', 30)
 
 
-def get_comment(conn, commentid):
-    cur = conn.execute('SELECT PackageComments.Comments, PackageBases.Name '
-                       'FROM PackageComments INNER JOIN PackageBases '
-                       'ON PackageBases.ID = PackageComments.PackageBaseID '
-                       'WHERE PackageComments.ID = ?', [commentid])
-    return cur.fetchone()
+def save_rendered_comment(comment: PackageComment, html: str):
+    with db.begin():
+        comment.RenderedComment = html
 
 
-def save_rendered_comment(conn, commentid, html):
-    conn.execute('UPDATE PackageComments SET RenderedComment = ? WHERE ID = ?',
-                 [html, commentid])
+def update_comment_render_fastapi(comment: PackageComment) -> None:
+    update_comment_render(comment)
 
 
-def update_comment_render_fastapi(comment):
-    conn = aurweb.db.ConnectionExecutor(
-        aurweb.db.get_engine().raw_connection())
-    update_comment_render(conn, comment.ID)
-    aurweb.db.refresh(comment)
+def update_comment_render(comment: PackageComment) -> None:
+    text = comment.Comments
+    pkgbasename = comment.PackageBase.Name
 
-
-def update_comment_render(conn, commentid):
-    text, pkgbase = get_comment(conn, commentid)
     html = markdown.markdown(text, extensions=[
         'fenced_code',
         LinkifyExtension(),
         FlysprayLinksExtension(),
-        GitCommitsExtension(pkgbase),
+        GitCommitsExtension(pkgbasename),
         HeadingExtension()
     ])
 
     allowed_tags = (bleach.sanitizer.ALLOWED_TAGS
                     + ['p', 'pre', 'h4', 'h5', 'h6', 'br', 'hr'])
     html = bleach.clean(html, tags=allowed_tags)
-    save_rendered_comment(conn, commentid, html)
-
-    conn.commit()
-    conn.close()
+    save_rendered_comment(comment, html)
+    db.refresh(comment)
 
 
 def main():
-    commentid = int(sys.argv[1])
-    conn = aurweb.db.Connection()
-    update_comment_render(conn, commentid)
+    db.get_engine()
+    comment_id = int(sys.argv[1])
+    comment = db.query(PackageComment).filter(
+        PackageComment.ID == comment_id
+    ).first()
+    update_comment_render(comment)
 
 
 if __name__ == '__main__':
diff --git a/aurweb/testing/git.py b/aurweb/testing/git.py
new file mode 100644
index 00000000..019d870f
--- /dev/null
+++ b/aurweb/testing/git.py
@@ -0,0 +1,110 @@
+import os
+import shlex
+
+from subprocess import PIPE, Popen
+from typing import Tuple
+
+import py
+
+from aurweb.models import Package
+from aurweb.templates import base_template
+from aurweb.testing.filelock import FileLock
+
+
+class GitRepository:
+    """
+    A Git repository class to be used for testing.
+
+    Expects a `tmpdir` fixture on construction, which an 'aur.git'
+    git repository will be created in. After this class is constructed,
+    users can call GitRepository.exec for git repository operations.
+    """
+
+    def __init__(self, tmpdir: py.path.local):
+        self.file_lock = FileLock(tmpdir, "aur.git")
+        self.file_lock.lock(on_create=self._setup)
+
+    def _exec(self, cmdline: str, cwd: str) -> Tuple[int, str, str]:
+        args = shlex.split(cmdline)
+        proc = Popen(args, cwd=cwd, stdout=PIPE, stderr=PIPE)
+        out, err = proc.communicate()
+        return (proc.returncode, out.decode().strip(), err.decode().strip())
+
+    def _exec_repository(self, cmdline: str) -> Tuple[int, str, str]:
+        return self._exec(cmdline, cwd=str(self.file_lock.path))
+
+    def exec(self, cmdline: str) -> Tuple[int, str, str]:
+        return self._exec_repository(cmdline)
+
+    def _setup(self, path: str) -> None:
+        """
+        Setup the git repository from scratch.
+
+        Create the `path` directory and run the INSTALL recommended
+        git initialization commands inside of it. Additionally, install
+        aurweb.git.update to {path}/hooks/update.
+
+        :param path: Repository path not yet created
+        """
+
+        os.makedirs(path)
+
+        commands = [
+            "git init -q",
+            "git config --local transfer.hideRefs '^refs/'",
+            "git config --local --add transfer.hideRefs '!refs/'",
+            "git config --local --add transfer.hideRefs '!HEAD'",
+            "git config --local commit.gpgsign false",
+            "git config --local user.name 'Test User'",
+            "git config --local user.email 'test@example.org'",
+        ]
+        for cmdline in commands:
+            return_code, out, err = self.exec(cmdline)
+            assert return_code == 0
+
+        # This is also done in the INSTALL script to give the `aur`
+        # ssh user permissions on the repository. We don't need it
+        # during testing, since our testing user will be controlling
+        # the repository. It is left here as a note.
+        # self.exec("chown -R aur .")
+
+    def commit(self, pkg: Package, message: str):
+        """
+        Commit a Package record to the git repository.
+
+        This function generates a PKGBUILD and .SRCINFO based on
+        `pkg`, then commits them to the repository with the
+        `message` commit message.
+
+        :param pkg: Package instance
+        :param message: Commit message
+        :return: Output of `git rev-parse HEAD` after committing
+        """
+        ref = f"refs/namespaces/{pkg.Name}/refs/heads/master"
+        rc, out, err = self.exec(f"git checkout -q --orphan {ref}")
+        assert rc == 0, f"{(rc, out, err)}"
+
+        # Path to aur.git repository.
+        repo = os.path.join(self.file_lock.path)
+
+        licenses = [f"'{p.License.Name}'" for p in pkg.package_licenses]
+        depends = [f"'{p.DepName}'" for p in pkg.package_dependencies]
+        pkgbuild = base_template("testing/PKGBUILD.j2")
+        pkgbuild_path = os.path.join(repo, "PKGBUILD")
+        with open(pkgbuild_path, "w") as f:
+            data = pkgbuild.render(pkg=pkg, licenses=licenses, depends=depends)
+            f.write(data)
+
+        srcinfo = base_template("testing/SRCINFO.j2")
+        srcinfo_path = os.path.join(repo, ".SRCINFO")
+        with open(srcinfo_path, "w") as f:
+            f.write(srcinfo.render(pkg=pkg))
+
+        rc, out, err = self.exec("git add PKGBUILD .SRCINFO")
+        assert rc == 0, f"{(rc, out, err)}"
+
+        rc, out, err = self.exec(f"git commit -q -m '{message}'")
+        assert rc == 0, f"{(rc, out, err)}"
+
+        # Return stdout of `git rev-parse HEAD`, which is the new commit hash.
+        return self.exec("git rev-parse HEAD")[1]
diff --git a/aurweb/util.py b/aurweb/util.py
index bf2d6e4b..f5ced259 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -13,6 +13,7 @@ from urllib.parse import urlencode, urlparse
 from zoneinfo import ZoneInfo
 
 import fastapi
+import pygit2
 
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
 from jinja2 import pass_context
@@ -193,3 +194,19 @@ def file_hash(filepath: str, hash_function: Callable) -> str:
     with open(filepath, "rb") as f:
         hash_ = hash_function(f.read())
     return hash_.hexdigest()
+
+
+def git_search(repo: pygit2.Repository, commit_hash: str) -> int:
+    """
+    Return the shortest prefix length matching `commit_hash` found.
+
+    :param repo: pygit2.Repository instance
+    :param commit_hash: Full length commit hash
+    :return: Shortest unique prefix length found
+    """
+    prefixlen = 12
+    while prefixlen < len(commit_hash):
+        if commit_hash[:prefixlen] in repo:
+            break
+        prefixlen += 1
+    return prefixlen
diff --git a/templates/testing/PKGBUILD.j2 b/templates/testing/PKGBUILD.j2
new file mode 100644
index 00000000..29d3a1d9
--- /dev/null
+++ b/templates/testing/PKGBUILD.j2
@@ -0,0 +1,14 @@
+pkgname={{ pkg.PackageBase.Name }}
+pkgver={{ pkg.Version }}
+pkgrel=1
+pkgdesc='{{ pkg.Description }}'
+url='{{ pkg.URL }}'
+arch='any'
+license=({{ licenses | join(" ") }})
+depends=({{ depends | join(" ") }})
+source=()
+md5sums=()
+
+package() {
+    {{ body }}
+}
diff --git a/templates/testing/SRCINFO.j2 b/templates/testing/SRCINFO.j2
new file mode 100644
index 00000000..873b9c1b
--- /dev/null
+++ b/templates/testing/SRCINFO.j2
@@ -0,0 +1,10 @@
+pkgbase = {{ pkg.PackageBase.name }}
+    pkgver = {{ pkg.Version }}
+    pkgrel = 1
+    pkgdesc = {{ pkg.Description }}
+    url = {{ pkg.URL }}
+    arch='any'
+    license = {{ pkg.package_licenses | join(", ", attribute="License.Name") }}
+    depends = {{ pkg.package_dependencies | join(", ", attribute="DepName") }}
+
+pkgname = {{ pkg.Name }}
diff --git a/test/conftest.py b/test/conftest.py
index 80f77c9a..fc7f77dc 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -58,6 +58,7 @@ import aurweb.db
 from aurweb import initdb, logging, testing
 from aurweb.testing.email import Email
 from aurweb.testing.filelock import FileLock
+from aurweb.testing.git import GitRepository
 
 logger = logging.get_logger(__name__)
 
@@ -211,3 +212,8 @@ def db_test(db_session: scoped_session) -> None:
     session via aurweb.db.get_session().
     """
     testing.setup_test_db()
+
+
+@pytest.fixture
+def git(tmpdir: py.path.local) -> GitRepository:
+    yield GitRepository(tmpdir)
diff --git a/test/t2600-rendercomment.t b/test/t2600-rendercomment.t
deleted file mode 100755
index bb84fcfe..00000000
--- a/test/t2600-rendercomment.t
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-
-test_description='rendercomment tests'
-
-. "$(dirname "$0")/setup.sh"
-
-test_expect_success 'Test comment rendering.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO PackageBases (ID, Name, PackagerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1, "foobar", 1, 0, 0, "");
-	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (1, 1, "Hello world!
-	This is a comment.", "");
-	EOD
-	cover "$RENDERCOMMENT" 1 &&
-	cat <<-EOD >expected &&
-	<p>Hello world!
-	This is a comment.</p>
-	EOD
-	cat <<-EOD | sqlite3 aur.db >actual &&
-	SELECT RenderedComment FROM PackageComments WHERE ID = 1;
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test Markdown conversion.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (2, 1, "*Hello* [world](https://www.archlinux.org/)!", "");
-	EOD
-	cover "$RENDERCOMMENT" 2 &&
-	cat <<-EOD >expected &&
-	<p><em>Hello</em> <a href="https://www.archlinux.org/">world</a>!</p>
-	EOD
-	cat <<-EOD | sqlite3 aur.db >actual &&
-	SELECT RenderedComment FROM PackageComments WHERE ID = 2;
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test HTML sanitizing.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (3, 1, "<script>alert(""XSS!"");</script>", "");
-	EOD
-	cover "$RENDERCOMMENT" 3 &&
-	cat <<-EOD >expected &&
-	&lt;script&gt;alert("XSS!");&lt;/script&gt;
-	EOD
-	cat <<-EOD | sqlite3 aur.db >actual &&
-	SELECT RenderedComment FROM PackageComments WHERE ID = 3;
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test link conversion.' '
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (4, 1, "
-		Visit https://www.archlinux.org/#_test_.
-		Visit *https://www.archlinux.org/*.
-		Visit <https://www.archlinux.org/>.
-		Visit \`https://www.archlinux.org/\`.
-		Visit [Arch Linux](https://www.archlinux.org/).
-		Visit [Arch Linux][arch].
-		[arch]: https://www.archlinux.org/
-	", "");
-	EOD
-	cover "$RENDERCOMMENT" 4 &&
-	cat <<-EOD >expected &&
-		<p>Visit <a href="https://www.archlinux.org/#_test_">https://www.archlinux.org/#_test_</a>.
-		Visit <em><a href="https://www.archlinux.org/">https://www.archlinux.org/</a></em>.
-		Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>.
-		Visit <code>https://www.archlinux.org/</code>.
-		Visit <a href="https://www.archlinux.org/">Arch Linux</a>.
-		Visit <a href="https://www.archlinux.org/">Arch Linux</a>.</p>
-	EOD
-	cat <<-EOD | sqlite3 aur.db >actual &&
-	SELECT RenderedComment FROM PackageComments WHERE ID = 4;
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test Git commit linkification.' '
-	local oid=`git -C aur.git rev-parse --verify HEAD`
-	cat <<-EOD | sqlite3 aur.db &&
-	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (5, 1, "
-		$oid
-		${oid:0:7}
-		x.$oid.x
-		${oid}x
-		0123456789abcdef
-		\`$oid\`
-		http://example.com/$oid
-	", "");
-	EOD
-	cover "$RENDERCOMMENT" 5 &&
-	cat <<-EOD >expected &&
-		<p><a href="https://aur.archlinux.org/cgit/aur.git/log/?h=foobar&amp;id=${oid:0:12}">${oid:0:12}</a>
-		<a href="https://aur.archlinux.org/cgit/aur.git/log/?h=foobar&amp;id=${oid:0:7}">${oid:0:7}</a>
-		x.<a href="https://aur.archlinux.org/cgit/aur.git/log/?h=foobar&amp;id=${oid:0:12}">${oid:0:12}</a>.x
-		${oid}x
-		0123456789abcdef
-		<code>$oid</code>
-		<a href="http://example.com/$oid">http://example.com/$oid</a></p>
-	EOD
-	cat <<-EOD | sqlite3 aur.db >actual &&
-	SELECT RenderedComment FROM PackageComments WHERE ID = 5;
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test Flyspray issue linkification.' '
-	sqlite3 aur.db <<-EOD &&
-	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (6, 1, "
-		FS#1234567.
-		*FS#1234*
-		FS#
-		XFS#1
-		\`FS#1234\`
-		https://archlinux.org/?test=FS#1234
-	", "");
-	EOD
-	cover "$RENDERCOMMENT" 6 &&
-	cat <<-EOD >expected &&
-		<p><a href="https://bugs.archlinux.org/task/1234567">FS#1234567</a>.
-		<em><a href="https://bugs.archlinux.org/task/1234">FS#1234</a></em>
-		FS#
-		XFS#1
-		<code>FS#1234</code>
-		<a href="https://archlinux.org/?test=FS#1234">https://archlinux.org/?test=FS#1234</a></p>
-	EOD
-	sqlite3 aur.db <<-EOD >actual &&
-	SELECT RenderedComment FROM PackageComments WHERE ID = 6;
-	EOD
-	test_cmp actual expected
-'
-
-test_expect_success 'Test headings lowering.' '
-	sqlite3 aur.db <<-EOD &&
-	INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (7, 1, "
-		# One
-		## Two
-		### Three
-		#### Four
-		##### Five
-		###### Six
-	", "");
-	EOD
-	cover "$RENDERCOMMENT" 7 &&
-	cat <<-EOD >expected &&
-		<h5>One</h5>
-		<h6>Two</h6>
-		<h6>Three</h6>
-		<h6>Four</h6>
-		<h6>Five</h6>
-		<h6>Six</h6>
-	EOD
-	sqlite3 aur.db <<-EOD >actual &&
-	SELECT RenderedComment FROM PackageComments WHERE ID = 7;
-	EOD
-	test_cmp actual expected
-'
-
-test_done
diff --git a/test/test_rendercomment.py b/test/test_rendercomment.py
new file mode 100644
index 00000000..c45d4235
--- /dev/null
+++ b/test/test_rendercomment.py
@@ -0,0 +1,202 @@
+from datetime import datetime
+from unittest import mock
+
+import pytest
+
+from aurweb import config, db, logging
+from aurweb.models import Package, PackageBase, PackageComment, User
+from aurweb.models.account_type import USER_ID
+from aurweb.scripts import rendercomment
+from aurweb.scripts.rendercomment import update_comment_render
+from aurweb.testing.git import GitRepository
+
+logger = logging.get_logger(__name__)
+aur_location = config.get("options", "aur_location")
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test, git: GitRepository):
+    config_get = config.get
+
+    def mock_config_get(section: str, key: str) -> str:
+        if section == "serve" and key == "repo-path":
+            return git.file_lock.path
+        elif section == "options" and key == "commit_uri":
+            return "/cgit/aur.git/log/?h=%s&id=%s"
+        return config_get(section, key)
+
+    with mock.patch("aurweb.config.get", side_effect=mock_config_get):
+        yield
+
+
+@pytest.fixture
+def user() -> User:
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         Passwd=str(), AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgbase = db.create(PackageBase, Packager=user, Name="pkgbase_0",
+                            SubmittedTS=now, ModifiedTS=now)
+    yield pkgbase
+
+
+@pytest.fixture
+def package(pkgbase: PackageBase) -> Package:
+    with db.begin():
+        package = db.create(Package, PackageBase=pkgbase,
+                            Name=pkgbase.Name, Version="1.0")
+    yield package
+
+
+def create_comment(user: User, pkgbase: PackageBase, comments: str,
+                   render: bool = True):
+    with db.begin():
+        comment = db.create(PackageComment, User=user,
+                            PackageBase=pkgbase, Comments=comments)
+    if render:
+        update_comment_render(comment)
+    return comment
+
+
+def test_comment_rendering(user: User, pkgbase: PackageBase):
+    text = "Hello world! This is a comment."
+    comment = create_comment(user, pkgbase, text)
+    expected = f"<p>{text}</p>"
+    assert comment.RenderedComment == expected
+
+
+def test_rendercomment_main(user: User, pkgbase: PackageBase):
+    text = "Hello world! This is a comment."
+    comment = create_comment(user, pkgbase, text, False)
+
+    args = ["aurweb-rendercomment", str(comment.ID)]
+    with mock.patch("sys.argv", args):
+        rendercomment.main()
+    db.refresh(comment)
+
+    expected = f"<p>{text}</p>"
+    assert comment.RenderedComment == expected
+
+
+def test_markdown_conversion(user: User, pkgbase: PackageBase):
+    text = "*Hello* [world](https://aur.archlinux.org)!"
+    comment = create_comment(user, pkgbase, text)
+    expected = ('<p><em>Hello</em> '
+                '<a href="https://aur.archlinux.org">world</a>!</p>')
+    assert comment.RenderedComment == expected
+
+
+def test_html_sanitization(user: User, pkgbase: PackageBase):
+    text = '<script>alert("XSS!")</script>'
+    comment = create_comment(user, pkgbase, text)
+    expected = '&lt;script&gt;alert("XSS!")&lt;/script&gt;'
+    assert comment.RenderedComment == expected
+
+
+def test_link_conversion(user: User, pkgbase: PackageBase):
+    text = """\
+Visit https://www.archlinux.org/#_test_.
+Visit *https://www.archlinux.org/*.
+Visit <https://www.archlinux.org/>.
+Visit `https://www.archlinux.org/`.
+Visit [Arch Linux](https://www.archlinux.org/).
+Visit [Arch Linux][arch].
+[arch]: https://www.archlinux.org/\
+"""
+    comment = create_comment(user, pkgbase, text)
+    expected = '''\
+<p>Visit <a href="https://www.archlinux.org/#_test_">\
+https://www.archlinux.org/#_test_</a>.
+Visit <em><a href="https://www.archlinux.org/">https://www.archlinux.org/</a></em>.
+Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>.
+Visit <code>https://www.archlinux.org/</code>.
+Visit <a href="https://www.archlinux.org/">Arch Linux</a>.
+Visit <a href="https://www.archlinux.org/">Arch Linux</a>.</p>\
+'''
+    assert comment.RenderedComment == expected
+
+
+def test_git_commit_link(git: GitRepository, user: User, package: Package):
+    commit_hash = git.commit(package, "Initial commit.")
+    logger.info(f"Created commit: {commit_hash}")
+    logger.info(f"Short hash: {commit_hash[:7]}")
+
+    text = f"""\
+{commit_hash}
+{commit_hash[:7]}
+x.{commit_hash}.x
+{commit_hash}x
+0123456789abcdef
+`{commit_hash}`
+http://example.com/{commit_hash}\
+"""
+    comment = create_comment(user, package.PackageBase, text)
+
+    pkgname = package.PackageBase.Name
+    cgit_path = f"/cgit/aur.git/log/?h={pkgname}&amp;"
+    expected = f"""\
+<p><a href="{cgit_path}id={commit_hash[:12]}">{commit_hash[:12]}</a>
+<a href="{cgit_path}id={commit_hash[:7]}">{commit_hash[:7]}</a>
+x.<a href="{cgit_path}id={commit_hash[:12]}">{commit_hash[:12]}</a>.x
+{commit_hash}x
+0123456789abcdef
+<code>{commit_hash}</code>
+<a href="http://example.com/{commit_hash}">\
+http://example.com/{commit_hash}\
+</a>\
+</p>\
+"""
+    assert comment.RenderedComment == expected
+
+
+def test_flyspray_issue_link(user: User, pkgbase: PackageBase):
+    text = """\
+FS#1234567.
+*FS#1234*
+FS#
+XFS#1
+`FS#1234`
+https://archlinux.org/?test=FS#1234\
+"""
+    comment = create_comment(user, pkgbase, text)
+
+    expected = """\
+<p><a href="https://bugs.archlinux.org/task/1234567">FS#1234567</a>.
+<em><a href="https://bugs.archlinux.org/task/1234">FS#1234</a></em>
+FS#
+XFS#1
+<code>FS#1234</code>
+<a href="https://archlinux.org/?test=FS#1234">\
+https://archlinux.org/?test=FS#1234\
+</a>\
+</p>\
+"""
+    assert comment.RenderedComment == expected
+
+
+def test_lower_headings(user: User, pkgbase: PackageBase):
+    text = """\
+# One
+## Two
+### Three
+#### Four
+##### Five
+###### Six\
+"""
+    comment = create_comment(user, pkgbase, text)
+
+    expected = """\
+<h5>One</h5>
+<h6>Two</h6>
+<h6>Three</h6>
+<h6>Four</h6>
+<h6>Five</h6>
+<h6>Six</h6>\
+"""
+    assert comment.RenderedComment == expected
diff --git a/test/test_util.py b/test/test_util.py
index 99b77a78..2529ed1f 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -40,3 +40,20 @@ def test_round():
     assert filters.do_round(1.3) == 1
     assert filters.do_round(1.5) == 2
     assert filters.do_round(2.0) == 2
+
+
+def test_git_search():
+    """ Test that git_search matches the full commit if necessary. """
+    commit_hash = "0123456789abcdef"
+    repo = {commit_hash}
+    prefixlen = util.git_search(repo, commit_hash)
+    assert prefixlen == 16
+
+
+def test_git_search_double_commit():
+    """ Test that git_search matches a shorter prefix length. """
+    commit_hash = "0123456789abcdef"
+    repo = {commit_hash[:13]}
+    # Locate the shortest prefix length that matches commit_hash.
+    prefixlen = util.git_search(repo, commit_hash)
+    assert prefixlen == 13

From bc1cf8b1f6089d0776dc753bc9255032aaf83a8f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 24 Nov 2021 20:30:16 -0800
Subject: [PATCH 647/844] fix(rendercomment): markdown.util.etree ->
 xml.etree.ElementTree

This removes a deprecation warning.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/rendercomment.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index 33349432..2af5384e 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -2,6 +2,8 @@
 
 import sys
 
+from xml.etree.ElementTree import Element
+
 import bleach
 import markdown
 import pygit2
@@ -40,7 +42,7 @@ class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor):
     """
 
     def handleMatch(self, m, data):
-        el = markdown.util.etree.Element('a')
+        el = Element('a')
         el.set('href', f'https://bugs.archlinux.org/task/{m.group(1)}')
         el.text = markdown.util.AtomicString(m.group(0))
         return (el, m.start(0), m.end(0))
@@ -73,7 +75,7 @@ class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor):
             # Unkwown OID; preserve the orginal text.
             return (None, None, None)
 
-        el = markdown.util.etree.Element('a')
+        el = Element('a')
         commit_uri = aurweb.config.get("options", "commit_uri")
         prefixlen = util.git_search(self._repo, oid)
         el.set('href', commit_uri % (self._head, oid[:prefixlen]))

From 67a6b8360eccb02ac4a65940fde7fa6801ac2398 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 24 Nov 2021 20:33:42 -0800
Subject: [PATCH 648/844] fix(docker): remove update and build steps from
 poetry

`install` includes dependencies present in poetry.lock
and we must stick to them if we wish to pin dependencies.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/install-python-deps.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker/scripts/install-python-deps.sh b/docker/scripts/install-python-deps.sh
index 3ab87742..3d5f28f0 100755
--- a/docker/scripts/install-python-deps.sh
+++ b/docker/scripts/install-python-deps.sh
@@ -6,8 +6,6 @@ pip install --upgrade pip
 
 # Install the aurweb package and deps system-wide via poetry.
 poetry config virtualenvs.create false
-poetry update
-poetry build
 poetry install --no-interaction --no-ansi
 
 exec "$@"

From 4426c639ceb59ea5d6414b70157f2c0e7cea4f6b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 24 Nov 2021 20:34:45 -0800
Subject: [PATCH 649/844] fix(logging): remove `test` logger definition

Like the `aurweb` logger definiton was previously, the `test`
logger is being redundant with the root logger. Use root for
all aurweb-local logging.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 logging.conf | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/logging.conf b/logging.conf
index 3b96e827..deb79cf5 100644
--- a/logging.conf
+++ b/logging.conf
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,test,uvicorn,hypercorn,alembic
+keys=root,uvicorn,hypercorn,alembic
 
 [handlers]
 keys=simpleHandler,detailedHandler
@@ -10,12 +10,7 @@ keys=simpleFormatter,detailedFormatter
 [logger_root]
 level=INFO
 handlers=detailedHandler
-
-[logger_test]
-level=DEBUG
-handlers=detailedHandler
-qualname=test
-propagate=1
+propogate=1
 
 [logger_uvicorn]
 level=DEBUG

From 436d7420179043baf4814b2d10bc1cb460132d97 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Nov 2021 14:02:47 -0800
Subject: [PATCH 650/844] fix(fastapi): use CRED_TU_LIST_VOTES for "Trusted
 User" navigation item

Closes #189

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth.py                         | 2 +-
 templates/partials/archdev-navbar.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 98a43fd5..4d6dafc6 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -329,7 +329,7 @@ cred_filters = {
     CRED_PKGREQ_CLOSE: trusted_user_or_dev,
     CRED_PKGREQ_LIST: trusted_user_or_dev,
     CRED_TU_ADD_VOTE: trusted_user,
-    CRED_TU_LIST_VOTES: trusted_user,
+    CRED_TU_LIST_VOTES: trusted_user_or_dev,
     CRED_TU_VOTE: trusted_user,
     CRED_ACCOUNT_EDIT_DEV: developer,
     CRED_PKGBASE_MERGE: trusted_user_or_dev,
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index ead0d8e2..81695951 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -36,8 +36,8 @@
                 </a>
             </li>
 
-            {# Only CRED_TU_VOTE privileged users see Trusted User #}
-            {% if request.user.has_credential("CRED_TU_VOTE") %}
+            {# Only CRED_TU_LIST_VOTES privileged users see Trusted User #}
+            {% if request.user.has_credential("CRED_TU_LIST_VOTES") %}
                 <li>
                     <a href="/tu">{% trans %}Trusted User{% endtrans %}</a>
                 </li>

From 44f2366675f0ca81af443dfa293d5251b1f2eb02 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Nov 2021 16:20:36 -0800
Subject: [PATCH 651/844] fix: remove TODO comments and noop tests from
 test_notify

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_notify.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/test/test_notify.py b/test/test_notify.py
index 45a1df31..dc6e7e3e 100644
--- a/test/test_notify.py
+++ b/test/test_notify.py
@@ -262,7 +262,6 @@ The package {pkgbase.Name} [1] was disowned by {user2.Username} [2].
 
 
 def test_comaintainer_addition(user: User, pkgbases: List[PackageBase]):
-    # TODO: Add this in fastapi code!
     pkgbase = pkgbases[0]
     notif = notify.ComaintainerAddNotification(user.ID, pkgbase.ID)
     notif.send()
@@ -282,7 +281,6 @@ You were added to the co-maintainer list of {pkgbase.Name} [1].
 
 
 def test_comaintainer_removal(user: User, pkgbases: List[PackageBase]):
-    # TODO: Add this in fastapi code!
     pkgbase = pkgbases[0]
     notif = notify.ComaintainerRemoveNotification(user.ID, pkgbase.ID)
     notif.send()
@@ -417,14 +415,9 @@ Request #{pkgreq.ID} has been rejected by {user2.Username} [1].
     assert email.body == expected
 
 
-def test_close_request_auto_accept():
-    pass
-
-
 def test_close_request_comaintainer_cc(user: User, user2: User,
                                        pkgreq: PackageRequest,
                                        pkgbases: List[PackageBase]):
-    # TODO: Check this in fastapi code!
     pkgbase = pkgbases[0]
     with db.begin():
         db.create(models.PackageComaintainer, PackageBase=pkgbase,

From 69eb17cb0d659d7de7a51715d2113e806663eb44 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Nov 2021 16:51:16 -0800
Subject: [PATCH 652/844] change(fastapi): remove the GET /logout route;
 replaced with POST

Had to add some additional CSS in to style a form button the same
as <a> links are styled.

Closes #188

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/auth.py                 | 15 ++-------------
 templates/partials/archdev-navbar.html |  9 ++++++---
 test/test_auth_routes.py               |  3 ++-
 web/html/css/aurweb.css                | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index c5a99419..fdc421f5 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -77,14 +77,9 @@ async def login_post(request: Request,
     return response
 
 
-@router.get("/logout")
+@router.post("/logout")
 @auth_required()
-async def logout(request: Request, next: str = "/"):
-    """ A GET and POST route for logging out.
-
-    @param request FastAPI request
-    @param next Route to redirect to
-    """
+async def logout(request: Request, next: str = Form(default="/")):
     if request.user.is_authenticated():
         request.user.logout(request)
 
@@ -95,9 +90,3 @@ async def logout(request: Request, next: str = "/"):
     response.delete_cookie("AURSID")
     response.delete_cookie("AURTZ")
     return response
-
-
-@router.post("/logout")
-@auth_required()
-async def logout_post(request: Request, next: str = "/"):
-    return await logout(request=request, next=next)
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 81695951..2e01eeab 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -45,9 +45,12 @@
 
             {# All logged in users see Logout #}
             <li>
-                <a href="/logout?next={{ next }}">
-                    {% trans %}Logout{% endtrans %}
-                </a>
+                <form action="/logout" method="post" class="link">
+                    <input type="hidden" name="next" value="{{ next }}" />
+                    <button type="submit">
+                        {% trans %}Logout{% endtrans %}
+                    </button>
+                </form>
             </li>
         {% else %}
             {# All guest users see Register #}
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index a0bb8a7c..dffd1b94 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -154,8 +154,9 @@ def test_unauthenticated_logout_unauthorized():
     with client as request:
         # Alright, let's verify that attempting to /logout when not
         # authenticated returns 401 Unauthorized.
-        response = request.get("/logout", allow_redirects=False)
+        response = request.post("/logout", allow_redirects=False)
         assert response.status_code == int(HTTPStatus.SEE_OTHER)
+        assert response.headers.get("location").startswith("/login")
 
 
 def test_login_missing_username():
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index 62179769..cd81160d 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -229,3 +229,18 @@ input#search-action-submit {
 .success {
     color: green;
 }
+
+/* Styling used to clone <a> styles for a form.link button. */
+form.link, form.link > button {
+    display: inline-block;
+}
+form.link > button {
+    padding: 0 0.5em;
+    color: #07b;
+    background: none;
+    border: none;
+}
+form.link > button:hover {
+    cursor: pointer;
+    text-decoration: underline;
+}

From fd8d23a37937f1bab5dfffea393ea30f0656df03 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Nov 2021 19:04:55 -0800
Subject: [PATCH 653/844] fix(fastapi): fix new Logout nav item css

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 web/html/css/aurweb.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index cd81160d..dafa8c91 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -231,16 +231,19 @@ input#search-action-submit {
 }
 
 /* Styling used to clone <a> styles for a form.link button. */
-form.link, form.link > button {
+form.link, form.link button {
     display: inline-block;
+    font-family: sans-serif;
 }
-form.link > button {
+form.link button {
     padding: 0 0.5em;
     color: #07b;
     background: none;
     border: none;
+    font-family: inherit;
+    font-size: inherit;
 }
-form.link > button:hover {
+form.link button:hover {
     cursor: pointer;
     text-decoration: underline;
 }

From 9bfe2b07ba712f1667f93a4527b6a76b0b3cfcc1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Nov 2021 19:39:27 -0800
Subject: [PATCH 654/844] fix(fastapi): render Logged-in as page on
 authenticated /login

This was missed during the initial porting of the /login route.

Modifications:
-------------
- A form is now used for the [Logout] link and some css was
  needed to deal with positioning.

Closes #186

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/auth.py   |   1 -
 templates/login.html     | 162 +++++++++++++++++++++------------------
 test/test_auth_routes.py |  10 ++-
 web/html/css/aurweb.css  |  10 ++-
 4 files changed, 104 insertions(+), 79 deletions(-)

diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index fdc421f5..1e0b026a 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -24,7 +24,6 @@ async def login_template(request: Request, next: str, errors: list = None):
 
 
 @router.get("/login", response_class=HTMLResponse)
-@auth_required(False, login=False)
 async def login_get(request: Request, next: str = "/"):
     return await login_template(request, next)
 
diff --git a/templates/login.html b/templates/login.html
index 2c028936..c62de43e 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -5,81 +5,95 @@
 <div id="dev-login" class="box">
     <h2>AUR {% trans %}Login{% endtrans %}</h2>
 
-    {% if request.url.scheme == "http" and config.getboolean("options", "disable_http_login") %}
-        {% set https_login = url_base.replace("http://", "https://") + "/login" %}
-        <p>
-        {{ "HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
-        | tr
-        | format(
-            '<a href="%s">' | format(https_login),
-            "</a>")
-        | safe
-        }}
-        </p>
-    {% elif request.user.is_authenticated() %}
-        <p>
-        {{ "Logged-in as: %s"
-        | tr
-        | format("<b>%s</b>" | format(request.user.Username))
-        | safe
-        }}
-        <a href="/logout?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
-        </p>
-    {% else %}
-        <form method="post" action="/login?next={{ next }}">
-            <fieldset>
-                <legend>{% trans %}Enter login credentials{% endtrans %}</legend>
-
-                {% if errors %}
-                    <ul class="errorlist">
-                        {% for error in errors %}
-                            <li>{{ error }}</li>
-                        {% endfor %}
-                    </ul>
-                {% endif %}
-
-                <p>
-                    <label for="id_username">
-                        {% trans %}User name or primary email address{% endtrans %}:
-                    </label>
-
-                    <input id="id_username" type="text" name="user" size="30"
-                           maxlength="254" autofocus="autofocus"
-                           required="required" value="{{ user or '' }}">
-                </p>
-
-                <p>
-                    <label for="id_password">
-                        {% trans %}Password{% endtrans %}:
-                    </label>
-                    <input id="id_password" type="password" name="passwd"
-                           size="30" required="required">
-                </p>
-
-                <p>
-                    <input id="id_remember_me" type="checkbox" name="remember_me"
-                        {% if remember_me %}
-                            checked="checked"
-                        {% endif %}
-                    >
-                    <label for="id_remember_me">
-                        {% trans %}Remember me{% endtrans %}
-                    </label>
-                </p>
-
-                <p>
-                    <input class="button" type="submit"
-                           value="{% trans %}Login{% endtrans %}">
-                    <a href="/passreset">
-                        [{% trans %}Forgot Password{% endtrans %}]
-                    </a>
-                    <input id="id_referer" type="hidden" name="referer"
-                           value="{{ url_base }}">
-                    <input type="hidden" name="next" value="{{ next }}">
-                </p>
-
-            </fieldset>
+    {% if request.user.is_authenticated() %}
+        <form action="/logout" method="post" class="link">
+            <p>
+                {{
+                    "Logged-in as: %s" | tr
+                    | format("<strong>%s</strong>" | format(request.user.Username))
+                    | safe
+                }}
+                <input type="hidden" name="next" value="{{ next }}" />
+                <button type="submit">[{{ "Logout" | tr }}]</button>
+            </p>
         </form>
+    {% else %}
+        {% if request.url.scheme == "http" and config.getboolean("options", "disable_http_login") %}
+            {% set https_login = url_base.replace("http://", "https://") + "/login" %}
+            <p>
+            {{ "HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+            | tr
+            | format(
+                '<a href="%s">' | format(https_login),
+                "</a>")
+            | safe
+            }}
+            </p>
+        {% elif request.user.is_authenticated() %}
+            <p>
+            {{ "Logged-in as: %s"
+            | tr
+            | format("<b>%s</b>" | format(request.user.Username))
+            | safe
+            }}
+            <a href="/logout?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
+            </p>
+        {% else %}
+            <form method="post" action="/login?next={{ next }}">
+                <fieldset>
+                    <legend>{% trans %}Enter login credentials{% endtrans %}</legend>
+
+                    {% if errors %}
+                        <ul class="errorlist">
+                            {% for error in errors %}
+                                <li>{{ error }}</li>
+                            {% endfor %}
+                        </ul>
+                    {% endif %}
+
+                    <p>
+                        <label for="id_username">
+                            {% trans %}User name or primary email address{% endtrans %}:
+                        </label>
+
+                        <input id="id_username" type="text" name="user" size="30"
+                               maxlength="254" autofocus="autofocus"
+                               required="required" value="{{ user or '' }}">
+                    </p>
+
+                    <p>
+                        <label for="id_password">
+                            {% trans %}Password{% endtrans %}:
+                        </label>
+                        <input id="id_password" type="password" name="passwd"
+                               size="30" required="required">
+                    </p>
+
+                    <p>
+                        <input id="id_remember_me" type="checkbox" name="remember_me"
+                            {% if remember_me %}
+                                checked="checked"
+                            {% endif %}
+                        >
+                        <label for="id_remember_me">
+                            {% trans %}Remember me{% endtrans %}
+                        </label>
+                    </p>
+
+                    <p>
+                        <input class="button" type="submit"
+                               value="{% trans %}Login{% endtrans %}">
+                        <a href="/passreset">
+                            [{% trans %}Forgot Password{% endtrans %}]
+                        </a>
+                        <input id="id_referer" type="hidden" name="referer"
+                               value="{{ url_base }}">
+                        <input type="hidden" name="next" value="{{ next }}">
+                    </p>
+
+                </fieldset>
+            </form>
+        {% endif %}
     {% endif %}
 </div>
 
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index dffd1b94..0157fcc8 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -131,7 +131,7 @@ def test_secure_login(mock):
     assert user.session == record
 
 
-def test_authenticated_login_forbidden():
+def test_authenticated_login():
     post_data = {
         "user": "test",
         "passwd": "testPassword",
@@ -139,15 +139,19 @@ def test_authenticated_login_forbidden():
     }
 
     with client as request:
-        # Login.
+        # Try to login.
         response = request.post("/login", data=post_data,
                                 allow_redirects=False)
         assert response.status_code == int(HTTPStatus.SEE_OTHER)
+        assert response.headers.get("location") == "/"
 
+        # Now, let's verify that we get the logged in rendering
+        # when requesting GET /login as an authenticated user.
         # Now, let's verify that we receive 403 Forbidden when we
         # try to get /login as an authenticated user.
         response = request.get("/login", allow_redirects=False)
-        assert response.status_code == int(HTTPStatus.SEE_OTHER)
+        assert response.status_code == int(HTTPStatus.OK)
+        assert "Logged-in as: <strong>test</strong>" in response.text
 
 
 def test_unauthenticated_logout_unauthorized():
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index dafa8c91..739ac7b7 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -232,7 +232,7 @@ input#search-action-submit {
 
 /* Styling used to clone <a> styles for a form.link button. */
 form.link, form.link button {
-    display: inline-block;
+    display: inline;
     font-family: sans-serif;
 }
 form.link button {
@@ -247,3 +247,11 @@ form.link button:hover {
     cursor: pointer;
     text-decoration: underline;
 }
+
+/* Customize form.link when used inside of a page. */
+div.box form.link p {
+    margin: .33em 0 1em;
+}
+div.box form.link button {
+    padding: 0;
+}

From 001e86317fd19b68491e61e8fad811a89a17ad3e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Nov 2021 19:44:18 -0800
Subject: [PATCH 655/844] fix(rpc): fix ordering of related records

They were being ordered by IDs; they should be ordered by Names.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index c70ddf1a..7bdae638 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -193,7 +193,7 @@ class RPC:
                 models.DependencyType.Name.label("Type"),
                 models.PackageDependency.DepName.label("Name"),
                 models.PackageDependency.DepCondition.label("Cond")
-            ).distinct().order_by("ID"),
+            ).distinct().order_by("Name"),
 
             # PackageRelation
             db.query(
@@ -205,7 +205,7 @@ class RPC:
                 models.RelationType.Name.label("Type"),
                 models.PackageRelation.RelName.label("Name"),
                 models.PackageRelation.RelCondition.label("Cond")
-            ).distinct().order_by("ID"),
+            ).distinct().order_by("Name"),
 
             # Groups
             db.query(models.PackageGroup).join(
@@ -217,7 +217,7 @@ class RPC:
                 literal("Groups").label("Type"),
                 models.Group.Name.label("Name"),
                 literal(str()).label("Cond")
-            ).distinct().order_by("ID"),
+            ).distinct().order_by("Name"),
 
             # Licenses
             db.query(models.PackageLicense).join(
@@ -230,7 +230,7 @@ class RPC:
                 literal("License").label("Type"),
                 models.License.Name.label("Name"),
                 literal(str()).label("Cond")
-            ).distinct().order_by("ID"),
+            ).distinct().order_by("Name"),
 
             # Keywords
             db.query(models.PackageKeyword).join(
@@ -242,7 +242,7 @@ class RPC:
                 literal("Keywords").label("Type"),
                 models.PackageKeyword.Keyword.label("Name"),
                 literal(str()).label("Cond")
-            ).distinct().order_by("ID")
+            ).distinct().order_by("Name")
         ]
 
         # Union all subqueries together.

From a6ac5f0dbf5b2e8d0d0c55a58e7a41ee7d5ad5dc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 29 Nov 2021 19:44:18 -0800
Subject: [PATCH 656/844] fix(rpc): fix ordering of related records

They were being ordered by IDs; they should be ordered by Names.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/rpc.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index c70ddf1a..7bdae638 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -193,7 +193,7 @@ class RPC:
                 models.DependencyType.Name.label("Type"),
                 models.PackageDependency.DepName.label("Name"),
                 models.PackageDependency.DepCondition.label("Cond")
-            ).distinct().order_by("ID"),
+            ).distinct().order_by("Name"),
 
             # PackageRelation
             db.query(
@@ -205,7 +205,7 @@ class RPC:
                 models.RelationType.Name.label("Type"),
                 models.PackageRelation.RelName.label("Name"),
                 models.PackageRelation.RelCondition.label("Cond")
-            ).distinct().order_by("ID"),
+            ).distinct().order_by("Name"),
 
             # Groups
             db.query(models.PackageGroup).join(
@@ -217,7 +217,7 @@ class RPC:
                 literal("Groups").label("Type"),
                 models.Group.Name.label("Name"),
                 literal(str()).label("Cond")
-            ).distinct().order_by("ID"),
+            ).distinct().order_by("Name"),
 
             # Licenses
             db.query(models.PackageLicense).join(
@@ -230,7 +230,7 @@ class RPC:
                 literal("License").label("Type"),
                 models.License.Name.label("Name"),
                 literal(str()).label("Cond")
-            ).distinct().order_by("ID"),
+            ).distinct().order_by("Name"),
 
             # Keywords
             db.query(models.PackageKeyword).join(
@@ -242,7 +242,7 @@ class RPC:
                 literal("Keywords").label("Type"),
                 models.PackageKeyword.Keyword.label("Name"),
                 literal(str()).label("Cond")
-            ).distinct().order_by("ID")
+            ).distinct().order_by("Name")
         ]
 
         # Union all subqueries together.

From ecbab8546b68574c939b269dac1ac2d77e53766b Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Thu, 21 Oct 2021 17:48:29 -0400
Subject: [PATCH 657/844] fix(FastAPI): access AccountType ID directly

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/auth.py b/aurweb/auth.py
index 4d6dafc6..1527f0a3 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth.py
@@ -244,7 +244,7 @@ def account_type_required(one_of: set):
     def decorator(func):
         @functools.wraps(func)
         async def wrapper(request: fastapi.Request, *args, **kwargs):
-            if request.user.AccountType.ID not in one_of:
+            if request.user.AccountTypeID not in one_of:
                 return RedirectResponse("/",
                                         status_code=int(HTTPStatus.SEE_OTHER))
             return await func(request, *args, **kwargs)

From 125b244f4478146ae293f76ca4a53a77160feda3 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Thu, 21 Oct 2021 17:49:10 -0400
Subject: [PATCH 658/844] fix(FastAPI): use account type vars instead of
 strings

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/routers/trusted_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index 7c0a0404..f0cea61e 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -228,7 +228,7 @@ async def trusted_user_proposal_post(request: Request,
 
 @router.get("/addvote")
 @auth_required(True, redirect="/addvote")
-@account_type_required({"Trusted User", "Trusted User & Developer"})
+@account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote(request: Request,
                                user: str = str(),
                                type: str = "add_tu",

From a10f8663fd9bc4ddb990f1dfba31cb3331f4c9e9 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Tue, 30 Nov 2021 15:44:18 -0500
Subject: [PATCH 659/844] fix(FastAPI): reorganize credential checkin into
 dedicated file

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/{auth.py => auth/__init__.py}     | 98 ------------------------
 aurweb/auth/creds.py                     | 76 ++++++++++++++++++
 aurweb/models/user.py                    |  9 ++-
 aurweb/routers/accounts.py               |  6 +-
 aurweb/routers/packages.py               | 56 +++++++-------
 aurweb/templates.py                      |  3 +-
 templates/partials/account/comment.html  |  2 +-
 templates/partials/account_form.html     |  2 +-
 templates/partials/archdev-navbar.html   |  4 +-
 templates/partials/comment_actions.html  |  8 +-
 templates/partials/packages/actions.html |  8 +-
 templates/partials/packages/comment.html |  2 +-
 templates/partials/packages/details.html |  4 +-
 test/test_auth.py                        | 12 +--
 test/test_user.py                        | 25 +++---
 15 files changed, 143 insertions(+), 172 deletions(-)
 rename aurweb/{auth.py => auth/__init__.py} (75%)
 create mode 100644 aurweb/auth/creds.py

diff --git a/aurweb/auth.py b/aurweb/auth/__init__.py
similarity index 75%
rename from aurweb/auth.py
rename to aurweb/auth/__init__.py
index 1527f0a3..82192cc2 100644
--- a/aurweb/auth.py
+++ b/aurweb/auth/__init__.py
@@ -250,101 +250,3 @@ def account_type_required(one_of: set):
             return await func(request, *args, **kwargs)
         return wrapper
     return decorator
-
-
-CRED_ACCOUNT_CHANGE_TYPE = 1
-CRED_ACCOUNT_EDIT = 2
-CRED_ACCOUNT_EDIT_DEV = 3
-CRED_ACCOUNT_LAST_LOGIN = 4
-CRED_ACCOUNT_SEARCH = 5
-CRED_ACCOUNT_LIST_COMMENTS = 28
-CRED_COMMENT_DELETE = 6
-CRED_COMMENT_UNDELETE = 27
-CRED_COMMENT_VIEW_DELETED = 22
-CRED_COMMENT_EDIT = 25
-CRED_COMMENT_PIN = 26
-CRED_PKGBASE_ADOPT = 7
-CRED_PKGBASE_SET_KEYWORDS = 8
-CRED_PKGBASE_DELETE = 9
-CRED_PKGBASE_DISOWN = 10
-CRED_PKGBASE_EDIT_COMAINTAINERS = 24
-CRED_PKGBASE_FLAG = 11
-CRED_PKGBASE_LIST_VOTERS = 12
-CRED_PKGBASE_NOTIFY = 13
-CRED_PKGBASE_UNFLAG = 15
-CRED_PKGBASE_VOTE = 16
-CRED_PKGREQ_FILE = 23
-CRED_PKGREQ_CLOSE = 17
-CRED_PKGREQ_LIST = 18
-CRED_TU_ADD_VOTE = 19
-CRED_TU_LIST_VOTES = 20
-CRED_TU_VOTE = 21
-CRED_PKGBASE_MERGE = 29
-
-
-def has_any(user, *account_types):
-    return str(user.AccountType) in set(account_types)
-
-
-def user_developer_or_trusted_user(user):
-    return True
-
-
-def trusted_user(user):
-    return has_any(user, "Trusted User", "Trusted User & Developer")
-
-
-def developer(user):
-    return has_any(user, "Developer", "Trusted User & Developer")
-
-
-def trusted_user_or_dev(user):
-    return has_any(user, "Trusted User", "Developer",
-                   "Trusted User & Developer")
-
-
-# A mapping of functions that users must pass to have credentials.
-cred_filters = {
-    CRED_PKGBASE_FLAG: user_developer_or_trusted_user,
-    CRED_PKGBASE_NOTIFY: user_developer_or_trusted_user,
-    CRED_PKGBASE_VOTE: user_developer_or_trusted_user,
-    CRED_PKGREQ_FILE: user_developer_or_trusted_user,
-    CRED_ACCOUNT_CHANGE_TYPE: trusted_user_or_dev,
-    CRED_ACCOUNT_EDIT: trusted_user_or_dev,
-    CRED_ACCOUNT_LAST_LOGIN: trusted_user_or_dev,
-    CRED_ACCOUNT_LIST_COMMENTS: trusted_user_or_dev,
-    CRED_ACCOUNT_SEARCH: trusted_user_or_dev,
-    CRED_COMMENT_DELETE: trusted_user_or_dev,
-    CRED_COMMENT_UNDELETE: trusted_user_or_dev,
-    CRED_COMMENT_VIEW_DELETED: trusted_user_or_dev,
-    CRED_COMMENT_EDIT: trusted_user_or_dev,
-    CRED_COMMENT_PIN: trusted_user_or_dev,
-    CRED_PKGBASE_ADOPT: trusted_user_or_dev,
-    CRED_PKGBASE_SET_KEYWORDS: trusted_user_or_dev,
-    CRED_PKGBASE_DELETE: trusted_user_or_dev,
-    CRED_PKGBASE_EDIT_COMAINTAINERS: trusted_user_or_dev,
-    CRED_PKGBASE_DISOWN: trusted_user_or_dev,
-    CRED_PKGBASE_LIST_VOTERS: trusted_user_or_dev,
-    CRED_PKGBASE_UNFLAG: trusted_user_or_dev,
-    CRED_PKGREQ_CLOSE: trusted_user_or_dev,
-    CRED_PKGREQ_LIST: trusted_user_or_dev,
-    CRED_TU_ADD_VOTE: trusted_user,
-    CRED_TU_LIST_VOTES: trusted_user_or_dev,
-    CRED_TU_VOTE: trusted_user,
-    CRED_ACCOUNT_EDIT_DEV: developer,
-    CRED_PKGBASE_MERGE: trusted_user_or_dev,
-}
-
-
-def has_credential(user: User,
-                   credential: int,
-                   approved_users: list = tuple()):
-
-    if user in approved_users:
-        return True
-
-    if credential in cred_filters:
-        cred_filter = cred_filters.get(credential)
-        return cred_filter(user)
-
-    return False
diff --git a/aurweb/auth/creds.py b/aurweb/auth/creds.py
new file mode 100644
index 00000000..100aad8c
--- /dev/null
+++ b/aurweb/auth/creds.py
@@ -0,0 +1,76 @@
+from aurweb.models.account_type import DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID, USER_ID
+from aurweb.models.user import User
+
+ACCOUNT_CHANGE_TYPE = 1
+ACCOUNT_EDIT = 2
+ACCOUNT_EDIT_DEV = 3
+ACCOUNT_LAST_LOGIN = 4
+ACCOUNT_SEARCH = 5
+ACCOUNT_LIST_COMMENTS = 28
+COMMENT_DELETE = 6
+COMMENT_UNDELETE = 27
+COMMENT_VIEW_DELETED = 22
+COMMENT_EDIT = 25
+COMMENT_PIN = 26
+PKGBASE_ADOPT = 7
+PKGBASE_SET_KEYWORDS = 8
+PKGBASE_DELETE = 9
+PKGBASE_DISOWN = 10
+PKGBASE_EDIT_COMAINTAINERS = 24
+PKGBASE_FLAG = 11
+PKGBASE_LIST_VOTERS = 12
+PKGBASE_NOTIFY = 13
+PKGBASE_UNFLAG = 15
+PKGBASE_VOTE = 16
+PKGREQ_FILE = 23
+PKGREQ_CLOSE = 17
+PKGREQ_LIST = 18
+TU_ADD_VOTE = 19
+TU_LIST_VOTES = 20
+TU_VOTE = 21
+PKGBASE_MERGE = 29
+
+user_developer_or_trusted_user = set([USER_ID, TRUSTED_USER_ID, DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID])
+trusted_user_or_dev = set([TRUSTED_USER_ID, DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID])
+developer = set([DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID])
+trusted_user = set([TRUSTED_USER_ID, TRUSTED_USER_AND_DEV_ID])
+
+cred_filters = {
+    PKGBASE_FLAG: user_developer_or_trusted_user,
+    PKGBASE_NOTIFY: user_developer_or_trusted_user,
+    PKGBASE_VOTE: user_developer_or_trusted_user,
+    PKGREQ_FILE: user_developer_or_trusted_user,
+    ACCOUNT_CHANGE_TYPE: trusted_user_or_dev,
+    ACCOUNT_EDIT: trusted_user_or_dev,
+    ACCOUNT_LAST_LOGIN: trusted_user_or_dev,
+    ACCOUNT_LIST_COMMENTS: trusted_user_or_dev,
+    ACCOUNT_SEARCH: trusted_user_or_dev,
+    COMMENT_DELETE: trusted_user_or_dev,
+    COMMENT_UNDELETE: trusted_user_or_dev,
+    COMMENT_VIEW_DELETED: trusted_user_or_dev,
+    COMMENT_EDIT: trusted_user_or_dev,
+    COMMENT_PIN: trusted_user_or_dev,
+    PKGBASE_ADOPT: trusted_user_or_dev,
+    PKGBASE_SET_KEYWORDS: trusted_user_or_dev,
+    PKGBASE_DELETE: trusted_user_or_dev,
+    PKGBASE_EDIT_COMAINTAINERS: trusted_user_or_dev,
+    PKGBASE_DISOWN: trusted_user_or_dev,
+    PKGBASE_LIST_VOTERS: trusted_user_or_dev,
+    PKGBASE_UNFLAG: trusted_user_or_dev,
+    PKGREQ_CLOSE: trusted_user_or_dev,
+    PKGREQ_LIST: trusted_user_or_dev,
+    TU_ADD_VOTE: trusted_user,
+    TU_LIST_VOTES: trusted_user_or_dev,
+    TU_VOTE: trusted_user,
+    ACCOUNT_EDIT_DEV: developer,
+    PKGBASE_MERGE: trusted_user_or_dev,
+}
+
+
+def has_credential(user: User,
+                   credential: int,
+                   approved_users: list = tuple()):
+
+    if user in approved_users:
+        return True
+    return user.AccountTypeID in cred_filters[credential]
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 03634a36..f0724202 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -1,6 +1,7 @@
 import hashlib
 
 from datetime import datetime
+from typing import List, Set
 
 import bcrypt
 
@@ -136,10 +137,10 @@ class User(Base):
         request.cookies["AURSID"] = self.session.SessionID
         return self.session.SessionID
 
-    def has_credential(self, credential: str, approved: list = tuple()):
-        import aurweb.auth
-        cred = getattr(aurweb.auth, credential)
-        return aurweb.auth.has_credential(self, cred, approved)
+    def has_credential(self, credential: Set[int],
+                       approved: List["User"] = list()):
+        from aurweb.auth.creds import has_credential
+        return has_credential(self, credential, approved)
 
     def logout(self, request):
         del request.cookies["AURSID"]
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 545811f0..360857e8 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -10,7 +10,7 @@ from sqlalchemy import and_, or_
 import aurweb.config
 
 from aurweb import cookies, db, l10n, logging, models, util
-from aurweb.auth import account_type_required, auth_required
+from aurweb.auth import account_type_required, auth_required, creds
 from aurweb.captcha import get_captcha_salts
 from aurweb.exceptions import ValidationError
 from aurweb.l10n import get_translator_for_request
@@ -176,7 +176,7 @@ def make_account_form_context(context: dict,
 
     user_account_type_id = context.get("account_types")[0][0]
 
-    if request.user.has_credential("CRED_ACCOUNT_EDIT_DEV"):
+    if request.user.has_credential(creds.ACCOUNT_EDIT_DEV):
         context["account_types"].append((at.DEVELOPER_ID, at.DEVELOPER))
         context["account_types"].append((at.TRUSTED_USER_AND_DEV_ID,
                                          at.TRUSTED_USER_AND_DEV))
@@ -332,7 +332,7 @@ async def account_register_post(request: Request,
 def cannot_edit(request, user):
     """ Return a 401 HTMLResponse if the request user doesn't
     have authorization, otherwise None. """
-    has_dev_cred = request.user.has_credential("CRED_ACCOUNT_EDIT_DEV",
+    has_dev_cred = request.user.has_credential(creds.ACCOUNT_EDIT_DEV,
                                                approved=[user])
     if not has_dev_cred:
         return HTMLResponse(status_code=HTTPStatus.UNAUTHORIZED)
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index b5f8478e..2bf04949 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -10,7 +10,7 @@ import aurweb.filters
 import aurweb.packages.util
 
 from aurweb import db, defaults, l10n, logging, models, util
-from aurweb.auth import auth_required
+from aurweb.auth import auth_required, creds
 from aurweb.exceptions import ValidationError
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
@@ -413,7 +413,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int,
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
-    authorized = request.user.has_credential("CRED_COMMENT_DELETE",
+    authorized = request.user.has_credential(creds.COMMENT_DELETE,
                                              [comment.User])
     if not authorized:
         _ = l10n.get_translator_for_request(request)
@@ -439,7 +439,7 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int,
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
-    has_cred = request.user.has_credential("CRED_COMMENT_UNDELETE",
+    has_cred = request.user.has_credential(creds.COMMENT_UNDELETE,
                                            approved=[comment.User])
     if not has_cred:
         _ = l10n.get_translator_for_request(request)
@@ -464,7 +464,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int,
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
-    has_cred = request.user.has_credential("CRED_COMMENT_PIN",
+    has_cred = request.user.has_credential(creds.COMMENT_PIN,
                                            approved=[pkgbase.Maintainer])
     if not has_cred:
         _ = l10n.get_translator_for_request(request)
@@ -489,7 +489,7 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int,
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     comment = get_pkgbase_comment(pkgbase, id)
 
-    has_cred = request.user.has_credential("CRED_COMMENT_PIN",
+    has_cred = request.user.has_credential(creds.COMMENT_PIN,
                                            approved=[pkgbase.Maintainer])
     if not has_cred:
         _ = l10n.get_translator_for_request(request)
@@ -514,7 +514,7 @@ async def package_base_comaintainers(request: Request, name: str) -> Response:
 
     # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
     # get redirected to the package base's page.
-    has_creds = request.user.has_credential("CRED_PKGBASE_EDIT_COMAINTAINERS",
+    has_creds = request.user.has_credential(creds.PKGBASE_EDIT_COMAINTAINERS,
                                             approved=[pkgbase.Maintainer])
     if not has_creds:
         return RedirectResponse(f"/pkgbase/{name}",
@@ -541,7 +541,7 @@ async def package_base_comaintainers_post(
 
     # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
     # get redirected to the package base's page.
-    has_creds = request.user.has_credential("CRED_PKGBASE_EDIT_COMAINTAINERS",
+    has_creds = request.user.has_credential(creds.PKGBASE_EDIT_COMAINTAINERS,
                                             approved=[pkgbase.Maintainer])
     if not has_creds:
         return RedirectResponse(f"/pkgbase/{name}",
@@ -779,7 +779,7 @@ async def pkgbase_keywords(request: Request, name: str,
 async def pkgbase_flag_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
-    has_cred = request.user.has_credential("CRED_PKGBASE_FLAG")
+    has_cred = request.user.has_credential(creds.PKGBASE_FLAG)
     if not has_cred or pkgbase.Flagger is not None:
         return RedirectResponse(f"/pkgbase/{name}",
                                 status_code=HTTPStatus.SEE_OTHER)
@@ -803,7 +803,7 @@ async def pkgbase_flag_post(request: Request, name: str,
         return render_template(request, "packages/flag.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
-    has_cred = request.user.has_credential("CRED_PKGBASE_FLAG")
+    has_cred = request.user.has_credential(creds.PKGBASE_FLAG)
     if has_cred and not pkgbase.Flagger:
         now = int(datetime.utcnow().timestamp())
         with db.begin():
@@ -830,7 +830,7 @@ async def pkgbase_flag_comment(request: Request, name: str):
 
 def pkgbase_unflag_instance(request: Request, pkgbase: models.PackageBase):
     has_cred = request.user.has_credential(
-        "CRED_PKGBASE_UNFLAG", approved=[pkgbase.Flagger, pkgbase.Maintainer])
+        creds.PKGBASE_UNFLAG, approved=[pkgbase.Flagger, pkgbase.Maintainer])
     if has_cred:
         with db.begin():
             pkgbase.OutOfDateTS = None
@@ -851,7 +851,7 @@ def pkgbase_notify_instance(request: Request, pkgbase: models.PackageBase):
     notif = db.query(pkgbase.notifications.filter(
         models.PackageNotification.UserID == request.user.ID
     ).exists()).scalar()
-    has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
+    has_cred = request.user.has_credential(creds.PKGBASE_NOTIFY)
     if has_cred and not notif:
         with db.begin():
             db.create(models.PackageNotification,
@@ -872,7 +872,7 @@ def pkgbase_unnotify_instance(request: Request, pkgbase: models.PackageBase):
     notif = pkgbase.notifications.filter(
         models.PackageNotification.UserID == request.user.ID
     ).first()
-    has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
+    has_cred = request.user.has_credential(creds.PKGBASE_NOTIFY)
     if has_cred and notif:
         with db.begin():
             db.delete(notif)
@@ -895,7 +895,7 @@ async def pkgbase_vote(request: Request, name: str):
     vote = pkgbase.package_votes.filter(
         models.PackageVote.UsersID == request.user.ID
     ).first()
-    has_cred = request.user.has_credential("CRED_PKGBASE_VOTE")
+    has_cred = request.user.has_credential(creds.PKGBASE_VOTE)
     if has_cred and not vote:
         now = int(datetime.utcnow().timestamp())
         with db.begin():
@@ -919,7 +919,7 @@ async def pkgbase_unvote(request: Request, name: str):
     vote = pkgbase.package_votes.filter(
         models.PackageVote.UsersID == request.user.ID
     ).first()
-    has_cred = request.user.has_credential("CRED_PKGBASE_VOTE")
+    has_cred = request.user.has_credential(creds.PKGBASE_VOTE)
     if has_cred and vote:
         with db.begin():
             db.delete(vote)
@@ -958,7 +958,7 @@ def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
 async def pkgbase_disown_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
-    has_cred = request.user.has_credential("CRED_PKGBASE_DISOWN",
+    has_cred = request.user.has_credential(creds.PKGBASE_DISOWN,
                                            approved=[pkgbase.Maintainer])
     if not has_cred:
         return RedirectResponse(f"/pkgbase/{name}",
@@ -975,7 +975,7 @@ async def pkgbase_disown_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
-    has_cred = request.user.has_credential("CRED_PKGBASE_DISOWN",
+    has_cred = request.user.has_credential(creds.PKGBASE_DISOWN,
                                            approved=[pkgbase.Maintainer])
     if not has_cred:
         return RedirectResponse(f"/pkgbase/{name}",
@@ -1007,7 +1007,7 @@ def pkgbase_adopt_instance(request: Request, pkgbase: models.PackageBase):
 async def pkgbase_adopt_post(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
-    has_cred = request.user.has_credential("CRED_PKGBASE_ADOPT")
+    has_cred = request.user.has_credential(creds.PKGBASE_ADOPT)
     if has_cred or not pkgbase.Maintainer:
         # If the user has credentials, they'll adopt the package regardless
         # of maintainership. Otherwise, we'll promote the user to maintainer
@@ -1021,7 +1021,7 @@ async def pkgbase_adopt_post(request: Request, name: str):
 @router.get("/pkgbase/{name}/delete")
 @auth_required(True, redirect="/pkgbase/{name}/delete")
 async def pkgbase_delete_get(request: Request, name: str):
-    if not request.user.has_credential("CRED_PKGBASE_DELETE"):
+    if not request.user.has_credential(creds.PKGBASE_DELETE):
         return RedirectResponse(f"/pkgbase/{name}",
                                 status_code=HTTPStatus.SEE_OTHER)
 
@@ -1036,7 +1036,7 @@ async def pkgbase_delete_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
-    if not request.user.has_credential("CRED_PKGBASE_DELETE"):
+    if not request.user.has_credential(creds.PKGBASE_DELETE):
         return RedirectResponse(f"/pkgbase/{name}",
                                 status_code=HTTPStatus.SEE_OTHER)
 
@@ -1070,7 +1070,7 @@ async def packages_unflag(request: Request, package_ids: List[int] = [],
         models.Package.ID.in_(package_ids)).all()
     for pkg in packages:
         has_cred = request.user.has_credential(
-            "CRED_PKGBASE_UNFLAG", approved=[pkg.PackageBase.Flagger])
+            creds.PKGBASE_UNFLAG, approved=[pkg.PackageBase.Flagger])
         if not has_cred:
             return (False, ["You did not select any packages to unflag."])
 
@@ -1106,7 +1106,7 @@ async def packages_notify(request: Request, package_ids: List[int] = [],
         notif = db.query(pkgbase.notifications.filter(
             models.PackageNotification.UserID == request.user.ID
         ).exists()).scalar()
-        has_cred = request.user.has_credential("CRED_PKGBASE_NOTIFY")
+        has_cred = request.user.has_credential(creds.PKGBASE_NOTIFY)
 
         # If the request user either does not have credentials
         # or the notification already exists:
@@ -1178,7 +1178,7 @@ async def packages_adopt(request: Request, package_ids: List[int] = [],
 
     # Check that the user has credentials for every package they selected.
     for pkgbase in bases:
-        has_cred = request.user.has_credential("CRED_PKGBASE_ADOPT")
+        has_cred = request.user.has_credential(creds.PKGBASE_ADOPT)
         if not (has_cred or not pkgbase.Maintainer):
             # TODO: This error needs to be translated.
             return (False, ["You are not allowed to adopt one of the "
@@ -1211,7 +1211,7 @@ async def packages_disown(request: Request, package_ids: List[int] = [],
 
     # Check that the user has credentials for every package they selected.
     for pkgbase in bases:
-        has_cred = request.user.has_credential("CRED_PKGBASE_DISOWN",
+        has_cred = request.user.has_credential(creds.PKGBASE_DISOWN,
                                                approved=[pkgbase.Maintainer])
         if not has_cred:
             # TODO: This error needs to be translated.
@@ -1235,7 +1235,7 @@ async def packages_delete(request: Request, package_ids: List[int] = [],
         return (False, ["The selected packages have not been deleted, "
                         "check the confirmation checkbox."])
 
-    if not request.user.has_credential("CRED_PKGBASE_DELETE"):
+    if not request.user.has_credential(creds.PKGBASE_DELETE):
         return (False, ["You do not have permission to delete packages."])
 
     # A "memo" used to store names of packages that we delete.
@@ -1329,10 +1329,10 @@ async def pkgbase_merge_get(request: Request, name: str,
 
     status_code = HTTPStatus.OK
     # TODO: Lookup errors from credential instead of hardcoding them.
-    # Idea: Something like credential_errors("CRED_PKGBASE_MERGE").
-    # Perhaps additionally: bad_credential_status_code("CRED_PKGBASE_MERGE").
+    # Idea: Something like credential_errors(creds.PKGBASE_MERGE).
+    # Perhaps additionally: bad_credential_status_code(creds.PKGBASE_MERGE).
     # Don't take these examples verbatim. We should find good naming.
-    if not request.user.has_credential("CRED_PKGBASE_MERGE"):
+    if not request.user.has_credential(creds.PKGBASE_MERGE):
         context["errors"] = [
             "Only Trusted Users and Developers can merge packages."]
         status_code = HTTPStatus.UNAUTHORIZED
@@ -1434,7 +1434,7 @@ async def pkgbase_merge_post(request: Request, name: str,
     context["pkgbase"] = pkgbase
 
     # TODO: Lookup errors from credential instead of hardcoding them.
-    if not request.user.has_credential("CRED_PKGBASE_MERGE"):
+    if not request.user.has_credential(creds.PKGBASE_MERGE):
         context["errors"] = [
             "Only Trusted Users and Developers can merge packages."]
         return render_template(request, "pkgbase/merge.html", context,
diff --git a/aurweb/templates.py b/aurweb/templates.py
index a7102ae1..635b22b4 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -16,7 +16,7 @@ from fastapi.responses import HTMLResponse
 
 import aurweb.config
 
-from aurweb import captcha, cookies, l10n, time, util
+from aurweb import auth, captcha, cookies, l10n, time, util
 
 # Prepare jinja2 objects.
 _loader = jinja2.FileSystemLoader(os.path.join(
@@ -107,6 +107,7 @@ def make_context(request: Request, title: str, next: str = None):
         "now": datetime.now(tz=zoneinfo.ZoneInfo(timezone)),
         "utcnow": int(datetime.utcnow().timestamp()),
         "config": aurweb.config,
+        "creds": auth.creds,
         "next": next if next else request.url.path
     }
 
diff --git a/templates/partials/account/comment.html b/templates/partials/account/comment.html
index bc167cf7..8c310738 100644
--- a/templates/partials/account/comment.html
+++ b/templates/partials/account/comment.html
@@ -3,7 +3,7 @@
     {% set header_cls = "%s %s" | format(header_cls, "comment-deleted") %}
 {% endif %}
 
-{% if not comment.Deleter or request.user.has_credential("CRED_COMMENT_VIEW_DELETED", approved=[comment.Deleter]) %}
+{% if not comment.Deleter or request.user.has_credential(creds.COMMENT_VIEW_DELETED, approved=[comment.Deleter]) %}
 
     {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
     <h4 id="comment-{{ comment.ID }}" class="{{ header_cls }}">
diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 2e47a932..f3c293d8 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -53,7 +53,7 @@
             </p>
         {% endif %}
 
-        {% if request.user.has_credential("CRED_ACCOUNT_CHANGE_TYPE") %}
+        {% if request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE) %}
 		<p>
             <label for="id_type">
                 {% trans %}Account Type{% endtrans %}:
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 2e01eeab..dc2377fe 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -21,7 +21,7 @@
             </li>
 
             {# Only CRED_ACCOUNT_SEARCH privileged users see Accounts #}
-            {% if request.user.has_credential("CRED_ACCOUNT_SEARCH") %}
+            {% if request.user.has_credential(creds.ACCOUNT_SEARCH) %}
                 <li>
                     <a href="/accounts">
                         {% trans %}Accounts{% endtrans %}
@@ -37,7 +37,7 @@
             </li>
 
             {# Only CRED_TU_LIST_VOTES privileged users see Trusted User #}
-            {% if request.user.has_credential("CRED_TU_LIST_VOTES") %}
+            {% if request.user.has_credential(creds.TU_LIST_VOTES) %}
                 <li>
                     <a href="/tu">{% trans %}Trusted User{% endtrans %}</a>
                 </li>
diff --git a/templates/partials/comment_actions.html b/templates/partials/comment_actions.html
index b8ccf945..78c4cc22 100644
--- a/templates/partials/comment_actions.html
+++ b/templates/partials/comment_actions.html
@@ -1,7 +1,7 @@
 {% set pkgbasename = comment.PackageBase.Name %}
 
 {% if not comment.Deleter %}
-    {% if request.user.has_credential('CRED_COMMENT_DELETE', approved=[comment.User]) %}
+    {% if request.user.has_credential(creds.COMMENT_DELETE, approved=[comment.User]) %}
         <form class="delete-comment-form"
               method="post"
               action="/pkgbase/{{ pkgbasename }}/comments/{{ comment.ID }}/delete"
@@ -22,7 +22,7 @@
         </form>
     {% endif %}
 
-    {% if request.user.has_credential('CRED_COMMENT_EDIT', approved=[comment.User]) %}
+    {% if request.user.has_credential(creds.COMMENT_EDIT, approved=[comment.User]) %}
         <a id="comment-edit-link-{{ comment.ID }}"
            {# /pkgbase/{name}/comments/{id}/edit #}
            href="/pkgbase/{{ pkgbasename }}/comments/{{ comment.ID }}/edit?{{ {'next': request.url.path} | urlencode }}"
@@ -47,7 +47,7 @@
 
     {% endif %}
 
-    {% if request.user.has_credential("CRED_COMMENT_PIN", approved=[comment.PackageBase.Maintainer]) %}
+    {% if request.user.has_credential(creds.COMMENT_PIN, approved=[comment.PackageBase.Maintainer]) %}
         {% if comment.PinnedTS %}
             <form class="pin-comment-form"
                   method="post"
@@ -82,7 +82,7 @@
             </form>
         {% endif %}
     {% endif %}
-{% elif request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
+{% elif request.user.has_credential(creds.COMMENT_UNDELETE, approved=[comment.User]) %}
         <form class="undelete-comment-form"
               method="post"
               action="/pkgbase/{{ comment.PackageBase.Name }}/comments/{{ comment.ID }}/undelete"
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index e9d72f26..148da592 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -88,7 +88,7 @@
                     </form>
                 {% endif %}
             </li>
-            {% if request.user.has_credential('CRED_PKGBASE_EDIT_COMAINTAINERS', approved=[pkgbase.Maintainer]) %}
+            {% if request.user.has_credential(creds.PKGBASE_EDIT_COMAINTAINERS, approved=[pkgbase.Maintainer]) %}
                 <li>
                     <a href="/pkgbase/{{ pkgbase.Name }}/comaintainers">
                         {{ "Manage Co-Maintainers" | tr }}
@@ -107,14 +107,14 @@
                     {{ "Submit Request" | tr }}
                 </a>
             </li>
-            {% if request.user.has_credential("CRED_PKGBASE_DELETE") %}
+            {% if request.user.has_credential(creds.PKGBASE_DELETE) %}
                 <li>
                     <a href="/pkgbase/{{ pkgbase.Name }}/delete">
                         {{ "Delete Package" | tr }}
                     </a>
                 </li>
             {% endif %}
-            {% if request.user.has_credential("CRED_PKGBASE_MERGE") %}
+            {% if request.user.has_credential(creds.PKGBASE_MERGE) %}
                 <li>
                     <a href="/pkgbase/{{ pkgbase.Name }}/merge">
                         {{ "Merge Package" | tr }}
@@ -130,7 +130,7 @@
                         />
                     </form>
                 </li>
-            {% elif request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
+            {% elif request.user.has_credential(creds.PKGBASE_DISOWN, approved=[pkgbase.Maintainer]) %}
                 <li>
                     <a href="/pkgbase/{{ pkgbase.Name }}/disown">
                         {{ "Disown Package" | tr }}
diff --git a/templates/partials/packages/comment.html b/templates/partials/packages/comment.html
index 676a7a73..1427e0a0 100644
--- a/templates/partials/packages/comment.html
+++ b/templates/partials/packages/comment.html
@@ -5,7 +5,7 @@
 	{% set article_cls = "%s %s" | format(article_cls, "comment-deleted") %}
 {% endif %}
 
-{% if not comment.Deleter or request.user.has_credential("CRED_COMMENT_VIEW_DELETED", approved=[comment.Deleter]) %}
+{% if not comment.Deleter or request.user.has_credential(creds.COMMENT_VIEW_DELETED, approved=[comment.Deleter]) %}
 	<h4 id="comment-{{ comment.ID }}" class="{{ header_cls }}">
 		{% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
 		{% set view_account_info = 'View account information for %s' | tr | format(comment.User.Username) %}
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index dbb81c19..78e0ad1c 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -33,10 +33,10 @@
             </td>
         </tr>
     {% endif %}
-    {% if pkgbase.keywords.count() or request.user.has_credential("CRED_PKGBASE_SET_KEYWORDS", approved=[pkgbase.Maintainer]) %}
+    {% if pkgbase.keywords.count() or request.user.has_credential(creds.PKGBASE_SET_KEYWORDS, approved=[pkgbase.Maintainer]) %}
         <tr>
             <th>{{ "Keywords" | tr }}:</th>
-            {% if request.user.has_credential("CRED_PKGBASE_SET_KEYWORDS", approved=[pkgbase.Maintainer]) %}
+            {% if request.user.has_credential(creds.PKGBASE_SET_KEYWORDS, approved=[pkgbase.Maintainer]) %}
             <td>
                 <form method="post"
                       action="/pkgbase/{{ pkgbase.Name }}/keywords"
diff --git a/test/test_auth.py b/test/test_auth.py
index 08eaac0b..0dc26f86 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -5,7 +5,7 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.auth import AnonymousUser, BasicAuthBackend, account_type_required, has_credential
+from aurweb.auth import AnonymousUser, BasicAuthBackend, account_type_required
 from aurweb.models.account_type import USER, USER_ID
 from aurweb.models.session import Session
 from aurweb.models.user import User
@@ -67,11 +67,6 @@ async def test_basic_auth_backend():
     assert result == user
 
 
-def test_has_fake_credential_fails():
-    # Fake credential 666 does not exist.
-    assert not has_credential(user, 666)
-
-
 def test_account_type_required():
     """ This test merely asserts that a few different paths
     do not raise exceptions. """
@@ -109,8 +104,3 @@ def test_voted_for():
 def test_notified():
     user_ = AnonymousUser()
     assert not user_.notified(None)
-
-
-def test_has_credential():
-    user_ = AnonymousUser()
-    assert not user_.has_credential("FAKE_CREDENTIAL")
diff --git a/test/test_user.py b/test/test_user.py
index 07f10487..dbb45166 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -10,6 +10,7 @@ import aurweb.auth
 import aurweb.config
 
 from aurweb import db
+from aurweb.auth import creds
 from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.package import Package
@@ -154,7 +155,7 @@ def test_user_minimum_passwd_length():
 
 
 def test_user_has_credential():
-    assert not user.has_credential("CRED_ACCOUNT_CHANGE_TYPE")
+    assert not user.has_credential(aurweb.auth.creds.ACCOUNT_CHANGE_TYPE)
 
 
 def test_user_ssh_pub_key():
@@ -169,10 +170,10 @@ def test_user_ssh_pub_key():
 
 
 def test_user_credential_types():
-    assert aurweb.auth.user_developer_or_trusted_user(user)
-    assert not aurweb.auth.trusted_user(user)
-    assert not aurweb.auth.developer(user)
-    assert not aurweb.auth.trusted_user_or_dev(user)
+    assert user.AccountTypeID in creds.user_developer_or_trusted_user
+    assert user.AccountTypeID not in creds.trusted_user
+    assert user.AccountTypeID not in creds.developer
+    assert user.AccountTypeID not in creds.trusted_user_or_dev
 
     trusted_user_type = db.query(AccountType).filter(
         AccountType.AccountType == "Trusted User"
@@ -180,16 +181,16 @@ def test_user_credential_types():
     with db.begin():
         user.AccountType = trusted_user_type
 
-    assert aurweb.auth.trusted_user(user)
-    assert aurweb.auth.trusted_user_or_dev(user)
+    assert user.AccountTypeID in creds.trusted_user
+    assert user.AccountTypeID in creds.trusted_user_or_dev
 
     developer_type = db.query(AccountType,
                               AccountType.AccountType == "Developer").first()
     with db.begin():
         user.AccountType = developer_type
 
-    assert aurweb.auth.developer(user)
-    assert aurweb.auth.trusted_user_or_dev(user)
+    assert user.AccountTypeID in creds.developer
+    assert user.AccountTypeID in creds.trusted_user_or_dev
 
     type_str = "Trusted User & Developer"
     elevated_type = db.query(AccountType,
@@ -197,9 +198,9 @@ def test_user_credential_types():
     with db.begin():
         user.AccountType = elevated_type
 
-    assert aurweb.auth.trusted_user(user)
-    assert aurweb.auth.developer(user)
-    assert aurweb.auth.trusted_user_or_dev(user)
+    assert user.AccountTypeID in creds.trusted_user
+    assert user.AccountTypeID in creds.developer
+    assert user.AccountTypeID in creds.trusted_user_or_dev
 
     # Some model authorization checks.
     assert user.is_elevated()

From 429d8059e1ea3a0b58af5269d529471ca09a278a Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Thu, 18 Nov 2021 14:17:46 -0500
Subject: [PATCH 660/844] fix(FastAPI): remove login and redirect parameters
 from auth_required

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/auth/__init__.py          | 27 ++++++--------
 aurweb/routers/accounts.py       | 22 ++++++------
 aurweb/routers/auth.py           |  2 +-
 aurweb/routers/packages.py       | 60 ++++++++++++++++----------------
 aurweb/routers/trusted_user.py   | 10 +++---
 test/test_trusted_user_routes.py |  5 +--
 6 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index 82192cc2..7aa4b526 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -1,5 +1,4 @@
 import functools
-import re
 
 from datetime import datetime
 from http import HTTPStatus
@@ -122,17 +121,12 @@ class BasicAuthBackend(AuthenticationBackend):
 
 
 def auth_required(is_required: bool = True,
-                  login: bool = True,
-                  redirect: str = "/",
                   template: tuple = None,
                   status_code: HTTPStatus = HTTPStatus.UNAUTHORIZED):
     """ Authentication route decorator.
 
-    If redirect is given, the user will be redirected if the auth state
-    does not match is_required.
-
     If template is given, it will be rendered with Unauthorized if
-    is_required does not match and take priority over redirect.
+    is_required does not match.
 
     A precondition of this function is that, if template is provided,
     it **must** match the following format:
@@ -152,8 +146,6 @@ def auth_required(is_required: bool = True,
     applying any format operations.
 
     :param is_required: A boolean indicating whether the function requires auth
-    :param login: Redirect to `/login`, passing `next=<redirect>`
-    :param redirect: Path to redirect to if is_required isn't True
     :param template: A three-element template tuple:
                      (path, title_iterable, variable_iterable)
     :param status_code: An optional status_code for template render.
@@ -166,14 +158,17 @@ def auth_required(is_required: bool = True,
             if request.user.is_authenticated() != is_required:
                 url = "/"
 
-                if redirect:
-                    path_params_expr = re.compile(r'\{(\w+)\}')
-                    match = re.findall(path_params_expr, redirect)
-                    args = {k: request.path_params.get(k) for k in match}
-                    url = redirect.format(**args)
+                if is_required:
+                    if request.method == "GET":
+                        url = request.url.path
+                    elif request.method == "POST" and (referer := request.headers.get("Referer")):
+                        aur = aurweb.config.get("options", "aur_location") + "/"
+                        if not referer.startswith(aur):
+                            raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
+                                                detail=_("Bad Referer header."))
+                        url = referer[len(aur) - 1:]
 
-                    if login:
-                        url = "/login?" + util.urlencode({"next": url})
+                    url = "/login?" + util.urlencode({"next": url})
 
                 if template:
                     # template=("template.html",
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 360857e8..dade92bb 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -27,14 +27,14 @@ logger = logging.get_logger(__name__)
 
 
 @router.get("/passreset", response_class=HTMLResponse)
-@auth_required(False, login=False)
+@auth_required(False)
 async def passreset(request: Request):
     context = await make_variable_context(request, "Password Reset")
     return render_template(request, "passreset.html", context)
 
 
 @router.post("/passreset", response_class=HTMLResponse)
-@auth_required(False, login=False)
+@auth_required(False)
 async def passreset_post(request: Request,
                          user: str = Form(...),
                          resetkey: str = Form(default=None),
@@ -226,7 +226,7 @@ def make_account_form_context(context: dict,
 
 
 @router.get("/register", response_class=HTMLResponse)
-@auth_required(False, login=False)
+@auth_required(False)
 async def account_register(request: Request,
                            U: str = Form(default=str()),    # Username
                            E: str = Form(default=str()),    # Email
@@ -252,7 +252,7 @@ async def account_register(request: Request,
 
 
 @router.post("/register", response_class=HTMLResponse)
-@auth_required(False, login=False)
+@auth_required(False)
 async def account_register_post(request: Request,
                                 U: str = Form(default=str()),  # Username
                                 E: str = Form(default=str()),  # Email
@@ -340,7 +340,7 @@ def cannot_edit(request, user):
 
 
 @router.get("/account/{username}/edit", response_class=HTMLResponse)
-@auth_required(True, redirect="/account/{username}")
+@auth_required(True)
 async def account_edit(request: Request, username: str):
     user = db.query(models.User, models.User.Username == username).first()
 
@@ -356,7 +356,7 @@ async def account_edit(request: Request, username: str):
 
 
 @router.post("/account/{username}/edit", response_class=HTMLResponse)
-@auth_required(True, redirect="/account/{username}")
+@auth_required(True)
 async def account_edit_post(request: Request,
                             username: str,
                             U: str = Form(default=str()),  # Username
@@ -443,7 +443,7 @@ async def account(request: Request, username: str):
 
 
 @router.get("/account/{username}/comments")
-@auth_required(redirect="/account/{username}/comments")
+@auth_required()
 async def account_comments(request: Request, username: str):
     user = get_user_by_name(username)
     context = make_context(request, "Accounts")
@@ -454,7 +454,7 @@ async def account_comments(request: Request, username: str):
 
 
 @router.get("/accounts")
-@auth_required(True, redirect="/accounts")
+@auth_required(True)
 @account_type_required({at.TRUSTED_USER,
                         at.DEVELOPER,
                         at.TRUSTED_USER_AND_DEV})
@@ -464,7 +464,7 @@ async def accounts(request: Request):
 
 
 @router.post("/accounts")
-@auth_required(True, redirect="/accounts")
+@auth_required(True)
 @account_type_required({at.TRUSTED_USER,
                         at.DEVELOPER,
                         at.TRUSTED_USER_AND_DEV})
@@ -548,7 +548,7 @@ def render_terms_of_service(request: Request,
 
 
 @router.get("/tos")
-@auth_required(True, redirect="/tos")
+@auth_required(True)
 async def terms_of_service(request: Request):
     # Query the database for terms that were previously accepted,
     # but now have a bumped Revision that needs to be accepted.
@@ -572,7 +572,7 @@ async def terms_of_service(request: Request):
 
 
 @router.post("/tos")
-@auth_required(True, redirect="/tos")
+@auth_required(True)
 async def terms_of_service_post(request: Request,
                                 accept: bool = Form(default=False)):
     # Query the database for terms that were previously accepted,
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 1e0b026a..74763667 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -29,7 +29,7 @@ async def login_get(request: Request, next: str = "/"):
 
 
 @router.post("/login", response_class=HTMLResponse)
-@auth_required(False, login=False)
+@auth_required(False)
 async def login_post(request: Request,
                      next: str = Form(...),
                      user: str = Form(default=str()),
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 2bf04949..4a2cdce3 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -295,7 +295,7 @@ async def package_base_voters(request: Request, name: str) -> Response:
 
 
 @router.post("/pkgbase/{name}/comments")
-@auth_required(True, redirect="/pkgbase/{name}/comments")
+@auth_required(True)
 async def pkgbase_comments_post(
         request: Request, name: str,
         comment: str = Form(default=str()),
@@ -327,7 +327,7 @@ async def pkgbase_comments_post(
 
 
 @router.get("/pkgbase/{name}/comments/{id}/form")
-@auth_required(True, login=False)
+@auth_required(True)
 async def pkgbase_comment_form(request: Request, name: str, id: int,
                                next: str = Query(default=None)):
     """ Produce a comment form for comment {id}. """
@@ -353,7 +353,7 @@ async def pkgbase_comment_form(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}")
-@auth_required(True, redirect="/pkgbase/{name}/comments/{id}")
+@auth_required(True)
 async def pkgbase_comment_post(
         request: Request, name: str, id: int,
         comment: str = Form(default=str()),
@@ -392,7 +392,7 @@ async def pkgbase_comment_post(
 
 
 @router.get("/pkgbase/{name}/comments/{id}/edit")
-@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/edit")
+@auth_required(True)
 async def pkgbase_comment_edit(request: Request, name: str, id: int,
                                next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -407,7 +407,7 @@ async def pkgbase_comment_edit(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/delete")
-@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/delete")
+@auth_required(True)
 async def pkgbase_comment_delete(request: Request, name: str, id: int,
                                  next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -433,7 +433,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/undelete")
-@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/undelete")
+@auth_required(True)
 async def pkgbase_comment_undelete(request: Request, name: str, id: int,
                                    next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -458,7 +458,7 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/pin")
-@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/pin")
+@auth_required(True)
 async def pkgbase_comment_pin(request: Request, name: str, id: int,
                               next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -483,7 +483,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/unpin")
-@auth_required(True, redirect="/pkgbase/{name}/comments/{id}/unpin")
+@auth_required(True)
 async def pkgbase_comment_unpin(request: Request, name: str, id: int,
                                 next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -507,7 +507,7 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int,
 
 
 @router.get("/pkgbase/{name}/comaintainers")
-@auth_required(True, redirect="/pkgbase/{name}/comaintainers")
+@auth_required(True)
 async def package_base_comaintainers(request: Request, name: str) -> Response:
     # Get the PackageBase.
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -532,7 +532,7 @@ async def package_base_comaintainers(request: Request, name: str) -> Response:
 
 
 @router.post("/pkgbase/{name}/comaintainers")
-@auth_required(True, redirect="/pkgbase/{name}/comaintainers")
+@auth_required(True)
 async def package_base_comaintainers_post(
         request: Request, name: str,
         users: str = Form(default=str())) -> Response:
@@ -584,7 +584,7 @@ async def package_base_comaintainers_post(
 
 
 @router.get("/requests")
-@auth_required(True, redirect="/requests")
+@auth_required(True)
 async def requests(request: Request,
                    O: int = Query(default=defaults.O),
                    PP: int = Query(default=defaults.PP)):
@@ -618,7 +618,7 @@ async def requests(request: Request,
 
 
 @router.get("/pkgbase/{name}/request")
-@auth_required(True, redirect="/pkgbase/{name}/request")
+@auth_required(True)
 async def package_request(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     context = await make_variable_context(request, "Submit Request")
@@ -627,7 +627,7 @@ async def package_request(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/request")
-@auth_required(True, redirect="/pkgbase/{name}/request")
+@auth_required(True)
 async def pkgbase_request_post(request: Request, name: str,
                                type: str = Form(...),
                                merge_into: str = Form(default=None),
@@ -699,7 +699,7 @@ async def pkgbase_request_post(request: Request, name: str,
 
 
 @router.get("/requests/{id}/close")
-@auth_required(True, redirect="/requests/{id}/close")
+@auth_required(True)
 async def requests_close(request: Request, id: int):
     pkgreq = get_pkgreq_by_id(id)
     if not request.user.is_elevated() and request.user != pkgreq.User:
@@ -712,7 +712,7 @@ async def requests_close(request: Request, id: int):
 
 
 @router.post("/requests/{id}/close")
-@auth_required(True, redirect="/requests/{id}/close")
+@auth_required(True)
 async def requests_close_post(request: Request, id: int,
                               reason: int = Form(default=0),
                               comments: str = Form(default=str())):
@@ -775,7 +775,7 @@ async def pkgbase_keywords(request: Request, name: str,
 
 
 @router.get("/pkgbase/{name}/flag")
-@auth_required(True, redirect="/pkgbase/{name}/flag")
+@auth_required(True)
 async def pkgbase_flag_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -790,7 +790,7 @@ async def pkgbase_flag_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/flag")
-@auth_required(True, redirect="/pkgbase/{name}/flag")
+@auth_required(True)
 async def pkgbase_flag_post(request: Request, name: str,
                             comments: str = Form(default=str())):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -839,7 +839,7 @@ def pkgbase_unflag_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.post("/pkgbase/{name}/unflag")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True)
 async def pkgbase_unflag(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     pkgbase_unflag_instance(request, pkgbase)
@@ -860,7 +860,7 @@ def pkgbase_notify_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.post("/pkgbase/{name}/notify")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True)
 async def pkgbase_notify(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     pkgbase_notify_instance(request, pkgbase)
@@ -879,7 +879,7 @@ def pkgbase_unnotify_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.post("/pkgbase/{name}/unnotify")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True)
 async def pkgbase_unnotify(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     pkgbase_unnotify_instance(request, pkgbase)
@@ -888,7 +888,7 @@ async def pkgbase_unnotify(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/vote")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True)
 async def pkgbase_vote(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -912,7 +912,7 @@ async def pkgbase_vote(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/unvote")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True)
 async def pkgbase_unvote(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -954,7 +954,7 @@ def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.get("/pkgbase/{name}/disown")
-@auth_required(True, redirect="/pkgbase/{name}/disown")
+@auth_required(True)
 async def pkgbase_disown_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -970,7 +970,7 @@ async def pkgbase_disown_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/disown")
-@auth_required(True, redirect="/pkgbase/{name}/disown")
+@auth_required(True)
 async def pkgbase_disown_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -1003,7 +1003,7 @@ def pkgbase_adopt_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.post("/pkgbase/{name}/adopt")
-@auth_required(True, redirect="/pkgbase/{name}")
+@auth_required(True)
 async def pkgbase_adopt_post(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -1019,7 +1019,7 @@ async def pkgbase_adopt_post(request: Request, name: str):
 
 
 @router.get("/pkgbase/{name}/delete")
-@auth_required(True, redirect="/pkgbase/{name}/delete")
+@auth_required(True)
 async def pkgbase_delete_get(request: Request, name: str):
     if not request.user.has_credential(creds.PKGBASE_DELETE):
         return RedirectResponse(f"/pkgbase/{name}",
@@ -1031,7 +1031,7 @@ async def pkgbase_delete_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/delete")
-@auth_required(True, redirect="/pkgbase/{name}/delete")
+@auth_required(True)
 async def pkgbase_delete_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -1279,7 +1279,7 @@ PACKAGE_ACTIONS = {
 
 
 @router.post("/packages")
-@auth_required(redirect="/packages")
+@auth_required()
 async def packages_post(request: Request,
                         IDs: List[int] = Form(default=[]),
                         action: str = Form(default=str()),
@@ -1311,7 +1311,7 @@ async def packages_post(request: Request,
 
 
 @router.get("/pkgbase/{name}/merge")
-@auth_required(redirect="/pkgbase/{name}/merge")
+@auth_required()
 async def pkgbase_merge_get(request: Request, name: str,
                             into: str = Query(default=str()),
                             next: str = Query(default=str())):
@@ -1423,7 +1423,7 @@ def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
 
 
 @router.post("/pkgbase/{name}/merge")
-@auth_required(redirect="/pkgbase/{name}/merge")
+@auth_required()
 async def pkgbase_merge_post(request: Request, name: str,
                              into: str = Form(default=str()),
                              confirm: bool = Form(default=False),
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index f0cea61e..09de58fe 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -41,7 +41,7 @@ ADDVOTE_SPECIFICS = {
 
 
 @router.get("/tu")
-@auth_required(True, redirect="/tu")
+@auth_required(True)
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user(request: Request,
                        coff: int = 0,  # current offset
@@ -147,7 +147,7 @@ def render_proposal(request: Request,
 
 
 @router.get("/tu/{proposal}")
-@auth_required(True, redirect="/tu/{proposal}")
+@auth_required(True)
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal(request: Request, proposal: int):
     context = await make_variable_context(request, "Trusted User")
@@ -176,7 +176,7 @@ async def trusted_user_proposal(request: Request, proposal: int):
 
 
 @router.post("/tu/{proposal}")
-@auth_required(True, redirect="/tu/{proposal}")
+@auth_required(True)
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal_post(request: Request,
                                      proposal: int,
@@ -227,7 +227,7 @@ async def trusted_user_proposal_post(request: Request,
 
 
 @router.get("/addvote")
-@auth_required(True, redirect="/addvote")
+@auth_required(True)
 @account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote(request: Request,
                                user: str = str(),
@@ -247,7 +247,7 @@ async def trusted_user_addvote(request: Request,
 
 
 @router.post("/addvote")
-@auth_required(True, redirect="/addvote")
+@auth_required(True)
 @account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote_post(request: Request,
                                     user: str = Form(default=str()),
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index 43a3443b..ac7f82d5 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -9,7 +9,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import db, util
+from aurweb import config, db, util
 from aurweb.models.account_type import AccountType
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
@@ -124,8 +124,9 @@ def proposal(user, tu_user):
 
 
 def test_tu_index_guest(client):
+    headers = {"referer": config.get("options", "aur_location") + "/tu"}
     with client as request:
-        response = request.get("/tu", allow_redirects=False)
+        response = request.get("/tu", allow_redirects=False, headers=headers)
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
     params = util.urlencode({"next": "/tu"})

From 0b30216229f561cfdcffd27231f200c3901ce26d Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Thu, 18 Nov 2021 15:18:17 -0500
Subject: [PATCH 661/844] fix(FastAPI): remove unnecessary arguments to
 auth_required

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/auth/__init__.py        | 59 ++--------------------------------
 aurweb/routers/accounts.py     | 24 ++++++--------
 aurweb/routers/packages.py     | 54 +++++++++++++++----------------
 aurweb/routers/trusted_user.py | 10 +++---
 4 files changed, 43 insertions(+), 104 deletions(-)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index 7aa4b526..8ceb136c 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -5,6 +5,7 @@ from http import HTTPStatus
 
 import fastapi
 
+from fastapi import HTTPException
 from fastapi.responses import RedirectResponse
 from sqlalchemy import and_
 from starlette.authentication import AuthCredentials, AuthenticationBackend
@@ -15,7 +16,6 @@ import aurweb.config
 from aurweb import db, l10n, util
 from aurweb.models import Session, User
 from aurweb.models.account_type import ACCOUNT_TYPE_ID
-from aurweb.templates import make_variable_context, render_template
 
 
 class StubQuery:
@@ -125,29 +125,7 @@ def auth_required(is_required: bool = True,
                   status_code: HTTPStatus = HTTPStatus.UNAUTHORIZED):
     """ Authentication route decorator.
 
-    If template is given, it will be rendered with Unauthorized if
-    is_required does not match.
-
-    A precondition of this function is that, if template is provided,
-    it **must** match the following format:
-
-        template=("template.html", ["Some Template For", "{}"], ["username"])
-
-    Where `username` is a FastAPI request path parameter, fitting
-    a route like: `/some_route/{username}`.
-
-    If you wish to supply a non-formatted template, just omit any Python
-    format strings (with the '{}' substring). The third tuple element
-    will not be used, and so anything can be supplied.
-
-        template=("template.html", ["Some Page"], None)
-
-    All title shards and format parameters will be translated before
-    applying any format operations.
-
     :param is_required: A boolean indicating whether the function requires auth
-    :param template: A three-element template tuple:
-                     (path, title_iterable, variable_iterable)
     :param status_code: An optional status_code for template render.
                         Redirects are always SEE_OTHER.
     """
@@ -164,45 +142,12 @@ def auth_required(is_required: bool = True,
                     elif request.method == "POST" and (referer := request.headers.get("Referer")):
                         aur = aurweb.config.get("options", "aur_location") + "/"
                         if not referer.startswith(aur):
+                            _ = l10n.get_translator_for_request(request)
                             raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
                                                 detail=_("Bad Referer header."))
                         url = referer[len(aur) - 1:]
 
                     url = "/login?" + util.urlencode({"next": url})
-
-                if template:
-                    # template=("template.html",
-                    #           ["Some Title", "someFormatted {}"],
-                    #           ["variable"])
-                    # => render template.html with title:
-                    #    "Some Title someFormatted variables"
-                    path, title_parts, variables = template
-                    _ = l10n.get_translator_for_request(request)
-
-                    # Step through title_parts; for each part which contains
-                    # a '{}' in it, apply .format(var) where var = the current
-                    # iteration of variables.
-                    #
-                    # This implies that len(variables) is equal to
-                    # len([part for part in title_parts if '{}' in part])
-                    # and this must always be true.
-                    #
-                    sanitized = []
-                    _variables = iter(variables)
-                    for part in title_parts:
-                        if "{}" in part:  # If this part is formattable.
-                            key = next(_variables)
-                            var = request.path_params.get(key)
-                            sanitized.append(_(part.format(var)))
-                        else:  # Otherwise, just add the translated part.
-                            sanitized.append(_(part))
-
-                    # Glue all title parts together, separated by spaces.
-                    title = " ".join(sanitized)
-
-                    context = await make_variable_context(request, title)
-                    return render_template(request, path, context,
-                                           status_code=status_code)
                 return RedirectResponse(url,
                                         status_code=int(HTTPStatus.SEE_OTHER))
             return await func(request, *args, **kwargs)
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index dade92bb..388daf84 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -340,7 +340,7 @@ def cannot_edit(request, user):
 
 
 @router.get("/account/{username}/edit", response_class=HTMLResponse)
-@auth_required(True)
+@auth_required()
 async def account_edit(request: Request, username: str):
     user = db.query(models.User, models.User.Username == username).first()
 
@@ -356,7 +356,7 @@ async def account_edit(request: Request, username: str):
 
 
 @router.post("/account/{username}/edit", response_class=HTMLResponse)
-@auth_required(True)
+@auth_required()
 async def account_edit_post(request: Request,
                             username: str,
                             U: str = Form(default=str()),  # Username
@@ -424,20 +424,14 @@ async def account_edit_post(request: Request,
                                            aurtz=TZ, aurlang=L)
 
 
-account_template = (
-    "account/show.html",
-    ["Account", "{}"],
-    ["username"]  # Query parameters to replace in the title string.
-)
-
-
 @router.get("/account/{username}")
-@auth_required(True, template=account_template,
-               status_code=HTTPStatus.UNAUTHORIZED)
 async def account(request: Request, username: str):
     _ = l10n.get_translator_for_request(request)
     context = await make_variable_context(
         request, _("Account") + " " + username)
+    if not request.user.is_authenticated():
+        return render_template(request, "account/show.html", context,
+                               status_code=HTTPStatus.UNAUTHORIZED)
     context["user"] = get_user_by_name(username)
     return render_template(request, "account/show.html", context)
 
@@ -454,7 +448,7 @@ async def account_comments(request: Request, username: str):
 
 
 @router.get("/accounts")
-@auth_required(True)
+@auth_required()
 @account_type_required({at.TRUSTED_USER,
                         at.DEVELOPER,
                         at.TRUSTED_USER_AND_DEV})
@@ -464,7 +458,7 @@ async def accounts(request: Request):
 
 
 @router.post("/accounts")
-@auth_required(True)
+@auth_required()
 @account_type_required({at.TRUSTED_USER,
                         at.DEVELOPER,
                         at.TRUSTED_USER_AND_DEV})
@@ -548,7 +542,7 @@ def render_terms_of_service(request: Request,
 
 
 @router.get("/tos")
-@auth_required(True)
+@auth_required()
 async def terms_of_service(request: Request):
     # Query the database for terms that were previously accepted,
     # but now have a bumped Revision that needs to be accepted.
@@ -572,7 +566,7 @@ async def terms_of_service(request: Request):
 
 
 @router.post("/tos")
-@auth_required(True)
+@auth_required()
 async def terms_of_service_post(request: Request,
                                 accept: bool = Form(default=False)):
     # Query the database for terms that were previously accepted,
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 4a2cdce3..c06ec51f 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -295,7 +295,7 @@ async def package_base_voters(request: Request, name: str) -> Response:
 
 
 @router.post("/pkgbase/{name}/comments")
-@auth_required(True)
+@auth_required()
 async def pkgbase_comments_post(
         request: Request, name: str,
         comment: str = Form(default=str()),
@@ -327,7 +327,7 @@ async def pkgbase_comments_post(
 
 
 @router.get("/pkgbase/{name}/comments/{id}/form")
-@auth_required(True)
+@auth_required()
 async def pkgbase_comment_form(request: Request, name: str, id: int,
                                next: str = Query(default=None)):
     """ Produce a comment form for comment {id}. """
@@ -353,7 +353,7 @@ async def pkgbase_comment_form(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}")
-@auth_required(True)
+@auth_required()
 async def pkgbase_comment_post(
         request: Request, name: str, id: int,
         comment: str = Form(default=str()),
@@ -392,7 +392,7 @@ async def pkgbase_comment_post(
 
 
 @router.get("/pkgbase/{name}/comments/{id}/edit")
-@auth_required(True)
+@auth_required()
 async def pkgbase_comment_edit(request: Request, name: str, id: int,
                                next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -407,7 +407,7 @@ async def pkgbase_comment_edit(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/delete")
-@auth_required(True)
+@auth_required()
 async def pkgbase_comment_delete(request: Request, name: str, id: int,
                                  next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -433,7 +433,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/undelete")
-@auth_required(True)
+@auth_required()
 async def pkgbase_comment_undelete(request: Request, name: str, id: int,
                                    next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -458,7 +458,7 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/pin")
-@auth_required(True)
+@auth_required()
 async def pkgbase_comment_pin(request: Request, name: str, id: int,
                               next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -483,7 +483,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/unpin")
-@auth_required(True)
+@auth_required()
 async def pkgbase_comment_unpin(request: Request, name: str, id: int,
                                 next: str = Form(default=None)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -507,7 +507,7 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int,
 
 
 @router.get("/pkgbase/{name}/comaintainers")
-@auth_required(True)
+@auth_required()
 async def package_base_comaintainers(request: Request, name: str) -> Response:
     # Get the PackageBase.
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -532,7 +532,7 @@ async def package_base_comaintainers(request: Request, name: str) -> Response:
 
 
 @router.post("/pkgbase/{name}/comaintainers")
-@auth_required(True)
+@auth_required()
 async def package_base_comaintainers_post(
         request: Request, name: str,
         users: str = Form(default=str())) -> Response:
@@ -584,7 +584,7 @@ async def package_base_comaintainers_post(
 
 
 @router.get("/requests")
-@auth_required(True)
+@auth_required()
 async def requests(request: Request,
                    O: int = Query(default=defaults.O),
                    PP: int = Query(default=defaults.PP)):
@@ -618,7 +618,7 @@ async def requests(request: Request,
 
 
 @router.get("/pkgbase/{name}/request")
-@auth_required(True)
+@auth_required()
 async def package_request(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     context = await make_variable_context(request, "Submit Request")
@@ -627,7 +627,7 @@ async def package_request(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/request")
-@auth_required(True)
+@auth_required()
 async def pkgbase_request_post(request: Request, name: str,
                                type: str = Form(...),
                                merge_into: str = Form(default=None),
@@ -699,7 +699,7 @@ async def pkgbase_request_post(request: Request, name: str,
 
 
 @router.get("/requests/{id}/close")
-@auth_required(True)
+@auth_required()
 async def requests_close(request: Request, id: int):
     pkgreq = get_pkgreq_by_id(id)
     if not request.user.is_elevated() and request.user != pkgreq.User:
@@ -712,7 +712,7 @@ async def requests_close(request: Request, id: int):
 
 
 @router.post("/requests/{id}/close")
-@auth_required(True)
+@auth_required()
 async def requests_close_post(request: Request, id: int,
                               reason: int = Form(default=0),
                               comments: str = Form(default=str())):
@@ -775,7 +775,7 @@ async def pkgbase_keywords(request: Request, name: str,
 
 
 @router.get("/pkgbase/{name}/flag")
-@auth_required(True)
+@auth_required()
 async def pkgbase_flag_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -790,7 +790,7 @@ async def pkgbase_flag_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/flag")
-@auth_required(True)
+@auth_required()
 async def pkgbase_flag_post(request: Request, name: str,
                             comments: str = Form(default=str())):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -839,7 +839,7 @@ def pkgbase_unflag_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.post("/pkgbase/{name}/unflag")
-@auth_required(True)
+@auth_required()
 async def pkgbase_unflag(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     pkgbase_unflag_instance(request, pkgbase)
@@ -860,7 +860,7 @@ def pkgbase_notify_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.post("/pkgbase/{name}/notify")
-@auth_required(True)
+@auth_required()
 async def pkgbase_notify(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     pkgbase_notify_instance(request, pkgbase)
@@ -879,7 +879,7 @@ def pkgbase_unnotify_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.post("/pkgbase/{name}/unnotify")
-@auth_required(True)
+@auth_required()
 async def pkgbase_unnotify(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
     pkgbase_unnotify_instance(request, pkgbase)
@@ -888,7 +888,7 @@ async def pkgbase_unnotify(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/vote")
-@auth_required(True)
+@auth_required()
 async def pkgbase_vote(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -912,7 +912,7 @@ async def pkgbase_vote(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/unvote")
-@auth_required(True)
+@auth_required()
 async def pkgbase_unvote(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -954,7 +954,7 @@ def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.get("/pkgbase/{name}/disown")
-@auth_required(True)
+@auth_required()
 async def pkgbase_disown_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -970,7 +970,7 @@ async def pkgbase_disown_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/disown")
-@auth_required(True)
+@auth_required()
 async def pkgbase_disown_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
@@ -1003,7 +1003,7 @@ def pkgbase_adopt_instance(request: Request, pkgbase: models.PackageBase):
 
 
 @router.post("/pkgbase/{name}/adopt")
-@auth_required(True)
+@auth_required()
 async def pkgbase_adopt_post(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -1019,7 +1019,7 @@ async def pkgbase_adopt_post(request: Request, name: str):
 
 
 @router.get("/pkgbase/{name}/delete")
-@auth_required(True)
+@auth_required()
 async def pkgbase_delete_get(request: Request, name: str):
     if not request.user.has_credential(creds.PKGBASE_DELETE):
         return RedirectResponse(f"/pkgbase/{name}",
@@ -1031,7 +1031,7 @@ async def pkgbase_delete_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/delete")
-@auth_required(True)
+@auth_required()
 async def pkgbase_delete_post(request: Request, name: str,
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index 09de58fe..fac68f04 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -41,7 +41,7 @@ ADDVOTE_SPECIFICS = {
 
 
 @router.get("/tu")
-@auth_required(True)
+@auth_required()
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user(request: Request,
                        coff: int = 0,  # current offset
@@ -147,7 +147,7 @@ def render_proposal(request: Request,
 
 
 @router.get("/tu/{proposal}")
-@auth_required(True)
+@auth_required()
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal(request: Request, proposal: int):
     context = await make_variable_context(request, "Trusted User")
@@ -176,7 +176,7 @@ async def trusted_user_proposal(request: Request, proposal: int):
 
 
 @router.post("/tu/{proposal}")
-@auth_required(True)
+@auth_required()
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal_post(request: Request,
                                      proposal: int,
@@ -227,7 +227,7 @@ async def trusted_user_proposal_post(request: Request,
 
 
 @router.get("/addvote")
-@auth_required(True)
+@auth_required()
 @account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote(request: Request,
                                user: str = str(),
@@ -247,7 +247,7 @@ async def trusted_user_addvote(request: Request,
 
 
 @router.post("/addvote")
-@auth_required(True)
+@auth_required()
 @account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote_post(request: Request,
                                     user: str = Form(default=str()),

From 2fee6205a6d11ad6ecae4b003991fc3aea1e992f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 01:42:19 -0800
Subject: [PATCH 662/844] housekeep(fastapi): rewrite test_rpc with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_rpc.py | 532 +++++++++++++++++++++++++++--------------------
 1 file changed, 308 insertions(+), 224 deletions(-)

diff --git a/test/test_rpc.py b/test/test_rpc.py
index b61a7e4e..acb82cad 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -1,6 +1,8 @@
 import re
 
+from datetime import datetime
 from http import HTTPStatus
+from typing import List
 from unittest import mock
 
 import orjson
@@ -9,10 +11,11 @@ import pytest
 from fastapi.testclient import TestClient
 from redis.client import Pipeline
 
-from aurweb import asgi, config, scripts
-from aurweb.db import begin, create, query
-from aurweb.models.account_type import AccountType
-from aurweb.models.dependency_type import DependencyType
+import aurweb.models.dependency_type as dt
+import aurweb.models.relation_type as rt
+
+from aurweb import asgi, config, db, scripts
+from aurweb.models.account_type import USER_ID
 from aurweb.models.license import License
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -21,7 +24,6 @@ from aurweb.models.package_keyword import PackageKeyword
 from aurweb.models.package_license import PackageLicense
 from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_vote import PackageVote
-from aurweb.models.relation_type import RelationType
 from aurweb.models.user import User
 from aurweb.redis import redis_connection
 
@@ -31,163 +33,172 @@ def client() -> TestClient:
     yield TestClient(app=asgi.app)
 
 
-@pytest.fixture(autouse=True)
-def setup(db_test):
-    # TODO: Rework this into organized fixtures.
+@pytest.fixture
+def user(db_test) -> User:
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User 1", Passwd=str(),
+                         AccountTypeID=USER_ID)
+    yield user
 
-    # Create test package details.
-    with begin():
-        # Get ID types.
-        account_type = query(AccountType, AccountType.AccountType == "User").first()
 
-        dependency_depends = query(DependencyType, DependencyType.Name == "depends").first()
-        dependency_optdepends = query(DependencyType, DependencyType.Name == "optdepends").first()
-        dependency_makedepends = query(DependencyType, DependencyType.Name == "makedepends").first()
-        dependency_checkdepends = query(DependencyType, DependencyType.Name == "checkdepends").first()
+@pytest.fixture
+def user2() -> User:
+    with db.begin():
+        user = db.create(User, Username="user2", Email="user2@example.org",
+                         RealName="Test User 2", Passwd=str(),
+                         AccountTypeID=USER_ID)
+    yield user
 
-        relation_conflicts = query(RelationType, RelationType.Name == "conflicts").first()
-        relation_provides = query(RelationType, RelationType.Name == "provides").first()
-        relation_replaces = query(RelationType, RelationType.Name == "replaces").first()
 
-        # Create database info.
-        user1 = create(User,
-                       Username="user1",
-                       Email="user1@example.com",
-                       RealName="Test User 1",
-                       Passwd="testPassword",
-                       AccountType=account_type)
+@pytest.fixture
+def user3() -> User:
+    with db.begin():
+        user = db.create(User, Username="user3", Email="user3@example.org",
+                         RealName="Test User 3", Passwd=str(),
+                         AccountTypeID=USER_ID)
+    yield user
 
-        user2 = create(User,
-                       Username="user2",
-                       Email="user2@example.com",
-                       RealName="Test User 2",
-                       Passwd="testPassword",
-                       AccountType=account_type)
 
-        user3 = create(User,
-                       Username="user3",
-                       Email="user3@example.com",
-                       RealName="Test User 3",
-                       Passwd="testPassword",
-                       AccountType=account_type)
+@pytest.fixture
+def packages(user: User, user2: User, user3: User) -> List[Package]:
+    output = []
 
-        pkgbase1 = create(PackageBase, Name="big-chungus",
-                          Maintainer=user1,
-                          Packager=user1)
+    # Create package records used in our tests.
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="big-chungus",
+                            Maintainer=user, Packager=user)
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name,
+                        Description="Bunny bunny around bunny",
+                        URL="https://example.com/")
+        output.append(pkg)
 
-        pkgname1 = create(Package,
-                          PackageBase=pkgbase1,
-                          Name=pkgbase1.Name,
-                          Description="Bunny bunny around bunny",
-                          URL="https://example.com/")
+        pkgbase = db.create(PackageBase, Name="chungy-chungus",
+                            Maintainer=user, Packager=user)
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name,
+                        Description="Wubby wubby on wobba wuubu",
+                        URL="https://example.com/")
+        output.append(pkg)
 
-        pkgbase2 = create(PackageBase, Name="chungy-chungus",
-                          Maintainer=user1,
-                          Packager=user1)
+        pkgbase = db.create(PackageBase, Name="gluggly-chungus",
+                            Maintainer=user, Packager=user)
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name,
+                        Description="glurrba glurrba gur globba",
+                        URL="https://example.com/")
+        output.append(pkg)
 
-        pkgname2 = create(Package,
-                          PackageBase=pkgbase2,
-                          Name=pkgbase2.Name,
-                          Description="Wubby wubby on wobba wuubu",
-                          URL="https://example.com/")
-
-        pkgbase3 = create(PackageBase, Name="gluggly-chungus",
-                          Maintainer=user1,
-                          Packager=user1)
-
-        pkgbase4 = create(PackageBase, Name="fugly-chungus",
-                          Maintainer=user1,
-                          Packager=user1)
+        pkgbase = db.create(PackageBase, Name="fugly-chungus",
+                            Maintainer=user, Packager=user)
 
         desc = "A Package belonging to a PackageBase with another name."
-        create(Package,
-               PackageBase=pkgbase4,
-               Name="other-pkg",
-               Description=desc,
-               URL="https://example.com")
+        pkg = db.create(Package, PackageBase=pkgbase, Name="other-pkg",
+                        Description=desc, URL="https://example.com")
+        output.append(pkg)
 
-        create(Package,
-               PackageBase=pkgbase3,
-               Name=pkgbase3.Name,
-               Description="glurrba glurrba gur globba",
-               URL="https://example.com/")
+        pkgbase = db.create(PackageBase, Name="woogly-chungus")
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name,
+                        Description="wuggla woblabeloop shemashmoop",
+                        URL="https://example.com/")
+        output.append(pkg)
 
-        pkgbase4 = create(PackageBase, Name="woogly-chungus")
+    # Setup a few more related records on the first package:
+    # a license, some keywords and some votes.
+    with db.begin():
+        lic = db.create(License, Name="GPL")
+        db.create(PackageLicense, Package=output[0], License=lic)
 
-        create(Package,
-               PackageBase=pkgbase4,
-               Name=pkgbase4.Name,
-               Description="wuggla woblabeloop shemashmoop",
-               URL="https://example.com/")
+        for keyword in ["big-chungus", "smol-chungus", "sizeable-chungus"]:
+            db.create(PackageKeyword,
+                      PackageBase=output[0].PackageBase,
+                      Keyword=keyword)
 
-        # Dependencies.
-        create(PackageDependency,
-               Package=pkgname1,
-               DependencyType=dependency_depends,
-               DepName="chungus-depends")
+        now = int(datetime.utcnow().timestamp())
+        for user_ in [user, user2, user3]:
+            db.create(PackageVote, User=user_,
+                      PackageBase=output[0].PackageBase, VoteTS=now)
+    scripts.popupdate.run_single(output[0].PackageBase)
 
-        create(PackageDependency,
-               Package=pkgname2,
-               DependencyType=dependency_depends,
-               DepName="chungy-depends")
+    yield output
 
-        create(PackageDependency,
-               Package=pkgname1,
-               DependencyType=dependency_optdepends,
-               DepName="chungus-optdepends",
-               DepCondition="=50")
 
-        create(PackageDependency,
-               Package=pkgname1,
-               DependencyType=dependency_makedepends,
-               DepName="chungus-makedepends")
+@pytest.fixture
+def depends(packages: List[Package]) -> List[PackageDependency]:
+    output = []
 
-        create(PackageDependency,
-               Package=pkgname1,
-               DependencyType=dependency_checkdepends,
-               DepName="chungus-checkdepends")
+    with db.begin():
+        dep = db.create(PackageDependency,
+                        Package=packages[0],
+                        DepTypeID=dt.DEPENDS_ID,
+                        DepName="chungus-depends")
+        output.append(dep)
 
-        # Relations.
-        create(PackageRelation,
-               Package=pkgname1,
-               RelationType=relation_conflicts,
-               RelName="chungus-conflicts")
+        dep = db.create(PackageDependency,
+                        Package=packages[1],
+                        DepTypeID=dt.DEPENDS_ID,
+                        DepName="chungy-depends")
+        output.append(dep)
 
-        create(PackageRelation,
-               Package=pkgname2,
-               RelationType=relation_conflicts,
-               RelName="chungy-conflicts")
+        dep = db.create(PackageDependency,
+                        Package=packages[0],
+                        DepTypeID=dt.OPTDEPENDS_ID,
+                        DepName="chungus-optdepends",
+                        DepCondition="=50")
+        output.append(dep)
 
-        create(PackageRelation,
-               Package=pkgname1,
-               RelationType=relation_provides,
-               RelName="chungus-provides",
-               RelCondition="<=200")
+        dep = db.create(PackageDependency,
+                        Package=packages[0],
+                        DepTypeID=dt.MAKEDEPENDS_ID,
+                        DepName="chungus-makedepends")
+        output.append(dep)
 
-        create(PackageRelation,
-               Package=pkgname1,
-               RelationType=relation_replaces,
-               RelName="chungus-replaces",
-               RelCondition="<=200")
+        dep = db.create(PackageDependency,
+                        Package=packages[0],
+                        DepTypeID=dt.CHECKDEPENDS_ID,
+                        DepName="chungus-checkdepends")
+        output.append(dep)
 
-        license = create(License, Name="GPL")
+    yield output
 
-        create(PackageLicense,
-               Package=pkgname1,
-               License=license)
 
-        for i in ["big-chungus", "smol-chungus", "sizeable-chungus"]:
-            create(PackageKeyword,
-                   PackageBase=pkgbase1,
-                   Keyword=i)
+@pytest.fixture
+def relations(user: User, packages: List[Package]) -> List[PackageRelation]:
+    output = []
 
-        for i in [user1, user2, user3]:
-            create(PackageVote,
-                   User=i,
-                   PackageBase=pkgbase1,
-                   VoteTS=5000)
+    with db.begin():
+        rel = db.create(PackageRelation,
+                        Package=packages[0],
+                        RelTypeID=rt.CONFLICTS_ID,
+                        RelName="chungus-conflicts")
+        output.append(rel)
 
-    scripts.popupdate.run_single(pkgbase1)
+        rel = db.create(PackageRelation,
+                        Package=packages[1],
+                        RelTypeID=rt.CONFLICTS_ID,
+                        RelName="chungy-conflicts")
+        output.append(rel)
+
+        rel = db.create(PackageRelation,
+                        Package=packages[0],
+                        RelTypeID=rt.PROVIDES_ID,
+                        RelName="chungus-provides",
+                        RelCondition="<=200")
+        output.append(rel)
+
+        rel = db.create(PackageRelation,
+                        Package=packages[0],
+                        RelTypeID=rt.REPLACES_ID,
+                        RelName="chungus-replaces",
+                        RelCondition="<=200")
+        output.append(rel)
+
+    # Finally, yield the packages.
+    yield output
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    # Create some extra package relationships.
+    pass
 
 
 @pytest.fixture
@@ -195,28 +206,35 @@ def pipeline():
     redis = redis_connection()
     pipeline = redis.pipeline()
 
+    # The 'testclient' host is used when requesting the app
+    # via fastapi.testclient.TestClient.
     pipeline.delete("ratelimit-ws:testclient")
     pipeline.delete("ratelimit:testclient")
-    one, two = pipeline.execute()
+    pipeline.execute()
 
     yield pipeline
 
 
-def test_rpc_singular_info(client: TestClient):
+def test_rpc_singular_info(client: TestClient,
+                           user: User,
+                           packages: List[Package],
+                           depends: List[PackageDependency],
+                           relations: List[PackageRelation]):
     # Define expected response.
+    pkg = packages[0]
     expected_data = {
         "version": 5,
         "results": [{
-            "Name": "big-chungus",
-            "Version": "",
-            "Description": "Bunny bunny around bunny",
-            "URL": "https://example.com/",
-            "PackageBase": "big-chungus",
-            "NumVotes": 3,
-            "Popularity": 0.0,
+            "Name": pkg.Name,
+            "Version": pkg.Version,
+            "Description": pkg.Description,
+            "URL": pkg.URL,
+            "PackageBase": pkg.PackageBase.Name,
+            "NumVotes": pkg.PackageBase.NumVotes,
+            "Popularity": float(pkg.PackageBase.Popularity),
             "OutOfDate": None,
-            "Maintainer": "user1",
-            "URLPath": "/cgit/aur.git/snapshot/big-chungus.tar.gz",
+            "Maintainer": user.Username,
+            "URLPath": f"/cgit/aur.git/snapshot/{pkg.Name}.tar.gz",
             "Depends": ["chungus-depends"],
             "OptDepends": ["chungus-optdepends=50"],
             "MakeDepends": ["chungus-makedepends"],
@@ -224,7 +242,7 @@ def test_rpc_singular_info(client: TestClient):
             "Conflicts": ["chungus-conflicts"],
             "Provides": ["chungus-provides<=200"],
             "Replaces": ["chungus-replaces<=200"],
-            "License": ["GPL"],
+            "License": [pkg.package_licenses.first().License.Name],
             "Keywords": [
                 "big-chungus",
                 "sizeable-chungus",
@@ -237,20 +255,23 @@ def test_rpc_singular_info(client: TestClient):
 
     # Make dummy request.
     with client as request:
-        response_arg = request.get(
-            "/rpc/?v=5&type=info&arg=chungy-chungus&arg=big-chungus")
+        resp = request.get("/rpc", params={
+            "v": 5,
+            "type": "info",
+            "arg": ["chungy-chungus", "big-chungus"],
+        })
 
     # Load  request response into Python dictionary.
-    response_info_arg = orjson.loads(response_arg.content.decode())
+    response_data = orjson.loads(resp.text)
 
     # Remove the FirstSubmitted LastModified, ID and PackageBaseID keys from
     # reponse, as the key's values aren't guaranteed to match between the two
     # (the keys are already removed from 'expected_data').
     for i in ["FirstSubmitted", "LastModified", "ID", "PackageBaseID"]:
-        response_info_arg["results"][0].pop(i)
+        response_data["results"][0].pop(i)
 
     # Validate that the new dictionaries are the same.
-    assert response_info_arg == expected_data
+    assert response_data == expected_data
 
 
 def test_rpc_nonexistent_package(client: TestClient):
@@ -265,12 +286,13 @@ def test_rpc_nonexistent_package(client: TestClient):
     assert response_data["resultcount"] == 0
 
 
-def test_rpc_multiinfo(client: TestClient):
+def test_rpc_multiinfo(client: TestClient, packages: List[Package]):
     # Make dummy request.
     request_packages = ["big-chungus", "chungy-chungus"]
     with client as request:
-        response = request.get(
-            "/rpc/?v=5&type=info&arg[]=big-chungus&arg[]=chungy-chungus")
+        response = request.get("/rpc", params={
+            "v": 5, "type": "info", "arg[]": request_packages
+        })
 
     # Load request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -282,19 +304,21 @@ def test_rpc_multiinfo(client: TestClient):
     assert request_packages == []
 
 
-def test_rpc_mixedargs(client: TestClient):
+def test_rpc_mixedargs(client: TestClient, packages: List[Package]):
     # Make dummy request.
     response1_packages = ["gluggly-chungus"]
     response2_packages = ["gluggly-chungus", "chungy-chungus"]
 
     with client as request:
+        # Supply all of the args in the url to enforce ordering.
         response1 = request.get(
             "/rpc?v=5&arg[]=big-chungus&arg=gluggly-chungus&type=info")
     assert response1.status_code == int(HTTPStatus.OK)
 
     with client as request:
         response2 = request.get(
-            "/rpc?v=5&arg=big-chungus&arg[]=gluggly-chungus&type=info&arg[]=chungy-chungus")
+            "/rpc?v=5&arg=big-chungus&arg[]=gluggly-chungus"
+            "&type=info&arg[]=chungy-chungus")
     assert response1.status_code == int(HTTPStatus.OK)
 
     # Load request response into Python dictionary.
@@ -312,22 +336,27 @@ def test_rpc_mixedargs(client: TestClient):
         assert i == []
 
 
-def test_rpc_no_dependencies(client: TestClient):
-    """This makes sure things like 'MakeDepends' get removed from JSON strings
-    when they don't have set values."""
-
+def test_rpc_no_dependencies_omits_key(client: TestClient, user: User,
+                                       packages: List[Package],
+                                       depends: List[PackageDependency],
+                                       relations: List[PackageRelation]):
+    """
+    This makes sure things like 'MakeDepends' get removed from JSON strings
+    when they don't have set values.
+    """
+    pkg = packages[1]
     expected_response = {
         'version': 5,
         'results': [{
-            'Name': 'chungy-chungus',
-            'Version': '',
-            'Description': 'Wubby wubby on wobba wuubu',
-            'URL': 'https://example.com/',
-            'PackageBase': 'chungy-chungus',
-            'NumVotes': 0,
-            'Popularity': 0.0,
+            'Name': pkg.Name,
+            'Version': pkg.Version,
+            'Description': pkg.Description,
+            'URL': pkg.URL,
+            'PackageBase': pkg.PackageBase.Name,
+            'NumVotes': pkg.PackageBase.NumVotes,
+            'Popularity': int(pkg.PackageBase.Popularity),
             'OutOfDate': None,
-            'Maintainer': 'user1',
+            'Maintainer': user.Username,
             'URLPath': '/cgit/aur.git/snapshot/chungy-chungus.tar.gz',
             'Depends': ['chungy-depends'],
             'Conflicts': ['chungy-conflicts'],
@@ -340,7 +369,9 @@ def test_rpc_no_dependencies(client: TestClient):
 
     # Make dummy request.
     with client as request:
-        response = request.get("/rpc/?v=5&type=info&arg=chungy-chungus")
+        response = request.get("/rpc", params={
+            "v": 5, "type": "info", "arg": "chungy-chungus"
+        })
     response_data = orjson.loads(response.content.decode())
 
     # Remove inconsistent keys.
@@ -362,7 +393,9 @@ def test_rpc_bad_type(client: TestClient):
 
     # Make dummy request.
     with client as request:
-        response = request.get("/rpc/?v=5&type=invalid-type&arg=big-chungus")
+        response = request.get("/rpc", params={
+            "v": 5, "type": "invalid-type", "arg": "big-chungus"
+        })
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -383,7 +416,9 @@ def test_rpc_bad_version(client: TestClient):
 
     # Make dummy request.
     with client as request:
-        response = request.get("/rpc/?v=0&type=info&arg=big-chungus")
+        response = request.get("/rpc", params={
+            "v": 0, "type": "info", "arg": "big-chungus"
+        })
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -404,7 +439,10 @@ def test_rpc_no_version(client: TestClient):
 
     # Make dummy request.
     with client as request:
-        response = request.get("/rpc/?type=info&arg=big-chungus")
+        response = request.get("/rpc", params={
+            "type": "info",
+            "arg": "big-chungus"
+        })
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -425,7 +463,7 @@ def test_rpc_no_type(client: TestClient):
 
     # Make dummy request.
     with client as request:
-        response = request.get("/rpc/?v=5&arg=big-chungus")
+        response = request.get("/rpc", params={"v": 5, "arg": "big-chungus"})
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -446,7 +484,7 @@ def test_rpc_no_args(client: TestClient):
 
     # Make dummy request.
     with client as request:
-        response = request.get("/rpc/?v=5&type=info")
+        response = request.get("/rpc", params={"v": 5, "type": "info"})
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -455,10 +493,12 @@ def test_rpc_no_args(client: TestClient):
     assert expected_data == response_data
 
 
-def test_rpc_no_maintainer(client: TestClient):
+def test_rpc_no_maintainer(client: TestClient, packages: List[Package]):
     # Make dummy request.
     with client as request:
-        response = request.get("/rpc/?v=5&type=info&arg=woogly-chungus")
+        response = request.get("/rpc", params={
+            "v": 5, "type": "info", "arg": "woogly-chungus"
+        })
 
     # Load  request response into Python dictionary.
     response_data = orjson.loads(response.content.decode())
@@ -467,39 +507,45 @@ def test_rpc_no_maintainer(client: TestClient):
     assert response_data["results"][0]["Maintainer"] is None
 
 
-def test_rpc_suggest_pkgbase(client: TestClient):
+def test_rpc_suggest_pkgbase(client: TestClient, packages: List[Package]):
+    params = {"v": 5, "type": "suggest-pkgbase", "arg": "big"}
     with client as request:
-        response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data == ["big-chungus"]
 
+    params["arg"] = "chungy"
     with client as request:
-        response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=chungy")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data == ["chungy-chungus"]
 
     # Test no arg supplied.
+    del params["arg"]
     with client as request:
-        response = request.get("/rpc?v=5&type=suggest-pkgbase")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data == []
 
 
-def test_rpc_suggest(client: TestClient):
+def test_rpc_suggest(client: TestClient, packages: List[Package]):
+    params = {"v": 5, "type": "suggest", "arg": "other"}
     with client as request:
-        response = request.get("/rpc?v=5&type=suggest&arg=other")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data == ["other-pkg"]
 
     # Test non-existent Package.
+    params["arg"] = "nonexistent"
     with client as request:
-        response = request.get("/rpc?v=5&type=suggest&arg=nonexistent")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data == []
 
     # Test no arg supplied.
+    del params["arg"]
     with client as request:
-        response = request.get("/rpc?v=5&type=suggest")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data == []
 
@@ -514,16 +560,18 @@ def mock_config_getint(section: str, key: str):
 
 @mock.patch("aurweb.config.getint", side_effect=mock_config_getint)
 def test_rpc_ratelimit(getint: mock.MagicMock, client: TestClient,
-                       pipeline: Pipeline):
+                       pipeline: Pipeline, packages: List[Package]):
+    params = {"v": 5, "type": "suggest-pkgbase", "arg": "big"}
+
     for i in range(4):
         # The first 4 requests should be good.
         with client as request:
-            response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
+            response = request.get("/rpc", params=params)
         assert response.status_code == int(HTTPStatus.OK)
 
     # The fifth request should be banned.
     with client as request:
-        response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
+        response = request.get("/rpc", params=params)
     assert response.status_code == int(HTTPStatus.TOO_MANY_REQUESTS)
 
     # Delete the cached records.
@@ -534,124 +582,155 @@ def test_rpc_ratelimit(getint: mock.MagicMock, client: TestClient,
 
     # The new first request should be good.
     with client as request:
-        response = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
+        response = request.get("/rpc", params=params)
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_rpc_etag(client: TestClient):
-    with client as request:
-        response1 = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
+def test_rpc_etag(client: TestClient, packages: List[Package]):
+    params = {"v": 5, "type": "suggest-pkgbase", "arg": "big"}
 
     with client as request:
-        response2 = request.get("/rpc?v=5&type=suggest-pkgbase&arg=big")
+        response1 = request.get("/rpc", params=params)
+    with client as request:
+        response2 = request.get("/rpc", params=params)
+
     assert response1.headers.get("ETag") is not None
     assert response1.headers.get("ETag") != str()
     assert response1.headers.get("ETag") == response2.headers.get("ETag")
 
 
 def test_rpc_search_arg_too_small(client: TestClient):
+    params = {"v": 5, "type": "search", "arg": "b"}
     with client as request:
-        response = request.get("/rpc?v=5&type=search&arg=b")
+        response = request.get("/rpc", params=params)
     assert response.status_code == int(HTTPStatus.OK)
     assert response.json().get("error") == "Query arg too small."
 
 
-def test_rpc_search(client: TestClient):
+def test_rpc_search(client: TestClient, packages: List[Package]):
+    params = {"v": 5, "type": "search", "arg": "big"}
     with client as request:
-        response = request.get("/rpc?v=5&type=search&arg=big")
+        response = request.get("/rpc", params=params)
     assert response.status_code == int(HTTPStatus.OK)
 
     data = response.json()
     assert data.get("resultcount") == 1
 
     result = data.get("results")[0]
-    assert result.get("Name") == "big-chungus"
+    assert result.get("Name") == packages[0].Name
 
     # Test the If-None-Match headers.
     etag = response.headers.get("ETag").strip('"')
     headers = {"If-None-Match": etag}
-    response = request.get("/rpc?v=5&type=search&arg=big", headers=headers)
+    response = request.get("/rpc", params=params, headers=headers)
     assert response.status_code == int(HTTPStatus.NOT_MODIFIED)
     assert response.content == b''
 
     # No args on non-m by types return an error.
-    response = request.get("/rpc?v=5&type=search")
+    del params["arg"]
+    with client as request:
+        response = request.get("/rpc", params=params)
     assert response.json().get("error") == "No request type/data specified."
 
 
-def test_rpc_msearch(client: TestClient):
+def test_rpc_msearch(client: TestClient, user: User, packages: List[Package]):
+    params = {"v": 5, "type": "msearch", "arg": user.Username}
     with client as request:
-        response = request.get("/rpc?v=5&type=msearch&arg=user1")
+        response = request.get("/rpc", params=params)
     data = response.json()
 
     # user1 maintains 4 packages; assert that we got them all.
     assert data.get("resultcount") == 4
     names = list(sorted(r.get("Name") for r in data.get("results")))
-    expected_results = list(sorted([
+    expected_results = [
         "big-chungus",
         "chungy-chungus",
         "gluggly-chungus",
         "other-pkg"
-    ]))
+    ]
     assert names == expected_results
 
     # Search for a non-existent maintainer, giving us zero packages.
-    response = request.get("/rpc?v=5&type=msearch&arg=blah-blah")
+    params["arg"] = "blah-blah"
+    response = request.get("/rpc", params=params)
     data = response.json()
     assert data.get("resultcount") == 0
 
     # A missing arg still succeeds, but it returns all orphans.
     # Just verify that we receive no error and the orphaned result.
-    response = request.get("/rpc?v=5&type=msearch")
+    params.pop("arg")
+    response = request.get("/rpc", params=params)
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
     assert result.get("Name") == "woogly-chungus"
 
 
-def test_rpc_search_depends(client: TestClient):
+def test_rpc_search_depends(client: TestClient, packages: List[Package],
+                            depends: List[PackageDependency]):
+    params = {
+        "v": 5, "type": "search", "by": "depends", "arg": "chungus-depends"
+    }
     with client as request:
-        response = request.get(
-            "/rpc?v=5&type=search&by=depends&arg=chungus-depends")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
-    assert result.get("Name") == "big-chungus"
+    assert result.get("Name") == packages[0].Name
 
 
-def test_rpc_search_makedepends(client: TestClient):
+def test_rpc_search_makedepends(client: TestClient, packages: List[Package],
+                                depends: List[PackageDependency]):
+    params = {
+        "v": 5,
+        "type": "search",
+        "by": "makedepends",
+        "arg": "chungus-makedepends"
+    }
     with client as request:
-        response = request.get(
-            "/rpc?v=5&type=search&by=makedepends&arg=chungus-makedepends")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
-    assert result.get("Name") == "big-chungus"
+    assert result.get("Name") == packages[0].Name
 
 
-def test_rpc_search_optdepends(client: TestClient):
+def test_rpc_search_optdepends(client: TestClient, packages: List[Package],
+                               depends: List[PackageDependency]):
+    params = {
+        "v": 5,
+        "type": "search",
+        "by": "optdepends",
+        "arg": "chungus-optdepends"
+    }
     with client as request:
-        response = request.get(
-            "/rpc?v=5&type=search&by=optdepends&arg=chungus-optdepends")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
-    assert result.get("Name") == "big-chungus"
+    assert result.get("Name") == packages[0].Name
 
 
-def test_rpc_search_checkdepends(client: TestClient):
+def test_rpc_search_checkdepends(client: TestClient, packages: List[Package],
+                                 depends: List[PackageDependency]):
+    params = {
+        "v": 5,
+        "type": "search",
+        "by": "checkdepends",
+        "arg": "chungus-checkdepends"
+    }
     with client as request:
-        response = request.get(
-            "/rpc?v=5&type=search&by=checkdepends&arg=chungus-checkdepends")
+        response = request.get("/rpc", params=params)
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
-    assert result.get("Name") == "big-chungus"
+    assert result.get("Name") == packages[0].Name
 
 
 def test_rpc_incorrect_by(client: TestClient):
+    params = {"v": 5, "type": "search", "by": "fake", "arg": "big"}
     with client as request:
-        response = request.get("/rpc?v=5&type=search&by=fake&arg=big")
+        response = request.get("/rpc", params=params)
     assert response.json().get("error") == "Incorrect by field specified."
 
 
@@ -661,15 +740,20 @@ def test_rpc_jsonp_callback(client: TestClient):
     For end-to-end verification, the `examples/jsonp.html` file can be
     used to submit jsonp callback requests to the RPC.
     """
+    params = {
+        "v": 5,
+        "type": "search",
+        "arg": "big",
+        "callback": "jsonCallback"
+    }
     with client as request:
-        response = request.get(
-            "/rpc?v=5&type=search&arg=big&callback=jsonCallback")
+        response = request.get("/rpc", params=params)
     assert response.headers.get("content-type") == "text/javascript"
     assert re.search(r'^/\*\*/jsonCallback\(.*\)$', response.text) is not None
 
     # Test an invalid callback name; we get an application/json error.
+    params["callback"] = "jsonCallback!"
     with client as request:
-        response = request.get(
-            "/rpc?v=5&type=search&arg=big&callback=jsonCallback!")
+        response = request.get("/rpc", params=params)
     assert response.headers.get("content-type") == "application/json"
     assert response.json().get("error") == "Invalid callback name."

From 604df50b88ac6a1b7babfeebb7ee2ae2844fba2a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 01:49:35 -0800
Subject: [PATCH 663/844] housekeep(fastapi): rewrite test_package_comment with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_comment.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/test/test_package_comment.py b/test/test_package_comment.py
index b00e08c3..c89e23af 100644
--- a/test/test_package_comment.py
+++ b/test/test_package_comment.py
@@ -8,21 +8,29 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.package_comment import PackageComment
 from aurweb.models.user import User
 
-user = pkgbase = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    with db.begin():
         pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+    yield pkgbase
 
 
-def test_package_comment_creation():
+def test_package_comment_creation(user: User, pkgbase: PackageBase):
     with db.begin():
         package_comment = db.create(PackageComment, PackageBase=pkgbase,
                                     User=user, Comments="Test comment.",
@@ -30,26 +38,28 @@ def test_package_comment_creation():
     assert bool(package_comment.ID)
 
 
-def test_package_comment_null_package_base_raises_exception():
+def test_package_comment_null_pkgbase_raises(user: User):
     with pytest.raises(IntegrityError):
         PackageComment(User=user, Comments="Test comment.",
                        RenderedComment="Test rendered comment.")
 
 
-def test_package_comment_null_user_raises_exception():
+def test_package_comment_null_user_raises(pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageComment(PackageBase=pkgbase,
                        Comments="Test comment.",
                        RenderedComment="Test rendered comment.")
 
 
-def test_package_comment_null_comments_raises_exception():
+def test_package_comment_null_comments_raises(user: User,
+                                              pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageComment(PackageBase=pkgbase, User=user,
                        RenderedComment="Test rendered comment.")
 
 
-def test_package_comment_null_renderedcomment_defaults():
+def test_package_comment_null_renderedcomment_defaults(user: User,
+                                                       pkgbase: PackageBase):
     with db.begin():
         record = db.create(PackageComment, PackageBase=pkgbase,
                            User=user, Comments="Test comment.")

From 012dd24fd85d24369556d4a3eb7e0675fa0c5856 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 01:53:02 -0800
Subject: [PATCH 664/844] housekeep(fastapi): rewrite test_tu_vote with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_tu_vote.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/test/test_tu_vote.py b/test/test_tu_vote.py
index 1dd33387..9bb344b1 100644
--- a/test/test_tu_vote.py
+++ b/test/test_tu_vote.py
@@ -10,28 +10,33 @@ from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
 
-user = tu_voteinfo = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, tu_voteinfo
+    return
 
-    ts = int(datetime.utcnow().timestamp())
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=TRUSTED_USER_ID)
+    yield user
 
-        tu_voteinfo = db.create(TUVoteInfo,
-                                Agenda="Blah blah.",
+
+@pytest.fixture
+def tu_voteinfo(user: User) -> TUVoteInfo:
+    ts = int(datetime.utcnow().timestamp())
+    with db.begin():
+        tu_voteinfo = db.create(TUVoteInfo, Agenda="Blah blah.",
                                 User=user.Username,
                                 Submitted=ts, End=ts + 5,
-                                Quorum=0.5,
-                                Submitter=user)
+                                Quorum=0.5, Submitter=user)
+    yield tu_voteinfo
 
 
-def test_tu_vote_creation():
+def test_tu_vote_creation(user: User, tu_voteinfo: TUVoteInfo):
     with db.begin():
         tu_vote = db.create(TUVote, User=user, VoteInfo=tu_voteinfo)
 
@@ -41,11 +46,11 @@ def test_tu_vote_creation():
     assert tu_vote in tu_voteinfo.tu_votes
 
 
-def test_tu_vote_null_user_raises_exception():
+def test_tu_vote_null_user_raises_exception(tu_voteinfo: TUVoteInfo):
     with pytest.raises(IntegrityError):
         TUVote(VoteInfo=tu_voteinfo)
 
 
-def test_tu_vote_null_voteinfo_raises_exception():
+def test_tu_vote_null_voteinfo_raises_exception(user: User):
     with pytest.raises(IntegrityError):
         TUVote(User=user)

From adafa6ebc14769b8ab3d8564b3c59d6ae441b81a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 01:56:49 -0800
Subject: [PATCH 665/844] housekeep(fastapi): rewrite test_package_request with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_request.py | 37 ++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/test/test_package_request.py b/test/test_package_request.py
index 4b5dfb2b..1ba48e09 100644
--- a/test/test_package_request.py
+++ b/test/test_package_request.py
@@ -12,21 +12,29 @@ from aurweb.models.package_request import (ACCEPTED, ACCEPTED_ID, CLOSED, CLOSED
 from aurweb.models.request_type import MERGE_ID
 from aurweb.models.user import User
 
-user = pkgbase = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    with db.begin():
         pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+    yield pkgbase
 
 
-def test_package_request_creation():
+def test_package_request_creation(user: User, pkgbase: PackageBase):
     with db.begin():
         package_request = db.create(PackageRequest, ReqTypeID=MERGE_ID,
                                     User=user, PackageBase=pkgbase,
@@ -45,7 +53,7 @@ def test_package_request_creation():
     assert package_request in pkgbase.requests
 
 
-def test_package_request_closed():
+def test_package_request_closed(user: User, pkgbase: PackageBase):
     ts = int(datetime.utcnow().timestamp())
     with db.begin():
         package_request = db.create(PackageRequest, ReqTypeID=MERGE_ID,
@@ -61,49 +69,54 @@ def test_package_request_closed():
     assert package_request in user.closed_requests
 
 
-def test_package_request_null_request_type_raises_exception():
+def test_package_request_null_request_type_raises(user: User,
+                                                  pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageRequest(User=user, PackageBase=pkgbase,
                        PackageBaseName=pkgbase.Name,
                        Comments=str(), ClosureComment=str())
 
 
-def test_package_request_null_user_raises_exception():
+def test_package_request_null_user_raises(pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageRequest(ReqTypeID=MERGE_ID,
                        PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
                        Comments=str(), ClosureComment=str())
 
 
-def test_package_request_null_package_base_raises_exception():
+def test_package_request_null_package_base_raises(user: User,
+                                                  pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageRequest(ReqTypeID=MERGE_ID,
                        User=user, PackageBaseName=pkgbase.Name,
                        Comments=str(), ClosureComment=str())
 
 
-def test_package_request_null_package_base_name_raises_exception():
+def test_package_request_null_package_base_name_raises(user: User,
+                                                       pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageRequest(ReqTypeID=MERGE_ID,
                        User=user, PackageBase=pkgbase,
                        Comments=str(), ClosureComment=str())
 
 
-def test_package_request_null_comments_raises_exception():
+def test_package_request_null_comments_raises(user: User,
+                                              pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageRequest(ReqTypeID=MERGE_ID, User=user,
                        PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
                        ClosureComment=str())
 
 
-def test_package_request_null_closure_comment_raises_exception():
+def test_package_request_null_closure_comment_raises(user: User,
+                                                     pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageRequest(ReqTypeID=MERGE_ID, User=user,
                        PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
                        Comments=str())
 
 
-def test_package_request_status_display():
+def test_package_request_status_display(user: User, pkgbase: PackageBase):
     """ Test status_display() based on the Status column value. """
     with db.begin():
         pkgreq = db.create(PackageRequest, ReqTypeID=MERGE_ID,

From 735c5f57cb467174f966c5030c6f13cb5481756b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 16:25:04 -0800
Subject: [PATCH 666/844] housekeep(fastapi): rewrite test_package_blacklist

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_blacklist.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/test/test_package_blacklist.py b/test/test_package_blacklist.py
index 6f4c36d7..427c3be4 100644
--- a/test/test_package_blacklist.py
+++ b/test/test_package_blacklist.py
@@ -3,21 +3,12 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.models.package_base import PackageBase
 from aurweb.models.package_blacklist import PackageBlacklist
-from aurweb.models.user import User
-
-user = pkgbase = None
 
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase
-
-    with db.begin():
-        user = db.create(User, Username="test", Email="test@example.org",
-                         RealName="Test User", Passwd="testPassword")
-        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+    return
 
 
 def test_package_blacklist_creation():

From d6cb3b9fac73d531b399ddcb86710df765260bc5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 16:30:33 -0800
Subject: [PATCH 667/844] housekeep(fastapi): rewrite test_auth with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_auth.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/test/test_auth.py b/test/test_auth.py
index 0dc26f86..b63fb96f 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -11,35 +11,40 @@ from aurweb.models.session import Session
 from aurweb.models.user import User
 from aurweb.testing.requests import Request
 
-user = backend = request = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, backend, request
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.com",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
+    yield user
 
-    backend = BasicAuthBackend()
-    request = Request()
+
+@pytest.fixture
+def backend() -> BasicAuthBackend:
+    yield BasicAuthBackend()
 
 
 @pytest.mark.asyncio
-async def test_auth_backend_missing_sid():
+async def test_auth_backend_missing_sid(backend: BasicAuthBackend):
     # The request has no AURSID cookie, so authentication fails, and
     # AnonymousUser is returned.
-    _, result = await backend.authenticate(request)
+    _, result = await backend.authenticate(Request())
     assert not result.is_authenticated()
 
 
 @pytest.mark.asyncio
-async def test_auth_backend_invalid_sid():
+async def test_auth_backend_invalid_sid(backend: BasicAuthBackend):
     # Provide a fake AURSID that won't be found in the database.
     # This results in our path going down the invalid sid route,
     # which gives us an AnonymousUser.
+    request = Request()
     request.cookies["AURSID"] = "fake"
     _, result = await backend.authenticate(request)
     assert not result.is_authenticated()
@@ -55,13 +60,15 @@ async def test_auth_backend_invalid_user_id():
 
 
 @pytest.mark.asyncio
-async def test_basic_auth_backend():
+async def test_basic_auth_backend(user: User, backend: BasicAuthBackend):
     # This time, everything matches up. We expect the user to
     # equal the real_user.
     now_ts = datetime.utcnow().timestamp()
     with db.begin():
         db.create(Session, UsersID=user.ID, SessionID="realSession",
                   LastUpdateTS=now_ts + 5)
+
+    request = Request()
     request.cookies["AURSID"] = "realSession"
     _, result = await backend.authenticate(request)
     assert result == user

From 91f65911414423fc9dae8cf509beb57e3fadabea Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 16:35:52 -0800
Subject: [PATCH 668/844] housekeep(fastapi): rewrite test_accepted_term with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_accepted_term.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/test/test_accepted_term.py b/test/test_accepted_term.py
index de18c61a..2af7127b 100644
--- a/test/test_accepted_term.py
+++ b/test/test_accepted_term.py
@@ -8,39 +8,48 @@ from aurweb.models.account_type import USER_ID
 from aurweb.models.term import Term
 from aurweb.models.user import User
 
-user = term = accepted_term = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, term
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
+    yield user
 
+
+@pytest.fixture
+def term() -> Term:
+    with db.begin():
         term = db.create(Term, Description="Test term",
                          URL="https://test.term")
-
     yield term
 
 
-def test_accepted_term():
+@pytest.fixture
+def accepted_term(user: User, term: Term) -> AcceptedTerm:
     with db.begin():
         accepted_term = db.create(AcceptedTerm, User=user, Term=term)
+    yield accepted_term
 
+
+def test_accepted_term(user: User, term: Term, accepted_term: AcceptedTerm):
     # Make sure our AcceptedTerm relationships got initialized properly.
     assert accepted_term.User == user
     assert accepted_term in user.accepted_terms
     assert accepted_term in term.accepted_terms
 
 
-def test_accepted_term_null_user_raises_exception():
+def test_accepted_term_null_user_raises_exception(term: Term):
     with pytest.raises(IntegrityError):
         AcceptedTerm(Term=term)
 
 
-def test_accepted_term_null_term_raises_exception():
+def test_accepted_term_null_term_raises_exception(user: User):
     with pytest.raises(IntegrityError):
         AcceptedTerm(User=user)

From b20ec9925a5f92c020b8705bc733cdc4831ca5e4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 17:11:10 -0800
Subject: [PATCH 669/844] housekeep(fastapi): rewrite test_ssh_pub_key with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_ssh_pub_key.py | 48 ++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/test/test_ssh_pub_key.py b/test/test_ssh_pub_key.py
index e17af5a7..68b6e7a0 100644
--- a/test/test_ssh_pub_key.py
+++ b/test/test_ssh_pub_key.py
@@ -16,47 +16,53 @@ lfv98Kr0NUp51zpf55Arxn9j0Rz9xTA7FiODQgCn6iQ0SDtzUNL0IKTCw26xJY5gzMxbfpvzPQGeul\
 x/ioM= kevr@volcano
 """
 
-user = ssh_pub_key = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, ssh_pub_key
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
+    yield user
 
+
+@pytest.fixture
+def pubkey(user: User) -> SSHPubKey:
     with db.begin():
-        ssh_pub_key = db.create(SSHPubKey, UserID=user.ID,
-                                Fingerprint="testFingerprint",
-                                PubKey="testPubKey")
+        pubkey = db.create(SSHPubKey, User=user,
+                           Fingerprint="testFingerprint",
+                           PubKey="testPubKey")
+    yield pubkey
 
 
-def test_ssh_pub_key():
-    assert ssh_pub_key.UserID == user.ID
-    assert ssh_pub_key.User == user
-    assert ssh_pub_key.Fingerprint == "testFingerprint"
-    assert ssh_pub_key.PubKey == "testPubKey"
+def test_pubkey(user: User, pubkey: SSHPubKey):
+    assert pubkey.UserID == user.ID
+    assert pubkey.User == user
+    assert pubkey.Fingerprint == "testFingerprint"
+    assert pubkey.PubKey == "testPubKey"
 
 
-def test_ssh_pub_key_cs():
+def test_pubkey_cs(user: User):
     """ Test case sensitivity of the database table. """
     with db.begin():
-        ssh_pub_key_cs = db.create(SSHPubKey, UserID=user.ID,
-                                   Fingerprint="TESTFINGERPRINT",
-                                   PubKey="TESTPUBKEY")
+        pubkey_cs = db.create(SSHPubKey, User=user,
+                              Fingerprint="TESTFINGERPRINT",
+                              PubKey="TESTPUBKEY")
 
-    assert ssh_pub_key_cs.Fingerprint == "TESTFINGERPRINT"
-    assert ssh_pub_key_cs.PubKey == "TESTPUBKEY"
-    assert ssh_pub_key.Fingerprint == "testFingerprint"
-    assert ssh_pub_key.PubKey == "testPubKey"
+    assert pubkey_cs.Fingerprint == "TESTFINGERPRINT"
+    assert pubkey_cs.Fingerprint != "testFingerprint"
+    assert pubkey_cs.PubKey == "TESTPUBKEY"
+    assert pubkey_cs.PubKey != "testPubKey"
 
 
-def test_ssh_pub_key_fingerprint():
+def test_pubkey_fingerprint():
     assert get_fingerprint(TEST_SSH_PUBKEY) is not None
 
 
-def test_ssh_pub_key_invalid_fingerprint():
+def test_pubkey_invalid_fingerprint():
     assert get_fingerprint("ssh-rsa fake and invalid") is None

From a082de5244f55aa4098608e2e6b3341463669c01 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 17:21:42 -0800
Subject: [PATCH 670/844] housekeep(fastapi): rewrite test_package_keyword with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_keyword.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/test/test_package_keyword.py b/test/test_package_keyword.py
index 88ccb734..ff466efc 100644
--- a/test/test_package_keyword.py
+++ b/test/test_package_keyword.py
@@ -8,26 +8,32 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.package_keyword import PackageKeyword
 from aurweb.models.user import User
 
-user = pkgbase = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
-        pkgbase = db.create(PackageBase,
-                            Name="beautiful-package",
-                            Maintainer=user)
+    yield user
 
 
-def test_package_keyword():
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
     with db.begin():
-        pkg_keyword = db.create(PackageKeyword,
-                                PackageBase=pkgbase,
+        pkgbase = db.create(PackageBase, Name="beautiful-package",
+                            Maintainer=user)
+    yield pkgbase
+
+
+def test_package_keyword(pkgbase: PackageBase):
+    with db.begin():
+        pkg_keyword = db.create(PackageKeyword, PackageBase=pkgbase,
                                 Keyword="test")
     assert pkg_keyword in pkgbase.keywords
     assert pkgbase == pkg_keyword.PackageBase

From 655b98d19e5e82817146f3f8a00215d10fd0da0a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 17:29:03 -0800
Subject: [PATCH 671/844] housekeep(fastapi): rewrite test_package_license with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_license.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/test/test_package_license.py b/test/test_package_license.py
index 965d0c6f..c43423b8 100644
--- a/test/test_package_license.py
+++ b/test/test_package_license.py
@@ -10,25 +10,37 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.package_license import PackageLicense
 from aurweb.models.user import User
 
-user = license = pkgbase = package = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, license, pkgbase, package
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
-        license = db.create(License, Name="Test License")
+    yield user
 
+
+@pytest.fixture
+def license() -> License:
+    with db.begin():
+        license = db.create(License, Name="Test License")
+    yield license
+
+
+@pytest.fixture
+def package(user: User, license: License):
     with db.begin():
         pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
         package = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    yield package
 
 
-def test_package_license():
+def test_package_license(license: License, package: Package):
     with db.begin():
         package_license = db.create(PackageLicense, Package=package,
                                     License=license)
@@ -36,11 +48,11 @@ def test_package_license():
     assert package_license.Package == package
 
 
-def test_package_license_null_package_raises_exception():
+def test_package_license_null_package_raises(license: License):
     with pytest.raises(IntegrityError):
         PackageLicense(License=license)
 
 
-def test_package_license_null_license_raises_exception():
+def test_package_license_null_license_raises(package: Package):
     with pytest.raises(IntegrityError):
         PackageLicense(Package=package)

From ff3931e43506a466d01dde48fa647c4d13740ce3 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 18:10:40 -0800
Subject: [PATCH 672/844] housekeep(fastapi): rewrite test_package_notification
 with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_notification.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/test/test_package_notification.py b/test/test_package_notification.py
index 2e505dd8..e7a72a43 100644
--- a/test/test_package_notification.py
+++ b/test/test_package_notification.py
@@ -7,20 +7,28 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.user import User
 
-user = pkgbase = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword")
+    yield user
+
+
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    with db.begin():
         pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+    yield pkgbase
 
 
-def test_package_notification_creation():
+def test_package_notification_creation(user: User, pkgbase: PackageBase):
     with db.begin():
         package_notification = db.create(
             PackageNotification, User=user, PackageBase=pkgbase)
@@ -29,11 +37,11 @@ def test_package_notification_creation():
     assert package_notification.PackageBase == pkgbase
 
 
-def test_package_notification_null_user_raises_exception():
+def test_package_notification_null_user_raises(pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageNotification(PackageBase=pkgbase)
 
 
-def test_package_notification_null_pkgbase_raises_exception():
+def test_package_notification_null_pkgbase_raises(user: User):
     with pytest.raises(IntegrityError):
         PackageNotification(User=user)

From 14d80d756fe73039d7e5b7836ad1c343668a7e9f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 18:18:48 -0800
Subject: [PATCH 673/844] housekeep(fastapi): rewrite test_package_comaintainer
 with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_comaintainer.py | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/test/test_package_comaintainer.py b/test/test_package_comaintainer.py
index ff74cddf..e377edc0 100644
--- a/test/test_package_comaintainer.py
+++ b/test/test_package_comaintainer.py
@@ -3,24 +3,34 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.user import User
 
-user = pkgbase = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
-                         RealName="Test User", Passwd="testPassword")
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    with db.begin():
         pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+    yield pkgbase
 
 
-def test_package_comaintainer_creation():
+def test_package_comaintainer_creation(user: User, pkgbase: PackageBase):
     with db.begin():
         package_comaintainer = db.create(PackageComaintainer, User=user,
                                          PackageBase=pkgbase, Priority=5)
@@ -30,16 +40,17 @@ def test_package_comaintainer_creation():
     assert package_comaintainer.Priority == 5
 
 
-def test_package_comaintainer_null_user_raises_exception():
+def test_package_comaintainer_null_user_raises(pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageComaintainer(PackageBase=pkgbase, Priority=1)
 
 
-def test_package_comaintainer_null_pkgbase_raises_exception():
+def test_package_comaintainer_null_pkgbase_raises(user: User):
     with pytest.raises(IntegrityError):
         PackageComaintainer(User=user, Priority=1)
 
 
-def test_package_comaintainer_null_priority_raises_exception():
+def test_package_comaintainer_null_priority_raises(user: User,
+                                                   pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageComaintainer(User=user, PackageBase=pkgbase)

From 31a093ba063168825595fe82d3c42d34d9d67a15 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 18:51:50 -0800
Subject: [PATCH 674/844] housekeep(fastapi): rewrite test_package_relation
 with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_relation.py | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/test/test_package_relation.py b/test/test_package_relation.py
index e5f7f453..6e9a5545 100644
--- a/test/test_package_relation.py
+++ b/test/test_package_relation.py
@@ -10,28 +10,32 @@ from aurweb.models.package_relation import PackageRelation
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
 from aurweb.models.user import User
 
-user = pkgbase = package = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase, package
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
-        pkgbase = db.create(PackageBase,
-                            Name="test-package",
-                            Maintainer=user)
-        package = db.create(Package,
-                            PackageBase=pkgbase,
-                            Name=pkgbase.Name,
+    yield user
+
+
+@pytest.fixture
+def package(user: User) -> Package:
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+        package = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name,
                             Description="Test description.",
                             URL="https://test.package")
+    yield package
 
 
-def test_package_relation():
+def test_package_relation(package: Package):
     with db.begin():
         pkgrel = db.create(PackageRelation, Package=package,
                            RelTypeID=CONFLICTS_ID,
@@ -48,16 +52,16 @@ def test_package_relation():
         pkgrel.RelTypeID = REPLACES_ID
 
 
-def test_package_relation_null_package_raises_exception():
+def test_package_relation_null_package_raises():
     with pytest.raises(IntegrityError):
         PackageRelation(RelTypeID=CONFLICTS_ID, RelName="test-relation")
 
 
-def test_package_relation_null_relation_type_raises_exception():
+def test_package_relation_null_relation_type_raises(package: Package):
     with pytest.raises(IntegrityError):
         PackageRelation(Package=package, RelName="test-relation")
 
 
-def test_package_relation_null_relname_raises_exception():
+def test_package_relation_null_relname_raises(package: Package):
     with pytest.raises(IntegrityError):
         PackageRelation(Package=package, RelTypeID=CONFLICTS_ID)

From a0e1a1641d08d533b1919ffb60298476f21de237 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:12:06 -0800
Subject: [PATCH 675/844] fix(fastapi): support UsersID and User columns in the
 Session model

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/session.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/aurweb/models/session.py b/aurweb/models/session.py
index 7a06eddc..37ab4bce 100644
--- a/aurweb/models/session.py
+++ b/aurweb/models/session.py
@@ -18,10 +18,16 @@ class Session(Base):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        user_exists = db.query(
-            db.query(_User).filter(_User.ID == self.UsersID).exists()
-        ).scalar()
-        if not user_exists:
+        # We'll try to either use UsersID or User.ID if we can.
+        # If neither exist, an AttributeError is raised, in which case
+        # we set the uid to 0, which triggers IntegrityError below.
+        try:
+            uid = self.UsersID or self.User.ID
+        except AttributeError:
+            uid = 0
+
+        user_exists = db.query(_User).filter(_User.ID == uid).exists()
+        if not db.query(user_exists).scalar():
             raise IntegrityError(
                 statement=("Foreign key UsersID cannot be null and "
                            "must be a valid user's ID."),

From ca25595022e4a5c525ecce9de0c009bf19c6fd2c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:12:31 -0800
Subject: [PATCH 676/844] housekeep(fastapi): rewrite test_sesion with fixtures

Also, added a new test function which tests the IntegrityError
exception.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_session.py | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/test/test_session.py b/test/test_session.py
index 7d3037a1..67b1ada0 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -4,31 +4,37 @@ from unittest import mock
 
 import pytest
 
+from sqlalchemy.exc import IntegrityError
+
 from aurweb import db
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.session import Session, generate_unique_sid
 from aurweb.models.user import User
 
-account_type = user = session = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global account_type, user, session
+    return
 
-    account_type = db.query(AccountType,
-                            AccountType.AccountType == "User").first()
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          ResetKey="testReset", Passwd="testPassword",
-                         AccountType=account_type)
+                         AccountTypeID=USER_ID)
+    yield user
 
+
+@pytest.fixture
+def session(user: User) -> Session:
     with db.begin():
-        session = db.create(Session, UsersID=user.ID, SessionID="testSession",
+        session = db.create(Session, User=user, SessionID="testSession",
                             LastUpdateTS=datetime.utcnow().timestamp())
+    yield session
 
 
-def test_session():
+def test_session(user: User, session: Session):
     assert session.SessionID == "testSession"
     assert session.UsersID == user.ID
 
@@ -38,22 +44,27 @@ def test_session_cs():
     with db.begin():
         user2 = db.create(User, Username="test2", Email="test2@example.org",
                           ResetKey="testReset2", Passwd="testPassword",
-                          AccountType=account_type)
+                          AccountTypeID=USER_ID)
 
     with db.begin():
-        session_cs = db.create(Session, UsersID=user2.ID,
-                               SessionID="TESTSESSION",
+        session_cs = db.create(Session, User=user2, SessionID="TESTSESSION",
                                LastUpdateTS=datetime.utcnow().timestamp())
+
     assert session_cs.SessionID == "TESTSESSION"
-    assert session.SessionID == "testSession"
+    assert session_cs.SessionID != "testSession"
 
 
-def test_session_user_association():
+def test_session_user_association(user: User, session: Session):
     # Make sure that the Session user attribute is correct.
     assert session.User == user
 
 
-def test_generate_unique_sid():
+def test_session_null_user_raises():
+    with pytest.raises(IntegrityError):
+        Session()
+
+
+def test_generate_unique_sid(session: Session):
     # Mock up aurweb.models.session.generate_sid by returning
     # sids[i % 2] from 0 .. n. This will swap between each sid
     # between each call.

From ae728179506bdd39ac0c929f36324626cea53a91 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:17:14 -0800
Subject: [PATCH 677/844] housekeep(fastapi): rewrite test_routes with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_routes.py | 46 +++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/test/test_routes.py b/test/test_routes.py
index 32f507f3..85d30c02 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -14,30 +14,34 @@ from aurweb.models.account_type import USER_ID
 from aurweb.models.user import User
 from aurweb.testing.requests import Request
 
-user = client = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, client
+    return
 
+
+@pytest.fixture
+def client() -> TestClient:
+    yield TestClient(app=app)
+
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
-
-    client = TestClient(app)
+    yield user
 
 
-def test_index():
+def test_index(client: TestClient):
     """ Test the index route at '/'. """
-    # Use `with` to trigger FastAPI app events.
     with client as req:
         response = req.get("/")
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_index_security_headers():
+def test_index_security_headers(client: TestClient):
     """ Check for the existence of CSP, XCTO, XFO and RP security headers.
 
     CSP: Content-Security-Policy
@@ -55,15 +59,16 @@ def test_index_security_headers():
     assert response.headers.get("X-Frame-Options") == "SAMEORIGIN"
 
 
-def test_favicon():
+def test_favicon(client: TestClient):
     """ Test the favicon route at '/favicon.ico'. """
-    response1 = client.get("/static/images/favicon.ico")
-    response2 = client.get("/favicon.ico")
+    with client as request:
+        response1 = request.get("/static/images/favicon.ico")
+        response2 = request.get("/favicon.ico")
     assert response1.status_code == int(HTTPStatus.OK)
     assert response1.content == response2.content
 
 
-def test_language():
+def test_language(client: TestClient):
     """ Test the language post route as a guest user. """
     post_data = {
         "set_lang": "de",
@@ -74,7 +79,7 @@ def test_language():
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
 
-def test_language_invalid_next():
+def test_language_invalid_next(client: TestClient):
     """ Test an invalid next route at '/language'. """
     post_data = {
         "set_lang": "de",
@@ -85,7 +90,7 @@ def test_language_invalid_next():
     assert response.status_code == int(HTTPStatus.BAD_REQUEST)
 
 
-def test_user_language():
+def test_user_language(client: TestClient, user: User):
     """ Test the language post route as an authenticated user. """
     post_data = {
         "set_lang": "de",
@@ -102,7 +107,7 @@ def test_user_language():
     assert user.LangPreference == "de"
 
 
-def test_language_query_params():
+def test_language_query_params(client: TestClient):
     """ Test the language post route with query params. """
     next = urllib.parse.quote_plus("/")
     post_data = {
@@ -117,14 +122,15 @@ def test_language_query_params():
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
 
-def test_error_messages():
-    response1 = client.get("/thisroutedoesnotexist")
-    response2 = client.get("/raisefivethree")
+def test_error_messages(client: TestClient):
+    with client as request:
+        response1 = request.get("/thisroutedoesnotexist")
+        response2 = request.get("/raisefivethree")
     assert response1.status_code == int(HTTPStatus.NOT_FOUND)
     assert response2.status_code == int(HTTPStatus.SERVICE_UNAVAILABLE)
 
 
-def test_nonce_csp():
+def test_nonce_csp(client: TestClient):
     with client as request:
         response = request.get("/")
     data = response.headers.get("Content-Security-Policy")
@@ -146,7 +152,7 @@ def test_nonce_csp():
     assert nonce_verified is True
 
 
-def test_id_redirect():
+def test_id_redirect(client: TestClient):
     with client as request:
         response = request.get("/", params={
             "id": "test",  # This param will be rewritten into Location.

From 93bc91cce252ab789493aa5d0bc0c796f5133ae2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:25:10 -0800
Subject: [PATCH 678/844] housekeep(fastapi): rewrite test_tu_voteinfo with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_tu_voteinfo.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index 5926fbf9..26fa9522 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -5,27 +5,27 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.db import create, query, rollback
-from aurweb.models.account_type import AccountType
+from aurweb.db import create, rollback
+from aurweb.models.account_type import TRUSTED_USER_ID
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
 
-user = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user
+    return
 
-    tu_type = query(AccountType,
-                    AccountType.AccountType == "Trusted User").first()
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = create(User, Username="test", Email="test@example.org",
                       RealName="Test User", Passwd="testPassword",
-                      AccountType=tu_type)
+                      AccountTypeID=TRUSTED_USER_ID)
+    yield user
 
 
-def test_tu_voteinfo_creation():
+def test_tu_voteinfo_creation(user: User):
     ts = int(datetime.utcnow().timestamp())
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
@@ -49,7 +49,7 @@ def test_tu_voteinfo_creation():
     assert tu_voteinfo in user.tu_voteinfo_set
 
 
-def test_tu_voteinfo_is_running():
+def test_tu_voteinfo_is_running(user: User):
     ts = int(datetime.utcnow().timestamp())
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
@@ -65,7 +65,7 @@ def test_tu_voteinfo_is_running():
     assert tu_voteinfo.is_running() is False
 
 
-def test_tu_voteinfo_total_votes():
+def test_tu_voteinfo_total_votes(user: User):
     ts = int(datetime.utcnow().timestamp())
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
@@ -83,7 +83,7 @@ def test_tu_voteinfo_total_votes():
     assert tu_voteinfo.total_votes() == 9
 
 
-def test_tu_voteinfo_null_submitter_raises_exception():
+def test_tu_voteinfo_null_submitter_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -94,7 +94,7 @@ def test_tu_voteinfo_null_submitter_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_agenda_raises_exception():
+def test_tu_voteinfo_null_agenda_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -105,7 +105,7 @@ def test_tu_voteinfo_null_agenda_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_user_raises_exception():
+def test_tu_voteinfo_null_user_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -116,7 +116,7 @@ def test_tu_voteinfo_null_user_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_submitted_raises_exception():
+def test_tu_voteinfo_null_submitted_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -128,7 +128,7 @@ def test_tu_voteinfo_null_submitted_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_end_raises_exception():
+def test_tu_voteinfo_null_end_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -140,7 +140,7 @@ def test_tu_voteinfo_null_end_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_quorum_raises_exception():
+def test_tu_voteinfo_null_quorum_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,

From 171b347dadddf92f90e16f98fab388112174053a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:38:49 -0800
Subject: [PATCH 679/844] housekeep(fastapi): rewrite test_package_base with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_base.py | 57 +++++++++++++++------------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

diff --git a/test/test_package_base.py b/test/test_package_base.py
index 8e4b2edf..5be7e40b 100644
--- a/test/test_package_base.py
+++ b/test/test_package_base.py
@@ -2,35 +2,36 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-import aurweb.config
-
 from aurweb import db
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
 
-user = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user
+    return
 
-    account_type = db.query(AccountType,
-                            AccountType.AccountType == "User").first()
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
-                         AccountType=account_type)
+                         AccountTypeID=USER_ID)
+    yield user
 
 
-def test_package_base():
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
     with db.begin():
-        pkgbase = db.create(PackageBase,
-                            Name="beautiful-package",
+        pkgbase = db.create(PackageBase, Name="beautiful-package",
                             Maintainer=user)
-    assert pkgbase in user.maintained_bases
+    yield pkgbase
 
+
+def test_package_base(user: User, pkgbase: PackageBase):
+    assert pkgbase in user.maintained_bases
     assert not pkgbase.OutOfDateTS
     assert pkgbase.SubmittedTS > 0
     assert pkgbase.ModifiedTS > 0
@@ -42,33 +43,19 @@ def test_package_base():
     assert pkgbase.Popularity == 0.0
 
 
-def test_package_base_ci():
+def test_package_base_ci(user: User, pkgbase: PackageBase):
     """ Test case insensitivity of the database table. """
-    if aurweb.config.get("database", "backend") == "sqlite":
-        return None  # SQLite doesn't seem handle this.
-
-    with db.begin():
-        pkgbase = db.create(PackageBase,
-                            Name="beautiful-package",
-                            Maintainer=user)
-    assert bool(pkgbase.ID)
-
     with pytest.raises(IntegrityError):
         with db.begin():
-            db.create(PackageBase,
-                      Name="Beautiful-Package",
-                      Maintainer=user)
+            db.create(PackageBase, Name=pkgbase.Name.upper(), Maintainer=user)
     db.rollback()
 
 
-def test_package_base_relationships():
+def test_package_base_relationships(user: User, pkgbase: PackageBase):
     with db.begin():
-        pkgbase = db.create(PackageBase,
-                            Name="beautiful-package",
-                            Flagger=user,
-                            Maintainer=user,
-                            Submitter=user,
-                            Packager=user)
+        pkgbase.Flagger = user
+        pkgbase.Submitter = user
+        pkgbase.Packager = user
     assert pkgbase in user.flagged_bases
     assert pkgbase in user.maintained_bases
     assert pkgbase in user.submitted_bases
@@ -77,6 +64,4 @@ def test_package_base_relationships():
 
 def test_package_base_null_name_raises_exception():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(PackageBase)
-    db.rollback()
+        PackageBase()

From df530d8a7358f71c6579e6bfd0fea1143dfc89b7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:42:50 -0800
Subject: [PATCH 680/844] housekeep(fastapi): rewrite test_package_source with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_source.py | 51 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/test/test_package_source.py b/test/test_package_source.py
index b83c9d48..e5797f90 100644
--- a/test/test_package_source.py
+++ b/test/test_package_source.py
@@ -2,46 +2,45 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb.db import begin, create, query, rollback
-from aurweb.models.account_type import AccountType
+from aurweb import db
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_source import PackageSource
 from aurweb.models.user import User
-from aurweb.testing import setup_test_db
-
-user = pkgbase = package = None
 
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase, package
-
-    setup_test_db("PackageSources", "Packages", "PackageBases", "Users")
-
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
-    with begin():
-        user = create(User, Username="test", Email="test@example.org",
-                      RealName="Test User", Passwd="testPassword",
-                      AccountType=account_type)
-        pkgbase = create(PackageBase,
-                         Name="test-package",
-                         Maintainer=user)
-        package = create(Package, PackageBase=pkgbase, Name="test-package")
+    return
 
 
-def test_package_source():
-    with begin():
-        pkgsource = create(PackageSource, Package=package)
+@pytest.fixture
+def user() -> User:
+    with db.begin():
+        user = db.create(User, Username="test", Email="test@example.org",
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def package(user: User) -> Package:
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+        package = db.create(Package, PackageBase=pkgbase, Name="test-package")
+    yield package
+
+
+def test_package_source(package: Package):
+    with db.begin():
+        pkgsource = db.create(PackageSource, Package=package)
     assert pkgsource.Package == package
     # By default, PackageSources.Source assigns the string '/dev/null'.
     assert pkgsource.Source == "/dev/null"
     assert pkgsource.SourceArch is None
 
 
-def test_package_source_null_package_raises_exception():
+def test_package_source_null_package_raises():
     with pytest.raises(IntegrityError):
-        with begin():
-            create(PackageSource)
-    rollback()
+        PackageSource()

From 150c944758bb67f97625c566cd635500d27ef7ef Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:45:08 -0800
Subject: [PATCH 681/844] housekeep(fastapi): rewrite test_package_group with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_group.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/test/test_package_group.py b/test/test_package_group.py
index 2c91e0b1..0cb83ee2 100644
--- a/test/test_package_group.py
+++ b/test/test_package_group.py
@@ -10,36 +10,48 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.package_group import PackageGroup
 from aurweb.models.user import User
 
-user = group = pkgbase = package = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, group, pkgbase, package
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
                          AccountTypeID=USER_ID)
-        group = db.create(Group, Name="Test Group")
+    yield user
 
+
+@pytest.fixture
+def group() -> Group:
+    with db.begin():
+        group = db.create(Group, Name="Test Group")
+    yield group
+
+
+@pytest.fixture
+def package(user: User) -> Package:
     with db.begin():
         pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
         package = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    yield package
 
 
-def test_package_group():
+def test_package_group(package: Package, group: Group):
     with db.begin():
         package_group = db.create(PackageGroup, Package=package, Group=group)
     assert package_group.Group == group
     assert package_group.Package == package
 
 
-def test_package_group_null_package_raises_exception():
+def test_package_group_null_package_raises(group: Group):
     with pytest.raises(IntegrityError):
         PackageGroup(Group=group)
 
 
-def test_package_group_null_group_raises_exception():
+def test_package_group_null_group_raises(package: Package):
     with pytest.raises(IntegrityError):
         PackageGroup(Package=package)

From 05bd6e9076d03006358c6862bfb2d95d78eb93b9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:48:01 -0800
Subject: [PATCH 682/844] housekeep(fastapi): rewrite test_package_vote with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_vote.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/test/test_package_vote.py b/test/test_package_vote.py
index d1ec203b..08edb92d 100644
--- a/test/test_package_vote.py
+++ b/test/test_package_vote.py
@@ -5,24 +5,34 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.user import User
 
-user = pkgbase = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
-                         RealName="Test User", Passwd="testPassword")
+                         RealName="Test User", Passwd=str(),
+                         AccountTypeID=USER_ID)
+    yield user
+
+
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    with db.begin():
         pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+    yield pkgbase
 
 
-def test_package_vote_creation():
+def test_package_vote_creation(user: User, pkgbase: PackageBase):
     ts = int(datetime.utcnow().timestamp())
 
     with db.begin():
@@ -34,16 +44,16 @@ def test_package_vote_creation():
     assert package_vote.VoteTS == ts
 
 
-def test_package_vote_null_user_raises_exception():
+def test_package_vote_null_user_raises(pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageVote(PackageBase=pkgbase, VoteTS=1)
 
 
-def test_package_vote_null_pkgbase_raises_exception():
+def test_package_vote_null_pkgbase_raises(user: User):
     with pytest.raises(IntegrityError):
         PackageVote(User=user, VoteTS=1)
 
 
-def test_package_vote_null_votets_raises_exception():
+def test_package_vote_null_votets_raises(user: User, pkgbase: PackageBase):
     with pytest.raises(IntegrityError):
         PackageVote(User=user, PackageBase=pkgbase)

From 140f9b1fb225e00163662290de426e8c2a064264 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:50:17 -0800
Subject: [PATCH 683/844] housekeep(fastapi): rewrite test_package_dependency
 with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package_dependency.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/test/test_package_dependency.py b/test/test_package_dependency.py
index e6125669..7297abe4 100644
--- a/test/test_package_dependency.py
+++ b/test/test_package_dependency.py
@@ -10,28 +10,32 @@ from aurweb.models.package_base import PackageBase
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.user import User
 
-user = pkgbase = package = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase, package
+    return
 
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
-                         RealName="Test User", Passwd="testPassword",
+                         RealName="Test User", Passwd=str(),
                          AccountTypeID=USER_ID)
-        pkgbase = db.create(PackageBase,
-                            Name="test-package",
-                            Maintainer=user)
-        package = db.create(Package,
-                            PackageBase=pkgbase,
-                            Name=pkgbase.Name,
+    yield user
+
+
+@pytest.fixture
+def package(user: User) -> Package:
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
+        package = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name,
                             Description="Test description.",
                             URL="https://test.package")
+    yield package
 
 
-def test_package_dependencies():
+def test_package_dependencies(user: User, package: Package):
     with db.begin():
         pkgdep = db.create(PackageDependency, Package=package,
                            DepTypeID=DEPENDS_ID, DepName="test-dep")
@@ -57,16 +61,16 @@ def test_package_dependencies():
     assert pkgdep.is_package()
 
 
-def test_package_dependencies_null_package_raises_exception():
+def test_package_dependencies_null_package_raises():
     with pytest.raises(IntegrityError):
         PackageDependency(DepTypeID=DEPENDS_ID, DepName="test-dep")
 
 
-def test_package_dependencies_null_dependency_type_raises_exception():
+def test_package_dependencies_null_dependency_type_raises(package: Package):
     with pytest.raises(IntegrityError):
         PackageDependency(Package=package, DepName="test-dep")
 
 
-def test_package_dependencies_null_depname_raises_exception():
+def test_package_dependencies_null_depname_raises(package: Package):
     with pytest.raises(IntegrityError):
         PackageDependency(DepTypeID=DEPENDS_ID, Package=package)

From 5b14ad406560b87773b7bf81b0ef0fbb6a362898 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 21:16:49 -0800
Subject: [PATCH 684/844] housekeep(fastapi): rewrite test_user with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_user.py | 110 +++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 66 deletions(-)

diff --git a/test/test_user.py b/test/test_user.py
index dbb45166..52cdc89e 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -8,10 +8,10 @@ import pytest
 
 import aurweb.auth
 import aurweb.config
+import aurweb.models.account_type as at
 
 from aurweb import db
 from aurweb.auth import creds
-from aurweb.models.account_type import AccountType
 from aurweb.models.ban import Ban
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -22,23 +22,30 @@ from aurweb.models.ssh_pub_key import SSHPubKey
 from aurweb.models.user import User
 from aurweb.testing.requests import Request
 
-account_type = user = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global account_type, user
+    return
 
-    account_type = db.query(AccountType,
-                            AccountType.AccountType == "User").first()
 
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
-                         AccountType=account_type)
+                         AccountTypeID=at.USER_ID)
+    yield user
 
 
-def test_user_login_logout():
+@pytest.fixture
+def package(user: User) -> Package:
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="pkg1", Maintainer=user)
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    yield pkg
+
+
+def test_user_login_logout(user: User):
     """ Test creating a user and reading its columns. """
     # Assert that make_user created a valid user.
     assert bool(user.ID)
@@ -47,8 +54,6 @@ def test_user_login_logout():
     assert user.valid_password("testPassword")
     assert not user.valid_password("badPassword")
 
-    assert user in account_type.users
-
     # Make a raw request.
     request = Request()
     assert not user.login(request, "badPassword")
@@ -81,10 +86,6 @@ def test_user_login_logout():
     assert result.valid_password("testPassword")
     assert result.is_authenticated()
 
-    # Ensure we've got the correct account type.
-    assert user.AccountType.ID == account_type.ID
-    assert user.AccountType.AccountType == account_type.AccountType
-
     # Test out user string functions.
     assert repr(user) == f"<User(ID='{user.ID}', " + \
         "AccountType='User', Username='test')>"
@@ -95,13 +96,13 @@ def test_user_login_logout():
     assert not user.is_authenticated()
 
 
-def test_user_login_twice():
+def test_user_login_twice(user: User):
     request = Request()
     assert user.login(request, "testPassword")
     assert user.login(request, "testPassword")
 
 
-def test_user_login_banned():
+def test_user_login_banned(user: User):
     # Add ban for the next 30 seconds.
     banned_timestamp = datetime.utcnow() + timedelta(seconds=30)
     with db.begin():
@@ -112,13 +113,13 @@ def test_user_login_banned():
     assert not user.login(request, "testPassword")
 
 
-def test_user_login_suspended():
+def test_user_login_suspended(user: User):
     with db.begin():
         user.Suspended = True
     assert not user.login(Request(), "testPassword")
 
 
-def test_legacy_user_authentication():
+def test_legacy_user_authentication(user: User):
     with db.begin():
         user.Salt = bcrypt.gensalt().decode()
         user.Passwd = hashlib.md5(
@@ -132,7 +133,7 @@ def test_legacy_user_authentication():
     assert not user.valid_password(None)
 
 
-def test_user_login_with_outdated_sid():
+def test_user_login_with_outdated_sid(user: User):
     # Make a session with a LastUpdateTS 5 seconds ago, causing
     # user.login to update it with a new sid.
     with db.begin():
@@ -143,7 +144,7 @@ def test_user_login_with_outdated_sid():
     assert sid != "stub"
 
 
-def test_user_update_password():
+def test_user_update_password(user: User):
     user.update_password("secondPassword")
     assert not user.valid_password("testPassword")
     assert user.valid_password("secondPassword")
@@ -154,11 +155,11 @@ def test_user_minimum_passwd_length():
     assert User.minimum_passwd_length() == passwd_min_len
 
 
-def test_user_has_credential():
-    assert not user.has_credential(aurweb.auth.creds.ACCOUNT_CHANGE_TYPE)
+def test_user_has_credential(user: User):
+    assert not user.has_credential(creds.ACCOUNT_CHANGE_TYPE)
 
 
-def test_user_ssh_pub_key():
+def test_user_ssh_pub_key(user: User):
     assert user.ssh_pub_key is None
 
     with db.begin():
@@ -169,34 +170,26 @@ def test_user_ssh_pub_key():
     assert user.ssh_pub_key == ssh_pub_key
 
 
-def test_user_credential_types():
+def test_user_credential_types(user: User):
     assert user.AccountTypeID in creds.user_developer_or_trusted_user
     assert user.AccountTypeID not in creds.trusted_user
     assert user.AccountTypeID not in creds.developer
     assert user.AccountTypeID not in creds.trusted_user_or_dev
 
-    trusted_user_type = db.query(AccountType).filter(
-        AccountType.AccountType == "Trusted User"
-    ).first()
     with db.begin():
-        user.AccountType = trusted_user_type
+        user.AccountTypeID = at.TRUSTED_USER_ID
 
     assert user.AccountTypeID in creds.trusted_user
     assert user.AccountTypeID in creds.trusted_user_or_dev
 
-    developer_type = db.query(AccountType,
-                              AccountType.AccountType == "Developer").first()
     with db.begin():
-        user.AccountType = developer_type
+        user.AccountTypeID = at.DEVELOPER_ID
 
     assert user.AccountTypeID in creds.developer
     assert user.AccountTypeID in creds.trusted_user_or_dev
 
-    type_str = "Trusted User & Developer"
-    elevated_type = db.query(AccountType,
-                             AccountType.AccountType == type_str).first()
     with db.begin():
-        user.AccountType = elevated_type
+        user.AccountTypeID = at.TRUSTED_USER_AND_DEV_ID
 
     assert user.AccountTypeID in creds.trusted_user
     assert user.AccountTypeID in creds.developer
@@ -208,7 +201,7 @@ def test_user_credential_types():
     assert user.is_developer()
 
 
-def test_user_json():
+def test_user_json(user: User):
     data = json.loads(user.json())
     assert data.get("ID") == user.ID
     assert data.get("Username") == user.Username
@@ -217,7 +210,7 @@ def test_user_json():
     assert isinstance(data.get("RegistrationTS"), int)
 
 
-def test_user_as_dict():
+def test_user_as_dict(user: User):
     data = user.as_dict()
     assert data.get("ID") == user.ID
     assert data.get("Username") == user.Username
@@ -226,57 +219,42 @@ def test_user_as_dict():
     assert isinstance(data.get("RegistrationTS"), datetime)
 
 
-def test_user_is_trusted_user():
-    tu_type = db.query(AccountType,
-                       AccountType.AccountType == "Trusted User").first()
+def test_user_is_trusted_user(user: User):
     with db.begin():
-        user.AccountType = tu_type
+        user.AccountTypeID = at.TRUSTED_USER_ID
     assert user.is_trusted_user() is True
 
     # Do it again with the combined role.
-    tu_type = db.query(
-        AccountType,
-        AccountType.AccountType == "Trusted User & Developer").first()
     with db.begin():
-        user.AccountType = tu_type
+        user.AccountTypeID = at.TRUSTED_USER_AND_DEV_ID
     assert user.is_trusted_user() is True
 
 
-def test_user_is_developer():
-    dev_type = db.query(AccountType,
-                        AccountType.AccountType == "Developer").first()
+def test_user_is_developer(user: User):
     with db.begin():
-        user.AccountType = dev_type
+        user.AccountTypeID = at.DEVELOPER_ID
     assert user.is_developer() is True
 
     # Do it again with the combined role.
-    dev_type = db.query(
-        AccountType,
-        AccountType.AccountType == "Trusted User & Developer").first()
     with db.begin():
-        user.AccountType = dev_type
+        user.AccountTypeID = at.TRUSTED_USER_AND_DEV_ID
     assert user.is_developer() is True
 
 
-def test_user_voted_for():
+def test_user_voted_for(user: User, package: Package):
+    pkgbase = package.PackageBase
     now = int(datetime.utcnow().timestamp())
     with db.begin():
-        pkgbase = db.create(PackageBase, Name="pkg1", Maintainer=user)
-        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
         db.create(PackageVote, PackageBase=pkgbase, User=user, VoteTS=now)
-    assert user.voted_for(pkg)
+    assert user.voted_for(package)
 
 
-def test_user_notified():
+def test_user_notified(user: User, package: Package):
+    pkgbase = package.PackageBase
     with db.begin():
-        pkgbase = db.create(PackageBase, Name="pkg1", Maintainer=user)
-        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
         db.create(PackageNotification, PackageBase=pkgbase, User=user)
-    assert user.notified(pkg)
+    assert user.notified(package)
 
 
-def test_user_packages():
-    with db.begin():
-        pkgbase = db.create(PackageBase, Name="pkg1", Maintainer=user)
-        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
-    assert pkg in user.packages()
+def test_user_packages(user: User, package: Package):
+    assert package in user.packages()

From eb396813a89c29bfbb96d6d5f7c884d1c83117bc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 21:27:02 -0800
Subject: [PATCH 685/844] housekeep(fastapi): rewrite test_package with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_package.py | 54 ++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/test/test_package.py b/test/test_package.py
index c2afa660..1408a182 100644
--- a/test/test_package.py
+++ b/test/test_package.py
@@ -4,7 +4,7 @@ from sqlalchemy import and_
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
@@ -14,28 +14,30 @@ user = pkgbase = package = None
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, pkgbase, package
+    return
 
-    account_type = db.query(AccountType,
-                            AccountType.AccountType == "User").first()
 
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
                          RealName="Test User", Passwd="testPassword",
-                         AccountType=account_type)
+                         AccountTypeID=USER_ID)
+    yield user
 
-        pkgbase = db.create(PackageBase,
-                            Name="beautiful-package",
+
+@pytest.fixture
+def package(user: User) -> Package:
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="beautiful-package",
                             Maintainer=user)
-        package = db.create(Package,
-                            PackageBase=pkgbase,
-                            Name=pkgbase.Name,
+        package = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name,
                             Description="Test description.",
                             URL="https://test.package")
+    yield package
 
 
-def test_package():
-    assert pkgbase == package.PackageBase
+def test_package(package: Package):
     assert package.Name == "beautiful-package"
     assert package.Description == "Test description."
     assert package.Version == str()  # Default version.
@@ -46,27 +48,21 @@ def test_package():
         package.Version = "1.2.3"
 
     # Make sure it got updated in the database.
-    record = db.query(Package,
-                      and_(Package.ID == package.ID,
-                           Package.Version == "1.2.3")).first()
+    record = db.query(Package).filter(
+        and_(Package.ID == package.ID,
+             Package.Version == "1.2.3")
+    ).first()
     assert record is not None
 
 
-def test_package_null_pkgbase_raises_exception():
+def test_package_null_pkgbase_raises():
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(Package,
-                      Name="some-package",
-                      Description="Some description.",
-                      URL="https://some.package")
-    db.rollback()
+        Package(Name="some-package", Description="Some description.",
+                URL="https://some.package")
 
 
-def test_package_null_name_raises_exception():
+def test_package_null_name_raises(package: Package):
+    pkgbase = package.PackageBase
     with pytest.raises(IntegrityError):
-        with db.begin():
-            db.create(Package,
-                      PackageBase=pkgbase,
-                      Description="Some description.",
-                      URL="https://some.package")
-    db.rollback()
+        Package(PackageBase=pkgbase, Description="Some description.",
+                URL="https://some.package")

From de0f9190778b160fcb05cf4a6945eb4dd56b1aa1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 22:06:32 -0800
Subject: [PATCH 686/844] housekeep(fastapi): rewrite test_ban with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_ban.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/test/test_ban.py b/test/test_ban.py
index 2c705410..ff49f7e2 100644
--- a/test/test_ban.py
+++ b/test/test_ban.py
@@ -11,20 +11,21 @@ from aurweb.db import create
 from aurweb.models.ban import Ban, is_banned
 from aurweb.testing.requests import Request
 
-ban = request = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global ban, request
+    return
 
+
+@pytest.fixture
+def ban() -> Ban:
     ts = datetime.utcnow() + timedelta(seconds=30)
     with db.begin():
         ban = create(Ban, IPAddress="127.0.0.1", BanTS=ts)
-    request = Request()
+    yield ban
 
 
-def test_ban():
+def test_ban(ban: Ban):
     assert ban.IPAddress == "127.0.0.1"
     assert bool(ban.BanTS)
 
@@ -45,11 +46,13 @@ def test_invalid_ban():
     db.rollback()
 
 
-def test_banned():
+def test_banned(ban: Ban):
+    request = Request()
     request.client.host = "127.0.0.1"
     assert is_banned(request)
 
 
-def test_not_banned():
+def test_not_banned(ban: Ban):
+    request = Request()
     request.client.host = "192.168.0.1"
     assert not is_banned(request)

From 7ef3e3438681b29d6a32aed54c92f3965737c7af Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 22:43:29 -0800
Subject: [PATCH 687/844] housekeep(fastapi): rewrite test_accounts_routes with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_accounts_routes.py | 233 ++++++++++++++++++-----------------
 1 file changed, 118 insertions(+), 115 deletions(-)

diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index be929e97..f08efcd2 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -23,16 +23,12 @@ from aurweb.models.user import User
 from aurweb.testing.html import get_errors
 from aurweb.testing.requests import Request
 
+logger = logging.get_logger(__name__)
+
 # Some test global constants.
 TEST_USERNAME = "test"
 TEST_EMAIL = "test@example.org"
 
-# Global mutables.
-client = TestClient(app)
-user = None
-
-logger = logging.get_logger(__name__)
-
 
 def make_ssh_pubkey():
     # Create a public key with ssh-keygen (this adds ssh-keygen as a
@@ -50,29 +46,32 @@ def make_ssh_pubkey():
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user
+    return
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
 
+@pytest.fixture
+def client() -> TestClient:
+    yield TestClient(app=app)
+
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
                       RealName="Test UserZ", Passwd="testPassword",
-                      IRCNick="testZ", AccountType=account_type)
+                      IRCNick="testZ", AccountTypeID=USER_ID)
 
     yield user
 
 
 @pytest.fixture
-def tu_user():
+def tu_user(user: User):
     with db.begin():
-        user.AccountType = query(AccountType).filter(
-            AccountType.ID == TRUSTED_USER_AND_DEV_ID
-        ).first()
+        user.AccountTypeID = TRUSTED_USER_AND_DEV_ID
     yield user
 
 
-def test_get_passreset_authed_redirects():
+def test_get_passreset_authed_redirects(client: TestClient, user: User):
     sid = user.login(Request(), "testPassword")
     assert sid is not None
 
@@ -84,39 +83,39 @@ def test_get_passreset_authed_redirects():
     assert response.headers.get("location") == "/"
 
 
-def test_get_passreset():
+def test_get_passreset(client: TestClient):
     with client as request:
         response = request.get("/passreset")
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_get_passreset_translation():
+def test_get_passreset_translation(client: TestClient):
     # Test that translation works; set it to de.
     with client as request:
         response = request.get("/passreset", cookies={"AURLANG": "de"})
 
     # The header title should be translated.
-    assert "Passwort zurücksetzen".encode("utf-8") in response.content
+    assert "Passwort zurücksetzen" in response.text
 
     # The form input label should be translated.
-    assert "Benutzername oder primäre E-Mail-Adresse eingeben:".encode(
-        "utf-8") in response.content
+    expected = "Benutzername oder primäre E-Mail-Adresse eingeben:"
+    assert expected in response.text
 
     # And the button.
-    assert "Weiter".encode("utf-8") in response.content
+    assert "Weiter" in response.text
 
     # Restore english.
     with client as request:
         response = request.get("/passreset", cookies={"AURLANG": "en"})
 
 
-def test_get_passreset_with_resetkey():
+def test_get_passreset_with_resetkey(client: TestClient):
     with client as request:
         response = request.get("/passreset", data={"resetkey": "abcd"})
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_post_passreset_authed_redirects():
+def test_post_passreset_authed_redirects(client: TestClient, user: User):
     sid = user.login(Request(), "testPassword")
     assert sid is not None
 
@@ -130,7 +129,7 @@ def test_post_passreset_authed_redirects():
     assert response.headers.get("location") == "/"
 
 
-def test_post_passreset_user():
+def test_post_passreset_user(client: TestClient, user: User):
     # With username.
     with client as request:
         response = request.post("/passreset", data={"user": TEST_USERNAME})
@@ -144,7 +143,7 @@ def test_post_passreset_user():
     assert response.headers.get("location") == "/passreset?step=confirm"
 
 
-def test_post_passreset_resetkey():
+def test_post_passreset_resetkey(client: TestClient, user: User):
     with db.begin():
         user.session = Session(UsersID=user.ID, SessionID="blah",
                                LastUpdateTS=datetime.utcnow().timestamp())
@@ -171,28 +170,7 @@ def test_post_passreset_resetkey():
     assert response.headers.get("location") == "/passreset?step=complete"
 
 
-def test_post_passreset_error_invalid_email():
-    # First, test with a user that doesn't even exist.
-    with client as request:
-        response = request.post("/passreset", data={"user": "invalid"})
-    assert response.status_code == int(HTTPStatus.NOT_FOUND)
-
-    error = "Invalid e-mail."
-    assert error in response.content.decode("utf-8")
-
-    # Then, test with an invalid resetkey for a real user.
-    _ = make_resetkey()
-    post_data = make_passreset_data("fake")
-    post_data["password"] = "abcd1234"
-    post_data["confirm"] = "abcd1234"
-
-    with client as request:
-        response = request.post("/passreset", data=post_data)
-    assert response.status_code == int(HTTPStatus.NOT_FOUND)
-    assert error in response.content.decode("utf-8")
-
-
-def make_resetkey():
+def make_resetkey(client: TestClient, user: User):
     with client as request:
         response = request.post("/passreset", data={"user": TEST_USERNAME})
         assert response.status_code == int(HTTPStatus.SEE_OTHER)
@@ -200,18 +178,37 @@ def make_resetkey():
     return user.ResetKey
 
 
-def make_passreset_data(resetkey):
+def make_passreset_data(user: User, resetkey: str):
     return {
         "user": user.Username,
         "resetkey": resetkey
     }
 
 
-def test_post_passreset_error_missing_field():
+def test_post_passreset_error_invalid_email(client: TestClient, user: User):
+    # First, test with a user that doesn't even exist.
+    with client as request:
+        response = request.post("/passreset", data={"user": "invalid"})
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+    assert "Invalid e-mail." in response.text
+
+    # Then, test with an invalid resetkey for a real user.
+    _ = make_resetkey(client, user)
+    post_data = make_passreset_data(user, "fake")
+    post_data["password"] = "abcd1234"
+    post_data["confirm"] = "abcd1234"
+
+    with client as request:
+        response = request.post("/passreset", data=post_data)
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+    assert "Invalid e-mail." in response.text
+
+
+def test_post_passreset_error_missing_field(client: TestClient, user: User):
     # Now that we've prepared the password reset, prepare a POST
     # request with the user's ResetKey.
-    resetkey = make_resetkey()
-    post_data = make_passreset_data(resetkey)
+    resetkey = make_resetkey(client, user)
+    post_data = make_passreset_data(user, resetkey)
 
     with client as request:
         response = request.post("/passreset", data=post_data)
@@ -222,9 +219,10 @@ def test_post_passreset_error_missing_field():
     assert error in response.content.decode("utf-8")
 
 
-def test_post_passreset_error_password_mismatch():
-    resetkey = make_resetkey()
-    post_data = make_passreset_data(resetkey)
+def test_post_passreset_error_password_mismatch(client: TestClient,
+                                                user: User):
+    resetkey = make_resetkey(client, user)
+    post_data = make_passreset_data(user, resetkey)
 
     post_data["password"] = "abcd1234"
     post_data["confirm"] = "mismatched"
@@ -238,9 +236,10 @@ def test_post_passreset_error_password_mismatch():
     assert error in response.content.decode("utf-8")
 
 
-def test_post_passreset_error_password_requirements():
-    resetkey = make_resetkey()
-    post_data = make_passreset_data(resetkey)
+def test_post_passreset_error_password_requirements(client: TestClient,
+                                                    user: User):
+    resetkey = make_resetkey(client, user)
+    post_data = make_passreset_data(user, resetkey)
 
     passwd_min_len = User.minimum_passwd_length()
     assert passwd_min_len >= 4
@@ -257,7 +256,7 @@ def test_post_passreset_error_password_requirements():
     assert error in response.content.decode("utf-8")
 
 
-def test_get_register():
+def test_get_register(client: TestClient):
     with client as request:
         response = request.get("/register")
     assert response.status_code == int(HTTPStatus.OK)
@@ -288,7 +287,7 @@ def post_register(request, **kwargs):
     return request.post("/register", data=data, allow_redirects=False)
 
 
-def test_post_register():
+def test_post_register(client: TestClient):
     with client as request:
         response = post_register(request)
     assert response.status_code == int(HTTPStatus.OK)
@@ -298,7 +297,7 @@ def test_post_register():
     assert expected in response.content.decode()
 
 
-def test_post_register_rejects_case_insensitive_spoof():
+def test_post_register_rejects_case_insensitive_spoof(client: TestClient):
     with client as request:
         response = post_register(request, U="newUser", E="newUser@example.org")
     assert response.status_code == int(HTTPStatus.OK)
@@ -319,7 +318,7 @@ def test_post_register_rejects_case_insensitive_spoof():
     assert expected in response.content.decode()
 
 
-def test_post_register_error_expired_captcha():
+def test_post_register_error_expired_captcha(client: TestClient):
     with client as request:
         response = post_register(request, captcha_salt="invalid-salt")
 
@@ -329,7 +328,7 @@ def test_post_register_error_expired_captcha():
     assert "This CAPTCHA has expired. Please try again." in content
 
 
-def test_post_register_error_missing_captcha():
+def test_post_register_error_missing_captcha(client: TestClient):
     with client as request:
         response = post_register(request, captcha=None)
 
@@ -339,7 +338,7 @@ def test_post_register_error_missing_captcha():
     assert "The CAPTCHA is missing." in content
 
 
-def test_post_register_error_invalid_captcha():
+def test_post_register_error_invalid_captcha(client: TestClient):
     with client as request:
         response = post_register(request, captcha="invalid blah blah")
 
@@ -349,7 +348,7 @@ def test_post_register_error_invalid_captcha():
     assert "The entered CAPTCHA answer is invalid." in content
 
 
-def test_post_register_error_ip_banned():
+def test_post_register_error_ip_banned(client: TestClient):
     # 'testclient' is used as request.client.host via FastAPI TestClient.
     with db.begin():
         create(Ban, IPAddress="testclient", BanTS=datetime.utcnow())
@@ -365,7 +364,7 @@ def test_post_register_error_ip_banned():
             "inconvenience.") in content
 
 
-def test_post_register_error_missing_username():
+def test_post_register_error_missing_username(client: TestClient):
     with client as request:
         response = post_register(request, U="")
 
@@ -375,7 +374,7 @@ def test_post_register_error_missing_username():
     assert "Missing a required field." in content
 
 
-def test_post_register_error_missing_email():
+def test_post_register_error_missing_email(client: TestClient):
     with client as request:
         response = post_register(request, E="")
 
@@ -385,7 +384,7 @@ def test_post_register_error_missing_email():
     assert "Missing a required field." in content
 
 
-def test_post_register_error_invalid_username():
+def test_post_register_error_invalid_username(client: TestClient):
     with client as request:
         # Our test config requires at least three characters for a
         # valid username, so test against two characters: 'ba'.
@@ -397,7 +396,7 @@ def test_post_register_error_invalid_username():
     assert "The username is invalid." in content
 
 
-def test_post_register_invalid_password():
+def test_post_register_invalid_password(client: TestClient):
     with client as request:
         response = post_register(request, P="abc", C="abc")
 
@@ -408,7 +407,7 @@ def test_post_register_invalid_password():
     assert re.search(expected, content)
 
 
-def test_post_register_error_missing_confirm():
+def test_post_register_error_missing_confirm(client: TestClient):
     with client as request:
         response = post_register(request, C=None)
 
@@ -418,7 +417,7 @@ def test_post_register_error_missing_confirm():
     assert "Please confirm your new password." in content
 
 
-def test_post_register_error_mismatched_confirm():
+def test_post_register_error_mismatched_confirm(client: TestClient):
     with client as request:
         response = post_register(request, C="mismatched")
 
@@ -428,7 +427,7 @@ def test_post_register_error_mismatched_confirm():
     assert "Password fields do not match." in content
 
 
-def test_post_register_error_invalid_email():
+def test_post_register_error_invalid_email(client: TestClient):
     with client as request:
         response = post_register(request, E="bad@email")
 
@@ -438,7 +437,7 @@ def test_post_register_error_invalid_email():
     assert "The email address is invalid." in content
 
 
-def test_post_register_error_undeliverable_email():
+def test_post_register_error_undeliverable_email(client: TestClient):
     with client as request:
         # At the time of writing, webchat.freenode.net does not contain
         # mx records; if it ever does, it'll break this test.
@@ -450,7 +449,7 @@ def test_post_register_error_undeliverable_email():
     assert "The email address is invalid." in content
 
 
-def test_post_register_invalid_backup_email():
+def test_post_register_invalid_backup_email(client: TestClient):
     with client as request:
         response = post_register(request, BE="bad@email")
 
@@ -460,7 +459,7 @@ def test_post_register_invalid_backup_email():
     assert "The backup email address is invalid." in content
 
 
-def test_post_register_error_invalid_homepage():
+def test_post_register_error_invalid_homepage(client: TestClient):
     with client as request:
         response = post_register(request, HP="bad")
 
@@ -471,7 +470,7 @@ def test_post_register_error_invalid_homepage():
     assert expected in content
 
 
-def test_post_register_error_invalid_pgp_fingerprints():
+def test_post_register_error_invalid_pgp_fingerprints(client: TestClient):
     with client as request:
         response = post_register(request, K="bad")
 
@@ -492,7 +491,7 @@ def test_post_register_error_invalid_pgp_fingerprints():
     assert expected in content
 
 
-def test_post_register_error_invalid_ssh_pubkeys():
+def test_post_register_error_invalid_ssh_pubkeys(client: TestClient):
     with client as request:
         response = post_register(request, PK="bad")
 
@@ -510,7 +509,7 @@ def test_post_register_error_invalid_ssh_pubkeys():
     assert "The SSH public key is invalid." in content
 
 
-def test_post_register_error_unsupported_language():
+def test_post_register_error_unsupported_language(client: TestClient):
     with client as request:
         response = post_register(request, L="bad")
 
@@ -521,7 +520,7 @@ def test_post_register_error_unsupported_language():
     assert expected in content
 
 
-def test_post_register_error_unsupported_timezone():
+def test_post_register_error_unsupported_timezone(client: TestClient):
     with client as request:
         response = post_register(request, TZ="ABCDEFGH")
 
@@ -532,7 +531,7 @@ def test_post_register_error_unsupported_timezone():
     assert expected in content
 
 
-def test_post_register_error_username_taken():
+def test_post_register_error_username_taken(client: TestClient, user: User):
     with client as request:
         response = post_register(request, U="test")
 
@@ -543,7 +542,7 @@ def test_post_register_error_username_taken():
     assert re.search(expected, content)
 
 
-def test_post_register_error_email_taken():
+def test_post_register_error_email_taken(client: TestClient, user: User):
     with client as request:
         response = post_register(request, E="test@example.org")
 
@@ -554,7 +553,7 @@ def test_post_register_error_email_taken():
     assert re.search(expected, content)
 
 
-def test_post_register_error_ssh_pubkey_taken():
+def test_post_register_error_ssh_pubkey_taken(client: TestClient, user: User):
     pk = str()
 
     # Create a public key with ssh-keygen (this adds ssh-keygen as a
@@ -584,7 +583,7 @@ def test_post_register_error_ssh_pubkey_taken():
     assert re.search(expected, content)
 
 
-def test_post_register_with_ssh_pubkey():
+def test_post_register_with_ssh_pubkey(client: TestClient):
     pk = str()
 
     # Create a public key with ssh-keygen (this adds ssh-keygen as a
@@ -605,7 +604,7 @@ def test_post_register_with_ssh_pubkey():
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_get_account_edit():
+def test_get_account_edit(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -617,7 +616,7 @@ def test_get_account_edit():
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_get_account_edit_unauthorized():
+def test_get_account_edit_unauthorized(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -633,7 +632,7 @@ def test_get_account_edit_unauthorized():
     assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
 
 
-def test_post_account_edit():
+def test_post_account_edit(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -655,7 +654,7 @@ def test_post_account_edit():
     assert expected in response.content.decode()
 
 
-def test_post_account_edit_dev():
+def test_post_account_edit_dev(client: TestClient, user: User):
     # Modify our user to be a "Trusted User & Developer"
     name = "Trusted User & Developer"
     tu_or_dev = query(AccountType, AccountType.AccountType == name).first()
@@ -683,7 +682,7 @@ def test_post_account_edit_dev():
     assert expected in response.content.decode()
 
 
-def test_post_account_edit_language():
+def test_post_account_edit_language(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -710,7 +709,7 @@ def test_post_account_edit_language():
     assert lang_nodes[0] == "selected"
 
 
-def test_post_account_edit_timezone():
+def test_post_account_edit_timezone(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -729,7 +728,8 @@ def test_post_account_edit_timezone():
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_post_account_edit_error_missing_password():
+def test_post_account_edit_error_missing_password(client: TestClient,
+                                                  user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -751,7 +751,8 @@ def test_post_account_edit_error_missing_password():
     assert "Invalid password." in content
 
 
-def test_post_account_edit_error_invalid_password():
+def test_post_account_edit_error_invalid_password(client: TestClient,
+                                                  user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -773,7 +774,8 @@ def test_post_account_edit_error_invalid_password():
     assert "Invalid password." in content
 
 
-def test_post_account_edit_inactivity_unauthorized():
+def test_post_account_edit_inactivity_unauthorized(client: TestClient,
+                                                   user: User):
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     post_data = {
         "U": "test",
@@ -791,7 +793,7 @@ def test_post_account_edit_inactivity_unauthorized():
     assert errors[0].text.strip() == expected
 
 
-def test_post_account_edit_inactivity():
+def test_post_account_edit_inactivity(client: TestClient, user: User):
     with db.begin():
         user.AccountTypeID = TRUSTED_USER_ID
     assert not user.Suspended
@@ -822,7 +824,7 @@ def test_post_account_edit_inactivity():
     assert user.InactivityTS == 0
 
 
-def test_post_account_edit_error_unauthorized():
+def test_post_account_edit_error_unauthorized(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -845,7 +847,7 @@ def test_post_account_edit_error_unauthorized():
     assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
 
 
-def test_post_account_edit_ssh_pub_key():
+def test_post_account_edit_ssh_pub_key(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -874,7 +876,7 @@ def test_post_account_edit_ssh_pub_key():
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_post_account_edit_missing_ssh_pubkey():
+def test_post_account_edit_missing_ssh_pubkey(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -907,7 +909,7 @@ def test_post_account_edit_missing_ssh_pubkey():
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_post_account_edit_invalid_ssh_pubkey():
+def test_post_account_edit_invalid_ssh_pubkey(client: TestClient, user: User):
     pubkey = "ssh-rsa fake key"
 
     request = Request()
@@ -930,7 +932,7 @@ def test_post_account_edit_invalid_ssh_pubkey():
     assert response.status_code == int(HTTPStatus.BAD_REQUEST)
 
 
-def test_post_account_edit_password():
+def test_post_account_edit_password(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -952,7 +954,7 @@ def test_post_account_edit_password():
     assert user.valid_password("newPassword")
 
 
-def test_post_account_edit_account_types():
+def test_post_account_edit_account_types(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
     cookies = {"AURSID": sid}
@@ -1066,7 +1068,7 @@ def test_post_account_edit_account_types():
     assert user.AccountTypeID == DEVELOPER_ID
 
 
-def test_get_account():
+def test_get_account(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -1077,7 +1079,7 @@ def test_get_account():
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_get_account_not_found():
+def test_get_account_not_found(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -1088,7 +1090,7 @@ def test_get_account_not_found():
     assert response.status_code == int(HTTPStatus.NOT_FOUND)
 
 
-def test_get_account_unauthenticated():
+def test_get_account_unauthenticated(client: TestClient, user: User):
     with client as request:
         response = request.get("/account/test", allow_redirects=False)
     assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
@@ -1097,7 +1099,7 @@ def test_get_account_unauthenticated():
     assert "You must log in to view user information." in content
 
 
-def test_get_accounts(tu_user):
+def test_get_accounts(client: TestClient, user: User, tu_user: User):
     """ Test that we can GET request /accounts and receive
     a form which can be used to POST /accounts. """
     sid = user.login(Request(), "testPassword")
@@ -1156,7 +1158,7 @@ def get_rows(html):
     return root.xpath('//table[contains(@class, "users")]/tbody/tr')
 
 
-def test_post_accounts(tu_user):
+def test_post_accounts(client: TestClient, user: User, tu_user: User):
     # Set a PGPKey.
     with db.begin():
         user.PGPKey = "5F18B20346188419750745D7335F2CB41F253D30"
@@ -1211,7 +1213,7 @@ def test_post_accounts(tu_user):
                      % (_user.ID, _user.Username))
 
 
-def test_post_accounts_username(tu_user):
+def test_post_accounts_username(client: TestClient, user: User, tu_user: User):
     # Test the U parameter path.
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1231,7 +1233,8 @@ def test_post_accounts_username(tu_user):
     assert username.text.strip() == user.Username
 
 
-def test_post_accounts_account_type(tu_user):
+def test_post_accounts_account_type(client: TestClient, user: User,
+                                    tu_user: User):
     # Check the different account type options.
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1324,7 +1327,7 @@ def test_post_accounts_account_type(tu_user):
     assert type.text.strip() == "Trusted User & Developer"
 
 
-def test_post_accounts_status(tu_user):
+def test_post_accounts_status(client: TestClient, user: User, tu_user: User):
     # Test the functionality of Suspended.
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1356,7 +1359,7 @@ def test_post_accounts_status(tu_user):
     assert status.text.strip() == "Suspended"
 
 
-def test_post_accounts_email(tu_user):
+def test_post_accounts_email(client: TestClient, user: User, tu_user: User):
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
 
@@ -1370,7 +1373,7 @@ def test_post_accounts_email(tu_user):
     assert len(rows) == 1
 
 
-def test_post_accounts_realname(tu_user):
+def test_post_accounts_realname(client: TestClient, user: User, tu_user: User):
     # Test the R parameter path.
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1384,7 +1387,7 @@ def test_post_accounts_realname(tu_user):
     assert len(rows) == 1
 
 
-def test_post_accounts_irc(tu_user):
+def test_post_accounts_irc(client: TestClient, user: User, tu_user: User):
     # Test the I parameter path.
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1398,7 +1401,7 @@ def test_post_accounts_irc(tu_user):
     assert len(rows) == 1
 
 
-def test_post_accounts_sortby(tu_user):
+def test_post_accounts_sortby(client: TestClient, user: User, tu_user: User):
     # Create a second user so we can compare sorts.
     account_type = query(AccountType,
                          AccountType.ID == DEVELOPER_ID).first()
@@ -1481,7 +1484,7 @@ def test_post_accounts_sortby(tu_user):
     assert compare_text_values(1, first_rows, reversed(rows))
 
 
-def test_post_accounts_pgp_key(tu_user):
+def test_post_accounts_pgp_key(client: TestClient, user: User, tu_user: User):
     with db.begin():
         user.PGPKey = "5F18B20346188419750745D7335F2CB41F253D30"
 
@@ -1498,7 +1501,7 @@ def test_post_accounts_pgp_key(tu_user):
     assert len(rows) == 1
 
 
-def test_post_accounts_paged(tu_user):
+def test_post_accounts_paged(client: TestClient, user: User, tu_user: User):
     # Create 150 users.
     users = [user]
     account_type = query(AccountType,
@@ -1572,7 +1575,7 @@ def test_post_accounts_paged(tu_user):
     assert page_next.attrib["disabled"] == "disabled"
 
 
-def test_get_terms_of_service():
+def test_get_terms_of_service(client: TestClient, user: User):
     with db.begin():
         term = create(Term, Description="Test term.",
                       URL="http://localhost", Revision=1)
@@ -1624,7 +1627,7 @@ def test_get_terms_of_service():
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
 
-def test_post_terms_of_service():
+def test_post_terms_of_service(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
@@ -1682,7 +1685,7 @@ def test_post_terms_of_service():
     assert response.headers.get("location") == "/"
 
 
-def test_account_comments_not_found():
+def test_account_comments_not_found(client: TestClient, user: User):
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
         resp = request.get("/account/non-existent/comments", cookies=cookies)

From fccd8b63d271785e741cae0ec453b349ee0d6d38 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 23:07:34 -0800
Subject: [PATCH 688/844] housekeep(fastapi): rewrite test_auth_routes with
 fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_auth_routes.py | 95 ++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index 0157fcc8..a8d0db11 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -8,11 +8,12 @@ from fastapi.testclient import TestClient
 
 import aurweb.config
 
+from aurweb import db
 from aurweb.asgi import app
-from aurweb.db import begin, create, query
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import USER_ID
 from aurweb.models.session import Session
 from aurweb.models.user import User
+from aurweb.testing.requests import Request
 
 # Some test global constants.
 TEST_USERNAME = "test"
@@ -21,30 +22,32 @@ TEST_REFERER = {
     "referer": aurweb.config.get("options", "aur_location") + "/login",
 }
 
-# Global mutables.
-user = client = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user, client
+    return
 
-    account_type = query(AccountType,
-                         AccountType.AccountType == "User").first()
 
-    with begin():
-        user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
-                      RealName="Test User", Passwd="testPassword",
-                      AccountType=account_type)
-
-    client = TestClient(app)
+@pytest.fixture
+def client() -> TestClient:
+    client = TestClient(app=app)
 
     # Necessary for forged login CSRF protection on the login route. Set here
     # instead of only on the necessary requests for convenience.
     client.headers.update(TEST_REFERER)
+    yield client
 
 
-def test_login_logout():
+@pytest.fixture
+def user() -> User:
+    with db.begin():
+        user = db.create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
+                         RealName="Test User", Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+    yield user
+
+
+def test_login_logout(client: TestClient, user: User):
     post_data = {
         "user": "test",
         "passwd": "testPassword",
@@ -83,7 +86,7 @@ def mock_getboolean(a, b):
 
 
 @mock.patch("aurweb.config.getboolean", side_effect=mock_getboolean)
-def test_secure_login(mock):
+def test_secure_login(getboolean: bool, client: TestClient, user: User):
     """ In this test, we check to verify the course of action taken
     by starlette when providing secure=True to a response cookie.
     This is achieved by mocking aurweb.config.getboolean to return
@@ -94,11 +97,11 @@ def test_secure_login(mock):
     on such a request. """
 
     # Create a local TestClient here since we mocked configuration.
-    client = TestClient(app)
+    # client = TestClient(app)
 
     # Necessary for forged login CSRF protection on the login route. Set here
     # instead of only on the necessary requests for convenience.
-    client.headers.update(TEST_REFERER)
+    # client.headers.update(TEST_REFERER)
 
     # Data used for our upcoming http post request.
     post_data = {
@@ -126,18 +129,19 @@ def test_secure_login(mock):
 
     # Let's make sure we actually have a session relationship
     # with the AURSID we ended up with.
-    record = query(Session, Session.SessionID == cookie.value).first()
+    record = db.query(Session, Session.SessionID == cookie.value).first()
     assert record is not None and record.User == user
     assert user.session == record
 
 
-def test_authenticated_login():
+def test_authenticated_login(client: TestClient, user: User):
     post_data = {
         "user": "test",
         "passwd": "testPassword",
         "next": "/"
     }
 
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
         # Try to login.
         response = request.post("/login", data=post_data,
@@ -149,12 +153,13 @@ def test_authenticated_login():
         # when requesting GET /login as an authenticated user.
         # Now, let's verify that we receive 403 Forbidden when we
         # try to get /login as an authenticated user.
-        response = request.get("/login", allow_redirects=False)
+        response = request.get("/login", cookies=cookies,
+                               allow_redirects=False)
         assert response.status_code == int(HTTPStatus.OK)
         assert "Logged-in as: <strong>test</strong>" in response.text
 
 
-def test_unauthenticated_logout_unauthorized():
+def test_unauthenticated_logout_unauthorized(client: TestClient):
     with client as request:
         # Alright, let's verify that attempting to /logout when not
         # authenticated returns 401 Unauthorized.
@@ -163,7 +168,7 @@ def test_unauthenticated_logout_unauthorized():
         assert response.headers.get("location").startswith("/login")
 
 
-def test_login_missing_username():
+def test_login_missing_username(client: TestClient):
     post_data = {
         "passwd": "testPassword",
         "next": "/"
@@ -179,7 +184,7 @@ def test_login_missing_username():
     assert "checked" not in content
 
 
-def test_login_remember_me():
+def test_login_remember_me(client: TestClient, user: User):
     post_data = {
         "user": "test",
         "passwd": "testPassword",
@@ -197,16 +202,15 @@ def test_login_remember_me():
         "options", "persistent_cookie_timeout")
     expected_ts = datetime.utcnow().timestamp() + cookie_timeout
 
-    _session = query(Session,
-                     Session.UsersID == user.ID).first()
+    session = db.query(Session).filter(Session.UsersID == user.ID).first()
 
     # Expect that LastUpdateTS was within 5 seconds of the expected_ts,
     # which is equal to the current timestamp + persistent_cookie_timeout.
-    assert _session.LastUpdateTS > expected_ts - 5
-    assert _session.LastUpdateTS < expected_ts + 5
+    assert session.LastUpdateTS > expected_ts - 5
+    assert session.LastUpdateTS < expected_ts + 5
 
 
-def test_login_incorrect_password_remember_me():
+def test_login_incorrect_password_remember_me(client: TestClient, user: User):
     post_data = {
         "user": "test",
         "passwd": "badPassword",
@@ -218,15 +222,14 @@ def test_login_incorrect_password_remember_me():
         response = request.post("/login", data=post_data)
     assert "AURSID" not in response.cookies
 
-    # Make sure username is prefilled, password isn't prefilled, and remember_me
-    # is checked.
-    content = response.content.decode()
-    assert post_data["user"] in content
-    assert post_data["passwd"] not in content
-    assert "checked" in content
+    # Make sure username is prefilled, password isn't prefilled,
+    # and remember_me is checked.
+    assert post_data["user"] in response.text
+    assert post_data["passwd"] not in response.text
+    assert "checked" in response.text
 
 
-def test_login_missing_password():
+def test_login_missing_password(client: TestClient):
     post_data = {
         "user": "test",
         "next": "/"
@@ -237,12 +240,11 @@ def test_login_missing_password():
     assert "AURSID" not in response.cookies
 
     # Make sure username is prefilled and remember_me isn't checked.
-    content = response.content.decode()
-    assert post_data["user"] in content
-    assert "checked" not in content
+    assert post_data["user"] in response.text
+    assert "checked" not in response.text
 
 
-def test_login_incorrect_password():
+def test_login_incorrect_password(client: TestClient):
     post_data = {
         "user": "test",
         "passwd": "badPassword",
@@ -253,15 +255,14 @@ def test_login_incorrect_password():
         response = request.post("/login", data=post_data)
     assert "AURSID" not in response.cookies
 
-    # Make sure username is prefilled, password isn't prefilled and remember_me
-    # isn't checked.
-    content = response.content.decode()
-    assert post_data["user"] in content
-    assert post_data["passwd"] not in content
-    assert "checked" not in content
+    # Make sure username is prefilled, password isn't prefilled
+    # and remember_me isn't checked.
+    assert post_data["user"] in response.text
+    assert post_data["passwd"] not in response.text
+    assert "checked" not in response.text
 
 
-def test_login_bad_referer():
+def test_login_bad_referer(client: TestClient):
     post_data = {
         "user": "test",
         "passwd": "testPassword",

From 043ac7fe9211b96222274fcab6797df8a48d55b1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 23:24:42 -0800
Subject: [PATCH 689/844] fix(test_aurblup): use correct type hint for tmpdir

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_aurblup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/test_aurblup.py b/test/test_aurblup.py
index 7eaae556..0b499d57 100644
--- a/test/test_aurblup.py
+++ b/test/test_aurblup.py
@@ -2,6 +2,7 @@ import tempfile
 
 from unittest import mock
 
+import py
 import pytest
 
 from aurweb import config, db
@@ -17,12 +18,12 @@ def tempdir() -> str:
 
 
 @pytest.fixture
-def alpm_db(tempdir: str) -> AlpmDatabase:
+def alpm_db(tempdir: py.path.local) -> AlpmDatabase:
     yield AlpmDatabase(tempdir)
 
 
 @pytest.fixture(autouse=True)
-def setup(db_test, alpm_db: AlpmDatabase, tempdir: str) -> None:
+def setup(db_test, alpm_db: AlpmDatabase, tempdir: py.path.local) -> None:
     config_get = config.get
 
     def mock_config_get(section: str, key: str) -> str:

From 112837e0e99c3d6c84660ece76240d959760dcdf Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 1 Dec 2021 11:53:43 -0800
Subject: [PATCH 690/844] fix(test_auth): cover mismatched referer situation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/requests.py | 12 ++++++++++--
 test/test_auth.py          | 22 +++++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/aurweb/testing/requests.py b/aurweb/testing/requests.py
index a8c077db..76f7afca 100644
--- a/aurweb/testing/requests.py
+++ b/aurweb/testing/requests.py
@@ -1,3 +1,5 @@
+from typing import Dict
+
 import aurweb.config
 
 
@@ -27,7 +29,13 @@ class URL:
 class Request:
     """ A fake Request object which mimics a FastAPI Request for tests. """
     client = Client()
-    cookies = dict()
-    headers = dict()
     user = User()
     url = URL()
+
+    def __init__(self,
+                 method: str = "GET",
+                 headers: Dict[str, str] = dict(),
+                 cookies: Dict[str, str] = dict()) -> "Request":
+        self.method = method.upper()
+        self.headers = headers
+        self.cookies = cookies
diff --git a/test/test_auth.py b/test/test_auth.py
index b63fb96f..b607a038 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -1,11 +1,13 @@
 from datetime import datetime
 
+import fastapi
 import pytest
 
+from fastapi import HTTPException
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.auth import AnonymousUser, BasicAuthBackend, account_type_required
+from aurweb.auth import AnonymousUser, BasicAuthBackend, account_type_required, auth_required
 from aurweb.models.account_type import USER, USER_ID
 from aurweb.models.session import Session
 from aurweb.models.user import User
@@ -74,6 +76,24 @@ async def test_basic_auth_backend(user: User, backend: BasicAuthBackend):
     assert result == user
 
 
+@pytest.mark.asyncio
+async def test_auth_required_redirection_bad_referrer():
+    # Create a fake route function which can be wrapped by auth_required.
+    def bad_referrer_route(request: fastapi.Request):
+        pass
+
+    # Get down to the nitty gritty internal wrapper.
+    bad_referrer_route = auth_required()(bad_referrer_route)
+
+    # Execute the route with a "./blahblahblah" Referer, which does not
+    # match aur_location; `./` has been used as a prefix to attempt to
+    # ensure we're providing a fake referer.
+    with pytest.raises(HTTPException) as exc:
+        request = Request(method="POST", headers={"Referer": "./blahblahblah"})
+        await bad_referrer_route(request)
+        assert exc.detail == "Bad Referer header."
+
+
 def test_account_type_required():
     """ This test merely asserts that a few different paths
     do not raise exceptions. """

From c09784d58f600a249f321e6d2a80f9073cd12d49 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 1 Dec 2021 11:56:44 -0800
Subject: [PATCH 691/844] fix(auth.auth_required): remove unused keyword
 arguments

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index 8ceb136c..18356ac2 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -120,9 +120,7 @@ class BasicAuthBackend(AuthenticationBackend):
         return (AuthCredentials(["authenticated"]), user)
 
 
-def auth_required(is_required: bool = True,
-                  template: tuple = None,
-                  status_code: HTTPStatus = HTTPStatus.UNAUTHORIZED):
+def auth_required(is_required: bool = True):
     """ Authentication route decorator.
 
     :param is_required: A boolean indicating whether the function requires auth

From 0435c56a41c8e9cf3c286ffbbf4ae21ad33bd6e6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 1 Dec 2021 12:27:14 -0800
Subject: [PATCH 692/844] update test/README.md to be more aligned with the
 current state

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/README.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/README.md b/test/README.md
index 13fb0a0c..0d86a879 100644
--- a/test/README.md
+++ b/test/README.md
@@ -117,13 +117,12 @@ To run `sharness` shell test suites (requires Arch Linux):
 
 To run `pytest` Python test suites:
 
-    $ make -C test pytest
+    $ pytest
 
 **Note:** For SQLite tests, users may want to use `eatmydata`
 to improve speed:
 
     $ eatmydata -- make -C test sh
-    $ eatmydata -- make -C test pytest
 
 To produce coverage reports related to Python when running tests manually,
 use the following method:
@@ -147,11 +146,9 @@ Almost all of our `pytest` suites use the database in some way. There
 are a few particular testing utilities in `aurweb` that one should
 keep aware of to aid testing code:
 
-- `aurweb.testing.setup_init_db(*tables)`
-    - Prepares test database tables to be cleared before a test
-      is run. Be careful not to specify any tables we depend on
-      for constant records, like `AccountTypes`, `DependencyTypes`,
-      `RelationTypes` and `RequestTypes`.
+- `db_test` pytest fixture
+    - Prepares test databases for the module and cleans out database
+      tables for each test function requiring this fixture.
 - `aurweb.testing.requests.Request`
     - A fake stripped down version of `fastapi.Request` that can
       be passed to any functions in our codebase which use
@@ -168,14 +165,16 @@ Example code:
 
 
     @pytest.fixture(autouse=True)
-    def setup():
-        setup_test_db(User.__tablename__)
+    def setup(db_test):
+        return
 
     @pytest.fixture
     def user():
-        yield db.create(User, Passwd="testPassword", ...)
+        with db.begin():
+            user = db.create(User, Passwd="testPassword", ...)
+        yield user
 
-    def test_user_login(user):
+    def test_user_login(user: User):
         assert isinstance(user, User) is True
 
         fake_request = Request()

From 42701514e75ac373c01d787508e092b7ed0d144d Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Wed, 1 Dec 2021 02:16:08 -0500
Subject: [PATCH 693/844] fix(FastAPI): Use HTTPStatus instead of raw number

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/routers/errors.py |  8 ++++++--
 aurweb/routers/html.py   |  2 +-
 aurweb/routers/sso.py    | 11 +++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/aurweb/routers/errors.py b/aurweb/routers/errors.py
index eb935b57..9ed1e80d 100644
--- a/aurweb/routers/errors.py
+++ b/aurweb/routers/errors.py
@@ -1,14 +1,18 @@
+from http import HTTPStatus
+
 from aurweb.templates import make_context, render_template
 
 
 async def not_found(request, exc):
     context = make_context(request, "Page Not Found")
-    return render_template(request, "errors/404.html", context, 404)
+    return render_template(request, "errors/404.html", context,
+                           HTTPStatus.NOT_FOUND)
 
 
 async def service_unavailable(request, exc):
     context = make_context(request, "Service Unavailable")
-    return render_template(request, "errors/503.html", context, 503)
+    return render_template(request, "errors/503.html", context,
+                           HTTPStatus.SERVICE_UNAVAILABLE)
 
 # Maps HTTP errors to functions
 exceptions = {
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 525fb626..337acce6 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -221,4 +221,4 @@ async def metrics(request: Request):
 
 @router.get("/raisefivethree", response_class=HTMLResponse)
 async def raise_service_unavailable(request: Request):
-    raise HTTPException(status_code=503)
+    raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE)
diff --git a/aurweb/routers/sso.py b/aurweb/routers/sso.py
index edeb7c6b..eff1c63f 100644
--- a/aurweb/routers/sso.py
+++ b/aurweb/routers/sso.py
@@ -1,6 +1,7 @@
 import time
 import uuid
 
+from http import HTTPStatus
 from urllib.parse import urlencode
 
 import fastapi
@@ -59,7 +60,8 @@ def open_session(request, conn, user_id):
     """
     if is_account_suspended(conn, user_id):
         _ = get_translator_for_request(request)
-        raise HTTPException(status_code=403, detail=_('Account suspended'))
+        raise HTTPException(status_code=HTTPStatus.FORBIDDEN,
+                            detail=_('Account suspended'))
         # TODO This is a terrible message because it could imply the attempt at
         #      logging in just caused the suspension.
 
@@ -104,7 +106,7 @@ async def authenticate(request: Request, redirect: str = None, conn=Depends(aurw
     if is_ip_banned(conn, request.client.host):
         _ = get_translator_for_request(request)
         raise HTTPException(
-            status_code=403,
+            status_code=HTTPStatus.FORBIDDEN,
             detail=_('The login form is currently disabled for your IP address, '
                      'probably due to sustained spam attacks. Sorry for the '
                      'inconvenience.'))
@@ -117,13 +119,14 @@ async def authenticate(request: Request, redirect: str = None, conn=Depends(aurw
         # Let’s give attackers as little information as possible.
         _ = get_translator_for_request(request)
         raise HTTPException(
-            status_code=400,
+            status_code=HTTPStatus.BAD_REQUEST,
             detail=_('Bad OAuth token. Please retry logging in from the start.'))
 
     sub = user.get("sub")  # this is the SSO account ID in JWT terminology
     if not sub:
         _ = get_translator_for_request(request)
-        raise HTTPException(status_code=400, detail=_("JWT is missing its `sub` field."))
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
+                            detail=_("JWT is missing its `sub` field."))
 
     aur_accounts = conn.execute(select([Users.c.ID]).where(Users.c.SSOAccountID == sub)) \
                        .fetchall()

From e1bf6dd56256eddfbed2909fd658406755ce06f2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 2 Dec 2021 17:09:37 -0800
Subject: [PATCH 694/844] fix(fastapi): restore stripped whitespace in
 archdev-navbar

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/archdev-navbar.html | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index dc2377fe..98bb1841 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -54,17 +54,10 @@
             </li>
         {% else %}
             {# All guest users see Register #}
-            <li>
-                <a href="/register">
-                    {% trans %}Register{% endtrans %}
-                </a>
-            </li>
+            <li><a href="/register">{% trans %}Register{% endtrans %}</a></li>
+
             {# All guest users see Login #}
-            <li>
-                <a href="/login?next={{ next }}">
-                    {% trans %}Login{% endtrans %}
-                </a>
-            </li>
+            <li><a href="/login?next={{ next }}">{% trans %}Login{% endtrans %}</a></li>
         {% endif %}
     </ul>
 </div>

From abfd41f31e76a11619f6aa233058aa0bb25c2dec Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 2 Dec 2021 23:22:31 -0800
Subject: [PATCH 695/844] change(fastapi): centralize HTTPException

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py               | 24 +++++++++++++-----------
 aurweb/routers/errors.py     | 21 ---------------------
 templates/errors/404.html    |  8 --------
 templates/errors/503.html    |  8 --------
 templates/errors/detail.html |  8 ++++++++
 test/test_asgi.py            | 10 +++++++---
 6 files changed, 28 insertions(+), 51 deletions(-)
 delete mode 100644 aurweb/routers/errors.py
 delete mode 100644 templates/errors/404.html
 delete mode 100644 templates/errors/503.html
 create mode 100644 templates/errors/detail.html

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index b399cfb1..ef8d5933 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -6,8 +6,8 @@ import typing
 
 from urllib.parse import quote_plus
 
-from fastapi import FastAPI, HTTPException, Request
-from fastapi.responses import HTMLResponse, RedirectResponse
+from fastapi import FastAPI, HTTPException, Request, Response
+from fastapi.responses import RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from prometheus_client import multiprocess
 from sqlalchemy import and_, or_
@@ -21,10 +21,11 @@ from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
 from aurweb.prometheus import http_api_requests_total, http_requests_total, instrumentator
-from aurweb.routers import accounts, auth, errors, html, packages, rpc, rss, sso, trusted_user
+from aurweb.routers import accounts, auth, html, packages, rpc, rss, sso, trusted_user
+from aurweb.templates import make_context, render_template
 
 # Setup the FastAPI app.
-app = FastAPI(exception_handlers=errors.exceptions)
+app = FastAPI()
 
 # Instrument routes with the prometheus-fastapi-instrumentator
 # library with custom collectors and expose /metrics.
@@ -93,14 +94,15 @@ def child_exit(server, worker):  # pragma: no cover
 
 
 @app.exception_handler(HTTPException)
-async def http_exception_handler(request, exc):
-    """
-    Dirty HTML error page to replace the default JSON error responses.
-    In the future this should use a proper Arch-themed HTML template.
-    """
+async def http_exception_handler(request: Request, exc: HTTPException) \
+        -> Response:
+    """ Handle an HTTPException thrown in a route. """
     phrase = http.HTTPStatus(exc.status_code).phrase
-    return HTMLResponse(f"<h1>{exc.status_code} {phrase}</h1><p>{exc.detail}</p>",
-                        status_code=exc.status_code)
+    context = make_context(request, phrase)
+    context["exc"] = exc
+    context["phrase"] = phrase
+    return render_template(request, "errors/detail.html", context,
+                           exc.status_code)
 
 
 @app.middleware("http")
diff --git a/aurweb/routers/errors.py b/aurweb/routers/errors.py
deleted file mode 100644
index 9ed1e80d..00000000
--- a/aurweb/routers/errors.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from http import HTTPStatus
-
-from aurweb.templates import make_context, render_template
-
-
-async def not_found(request, exc):
-    context = make_context(request, "Page Not Found")
-    return render_template(request, "errors/404.html", context,
-                           HTTPStatus.NOT_FOUND)
-
-
-async def service_unavailable(request, exc):
-    context = make_context(request, "Service Unavailable")
-    return render_template(request, "errors/503.html", context,
-                           HTTPStatus.SERVICE_UNAVAILABLE)
-
-# Maps HTTP errors to functions
-exceptions = {
-    404: not_found,
-    503: service_unavailable
-}
diff --git a/templates/errors/404.html b/templates/errors/404.html
deleted file mode 100644
index 4926aff6..00000000
--- a/templates/errors/404.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'partials/layout.html' %}
-
-{% block pageContent %}
-  <div id="error-page" class="box 404">
-    <h2>404 - {% trans %}Page Not Found{% endtrans %}</h2>
-    <p>{% trans %}Sorry, the page you've requested does not exist.{% endtrans %}</p>
-  </div>
-{% endblock %}
diff --git a/templates/errors/503.html b/templates/errors/503.html
deleted file mode 100644
index 9a0ed56a..00000000
--- a/templates/errors/503.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'partials/layout.html' %}
-
-{% block pageContent %}
-  <div id="error-page" class="box 503">
-    <h2>503 - {% trans %}Service Unavailable{% endtrans %}</h2>
-    <p>{% trans %}Don't panic! This site is down due to maintenance. We will be back soon.{% endtrans %}</p>
-  </div>
-{% endblock %}
diff --git a/templates/errors/detail.html b/templates/errors/detail.html
new file mode 100644
index 00000000..f382a9bb
--- /dev/null
+++ b/templates/errors/detail.html
@@ -0,0 +1,8 @@
+{% extends 'partials/layout.html' %}
+
+{% block pageContent %}
+    <div id="error-page" class="box">
+        <h2>{{ "%d" | format(exc.status_code) }} - {{ phrase }}</h2>
+        <p>{{ exc.detail }}</p>
+    </div>
+{% endblock %}
diff --git a/test/test_asgi.py b/test/test_asgi.py
index fa2df5a1..16b07c31 100644
--- a/test/test_asgi.py
+++ b/test/test_asgi.py
@@ -11,6 +11,8 @@ import aurweb.asgi
 import aurweb.config
 import aurweb.redis
 
+from aurweb.testing.requests import Request
+
 
 @pytest.mark.asyncio
 async def test_asgi_startup_session_secret_exception(monkeypatch):
@@ -42,9 +44,11 @@ async def test_asgi_startup_exception(monkeypatch):
 async def test_asgi_http_exception_handler():
     exc = HTTPException(status_code=422, detail="EXCEPTION!")
     phrase = http.HTTPStatus(exc.status_code).phrase
-    response = await aurweb.asgi.http_exception_handler(None, exc)
-    assert response.body.decode() == \
-        f"<h1>{exc.status_code} {phrase}</h1><p>{exc.detail}</p>"
+    response = await aurweb.asgi.http_exception_handler(Request(), exc)
+    assert response.status_code == 422
+    content = response.body.decode()
+    assert f"{exc.status_code} - {phrase}" in content
+    assert "EXCEPTION!" in content
 
 
 @pytest.mark.asyncio

From 806a19b91a3f2e254e1956243a2fff89b123ff4f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 2 Dec 2021 23:26:42 -0800
Subject: [PATCH 696/844] feat(fastapi): render a 500 html response when unique
 SID generation fails

We've seen a bug in the past where unique SID generation fails and
still ends up raising an exception.

This commit reworks how we deal with database exceptions internally,
tries for 36 iterations to set a fresh unique SID, and raises a 500
HTTPException if we were unable to.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py    | 67 ++++++++++++++++++++++++----------------
 test/test_auth_routes.py | 45 +++++++++++++++++++++++++++
 test/test_user.py        |  2 --
 3 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index f0724202..dcf5f519 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -1,12 +1,14 @@
 import hashlib
 
 from datetime import datetime
+from http import HTTPStatus
 from typing import List, Set
 
 import bcrypt
 
-from fastapi import Request
+from fastapi import HTTPException, Request
 from sqlalchemy import or_
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
 import aurweb.config
@@ -108,33 +110,45 @@ class User(Base):
         if not self.authenticated:
             return None
 
-        now_ts = datetime.utcnow().timestamp()
-        session_ts = now_ts + (
-            session_time if session_time
-            else aurweb.config.getint("options", "login_timeout")
-        )
+        # Maximum number of iterations where we attempt to generate
+        # a unique SID. In cases where the Session table has
+        # exhausted all possible values, this will catch exceptions
+        # instead of raising them and include details about failing
+        # generation in an HTTPException.
+        tries = 36
 
-        sid = None
+        exc = None
+        for i in range(tries):
+            exc = None
+            now_ts = datetime.utcnow().timestamp()
+            session_ts = now_ts + (
+                session_time if session_time
+                else aurweb.config.getint("options", "login_timeout")
+            )
+            try:
+                with db.begin():
+                    self.LastLogin = now_ts
+                    self.LastLoginIPAddress = request.client.host
+                    if not self.session:
+                        sid = generate_unique_sid()
+                        self.session = db.create(Session, User=self,
+                                                 SessionID=sid,
+                                                 LastUpdateTS=session_ts)
+                    else:
+                        last_updated = self.session.LastUpdateTS
+                        if last_updated and last_updated < now_ts:
+                            self.session.SessionID = generate_unique_sid()
+                        self.session.LastUpdateTS = session_ts
+                    break
+            except IntegrityError as exc_:
+                exc = exc_
 
-        with db.begin():
-            self.LastLogin = now_ts
-            self.LastLoginIPAddress = request.client.host
-            if not self.session:
-                sid = generate_unique_sid()
-                self.session = Session(UsersID=self.ID, SessionID=sid,
-                                       LastUpdateTS=session_ts)
-                db.add(self.session)
-            else:
-                last_updated = self.session.LastUpdateTS
-                if last_updated and last_updated < now_ts:
-                    self.session.SessionID = sid = generate_unique_sid()
-                else:
-                    # Session is still valid; retrieve the current SID.
-                    sid = self.session.SessionID
+        if exc:
+            detail = ("Unable to generate a unique session ID in "
+                      f"{tries} iterations.")
+            raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+                                detail=detail)
 
-                self.session.LastUpdateTS = session_ts
-
-        request.cookies["AURSID"] = self.session.SessionID
         return self.session.SessionID
 
     def has_credential(self, credential: Set[int],
@@ -142,8 +156,7 @@ class User(Base):
         from aurweb.auth.creds import has_credential
         return has_credential(self, credential, approved)
 
-    def logout(self, request):
-        del request.cookies["AURSID"]
+    def logout(self, request: Request):
         self.authenticated = False
         if self.session:
             with db.begin():
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index a8d0db11..3455a019 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -283,3 +283,48 @@ def test_login_bad_referer(client: TestClient):
         response = request.post("/login", data=post_data, headers=BAD_REFERER)
     assert response.status_code == int(HTTPStatus.BAD_REQUEST)
     assert "AURSID" not in response.cookies
+
+
+def test_generate_unique_sid_exhausted(client: TestClient, user: User):
+    """
+    In this test, we mock up generate_unique_sid() to infinitely return
+    the same SessionID given to `user`. Within that mocking, we try
+    to login as `user2` and expect the internal server error rendering
+    by our error handler.
+
+    This exercises the bad path of /login, where we can't find a unique
+    SID to assign the user.
+    """
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        # Create a second user; we'll login with this one.
+        user2 = db.create(User, Username="test2", Email="test2@example.org",
+                          ResetKey="testReset", Passwd="testPassword",
+                          AccountTypeID=USER_ID)
+
+        # Create a session with ID == "testSession" for `user`.
+        db.create(Session, User=user, SessionID="testSession",
+                  LastUpdateTS=now)
+
+    # Mock out generate_unique_sid; always return "testSession" which
+    # causes us to eventually error out and raise an internal error.
+    def mock_generate_sid():
+        return "testSession"
+
+    # Login as `user2`; we expect an internal server error response
+    # with a relevent detail.
+    post_data = {
+        "user": user2.Username,
+        "passwd": "testPassword",
+        "next": "/",
+    }
+    generate_unique_sid_ = "aurweb.models.session.generate_unique_sid"
+    with mock.patch(generate_unique_sid_, mock_generate_sid):
+        with client as request:
+            # Set cookies = {} to remove any previous login kept by TestClient.
+            response = request.post("/login", data=post_data, cookies={})
+    assert response.status_code == int(HTTPStatus.INTERNAL_SERVER_ERROR)
+
+    expected = "Unable to generate a unique session ID"
+    assert expected in response.text
+    assert "500 - Internal Server Error" in response.text
diff --git a/test/test_user.py b/test/test_user.py
index 52cdc89e..2c8dd847 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -62,7 +62,6 @@ def test_user_login_logout(user: User):
     sid = user.login(request, "testPassword")
     assert sid is not None
     assert user.is_authenticated()
-    assert "AURSID" in request.cookies
 
     # Expect that User session relationships work right.
     user_session = db.query(Session,
@@ -92,7 +91,6 @@ def test_user_login_logout(user: User):
 
     # Test logout.
     user.logout(request)
-    assert "AURSID" not in request.cookies
     assert not user.is_authenticated()
 
 

From 81f8c2326566f993fcbcb2f0ef189c13657b0676 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 2 Dec 2021 23:42:13 -0800
Subject: [PATCH 697/844] fix(fastapi): log out IntegrityError from failed SID
 generation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py    | 5 ++++-
 test/test_auth_routes.py | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index dcf5f519..8e66b490 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -15,11 +15,13 @@ import aurweb.config
 import aurweb.models.account_type
 import aurweb.schema
 
-from aurweb import db, schema
+from aurweb import db, logging, schema
 from aurweb.models.account_type import AccountType as _AccountType
 from aurweb.models.ban import is_banned
 from aurweb.models.declarative import Base
 
+logger = logging.get_logger(__name__)
+
 SALT_ROUNDS_DEFAULT = 12
 
 
@@ -146,6 +148,7 @@ class User(Base):
         if exc:
             detail = ("Unable to generate a unique session ID in "
                       f"{tries} iterations.")
+            logger.error(str(exc))
             raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
                                 detail=detail)
 
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index 3455a019..3ae8a56c 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -285,7 +285,8 @@ def test_login_bad_referer(client: TestClient):
     assert "AURSID" not in response.cookies
 
 
-def test_generate_unique_sid_exhausted(client: TestClient, user: User):
+def test_generate_unique_sid_exhausted(client: TestClient, user: User,
+                                       caplog: pytest.LogCaptureFixture):
     """
     In this test, we mock up generate_unique_sid() to infinitely return
     the same SessionID given to `user`. Within that mocking, we try
@@ -328,3 +329,6 @@ def test_generate_unique_sid_exhausted(client: TestClient, user: User):
     expected = "Unable to generate a unique session ID"
     assert expected in response.text
     assert "500 - Internal Server Error" in response.text
+
+    # Make sure an IntegrityError from the DB got logged out.
+    assert "IntegrityError" in caplog.text

From 75ad2fb53d04e5f85dc32779bfa0e373f9301e74 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Wed, 1 Dec 2021 16:35:24 -0500
Subject: [PATCH 698/844] fix(FastAPI): cleanup auth_required decorator

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/auth/__init__.py | 46 ++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index 18356ac2..b6dd6e3f 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -120,35 +120,39 @@ class BasicAuthBackend(AuthenticationBackend):
         return (AuthCredentials(["authenticated"]), user)
 
 
-def auth_required(is_required: bool = True):
-    """ Authentication route decorator.
+def auth_required(auth_goal: bool = True):
+    """ Enforce a user's authentication status, bringing them to the login page
+    or homepage if their authentication status does not match the goal.
 
-    :param is_required: A boolean indicating whether the function requires auth
-    :param status_code: An optional status_code for template render.
-                        Redirects are always SEE_OTHER.
+    :param auth_goal: Whether authentication is required or entirely disallowed
+                      for a user to perform this request.
+    :return: Return the FastAPI function this decorator wraps.
     """
 
     def decorator(func):
         @functools.wraps(func)
         async def wrapper(request, *args, **kwargs):
-            if request.user.is_authenticated() != is_required:
-                url = "/"
+            if request.user.is_authenticated() == auth_goal:
+                return await func(request, *args, **kwargs)
 
-                if is_required:
-                    if request.method == "GET":
-                        url = request.url.path
-                    elif request.method == "POST" and (referer := request.headers.get("Referer")):
-                        aur = aurweb.config.get("options", "aur_location") + "/"
-                        if not referer.startswith(aur):
-                            _ = l10n.get_translator_for_request(request)
-                            raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
-                                                detail=_("Bad Referer header."))
-                        url = referer[len(aur) - 1:]
+            url = "/"
+            if auth_goal is False:
+                return RedirectResponse(url, status_code=int(HTTPStatus.SEE_OTHER))
 
-                    url = "/login?" + util.urlencode({"next": url})
-                return RedirectResponse(url,
-                                        status_code=int(HTTPStatus.SEE_OTHER))
-            return await func(request, *args, **kwargs)
+            # Use the request path when the user can visit a page directly but
+            # is not authenticated and use the Referer header if visiting the
+            # page itself is not directly possible (e.g. submitting a form).
+            if request.method in ("GET", "HEAD"):
+                url = request.url.path
+            elif (referer := request.headers.get("Referer")):
+                aur = aurweb.config.get("options", "aur_location") + "/"
+                if not referer.startswith(aur):
+                    _ = l10n.get_translator_for_request(request)
+                    raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
+                                        detail=_("Bad Referer header."))
+                url = referer[len(aur) - 1:]
+            url = "/login?" + util.urlencode({"next": url})
+            return RedirectResponse(url, status_code=int(HTTPStatus.SEE_OTHER))
         return wrapper
 
     return decorator

From b0b5e4c9d10ee3c31c7e3a61286c9fdabd3c8ceb Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 3 Dec 2021 15:13:41 -0800
Subject: [PATCH 699/844] fix(fastapi): use `secrets` module to generate random
 strings

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index f5ced259..542dfc2e 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -1,7 +1,6 @@
 import base64
 import copy
 import math
-import random
 import re
 import secrets
 import string
@@ -25,9 +24,9 @@ from aurweb import defaults, logging
 logger = logging.get_logger(__name__)
 
 
-def make_random_string(length):
-    return ''.join(random.choices(string.ascii_lowercase
-                                  + string.digits, k=length))
+def make_random_string(length: int) -> str:
+    alphanumerics = string.ascii_lowercase + string.digits
+    return ''.join([secrets.choice(alphanumerics) for i in range(length)])
 
 
 def make_nonce(length: int = 8):

From aa717a4ef9d45d0b2a454a75bdd4f55dd18a2225 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 3 Dec 2021 15:41:54 -0800
Subject: [PATCH 700/844] change(fastapi): no longer care about ResetKey
 collisions

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py      | 6 +++---
 aurweb/routers/accounts.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 8e66b490..d0bdea30 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -15,7 +15,7 @@ import aurweb.config
 import aurweb.models.account_type
 import aurweb.schema
 
-from aurweb import db, logging, schema
+from aurweb import db, logging, schema, util
 from aurweb.models.account_type import AccountType as _AccountType
 from aurweb.models.ban import is_banned
 from aurweb.models.declarative import Base
@@ -249,5 +249,5 @@ class User(Base):
             self.ID, str(self.AccountType), self.Username)
 
 
-def generate_unique_resetkey():
-    return db.make_random_value(User, User.ResetKey, 32)
+def generate_resetkey():
+    return util.make_random_string(32)
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 388daf84..f61ccdd2 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -16,7 +16,7 @@ from aurweb.exceptions import ValidationError
 from aurweb.l10n import get_translator_for_request
 from aurweb.models import account_type as at
 from aurweb.models.ssh_pub_key import get_fingerprint
-from aurweb.models.user import generate_unique_resetkey
+from aurweb.models.user import generate_resetkey
 from aurweb.scripts.notify import ResetKeyNotification, WelcomeNotification
 from aurweb.templates import make_context, make_variable_context, render_template
 from aurweb.users import update, validate
@@ -93,7 +93,7 @@ async def passreset_post(request: Request,
                                 status_code=HTTPStatus.SEE_OTHER)
 
     # If we got here, we continue with issuing a resetkey for the user.
-    resetkey = generate_unique_resetkey()
+    resetkey = generate_resetkey()
     with db.begin():
         user.ResetKey = resetkey
 
@@ -291,7 +291,7 @@ async def account_register_post(request: Request,
 
     # Create a user with no password with a resetkey, then send
     # an email off about it.
-    resetkey = generate_unique_resetkey()
+    resetkey = generate_resetkey()
 
     # By default, we grab the User account type to associate with.
     atype = db.query(models.AccountType,

From bfa916c7b294fb82f3b935f973b649f42849557b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 3 Dec 2021 23:40:16 -0800
Subject: [PATCH 701/844] fix(fastapi): fix PGP Key Fingerprint display for
 account/show.html

There's a space between every 4 characters in the fingerprint
in PHP; we were missing it in FastAPI. This commit fixes that
inconsistency.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py  | 11 ++++++++++-
 templates/account/show.html |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index f61ccdd2..946ffc31 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -432,7 +432,16 @@ async def account(request: Request, username: str):
     if not request.user.is_authenticated():
         return render_template(request, "account/show.html", context,
                                status_code=HTTPStatus.UNAUTHORIZED)
-    context["user"] = get_user_by_name(username)
+
+    # Get related User record, if possible.
+    user = get_user_by_name(username)
+    context["user"] = user
+
+    # Format PGPKey for display with a space between each 4 characters.
+    k = user.PGPKey or str()
+    context["pgp_key"] = " ".join([k[i:i + 4] for i in range(0, len(k), 4)])
+
+    # Render the template.
     return render_template(request, "account/show.html", context)
 
 
diff --git a/templates/account/show.html b/templates/account/show.html
index 0c99c99f..23b262b0 100644
--- a/templates/account/show.html
+++ b/templates/account/show.html
@@ -46,7 +46,7 @@
                                     </tr>
                                     <tr>
                                         <th>{% trans %}PGP Key Fingerprint{% endtrans %}:</th>
-                                        <td>{{ user.PGPKey or '' }}</td>
+                                        <td>{{ pgp_key }}</td>
                                     </tr>
                                     <tr>
                                         <th>{% trans %}Status{% endtrans %}:</th>

From d0fc56d53fa1232aa5d5c1b5a7bca12ad1edb773 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Dec 2021 00:14:55 -0800
Subject: [PATCH 702/844] fix(python): redirect when the request user can't
 edit target user

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py   | 24 +++++++++++++++++-------
 test/test_accounts_routes.py | 30 ++++++++++++++++++------------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index f61ccdd2..ff2c3040 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -329,13 +329,23 @@ async def account_register_post(request: Request,
     return render_template(request, "register.html", context)
 
 
-def cannot_edit(request, user):
-    """ Return a 401 HTMLResponse if the request user doesn't
-    have authorization, otherwise None. """
-    has_dev_cred = request.user.has_credential(creds.ACCOUNT_EDIT_DEV,
-                                               approved=[user])
-    if not has_dev_cred:
-        return HTMLResponse(status_code=HTTPStatus.UNAUTHORIZED)
+def cannot_edit(request: Request, user: models.User) \
+        -> typing.Optional[RedirectResponse]:
+    """
+    Decide if `request.user` cannot edit `user`.
+
+    If the request user can edit the target user, None is returned.
+    Otherwise, a redirect is returned to /account/{user.Username}.
+
+    :param request: FastAPI request
+    :param user: Target user to be edited
+    :return: RedirectResponse if approval != granted else None
+    """
+    approved = request.user.has_credential(creds.ACCOUNT_EDIT, approved=[user])
+    if not approved and (to := "/"):
+        if user:
+            to = f"/account/{user.Username}"
+        return RedirectResponse(to, status_code=HTTPStatus.SEE_OTHER)
     return None
 
 
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index f08efcd2..348a6994 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -620,16 +620,19 @@ def test_get_account_edit_unauthorized(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
-    create(User, Username="test2", Email="test2@example.org",
-           Passwd="testPassword")
+    with db.begin():
+        user2 = create(User, Username="test2", Email="test2@example.org",
+                       Passwd="testPassword", AccountTypeID=USER_ID)
 
+    endpoint = f"/account/{user2.Username}/edit"
     with client as request:
         # Try to edit `test2` while authenticated as `test`.
-        response = request.get("/account/test2/edit", cookies={
-            "AURSID": sid
-        }, allow_redirects=False)
+        response = request.get(endpoint, cookies={"AURSID": sid},
+                               allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
-    assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
+    expected = f"/account/{user2.Username}"
+    assert response.headers.get("location") == expected
 
 
 def test_post_account_edit(client: TestClient, user: User):
@@ -828,8 +831,9 @@ def test_post_account_edit_error_unauthorized(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
 
-    create(User, Username="test2",
-           Email="test2@example.org", Passwd="testPassword")
+    with db.begin():
+        user2 = create(User, Username="test2", Email="test2@example.org",
+                       Passwd="testPassword", AccountTypeID=USER_ID)
 
     post_data = {
         "U": "test",
@@ -838,13 +842,15 @@ def test_post_account_edit_error_unauthorized(client: TestClient, user: User):
         "passwd": "testPassword"
     }
 
+    endpoint = f"/account/{user2.Username}/edit"
     with client as request:
         # Attempt to edit 'test2' while logged in as 'test'.
-        response = request.post("/account/test2/edit", cookies={
-            "AURSID": sid
-        }, data=post_data, allow_redirects=False)
+        response = request.post(endpoint, cookies={"AURSID": sid},
+                                data=post_data, allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
-    assert response.status_code == int(HTTPStatus.UNAUTHORIZED)
+    expected = f"/account/{user2.Username}"
+    assert response.headers.get("location") == expected
 
 
 def test_post_account_edit_ssh_pub_key(client: TestClient, user: User):

From 973dbf04828c1b5f475c189d12dd8c099ac8b35e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Dec 2021 00:15:34 -0800
Subject: [PATCH 703/844] fix(python): use creds to determine account links to
 display

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/account/show.html | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/templates/account/show.html b/templates/account/show.html
index 0c99c99f..14a4eccf 100644
--- a/templates/account/show.html
+++ b/templates/account/show.html
@@ -69,20 +69,24 @@
                                                     | safe
                                                     }}
                                                 </li>
-                                                <li>
-                                                    {{ "%sEdit this user's account%s"
-                                                    | tr
-                                                    | format('<a href="/account/%s/edit">' | format(user.Username), "</a>")
-                                                    | safe
-                                                    }}
-                                                </li>
-                                                <li>
-                                                    {{ "%sList this user's comments%s"
-                                                    | tr
-                                                    | format('<a href="/account/%s/comments">' | format(user.Username), "</a>")
-                                                    | safe
-                                                    }}
-                                                </li>
+                                                {% if request.user.has_credential(creds.ACCOUNT_EDIT, approved=[user]) %}
+                                                    <li>
+                                                        {{ "%sEdit this user's account%s"
+                                                        | tr
+                                                        | format('<a href="/account/%s/edit">' | format(user.Username), "</a>")
+                                                        | safe
+                                                        }}
+                                                    </li>
+                                                {% endif %}
+                                                {% if request.user.has_credential(creds.ACCOUNT_LIST_COMMENTS, approved=[user]) %}
+                                                    <li>
+                                                        {{ "%sList this user's comments%s"
+                                                        | tr
+                                                        | format('<a href="/account/%s/comments">' | format(user.Username), "</a>")
+                                                        | safe
+                                                        }}
+                                                    </li>
+                                                {% endif %}
                                             </ul>
                                         </td>
                                     </tr>

From 2ea4559b60135b38c07b949d5905c99ec98739dc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Dec 2021 00:50:32 -0800
Subject: [PATCH 704/844] fix(python): use correct Status field in
 account/show.html

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/account/show.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/templates/account/show.html b/templates/account/show.html
index e1074394..3e36faf0 100644
--- a/templates/account/show.html
+++ b/templates/account/show.html
@@ -50,6 +50,17 @@
                                     </tr>
                                     <tr>
                                         <th>{% trans %}Status{% endtrans %}:</th>
+                                        {% if not user.InactivityTS %}
+                                            <td>{{ "Active" | tr }}</td>
+                                        {% else %}
+                                            {% set inactive_ds = user.InactivityTS | dt | as_timezone(timezone) %}
+                                            <td>
+                                                {{
+                                                    "Inactive since %s" | tr
+                                                    | format(inactive_ds.strftime("%Y-%m-%d %H:%M"))
+                                                }}
+                                            </td>
+                                        {% endif %}
                                         <td>{{ "Active" if not user.Suspended else "Suspended" | tr }}</td>
                                     </tr>
                                     <tr>

From 224a0de784634c1ee5569e12a7f95d1e9bc1bb5f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Dec 2021 01:16:14 -0800
Subject: [PATCH 705/844] fix(python): add logged in date field to
 account/show.html

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py  | 7 +++++++
 templates/account/show.html | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index fc25a7e8..8eecaa31 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -451,6 +451,13 @@ async def account(request: Request, username: str):
     k = user.PGPKey or str()
     context["pgp_key"] = " ".join([k[i:i + 4] for i in range(0, len(k), 4)])
 
+    login_ts = None
+    session = db.query(models.Session).filter(
+        models.Session.UsersID == user.ID).first()
+    if session:
+        login_ts = user.session.LastUpdateTS
+    context["login_ts"] = login_ts
+
     # Render the template.
     return render_template(request, "account/show.html", context)
 
diff --git a/templates/account/show.html b/templates/account/show.html
index 3e36faf0..c6a53f4a 100644
--- a/templates/account/show.html
+++ b/templates/account/show.html
@@ -61,7 +61,6 @@
                                                 }}
                                             </td>
                                         {% endif %}
-                                        <td>{{ "Active" if not user.Suspended else "Suspended" | tr }}</td>
                                     </tr>
                                     <tr>
                                         <th>{% trans %}Registration date{% endtrans %}:</th>
@@ -69,6 +68,13 @@
                                             {{ user.RegistrationTS.strftime("%Y-%m-%d") }}
                                         </td>
                                     </tr>
+                                    {% if login_ts %}
+                                        <tr>
+                                            <th>{% trans %}Last Login{% endtrans %}:</th>
+                                            {% set login_ds = login_ts | dt | as_timezone(timezone) %}
+                                            <td>{{ login_ds.strftime("%Y-%m-%d") }}</td>
+                                        </tr>
+                                    {% endif %}
                                     <tr>
                                         <th>{% trans %}Links{% endtrans %}:</th>
                                         <td>

From 8501bba0ac7e6ad03f80d9f370bcd4cbd63db296 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Dec 2021 02:12:20 -0800
Subject: [PATCH 706/844] change(python): rework session timing

Previously, we were just relying on the cookie expiration
for sessions to expire. We were not cleaning up Session
records either.

Rework timing to depend on an AURREMEMBER cookie which is
now emitted on login during BasicAuthBackend processing.

If the SID does still have a session but it's expired,
we now delete the session record before returning.

Otherwise, we update the session's LastUpdateTS to
the current time.

In addition, stored the unauthenticated result value
in a variable to reduce redundancy.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth/__init__.py  | 22 +++++++++++++++-------
 aurweb/models/user.py    |  8 ++------
 aurweb/routers/auth.py   |  4 ++++
 test/test_auth.py        | 24 +++++++++++++++++++++++-
 test/test_auth_routes.py | 16 ++++++----------
 5 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index b6dd6e3f..5f55e2fb 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -7,7 +7,6 @@ import fastapi
 
 from fastapi import HTTPException
 from fastapi.responses import RedirectResponse
-from sqlalchemy import and_
 from starlette.authentication import AuthCredentials, AuthenticationBackend
 from starlette.requests import HTTPConnection
 
@@ -97,18 +96,27 @@ class AnonymousUser:
 
 class BasicAuthBackend(AuthenticationBackend):
     async def authenticate(self, conn: HTTPConnection):
+        unauthenticated = (None, AnonymousUser())
         sid = conn.cookies.get("AURSID")
         if not sid:
-            return (None, AnonymousUser())
+            return unauthenticated
 
-        now_ts = datetime.utcnow().timestamp()
-        record = db.query(Session).filter(
-            and_(Session.SessionID == sid,
-                 Session.LastUpdateTS >= now_ts)).first()
+        timeout = aurweb.config.getint("options", "login_timeout")
+        remembered = ("AURREMEMBER" in conn.cookies
+                      and bool(conn.cookies.get("AURREMEMBER")))
+        if remembered:
+            timeout = aurweb.config.getint("options",
+                                           "persistent_cookie_timeout")
 
         # If no session with sid and a LastUpdateTS now or later exists.
+        now_ts = int(datetime.utcnow().timestamp())
+        record = db.query(Session).filter(Session.SessionID == sid).first()
         if not record:
-            return (None, AnonymousUser())
+            return unauthenticated
+        elif record.LastUpdateTS < (now_ts - timeout):
+            with db.begin():
+                db.delete_all([record])
+            return unauthenticated
 
         # At this point, we cannot have an invalid user if the record
         # exists, due to ForeignKey constraints in the schema upheld
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index d0bdea30..5ead606e 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -123,10 +123,6 @@ class User(Base):
         for i in range(tries):
             exc = None
             now_ts = datetime.utcnow().timestamp()
-            session_ts = now_ts + (
-                session_time if session_time
-                else aurweb.config.getint("options", "login_timeout")
-            )
             try:
                 with db.begin():
                     self.LastLogin = now_ts
@@ -135,12 +131,12 @@ class User(Base):
                         sid = generate_unique_sid()
                         self.session = db.create(Session, User=self,
                                                  SessionID=sid,
-                                                 LastUpdateTS=session_ts)
+                                                 LastUpdateTS=now_ts)
                     else:
                         last_updated = self.session.LastUpdateTS
                         if last_updated and last_updated < now_ts:
                             self.session.SessionID = generate_unique_sid()
-                        self.session.LastUpdateTS = session_ts
+                        self.session.LastUpdateTS = now_ts
                     break
             except IntegrityError as exc_:
                 exc = exc_
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 74763667..8815c896 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -73,6 +73,10 @@ async def login_post(request: Request,
     response.set_cookie("AURLANG", user.LangPreference,
                         secure=secure, httponly=secure,
                         samesite=cookies.samesite())
+    response.set_cookie("AURREMEMBER", remember_me,
+                        expires=expires_at,
+                        secure=secure, httponly=secure,
+                        samesite=cookies.samesite())
     return response
 
 
diff --git a/test/test_auth.py b/test/test_auth.py
index b607a038..0094aa25 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -6,7 +6,7 @@ import pytest
 from fastapi import HTTPException
 from sqlalchemy.exc import IntegrityError
 
-from aurweb import db
+from aurweb import config, db
 from aurweb.auth import AnonymousUser, BasicAuthBackend, account_type_required, auth_required
 from aurweb.models.account_type import USER, USER_ID
 from aurweb.models.session import Session
@@ -76,6 +76,28 @@ async def test_basic_auth_backend(user: User, backend: BasicAuthBackend):
     assert result == user
 
 
+@pytest.mark.asyncio
+async def test_expired_session(backend: BasicAuthBackend, user: User):
+    """ Login, expire the session manually, then authenticate. """
+    # First, build a Request with a logged  in user.
+    request = Request()
+    request.user = user
+    sid = request.user.login(Request(), "testPassword")
+    request.cookies["AURSID"] = sid
+
+    # Set Session.LastUpdateTS to 20 seconds expired.
+    timeout = config.getint("options", "login_timeout")
+    now_ts = int(datetime.utcnow().timestamp())
+    with db.begin():
+        request.user.session.LastUpdateTS = now_ts - timeout - 20
+
+    # Run through authentication backend and get the session
+    # deleted due to its expiration.
+    await backend.authenticate(request)
+    session = db.query(Session).filter(Session.SessionID == sid).first()
+    assert session is None
+
+
 @pytest.mark.asyncio
 async def test_auth_required_redirection_bad_referrer():
     # Create a fake route function which can be wrapped by auth_required.
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index 3ae8a56c..f3e2a011 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -13,7 +13,6 @@ from aurweb.asgi import app
 from aurweb.models.account_type import USER_ID
 from aurweb.models.session import Session
 from aurweb.models.user import User
-from aurweb.testing.requests import Request
 
 # Some test global constants.
 TEST_USERNAME = "test"
@@ -136,12 +135,11 @@ def test_secure_login(getboolean: bool, client: TestClient, user: User):
 
 def test_authenticated_login(client: TestClient, user: User):
     post_data = {
-        "user": "test",
+        "user": user.Username,
         "passwd": "testPassword",
         "next": "/"
     }
 
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
         # Try to login.
         response = request.post("/login", data=post_data,
@@ -153,7 +151,7 @@ def test_authenticated_login(client: TestClient, user: User):
         # when requesting GET /login as an authenticated user.
         # Now, let's verify that we receive 403 Forbidden when we
         # try to get /login as an authenticated user.
-        response = request.get("/login", cookies=cookies,
+        response = request.get("/login", cookies=response.cookies,
                                allow_redirects=False)
         assert response.status_code == int(HTTPStatus.OK)
         assert "Logged-in as: <strong>test</strong>" in response.text
@@ -200,14 +198,12 @@ def test_login_remember_me(client: TestClient, user: User):
 
     cookie_timeout = aurweb.config.getint(
         "options", "persistent_cookie_timeout")
-    expected_ts = datetime.utcnow().timestamp() + cookie_timeout
-
+    now_ts = int(datetime.utcnow().timestamp())
     session = db.query(Session).filter(Session.UsersID == user.ID).first()
 
-    # Expect that LastUpdateTS was within 5 seconds of the expected_ts,
-    # which is equal to the current timestamp + persistent_cookie_timeout.
-    assert session.LastUpdateTS > expected_ts - 5
-    assert session.LastUpdateTS < expected_ts + 5
+    # Expect that LastUpdateTS is not past the cookie timeout
+    # for a remembered session.
+    assert session.LastUpdateTS > (now_ts - cookie_timeout)
 
 
 def test_login_incorrect_password_remember_me(client: TestClient, user: User):

From cf978e23aa787a002d66403866140cc4be2617fe Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Dec 2021 00:51:33 -0800
Subject: [PATCH 707/844] fix(python): use S argument to decide Suspended

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/users/update.py       |  4 ++--
 test/test_accounts_routes.py | 30 ++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/aurweb/users/update.py b/aurweb/users/update.py
index 60a6184e..fd42a194 100644
--- a/aurweb/users/update.py
+++ b/aurweb/users/update.py
@@ -12,7 +12,7 @@ def simple(U: str = str(), E: str = str(), H: bool = False,
            BE: str = str(), R: str = str(), HP: str = str(),
            I: str = str(), K: str = str(), J: bool = False,
            CN: bool = False, UN: bool = False, ON: bool = False,
-           user: models.User = None,
+           S: bool = False, user: models.User = None,
            **kwargs) -> None:
     now = int(datetime.utcnow().timestamp())
     with db.begin():
@@ -24,7 +24,7 @@ def simple(U: str = str(), E: str = str(), H: bool = False,
         user.Homepage = HP or user.Homepage
         user.IRCNick = I or user.IRCNick
         user.PGPKey = K or user.PGPKey
-        user.Suspended = strtobool(J)
+        user.Suspended = strtobool(S)
         user.InactivityTS = now * int(strtobool(J))
         user.CommentNotify = strtobool(CN)
         user.UpdateNotify = strtobool(UN)
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 348a6994..d3435089 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -814,7 +814,6 @@ def test_post_account_edit_inactivity(client: TestClient, user: User):
     assert resp.status_code == int(HTTPStatus.OK)
 
     # Make sure the user record got updated correctly.
-    assert user.Suspended
     assert user.InactivityTS > 0
 
     post_data.update({"J": False})
@@ -823,10 +822,37 @@ def test_post_account_edit_inactivity(client: TestClient, user: User):
                             cookies=cookies)
     assert resp.status_code == int(HTTPStatus.OK)
 
-    assert not user.Suspended
     assert user.InactivityTS == 0
 
 
+def test_post_account_edit_suspended(client: TestClient, user: User):
+    with db.begin():
+        user.AccountTypeID = TRUSTED_USER_ID
+    assert not user.Suspended
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    post_data = {
+        "U": "test",
+        "E": "test@example.org",
+        "S": True,
+        "passwd": "testPassword"
+    }
+    endpoint = f"/account/{user.Username}/edit"
+    with client as request:
+        resp = request.post(endpoint, data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Make sure the user record got updated correctly.
+    assert user.Suspended
+
+    post_data.update({"S": False})
+    with client as request:
+        resp = request.post(endpoint, data=post_data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    assert not user.Suspended
+
+
 def test_post_account_edit_error_unauthorized(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")

From 27f8603dc511ad4723c8100829f458b0e5a3c719 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Dec 2021 00:51:59 -0800
Subject: [PATCH 708/844] fix(python): fix ordering of fields in
 partials/account_form.html

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/account_form.html | 64 ++++++++++++++--------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index f3c293d8..37bb85c4 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -42,6 +42,38 @@
             "account is inactive." | tr }}</em>
         </p>
 
+        {% if request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE) %}
+            <p>
+                <label for="id_type">
+                    {% trans %}Account Type{% endtrans %}:
+                </label>
+                <select name="T" id="id_type">
+                    {% for value, type in account_types %}
+                        <option value="{{ value }}"
+                                {% if request.user.AccountType.ID == value %}
+                                selected="selected"
+                                {% endif %}
+                        >
+                            {{ type | tr }}
+                        </option>
+                    {% endfor %}
+
+                </select>
+            </p>
+
+            <p>
+                <label for="id_suspended">
+                    {% trans %}Account Suspended{% endtrans %}:
+                </label>
+
+                <input id="suspended" type="checkbox" name="S"
+                       {% if suspended %}
+                       checked="checked"
+                       {% endif %}
+                >
+            </p>
+        {% endif %}
+
         {% if request.user.is_elevated() %}
             <p>
                 <label for="id_inactive">{% trans %}Inactive{% endtrans %}:</label>
@@ -53,38 +85,6 @@
             </p>
         {% endif %}
 
-        {% if request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE) %}
-		<p>
-            <label for="id_type">
-                {% trans %}Account Type{% endtrans %}:
-            </label>
-            <select name="T" id="id_type">
-                {% for value, type in account_types %}
-                    <option value="{{ value }}"
-                            {% if request.user.AccountType.ID == value %}
-                            selected="selected"
-                            {% endif %}
-                    >
-                        {{ type | tr }}
-                    </option>
-                {% endfor %}
-
-			</select>
-		</p>
-
-		<p>
-            <label for="id_suspended">
-                {% trans %}Account Suspended{% endtrans %}:
-            </label>
-
-            <input id="suspended" type="checkbox" name="S"
-                   {% if suspended %}
-                   checked="checked"
-                   {% endif %}
-            >
-		</p>
-        {% endif %}
-
         <!-- Email -->
         <p>
             <label for="id_email">

From 57df6db609cb729b21ccd63950b8cf6712426973 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 6 Dec 2021 15:12:49 -0800
Subject: [PATCH 709/844] fix(PackageComaintainer): populate backref cascade
 properly

Closes #205

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_comaintainer.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/package_comaintainer.py b/aurweb/models/package_comaintainer.py
index 7641fb43..b5cdcf38 100644
--- a/aurweb/models/package_comaintainer.py
+++ b/aurweb/models/package_comaintainer.py
@@ -15,11 +15,13 @@ class PackageComaintainer(Base):
     }
 
     User = relationship(
-        _User, backref=backref("comaintained", lazy="dynamic"),
+        _User, backref=backref("comaintained", lazy="dynamic",
+                               cascade="all, delete"),
         foreign_keys=[__table__.c.UsersID])
 
     PackageBase = relationship(
-        _PackageBase, backref=backref("comaintainers", lazy="dynamic"),
+        _PackageBase, backref=backref("comaintainers", lazy="dynamic",
+                                      cascade="all, delete"),
         foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):

From 51b4709ea44338ba72bb9a072fdfd0ff06447762 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 4 Dec 2021 23:44:46 -0800
Subject: [PATCH 710/844] fix(PackageVote): include backref cascade definition

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_vote.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aurweb/models/package_vote.py b/aurweb/models/package_vote.py
index 7221d527..8da88210 100644
--- a/aurweb/models/package_vote.py
+++ b/aurweb/models/package_vote.py
@@ -19,7 +19,8 @@ class PackageVote(Base):
         foreign_keys=[__table__.c.UsersID])
 
     PackageBase = relationship(
-        _PackageBase, backref=backref("package_votes", lazy="dynamic"),
+        _PackageBase, backref=backref("package_votes", lazy="dynamic",
+                                      cascade="all, delete"),
         foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):

From 0447afa2e520d845c1785ae80db201cfea0729ae Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 6 Dec 2021 21:30:23 -0800
Subject: [PATCH 711/844] fix(PackageNotification): add missing backref cascade

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_notification.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/package_notification.py b/aurweb/models/package_notification.py
index 97dbe38f..327b92a6 100644
--- a/aurweb/models/package_notification.py
+++ b/aurweb/models/package_notification.py
@@ -15,12 +15,14 @@ class PackageNotification(Base):
     }
 
     User = relationship(
-        _User, backref=backref("notifications", lazy="dynamic"),
+        _User, backref=backref("notifications", lazy="dynamic",
+                               cascade="all, delete"),
         foreign_keys=[__table__.c.UserID])
 
     PackageBase = relationship(
         _PackageBase,
-        backref=backref("notifications", lazy="dynamic"),
+        backref=backref("notifications", lazy="dynamic",
+                        cascade="all, delete"),
         foreign_keys=[__table__.c.PackageBaseID])
 
     def __init__(self, **kwargs):

From a9a0adaead8e825526a94c02bd98a04d9dd665bf Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 6 Dec 2021 19:21:56 -0800
Subject: [PATCH 712/844] fix(python): fix package_link check

This was failing when it matched more than one record.
This fixes that issue by using an EXISTS query.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 3bb3ae5f..4fb6cbe4 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -67,8 +67,8 @@ def pkgname_link(pkgname: str) -> str:
 def package_link(package: models.Package) -> str:
     base = "/".join([OFFICIAL_BASE, "packages"])
     official = db.query(models.OfficialProvider).filter(
-        models.OfficialProvider.Name == package.Name)
-    if official.scalar():
+        models.OfficialProvider.Name == package.Name).exists()
+    if db.query(official).scalar():
         return f"{base}/?q={package.Name}"
     return f"/packages/{package.Name}"
 

From de7e3ab607b7dd75074a548f0980e8197ea4dadf Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 6 Dec 2021 22:35:22 -0800
Subject: [PATCH 713/844] fix(logging): restore aurweb logger; null out root
 logger

After actually digging into how the logger does things,
since the root logger is required and we have specific
level-changing loggers for our components, we must no-op
the root logger to avoid it duplicating logs from the others.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/logging.py |  1 +
 logging.conf      | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/aurweb/logging.py b/aurweb/logging.py
index 5c4a7b6a..b205a296 100644
--- a/aurweb/logging.py
+++ b/aurweb/logging.py
@@ -8,6 +8,7 @@ aurwebdir = aurweb.config.get("options", "aurwebdir")
 config_path = os.path.join(aurwebdir, "logging.conf")
 
 logging.config.fileConfig(config_path, disable_existing_loggers=False)
+logging.getLogger("root").addHandler(logging.NullHandler())
 
 
 def get_logger(name: str) -> logging.Logger:
diff --git a/logging.conf b/logging.conf
index deb79cf5..7dfd30f0 100644
--- a/logging.conf
+++ b/logging.conf
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,uvicorn,hypercorn,alembic
+keys=root,aurweb,uvicorn,hypercorn,alembic
 
 [handlers]
 keys=simpleHandler,detailedHandler
@@ -9,17 +9,24 @@ keys=simpleFormatter,detailedFormatter
 
 [logger_root]
 level=INFO
-handlers=detailedHandler
-propogate=1
+; We add NullHandler programmatically.
+handlers=
+propogate=0
+
+[logger_aurweb]
+level=INFO
+handlers=simpleHandler
+qualname=aurweb
+propagate=1
 
 [logger_uvicorn]
-level=DEBUG
+level=INFO
 handlers=simpleHandler
 qualname=uvicorn
 propagate=0
 
 [logger_hypercorn]
-level=DEBUG
+level=INFO
 handlers=simpleHandler
 qualname=hypercorn
 propagate=0
@@ -32,7 +39,7 @@ propagate=0
 
 [handler_simpleHandler]
 class=StreamHandler
-level=INFO
+level=DEBUG
 formatter=simpleFormatter
 args=(sys.stdout,)
 

From 31d82fb1afbb958c2031680861e4905a137c489a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 6 Dec 2021 22:54:46 -0800
Subject: [PATCH 714/844] fix(templates): correct Closed link display

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/requests.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/requests.html b/templates/requests.html
index 74ea6416..e8c1a8c8 100644
--- a/templates/requests.html
+++ b/templates/requests.html
@@ -76,7 +76,7 @@
                                         ) %}
                                     {% endif %}
 
-                                    {% if request.user.is_elevated() %}
+                                    {% if request.user.is_elevated() and not result.ClosedTS %}
                                         {% if result.RequestType.ID == 2 and not due %}
                                             {% set time_left = idle_time - time_delta %}
                                             {% if time_left > 48 * 3600 %}
@@ -98,9 +98,11 @@
                                         {% endif %}
                                         <br />
                                     {% endif %}
-                                    <a href="/requests/{{ result.ID }}/close">
-                                        {{ "Close" | tr }}
-                                    </a>
+                                    {% if not result.ClosedTS %}
+                                        <a href="/requests/{{ result.ID }}/close">
+                                            {{ "Close" | tr }}
+                                        </a>
+                                    {% endif %}
                                 {% else %}
                                     {{ result.status_display() }}
                                 {% endif %}

From 452f5d160a7099773d8a8208609a0c355f1c6500 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 6 Dec 2021 22:49:40 -0800
Subject: [PATCH 715/844] fix(python): remove unneeded newline

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index c06ec51f..fb9498d4 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -694,8 +694,7 @@ async def pkgbase_request_post(request: Request, name: str,
             delete_package(request.user, package)
 
     # Redirect the submitting user to /packages.
-    return RedirectResponse("/packages",
-                            status_code=HTTPStatus.SEE_OTHER)
+    return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
 
 
 @router.get("/requests/{id}/close")

From 1b203f0d30acca861fa96e73e3ac752ddaa77551 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 6 Dec 2021 22:39:40 -0800
Subject: [PATCH 716/844] fix(requests): show unlinked pkgname when PackageBase
 has been deleted

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/requests.html | 16 +++++++++++-----
 templates/requests.html                   | 17 +++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/templates/partials/packages/requests.html b/templates/partials/packages/requests.html
index 5188a476..4084e96f 100644
--- a/templates/partials/packages/requests.html
+++ b/templates/partials/packages/requests.html
@@ -15,11 +15,17 @@
         {% for request in requests %}
             {% set requested = request.RequestTS | dt | as_timezone(timezone) %}
             <tr>
-                <td>
-                    <a href="/pkgbase/{{ request.PackageBase.Name }}">
-                        {{ request.PackageBase.Name }}
-                    </a>
-                </td>
+                {% if request.PackageBase %}
+                    {# If the PackageBase still exists, link to it. #}
+                    <td>
+                        <a href="/pkgbase/{{ request.PackageBaseName }}">
+                            {{ request.PackageBaseName }}
+                        </a>
+                    </td>
+                {% else %}
+                    {# Otherwise, just display PackageBaseName unlinked. #}
+                    <td>{{ request.PackageBaseName }}</td>
+                {% endif %}
                 <td>
                     {{ request.RequestType.name_display() | tr }}
                     {# If the RequestType is a merge and request.MergeBaseName is valid... #}
diff --git a/templates/requests.html b/templates/requests.html
index 74ea6416..09448b6d 100644
--- a/templates/requests.html
+++ b/templates/requests.html
@@ -23,12 +23,17 @@
                 <tbody>
                     {% for result in results %}
                         <tr>
-                            <td>
-                                {# Package #}
-                                <a href="/pkgbase/{{ result.PackageBaseName }}">
-                                    {{ result.PackageBaseName }}
-                                </a>
-                            </td>
+                            {% if result.PackageBase %}
+                                {# If the PackageBase still exists, link to it. #}
+                                <td>
+                                    <a href="/pkgbase/{{ result.PackageBaseName }}">
+                                        {{ result.PackageBaseName }}
+                                    </a>
+                                </td>
+                            {% else %}
+                                {# Otherwise, just display PackageBaseName unlinked. #}
+                                <td>{{ result.PackageBaseName }}</td>
+                            {% endif %}
                             {# Type #}
                             <td>
                                 {{ result.RequestType.name_display() | tr }}

From 409229739e221f287d8cf853812048fb5dbe02d6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 7 Dec 2021 12:07:44 -0800
Subject: [PATCH 717/844] feat(conftest): set default logging.conf to DEBUG

We now maintain a logging.prod.conf, which should contain sane
defaults for a production instance. Our main logging.conf is
a good default for both testing and debugging, but provides
too much logging for production.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 logging.conf      |  4 +++-
 logging.prod.conf | 61 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 logging.prod.conf

diff --git a/logging.conf b/logging.conf
index 7dfd30f0..6c44f5dc 100644
--- a/logging.conf
+++ b/logging.conf
@@ -14,7 +14,9 @@ handlers=
 propogate=0
 
 [logger_aurweb]
-level=INFO
+; This loglevel is set to DEBUG for tests where we expect specific
+; debug logging to occur. In production, this should be set to INFO.
+level=DEBUG
 handlers=simpleHandler
 qualname=aurweb
 propagate=1
diff --git a/logging.prod.conf b/logging.prod.conf
new file mode 100644
index 00000000..016e7949
--- /dev/null
+++ b/logging.prod.conf
@@ -0,0 +1,61 @@
+; This logger should be used in production, as it limits the logging
+; done to INFO. The main logger uses DEBUG and is purely meant for
+; debugging and unit tests.
+[loggers]
+keys=root,aurweb,uvicorn,hypercorn,alembic
+
+[handlers]
+keys=simpleHandler,detailedHandler
+
+[formatters]
+keys=simpleFormatter,detailedFormatter
+
+[logger_root]
+level=INFO
+; We add NullHandler programmatically.
+handlers=
+propogate=0
+
+[logger_aurweb]
+level=INFO
+handlers=simpleHandler
+qualname=aurweb
+propagate=1
+
+[logger_uvicorn]
+level=INFO
+handlers=simpleHandler
+qualname=uvicorn
+propagate=0
+
+[logger_hypercorn]
+level=INFO
+handlers=simpleHandler
+qualname=hypercorn
+propagate=0
+
+[logger_alembic]
+level=INFO
+handlers=simpleHandler
+qualname=alembic
+propagate=0
+
+[handler_simpleHandler]
+class=StreamHandler
+level=DEBUG
+formatter=simpleFormatter
+args=(sys.stdout,)
+
+[handler_detailedHandler]
+class=StreamHandler
+level=DEBUG
+formatter=detailedFormatter
+args=(sys.stdout,)
+
+[formatter_simpleFormatter]
+format=%(asctime)s %(levelname)-5s | %(name)s: %(message)s
+datefmt=%H:%M:%S
+
+[formatter_detailedFormatter]
+format=%(asctime)s %(levelname)-5s | %(name)s.%(funcName)s() @ L%(lineno)d: %(message)s
+datefmt=%H:%M:%S

From 7831503c190e4d3e994a079a24502817034fe5e2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 7 Dec 2021 13:44:13 -0800
Subject: [PATCH 718/844] fix(docker): use logging.prod.conf for sharness

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml            | 2 +-
 docker/scripts/run-tests.sh   | 3 +++
 docker/sharness-entrypoint.sh | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 docker/sharness-entrypoint.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 401193d5..af522b6e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -275,7 +275,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config.sqlite
-    entrypoint: /docker/test-sqlite-entrypoint.sh
+    entrypoint: /docker/sharness-entrypoint.sh
     command: /docker/scripts/run-sharness.sh
     stdin_open: true
     tty: true
diff --git a/docker/scripts/run-tests.sh b/docker/scripts/run-tests.sh
index a726c957..07e84822 100755
--- a/docker/scripts/run-tests.sh
+++ b/docker/scripts/run-tests.sh
@@ -6,7 +6,10 @@ dir=$(dirname $0)
 make -C test clean
 
 # Run sharness tests.
+cp -vf logging.conf logging.conf.bak
+cp -vf logging.prod.conf logging.conf
 bash $dir/run-sharness.sh
+cp -vf logging.conf.bak logging.conf
 
 # Run Python tests with MariaDB database.
 # Pass --silence to avoid reporting coverage. We will do that below.
diff --git a/docker/sharness-entrypoint.sh b/docker/sharness-entrypoint.sh
new file mode 100755
index 00000000..3a1b244c
--- /dev/null
+++ b/docker/sharness-entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eou pipefail
+
+cp -vf logging.prod.conf logging.conf
+
+exec "$@"

From 061e828f16fc77aa51b112be011bdf476541392e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 7 Dec 2021 13:44:36 -0800
Subject: [PATCH 719/844] fix(gitlab-ci): use logging.prod.conf for sharness

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6d49a55..0166db2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,12 @@ test:
     - make -C po all install
     - make -C test clean
   script:
+    # Run sharness.
+    - cp logging.conf logging.conf.bak # Copy devel logging.conf to backup
+    - cp logging.prod.conf logging.conf # Copy in logging.prod.conf
     - make -C test sh # sharness tests use sqlite.
+    - cp logging.conf.bak logging.conf # Restore devel logging.conf
+    # Run pytest.
     - pytest # Run pytest suites.
     - make -C test coverage # Produce coverage reports.
     - flake8 --count aurweb # Assert no flake8 violations in aurweb.
@@ -59,6 +64,7 @@ deploy:
     COMMIT_HASH: $CI_COMMIT_SHA
     GIT_DATA_DIR: git_data
   script:
+    - cp -vf logging.prod.conf logging.conf # Use production logging.conf
     - pacman -Syu --noconfirm docker docker-compose socat openssh
     - chmod 600 ${SSH_KEY}
     - socat "UNIX-LISTEN:/tmp/docker.sock,reuseaddr,fork" EXEC:"ssh -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -Ti ${SSH_KEY} ${SSH_USER}@${SSH_HOST}" &

From c3d962a0d0f40aeb8eb6ca4a99b97ba34bc7aa02 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 8 Dec 2021 16:12:51 -0800
Subject: [PATCH 720/844] fix(templates): add some comments

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/requests.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/requests.html b/templates/requests.html
index 12f3f9c4..30241422 100644
--- a/templates/requests.html
+++ b/templates/requests.html
@@ -82,6 +82,12 @@
                                     {% endif %}
 
                                     {% if request.user.is_elevated() and not result.ClosedTS %}
+                                        {#
+                                        If RequestType is an orphan and it's not yet due, it's locked
+                                        to allow the maintainer time to react to such a request.
+
+                                        On request, orphans are locked for two weeks.
+                                        #}
                                         {% if result.RequestType.ID == 2 and not due %}
                                             {% set time_left = idle_time - time_delta %}
                                             {% if time_left > 48 * 3600 %}

From 32660881f6e82743210e65389faf53691e5f5f15 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 6 Dec 2021 14:56:39 -0800
Subject: [PATCH 721/844] fix(docker): set notifications up in test config

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/test-mysql-entrypoint.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
index 1bf85b54..b3464256 100755
--- a/docker/test-mysql-entrypoint.sh
+++ b/docker/test-mysql-entrypoint.sh
@@ -13,4 +13,7 @@ aurweb-config set database socket '/var/run/mysqld/mysqld.sock'
 aurweb-config unset database password
 aurweb-config unset database port
 
+# Setup notifications for testing.
+aurweb-config set notifications sendmail "$(pwd)/util/sendmail"
+
 exec "$@"

From 60b098a2f2c74b03c7f4a8b8ce1e3649cd27c8d1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 9 Dec 2021 14:57:31 -0800
Subject: [PATCH 722/844] fix(git-cliff): define Housekeeping group + match all
 tags

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 cliff.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cliff.toml b/cliff.toml
index b71ea672..6ee495a3 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -63,6 +63,7 @@ commit_parsers = [
     { message = "^refactor", group = "Refactor"},
     { message = "^style", group = "Styling"},
     { message = "^test", group = "Testing"},
+    { message = "^housekeep", group = "Housekeeping"},
     { message = "^chore\\(release\\): prepare for", skip = true},
     { message = "^chore", group = "Miscellaneous Tasks"},
     { body = ".*security", group = "Security"},
@@ -70,6 +71,6 @@ commit_parsers = [
 # filter out the commits that are not matched by commit parsers
 filter_commits = false
 # glob pattern for matching git tags
-tag_pattern = "v[0-9]*"
+tag_pattern = "*[0-9]*"
 # regex for skipping tags
 skip_tags = "v0.1.0-beta.1"

From 85e6ad03dbdb7be77eb01757c82a73fe01672c98 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 7 Dec 2021 11:48:53 -0800
Subject: [PATCH 723/844] feat(testing.email): add Email.dump

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/email.py | 43 +++++++++++++++++++++++++++---
 test/conftest.py        | 12 +++++++++
 test/test_email.py      | 59 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+), 4 deletions(-)
 create mode 100644 test/test_email.py

diff --git a/aurweb/testing/email.py b/aurweb/testing/email.py
index 6ff9df99..c0be2797 100644
--- a/aurweb/testing/email.py
+++ b/aurweb/testing/email.py
@@ -1,8 +1,12 @@
 import base64
+import binascii
 import copy
 import email
 import os
 import re
+import sys
+
+from typing import TextIO
 
 
 class Email:
@@ -26,10 +30,13 @@ class Email:
     """
     TEST_DIR = "test-emails"
 
-    def __init__(self, serial: int = 1):
+    def __init__(self, serial: int = 1, autoparse: bool = True):
         self.serial = serial
         self.content = self._get()
 
+        if autoparse:
+            self._parse()
+
     @staticmethod
     def email_prefix(suite: bool = False) -> str:
         """
@@ -77,7 +84,7 @@ class Email:
         with open(path) as f:
             return f.read()
 
-    def parse(self) -> "Email":
+    def _parse(self) -> "Email":
         """
         Parse this email and base64-decode the body.
 
@@ -94,7 +101,10 @@ class Email:
 
         # aurweb email notifications always have base64 encoded content.
         # Decode it here so self.body is human readable.
-        self.body = base64.b64decode(self.message.get_payload()).decode()
+        try:
+            self.body = base64.b64decode(self.message.get_payload()).decode()
+        except (binascii.Error, UnicodeDecodeError):
+            self.body = self.message.get_payload()
 
         path = self._email_path()
         with open(path, "w") as f:
@@ -102,6 +112,9 @@ class Email:
 
         return self
 
+    def parse(self) -> "Email":
+        return self
+
     def glue(self) -> str:
         """
         Glue parsed content back into a complete email document, but
@@ -110,7 +123,9 @@ class Email:
         :return: Email document as a string
         """
         headers = copy.copy(self.headers)
-        del headers["Content-Transfer-Encoding"]
+
+        if "Content-Transfer-Encoding" in headers:
+            headers.pop("Content-Transfer-Encoding")
 
         output = []
         for k, v in headers.items():
@@ -118,3 +133,23 @@ class Email:
         output.append("")
         output.append(self.body)
         return "\n".join(output)
+
+    @staticmethod
+    def dump(file: TextIO = sys.stdout) -> None:
+        """
+        Dump emails content to `file`.
+
+        This function is intended to be used to debug email issues
+        while testing something relevent to email.
+
+        :param file: Writable file object
+        """
+        lines = []
+        for i in range(Email.count()):
+            email = Email(i + 1)
+            lines += [
+                f"== Email #{i + 1} ==",
+                email.glue(),
+                f"== End of Email #{i + 1}"
+            ]
+        print("\n".join(lines), file=file)
diff --git a/test/conftest.py b/test/conftest.py
index fc7f77dc..283c979a 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -217,3 +217,15 @@ def db_test(db_session: scoped_session) -> None:
 @pytest.fixture
 def git(tmpdir: py.path.local) -> GitRepository:
     yield GitRepository(tmpdir)
+
+
+@pytest.fixture
+def email_test() -> None:
+    """
+    A decoupled test email setup fixture.
+
+    When using the `db_test` fixture, this fixture is redundant. Otherwise,
+    email tests need to run through our `setup_email` function to ensure
+    that we set them up to be used via aurweb.testing.email.Email.
+    """
+    setup_email()
diff --git a/test/test_email.py b/test/test_email.py
new file mode 100644
index 00000000..873feffe
--- /dev/null
+++ b/test/test_email.py
@@ -0,0 +1,59 @@
+import io
+
+from subprocess import PIPE, Popen
+
+import pytest
+
+from aurweb import config
+from aurweb.testing.email import Email
+
+
+@pytest.fixture(autouse=True)
+def setup(email_test):
+    return
+
+
+def sendmail(from_: str, to_: str, content: str) -> Email:
+    binary = config.get("notifications", "sendmail")
+    proc = Popen(binary, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    content = f"From: {from_}\nTo: {to_}\n\n{content}"
+    proc.communicate(content.encode())
+    proc.wait()
+    assert proc.returncode == 0
+
+
+def test_email_glue():
+    """ Test that Email.glue() decodes both base64 and decoded content. """
+    body = "Test email."
+    sendmail("test@example.org", "test@example.org", body)
+    assert Email.count() == 1
+
+    email1 = Email(1)
+    email2 = Email(1)
+    assert email1.glue() == email2.glue()
+
+
+def test_email_dump():
+    """ Test that Email.dump() dumps a single email. """
+    body = "Test email."
+    sendmail("test@example.org", "test@example.org", body)
+    assert Email.count() == 1
+
+    stdout = io.StringIO()
+    Email.dump(file=stdout)
+    content = stdout.getvalue()
+    assert "== Email #1 ==" in content
+
+
+def test_email_dump_multiple():
+    """ Test that Email.dump() dumps multiple emails. """
+    body = "Test email."
+    sendmail("test@example.org", "test@example.org", body)
+    sendmail("test2@example.org", "test2@example.org", body)
+    assert Email.count() == 2
+
+    stdout = io.StringIO()
+    Email.dump(file=stdout)
+    content = stdout.getvalue()
+    assert "== Email #1 ==" in content
+    assert "== Email #2 ==" in content

From bad57ba502bcb8ea846938e8dd0d2490854c3e1f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 8 Dec 2021 16:02:21 -0800
Subject: [PATCH 724/844] feat(exceptions): add InvariantError

This exception is to be used when a known invariant is violated.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/exceptions.py    | 4 ++++
 test/test_exceptions.py | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/aurweb/exceptions.py b/aurweb/exceptions.py
index 31212676..1c45b7f3 100644
--- a/aurweb/exceptions.py
+++ b/aurweb/exceptions.py
@@ -86,3 +86,7 @@ class ValidationError(AurwebException):
     def __init__(self, data: Any, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.data = data
+
+
+class InvariantError(AurwebException):
+    pass
diff --git a/test/test_exceptions.py b/test/test_exceptions.py
index 7247106b..e43cd645 100644
--- a/test/test_exceptions.py
+++ b/test/test_exceptions.py
@@ -97,3 +97,10 @@ def test_repository_name_exception():
         raise exceptions.InvalidRepositoryNameException("test")
     except exceptions.InvalidRepositoryNameException as exc:
         assert str(exc) == "invalid repository name: test"
+
+
+def test_invariant_error():
+    try:
+        raise exceptions.InvariantError("test")
+    except exceptions.InvariantError as exc:
+        assert str(exc) == "test"

From 26b1674c9eaa26954df376ba3007af56235a062b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 8 Dec 2021 17:34:44 -0800
Subject: [PATCH 725/844] fix(requests): rework handling of requests

This commit changes several things about how we were handling
package requests.

Modifications (requests):
-------------
- `/requests/{id}/close` no longer provides an Accepted selection.
  All manual request closures will cause a rejection.
- Relevent `pkgbase` actions now trigger request closures:
  `/pkgbase/{name}/delete` (deletion), `/pkgbase/{name}/merge` (merge)
  and `/pkgbase/{name}/disown` (orphan).
- Comment fields have been added to
  `/pkgbase/{name}/{delete,merge,disown}`, which is used to set the
  `PackageRequest.ClosureComment` on pending requests. If the comment
  field is left blank, a closure comment is autogenerated.
- Autogenerated request notifications are only sent out once
  as a closure notification.
- Some markup has been fixed.

Modifications (disown/orphan):
-----------------------------
- Orphan requests are now handled through the same path as
  deletion/merge.
- We now check for due date when disowning as non-maintainer;
  previously, this was only done for display and not functionally.
  This check applies to Trusted Users' disowning of a package.

This style of notification flow does reduce our visibility, but
accounting can still be done via the close request; it includes
the action, pkgbase name and the user who accepted it.

Closes #204

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/requests.py    | 240 ++++++++++++++
 aurweb/routers/packages.py     | 260 +++++++--------
 po/aurweb.pot                  |   4 +
 templates/packages/delete.html |   6 +
 templates/packages/disown.html |   6 +
 templates/pkgbase/merge.html   |   6 +
 templates/requests.html        |   1 -
 templates/requests/close.html  |  18 --
 test/test_packages_routes.py   | 299 +++++++-----------
 test/test_requests.py          | 558 +++++++++++++++++++++++++++++++++
 10 files changed, 1044 insertions(+), 354 deletions(-)
 create mode 100644 aurweb/packages/requests.py
 create mode 100644 test/test_requests.py

diff --git a/aurweb/packages/requests.py b/aurweb/packages/requests.py
new file mode 100644
index 00000000..d68f9688
--- /dev/null
+++ b/aurweb/packages/requests.py
@@ -0,0 +1,240 @@
+from datetime import datetime
+from typing import List, Optional, Set
+
+from fastapi import Request
+from sqlalchemy import and_, orm
+
+from aurweb import config, db, l10n, util
+from aurweb.exceptions import InvariantError
+from aurweb.models import PackageBase, PackageRequest, User
+from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
+from aurweb.models.request_type import DELETION, DELETION_ID, MERGE, MERGE_ID, ORPHAN, ORPHAN_ID
+from aurweb.scripts import notify
+
+
+class ClosureFactory:
+    """ A factory class used to autogenerate closure comments. """
+
+    REQTYPE_NAMES = {
+        DELETION_ID: DELETION,
+        MERGE_ID: MERGE,
+        ORPHAN_ID: ORPHAN
+    }
+
+    def _deletion_closure(self, requester: User,
+                          pkgbase: PackageBase,
+                          target: PackageBase = None):
+        return (f"[Autogenerated] Accepted deletion for {pkgbase.Name}.")
+
+    def _merge_closure(self, requester: User,
+                       pkgbase: PackageBase,
+                       target: PackageBase = None):
+        return (f"[Autogenerated] Accepted merge for {pkgbase.Name} "
+                "into {target.Name}.")
+
+    def _orphan_closure(self, requester: User,
+                        pkgbase: PackageBase,
+                        target: PackageBase = None):
+        return (f"[Autogenerated] Accepted orphan for {pkgbase.Name}.")
+
+    def _rejected_merge_closure(self, requester: User,
+                                pkgbase: PackageBase,
+                                target: PackageBase = None):
+        return (f"[Autogenerated] Another request to merge {pkgbase.Name} "
+                f"into {target.Name} has rendered this request invalid.")
+
+    def get_closure(self, reqtype_id: int,
+                    requester: User,
+                    pkgbase: PackageBase,
+                    target: PackageBase = None,
+                    status: int = ACCEPTED_ID) -> str:
+        """
+        Return a closure comment handled by this class.
+
+        :param reqtype_id: RequestType.ID
+        :param requester: User who is closing a request
+        :param pkgbase: PackageBase instance related to the request
+        :param target: Merge request target PackageBase instance
+        :param status: PackageRequest.Status
+        """
+        reqtype = ClosureFactory.REQTYPE_NAMES.get(reqtype_id)
+
+        partial = str()
+        if status == REJECTED_ID:
+            partial = "_rejected"
+
+        try:
+            handler = getattr(self, f"{partial}_{reqtype}_closure")
+        except AttributeError:
+            raise NotImplementedError("Unsupported 'reqtype_id' value.")
+        return handler(requester, pkgbase, target)
+
+
+def update_closure_comment(pkgbase: PackageBase, reqtype_id: int,
+                           comments: str, target: PackageBase = None) -> None:
+    """
+    Update all pending requests related to `pkgbase` with a closure comment.
+
+    In order to persist closure comments through `handle_request`'s
+    algorithm, we must set `PackageRequest.ClosureComment` before calling
+    it. This function can be used to update the closure comment of all
+    package requests related to `pkgbase` and `reqtype_id`.
+
+    If an empty `comments` string is provided, we no-op out of this.
+
+    :param pkgbase: PackageBase instance
+    :param reqtype_id: RequestType.ID
+    :param comments: PackageRequest.ClosureComment to update to
+    :param target: Merge request target PackageBase instance
+    """
+    if not comments:
+        return
+
+    query = pkgbase.requests.filter(
+        and_(PackageRequest.ReqTypeID == reqtype_id,
+             PackageRequest.Status == PENDING_ID))
+    if reqtype_id == MERGE_ID:
+        query = query.filter(PackageRequest.MergeBaseName == target.Name)
+
+    for pkgreq in query:
+        pkgreq.ClosureComment = comments
+
+
+def verify_orphan_request(user: User, pkgbase: PackageBase):
+    """ Verify that an undue orphan request exists in `requests`. """
+    is_maint = user == pkgbase.Maintainer
+    if is_maint:
+        return True
+
+    requests = pkgbase.requests.filter(
+        PackageRequest.ReqTypeID == ORPHAN_ID)
+    for pkgreq in requests:
+        idle_time = config.getint("options", "request_idle_time")
+        time_delta = int(datetime.utcnow().timestamp()) - pkgreq.RequestTS
+        is_due = pkgreq.Status == PENDING_ID and time_delta > idle_time
+        if is_due:
+            # If the requester is the pkgbase maintainer or the
+            # request is already due, we're good to go: return True.
+            return True
+
+    return False
+
+
+def close_pkgreq(pkgreq: PackageRequest, closer: User,
+                 pkgbase: PackageBase, target: Optional[PackageBase],
+                 status: int) -> None:
+    """
+    Close a package request with `pkgreq`.Status == `status`.
+
+    :param pkgreq: PackageRequest instance
+    :param closer: `pkgreq`.Closer User instance to update to
+    :param pkgbase: PackageBase instance which `pkgreq` is about
+    :param target: Optional PackageBase instance to merge into
+    :param status: `pkgreq`.Status value to update to
+    """
+    now = int(datetime.utcnow().timestamp())
+    pkgreq.Status = status
+    pkgreq.Closer = closer
+    pkgreq.ClosureComment = (
+        pkgreq.ClosureComment or ClosureFactory().get_closure(
+            pkgreq.ReqTypeID, closer, pkgbase, target, status)
+    )
+    pkgreq.ClosedTS = now
+
+
+def handle_request(request: Request, reqtype_id: int,
+                   pkgbase: PackageBase,
+                   target: PackageBase = None) -> List[notify.Notification]:
+    """
+    Handle package requests before performing an action.
+
+    The actions we're interested in are disown (orphan), delete and
+    merge. There is now an automated request generation and closure
+    notification when a privileged user performs one of these actions
+    without a pre-existing request. They all commit changes to the
+    database, and thus before calling, state should be verified to
+    avoid leaked database records regarding these requests.
+
+    Otherwise, we accept and reject requests based on their state
+    and send out the relevent notifications.
+
+    :param requester: User who needs this a `pkgbase` request handled
+    :param reqtype_id: RequestType.ID
+    :param pkgbase: PackageBase which the request is about
+    :param target: Optional target to merge into
+    """
+    notifs: List[notify.Notification] = []
+
+    # If it's an orphan request, perform further verification
+    # regarding existing requests.
+    if reqtype_id == ORPHAN_ID:
+        if not verify_orphan_request(request.user, pkgbase):
+            _ = l10n.get_translator_for_request(request)
+            raise InvariantError(_(
+                "No due existing orphan requests to accept for %s."
+            ) % pkgbase.Name)
+
+    # Produce a base query for requests related to `pkgbase`, based
+    # on ReqTypeID matching `reqtype_id`, pending status and a correct
+    # PackagBaseName column.
+    query: orm.Query = pkgbase.requests.filter(
+        and_(PackageRequest.ReqTypeID == reqtype_id,
+             PackageRequest.Status == PENDING_ID,
+             PackageRequest.PackageBaseName == pkgbase.Name))
+
+    # Build a query for records we should accept. For merge requests,
+    # this is specific to a matching MergeBaseName. For others, this
+    # just ends up becoming `query`.
+    accept_query: orm.Query = query
+    if target:
+        # If a `target` was supplied, filter by MergeBaseName
+        accept_query = query.filter(
+            PackageRequest.MergeBaseName == target.Name)
+
+    # Build an accept list out of `accept_query`.
+    to_accept: List[PackageRequest] = accept_query.all()
+    accepted_ids: Set[int] = set(p.ID for p in to_accept)
+
+    # Build a reject list out of `query` filtered by IDs not found
+    # in `to_accept`. That is, unmatched records of the same base
+    # query properties.
+    to_reject: List[PackageRequest] = query.filter(
+        ~PackageRequest.ID.in_(accepted_ids)
+    ).all()
+
+    # If we have no requests to accept, create a new one.
+    # This is done to increase tracking of actions occurring
+    # through the website.
+    if not to_accept:
+        with db.begin():
+            pkgreq = db.create(PackageRequest,
+                               ReqTypeID=reqtype_id,
+                               User=request.user,
+                               PackageBase=pkgbase,
+                               PackageBaseName=pkgbase.Name,
+                               Comments="Autogenerated by aurweb.",
+                               ClosureComment=str())
+
+            # If it's a merge request, set MergeBaseName to `target`.Name.
+            if pkgreq.ReqTypeID == MERGE_ID:
+                pkgreq.MergeBaseName = target.Name
+
+            # Add the new request to `to_accept` and allow standard
+            # flow to continue afterward.
+            to_accept.append(pkgreq)
+
+    # Update requests with their new status and closures.
+    with db.begin():
+        util.apply_all(to_accept, lambda p: close_pkgreq(
+            p, request.user, pkgbase, target, ACCEPTED_ID))
+        util.apply_all(to_reject, lambda p: close_pkgreq(
+            p, request.user, pkgbase, target, REJECTED_ID))
+
+    # Create RequestCloseNotifications for all requests involved.
+    for pkgreq in (to_accept + to_reject):
+        notif = notify.RequestCloseNotification(
+            request.user.ID, pkgreq.ID, pkgreq.status_display())
+        notifs.append(notif)
+
+    # Return notifications to the caller for sending.
+    return notifs
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index fb9498d4..eb4cab74 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -4,19 +4,20 @@ from typing import Any, Dict, List
 
 from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse
-from sqlalchemy import case
+from sqlalchemy import and_, case
 
 import aurweb.filters
 import aurweb.packages.util
 
 from aurweb import db, defaults, l10n, logging, models, util
 from aurweb.auth import auth_required, creds
-from aurweb.exceptions import ValidationError
+from aurweb.exceptions import InvariantError, ValidationError
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
-from aurweb.models.request_type import DELETION_ID, MERGE, MERGE_ID
+from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
 from aurweb.packages import util as pkgutil
 from aurweb.packages import validate
+from aurweb.packages.requests import handle_request, update_closure_comment
 from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, get_pkgreq_by_id, query_notified, query_voted
 from aurweb.scripts import notify, popupdate
@@ -115,66 +116,30 @@ async def packages(request: Request) -> Response:
     return await packages_get(request, context)
 
 
-def create_request_if_missing(requests: List[models.PackageRequest],
-                              reqtype: models.RequestType,
-                              user: models.User,
-                              package: models.Package):
-    now = int(datetime.utcnow().timestamp())
-    pkgreq = db.query(models.PackageRequest).filter(
-        models.PackageRequest.PackageBaseName == package.PackageBase.Name
-    ).first()
-    if not pkgreq:
-        # No PackageRequest existed. Create one.
-        comments = "Automatically generated by aurweb."
-        closure_comment = "Deleted by aurweb."
-        pkgreq = db.create(models.PackageRequest,
-                           RequestType=reqtype,
-                           PackageBase=package.PackageBase,
-                           PackageBaseName=package.PackageBase.Name,
-                           User=user,
-                           Status=ACCEPTED_ID,
-                           Comments=comments,
-                           ClosureComment=closure_comment,
-                           ClosedTS=now,
-                           Closer=user)
-        requests.append(pkgreq)
-    return pkgreq
-
-
-def delete_package(deleter: models.User, package: models.Package):
-    notifications = []
-    requests = []
+def delete_package(request: Request, package: models.Package,
+                   merge_into: models.PackageBase = None,
+                   comments: str = str()):
     bases_to_delete = []
 
+    target = db.query(models.PackageBase).filter(
+        models.PackageBase.Name == merge_into
+    ).first()
+
+    notifs = []
     # In all cases, though, just delete the Package in question.
     if package.PackageBase.packages.count() == 1:
-        reqtype = db.query(models.RequestType).filter(
-            models.RequestType.ID == DELETION_ID
-        ).first()
-
-        with db.begin():
-            pkgreq = create_request_if_missing(
-                requests, reqtype, deleter, package)
-            pkgreq.Status = ACCEPTED_ID
+        notifs = handle_request(request, DELETION_ID, package.PackageBase,
+                                target=target)
 
         bases_to_delete.append(package.PackageBase)
 
-        # Prepare DeleteNotification.
-        notifications.append(
-            notify.DeleteNotification(deleter.ID, package.PackageBase.ID)
-        )
+        with db.begin():
+            update_closure_comment(package.PackageBase, DELETION_ID, comments,
+                                   target=target)
 
-    # For each PackageRequest created, mock up an open and close notification.
-    basename = package.PackageBase.Name
-    for pkgreq in requests:
-        notifications.append(
-            notify.RequestOpenNotification(
-                deleter.ID, pkgreq.ID, reqtype.Name,
-                pkgreq.PackageBase.ID, merge_into=basename or None)
-        )
-        notifications.append(
-            notify.RequestCloseNotification(
-                deleter.ID, pkgreq.ID, pkgreq.status_display())
+        # Prepare DeleteNotification.
+        notifs.append(
+            notify.DeleteNotification(request.user.ID, package.PackageBase.ID)
         )
 
     # Perform all the deletions.
@@ -183,7 +148,7 @@ def delete_package(deleter: models.User, package: models.Package):
         db.delete_all(bases_to_delete)
 
     # Send out all the notifications.
-    util.apply_all(notifications, lambda n: n.send())
+    util.apply_all(notifs, lambda n: n.send())
 
 
 async def make_single_context(request: Request,
@@ -676,22 +641,26 @@ async def pkgbase_request_post(request: Request, name: str,
     auto_orphan_age = aurweb.config.getint("options", "auto_orphan_age")
     auto_delete_age = aurweb.config.getint("options", "auto_delete_age")
 
-    flagged = pkgbase.OutOfDateTS and pkgbase.OutOfDateTS >= auto_orphan_age
+    ood_ts = pkgbase.OutOfDateTS or 0
+    flagged = ood_ts and (now - ood_ts) >= auto_orphan_age
     is_maintainer = pkgbase.Maintainer == request.user
-    outdated = now - pkgbase.SubmittedTS <= auto_delete_age
+    outdated = (now - pkgbase.SubmittedTS) <= auto_delete_age
 
     if type == "orphan" and flagged:
+        # This request should be auto-accepted.
         with db.begin():
             pkgbase.Maintainer = None
             pkgreq.Status = ACCEPTED_ID
-        db.refresh(pkgreq)
         notif = notify.RequestCloseNotification(
             request.user.ID, pkgreq.ID, pkgreq.status_display())
         notif.send()
+        logger.debug(f"New request #{pkgreq.ID} is marked for auto-orphan.")
     elif type == "deletion" and is_maintainer and outdated:
+        # This request should be auto-accepted.
         packages = pkgbase.packages.all()
         for package in packages:
-            delete_package(request.user, package)
+            delete_package(request, package)
+        logger.debug(f"New request #{pkgreq.ID} is marked for auto-deletion.")
 
     # Redirect the submitting user to /packages.
     return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
@@ -713,31 +682,24 @@ async def requests_close(request: Request, id: int):
 @router.post("/requests/{id}/close")
 @auth_required()
 async def requests_close_post(request: Request, id: int,
-                              reason: int = Form(default=0),
                               comments: str = Form(default=str())):
     pkgreq = get_pkgreq_by_id(id)
-    if not request.user.is_elevated() and request.user != pkgreq.User:
+
+    # `pkgreq`.User can close their own request.
+    approved = [pkgreq.User]
+    if not request.user.has_credential(creds.PKGREQ_CLOSE, approved=approved):
         # Request user doesn't have permission here: redirect to '/'.
         return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
 
     context = make_context(request, "Close Request")
     context["pkgreq"] = pkgreq
 
-    if reason not in {ACCEPTED_ID, REJECTED_ID}:
-        # If the provided reason is not valid, send the user back to
-        # the closure form with a BAD_REQUEST status.
-        return render_template(request, "requests/close.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    if not request.user.is_elevated():
-        # If we're closing the request as the user who created it,
-        # the reason should just be a REJECTION.
-        reason = REJECTED_ID
-
+    now = int(datetime.utcnow().timestamp())
     with db.begin():
         pkgreq.Closer = request.user
-        pkgreq.Status = reason
         pkgreq.ClosureComment = comments
+        pkgreq.ClosedTS = now
+        pkgreq.Status = REJECTED_ID
 
     notify_ = notify.RequestCloseNotification(
         request.user.ID, pkgreq.ID, pkgreq.status_display())
@@ -932,7 +894,8 @@ async def pkgbase_unvote(request: Request, name: str):
 
 def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
     disowner = request.user
-    notif = notify.DisownNotification(disowner.ID, pkgbase.ID)
+    notifs = [notify.DisownNotification(disowner.ID, pkgbase.ID)]
+    notifs += handle_request(request, ORPHAN_ID, pkgbase)
 
     if disowner != pkgbase.Maintainer:
         with db.begin():
@@ -949,7 +912,7 @@ def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
             else:
                 pkgbase.Maintainer = None
 
-    notif.send()
+    util.apply_all(notifs, lambda n: n.send())
 
 
 @router.get("/pkgbase/{name}/disown")
@@ -971,6 +934,7 @@ async def pkgbase_disown_get(request: Request, name: str):
 @router.post("/pkgbase/{name}/disown")
 @auth_required()
 async def pkgbase_disown_post(request: Request, name: str,
+                              comments: str = Form(default=str()),
                               confirm: bool = Form(default=False)):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
@@ -980,15 +944,24 @@ async def pkgbase_disown_post(request: Request, name: str,
         return RedirectResponse(f"/pkgbase/{name}",
                                 HTTPStatus.SEE_OTHER)
 
+    context = make_context(request, "Disown Package")
+    context["pkgbase"] = pkgbase
     if not confirm:
-        context = make_context(request, "Disown Package")
-        context["pkgbase"] = pkgbase
         context["errors"] = [("The selected packages have not been disowned, "
                               "check the confirmation checkbox.")]
         return render_template(request, "packages/disown.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
-    pkgbase_disown_instance(request, pkgbase)
+    with db.begin():
+        update_closure_comment(pkgbase, ORPHAN_ID, comments)
+
+    try:
+        pkgbase_disown_instance(request, pkgbase)
+    except InvariantError as exc:
+        context["errors"] = [str(exc)]
+        return render_template(request, "packages/disown.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
     return RedirectResponse(f"/pkgbase/{name}",
                             status_code=HTTPStatus.SEE_OTHER)
 
@@ -1032,7 +1005,8 @@ async def pkgbase_delete_get(request: Request, name: str):
 @router.post("/pkgbase/{name}/delete")
 @auth_required()
 async def pkgbase_delete_post(request: Request, name: str,
-                              confirm: bool = Form(default=False)):
+                              confirm: bool = Form(default=False),
+                              comments: str = Form(default=str())):
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     if not request.user.has_credential(creds.PKGBASE_DELETE):
@@ -1047,10 +1021,20 @@ async def pkgbase_delete_post(request: Request, name: str,
         return render_template(request, "packages/delete.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
+    if comments:
+        # Update any existing deletion requests' ClosureComment.
+        with db.begin():
+            requests = pkgbase.requests.filter(
+                and_(models.PackageRequest.Status == PENDING_ID,
+                     models.PackageRequest.ReqTypeID == DELETION_ID)
+            )
+            for pkgreq in requests:
+                pkgreq.ClosureComment = comments
+
     # Obtain deletion locks and delete the packages.
     packages = pkgbase.packages.all()
     for package in packages:
-        delete_package(request.user, package)
+        delete_package(request, package, comments=comments)
 
     return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
 
@@ -1190,6 +1174,17 @@ async def packages_adopt(request: Request, package_ids: List[int] = [],
     return (True, ["The selected packages have been adopted."])
 
 
+def disown_all(request: Request, pkgbases: List[models.PackageBase]) \
+        -> List[str]:
+    errors = []
+    for pkgbase in pkgbases:
+        try:
+            pkgbase_disown_instance(request, pkgbase)
+        except InvariantError as exc:
+            errors.append(str(exc))
+    return errors
+
+
 async def packages_disown(request: Request, package_ids: List[int] = [],
                           confirm: bool = False, **kwargs):
     if not package_ids:
@@ -1217,9 +1212,9 @@ async def packages_disown(request: Request, package_ids: List[int] = [],
             return (False, ["You are not allowed to disown one "
                             "of the packages you selected."])
 
-    # Now, really disown the bases.
-    for pkgbase in bases:
-        pkgbase_disown_instance(request, pkgbase)
+    # Now, disown all the bases if we can.
+    if errors := disown_all(request, bases):
+        return (False, errors)
 
     return (True, ["The selected packages have been disowned."])
 
@@ -1256,7 +1251,7 @@ async def packages_delete(request: Request, package_ids: List[int] = [],
     # using the same method we use in our /pkgbase/{name}/delete route.
     for pkg in packages:
         deleted_pkgs.append(pkg.Name)
-        delete_package(request.user, pkg)
+        delete_package(request, pkg)
 
     # Log out the fact that this happened for accountability.
     logger.info(f"Privileged user '{request.user.Username}' deleted the "
@@ -1341,83 +1336,46 @@ async def pkgbase_merge_get(request: Request, name: str,
 
 
 def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
-                           target: models.PackageBase):
+                           target: models.PackageBase, comments: str = str()):
     pkgbasename = str(pkgbase.Name)
 
-    # Collect requests related to this merge.
-    query = pkgbase.requests.filter(
-        models.PackageRequest.ReqTypeID == MERGE_ID
-    )
+    # Create notifications.
+    notifs = handle_request(request, MERGE_ID, pkgbase, target)
 
-    requests = query.filter(
-        models.PackageRequest.MergeBaseName == target.Name).all()
-    reject_requests = query.filter(
-        models.PackageRequest.MergeBaseName != target.Name).all()
+    # Target votes and notifications sets of user IDs that are
+    # looking to be migrated.
+    target_votes = set(v.UsersID for v in target.package_votes)
+    target_notifs = set(n.UserID for n in target.notifications)
 
-    notifs = []  # Used to keep track of notifications over the function.
-    closure_comment = (f"Merged into package base {target.Name} by "
-                       f"{request.user.Username}.")
-    rejected_closure_comment = ("Rejected because another merge request "
-                                "for the same package base was accepted.")
+    with db.begin():
+        # Merge pkgbase's comments.
+        for comment in pkgbase.comments:
+            comment.PackageBase = target
 
-    if not requests:
-        # If there are no requests, create one owned by request.user.
-        with db.begin():
-            pkgreq = db.create(models.PackageRequest,
-                               ReqTypeID=MERGE_ID,
-                               User=request.user,
-                               PackageBase=pkgbase,
-                               PackageBaseName=pkgbasename,
-                               MergeBaseName=target.Name,
-                               Comments="Generated by aurweb.",
-                               Status=ACCEPTED_ID,
-                               ClosureComment=closure_comment)
-            requests.append(pkgreq)
-
-        # Add a notification about the opening to our notifs array.
-        notif = notify.RequestOpenNotification(
-            request.user.ID, pkgreq.ID, MERGE,
-            pkgbase.ID, merge_into=target.Name)
-        notifs.append(notif)
-
-        with db.begin():
-            # Merge pkgbase's comments, notifications and votes into target.
-            for comment in pkgbase.comments:
-                comment.PackageBase = target
-            for notif in pkgbase.notifications:
+        # Merge notifications that don't yet exist in the target.
+        for notif in pkgbase.notifications:
+            if notif.UserID not in target_notifs:
                 notif.PackageBase = target
-            for vote in pkgbase.package_votes:
+
+        # Merge votes that don't yet exist in the target.
+        for vote in pkgbase.package_votes:
+            if vote.UsersID not in target_votes:
                 vote.PackageBase = target
 
-        with db.begin():
-            # Delete pkgbase and its packages now that everything's merged.
-            for pkg in pkgbase.packages:
-                db.delete(pkg)
-            db.delete(pkgbase)
+    # Run popupdate.
+    popupdate.run_single(target)
 
-            # Accept merge requests related to this pkgbase and target.
-            for pkgreq in requests:
-                pkgreq.Status = ACCEPTED_ID
-                pkgreq.ClosureComment = closure_comment
-                pkgreq.Closer = request.user
-
-            for pkgreq in reject_requests:
-                pkgreq.Status = REJECTED_ID
-                pkgreq.ClosureComment = rejected_closure_comment
-                pkgreq.Closer = request.user
-
-    all_requests = requests + reject_requests
-    for pkgreq in all_requests:
-        # Create notifications for request closure.
-        notif = notify.RequestCloseNotification(
-            request.user.ID, pkgreq.ID, pkgreq.status_display())
-        notifs.append(notif)
+    with db.begin():
+        # Delete pkgbase and its packages now that everything's merged.
+        for pkg in pkgbase.packages:
+            db.delete(pkg)
+        db.delete(pkgbase)
 
     # Log this out for accountability purposes.
     logger.info(f"Trusted User '{request.user.Username}' merged "
                 f"'{pkgbasename}' into '{target.Name}'.")
 
-    # Send our notifications array.
+    # Send notifications.
     util.apply_all(notifs, lambda n: n.send())
 
 
@@ -1425,6 +1383,7 @@ def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
 @auth_required()
 async def pkgbase_merge_post(request: Request, name: str,
                              into: str = Form(default=str()),
+                             comments: str = Form(default=str()),
                              confirm: bool = Form(default=False),
                              next: str = Form(default=str())):
 
@@ -1458,8 +1417,11 @@ async def pkgbase_merge_post(request: Request, name: str,
         return render_template(request, "pkgbase/merge.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
+    with db.begin():
+        update_closure_comment(pkgbase, MERGE_ID, comments, target=target)
+
     # Merge pkgbase into target.
-    pkgbase_merge_instance(request, pkgbase, target)
+    pkgbase_merge_instance(request, pkgbase, target, comments=comments)
 
     # Run popupdate on the target.
     popupdate.run_single(target)
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 0b3996a8..f6d1377b 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -2300,3 +2300,7 @@ msgstr ""
 #: aurweb/routers/accounts.py
 msgid "You do not have permission to change this user's account type to %s."
 msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
diff --git a/templates/packages/delete.html b/templates/packages/delete.html
index 6e882d05..8910cce9 100644
--- a/templates/packages/delete.html
+++ b/templates/packages/delete.html
@@ -43,6 +43,12 @@
                     </label>
                 </p>
 
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments" name="comments"
+                              rows="5" cols="50"></textarea>
+                </p>
+
                 <p>
                     <input class="button"
                            type="submit"
diff --git a/templates/packages/disown.html b/templates/packages/disown.html
index 8d5a8574..1442053f 100644
--- a/templates/packages/disown.html
+++ b/templates/packages/disown.html
@@ -36,6 +36,12 @@
 
         <form action="/pkgbase/{{ pkgbase.Name }}/disown" method="post">
             <fieldset>
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments" name="comments"
+                              rows="5" cols="50"></textarea>
+                </p>
+
                 <p>
                     <label class="confirmation">
                         <input type="checkbox" name="confirm" value="1" />
diff --git a/templates/pkgbase/merge.html b/templates/pkgbase/merge.html
index 41f69916..b5129801 100644
--- a/templates/pkgbase/merge.html
+++ b/templates/pkgbase/merge.html
@@ -49,6 +49,12 @@
                     />
                 </p>
 
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments" name="comments"
+                              rows="5" cols="50"></textarea>
+                </p>
+
                 <p>
                     <label class="confirmation">
                         <input type="checkbox" name="confirm" />
diff --git a/templates/requests.html b/templates/requests.html
index 30241422..6701af5d 100644
--- a/templates/requests.html
+++ b/templates/requests.html
@@ -76,7 +76,6 @@
                                         {% set action = "merge" %}
                                         {# Add the 'via' url query parameter. #}
                                         {% set temp_q = temp_q | extend_query(
-                                            ["via", result.ID],
                                             ["into", result.MergeBaseName]
                                         ) %}
                                     {% endif %}
diff --git a/templates/requests/close.html b/templates/requests/close.html
index 7862064a..df767eae 100644
--- a/templates/requests/close.html
+++ b/templates/requests/close.html
@@ -23,24 +23,6 @@
 
         <form action="/requests/{{ pkgreq.ID }}/close" method="post">
             <fieldset>
-                <p>
-                    <label for="id_reason">{{ "Reason" | tr }}:</label>
-                    <select id="id_reason" name="reason">
-                        {# Value 2 == "Accepted" status.
-                        See aurweb.models.package_request. #}
-                        {% if request.user.is_elevated() %}
-                            <option value="2">
-                                {{ "Accepted" | tr }}
-                            </option>
-                        {% endif %}
-                        {# Value 3 == "Rejected" status.
-                        See aurweb.models.package_request. #}
-                        <option value="3">
-                            {{ "Rejected" | tr }}
-                        </option>
-                    </select>
-                </p>
-
                 <p>
                     <label for="id_comments">{{ "Comments" | tr }}:</label>
                     <textarea id="id_comments" name="comments"
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 64ee38d0..cccdcba4 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -10,7 +10,7 @@ import pytest
 from fastapi.testclient import TestClient
 from sqlalchemy import and_
 
-from aurweb import asgi, config, db, defaults
+from aurweb import asgi, db, defaults
 from aurweb.models import License, PackageLicense
 from aurweb.models.account_type import USER_ID, AccountType
 from aurweb.models.dependency_type import DependencyType
@@ -28,6 +28,7 @@ from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID, RelationType
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, RequestType
 from aurweb.models.user import User
+from aurweb.testing.email import Email
 from aurweb.testing.html import get_errors, get_successes, parse_root
 from aurweb.testing.requests import Request
 
@@ -126,6 +127,39 @@ def package(maintainer: User) -> Package:
     yield package
 
 
+@pytest.fixture
+def pkgbase(package: Package) -> PackageBase:
+    yield package.PackageBase
+
+
+@pytest.fixture
+def target(maintainer: User) -> PackageBase:
+    """ Merge target. """
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="target-package",
+                            Maintainer=maintainer,
+                            Packager=maintainer,
+                            Submitter=maintainer,
+                            ModifiedTS=now)
+        db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    yield pkgbase
+
+
+@pytest.fixture
+def pkgreq(user: User, pkgbase: PackageBase) -> PackageRequest:
+    """ Yield a PackageRequest related to `pkgbase`. """
+    with db.begin():
+        pkgreq = db.create(PackageRequest,
+                           ReqTypeID=DELETION_ID,
+                           User=user,
+                           PackageBase=pkgbase,
+                           PackageBaseName=pkgbase.Name,
+                           Comments=f"Deletion request for {pkgbase.Name}",
+                           ClosureComment=str())
+    yield pkgreq
+
+
 @pytest.fixture
 def comment(user: User, package: Package) -> PackageComment:
     pkgbase = package.PackageBase
@@ -296,15 +330,7 @@ def test_package_comments(client: TestClient, user: User, package: Package):
 
 
 def test_package_requests_display(client: TestClient, user: User,
-                                  package: Package):
-    type_ = db.query(RequestType, RequestType.ID == DELETION_ID).first()
-    with db.begin():
-        db.create(PackageRequest, PackageBase=package.PackageBase,
-                  PackageBaseName=package.PackageBase.Name,
-                  User=user, RequestType=type_,
-                  Comments="Test comment.",
-                  ClosureComment=str())
-
+                                  package: Package, pkgreq: PackageRequest):
     # Test that a single request displays "1 pending request".
     with client as request:
         resp = request.get(package_endpoint(package))
@@ -1516,115 +1542,6 @@ def test_pkgbase_request(client: TestClient, user: User, package: Package):
     assert resp.status_code == int(HTTPStatus.OK)
 
 
-def test_pkgbase_request_post_deletion(client: TestClient, user: User,
-                                       package: Package):
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "deletion",
-            "comments": "We want to delete this."
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    pkgreq = db.query(PackageRequest).filter(
-        PackageRequest.PackageBaseID == package.PackageBase.ID
-    ).first()
-    assert pkgreq is not None
-    assert pkgreq.RequestType.Name == "deletion"
-    assert pkgreq.PackageBaseName == package.PackageBase.Name
-    assert pkgreq.Comments == "We want to delete this."
-
-
-def test_pkgbase_request_post_maintainer_deletion(
-        client: TestClient, maintainer: User, package: Package):
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "deletion",
-            "comments": "We want to delete this."
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    pkgreq = db.query(PackageRequest).filter(
-        PackageRequest.PackageBaseName == pkgbasename
-    ).first()
-    assert pkgreq.Status == ACCEPTED_ID
-
-
-def test_pkgbase_request_post_orphan(client: TestClient, user: User,
-                                     package: Package):
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "orphan",
-            "comments": "We want to disown this."
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    pkgreq = db.query(PackageRequest).filter(
-        PackageRequest.PackageBaseID == package.PackageBase.ID
-    ).first()
-    assert pkgreq is not None
-    assert pkgreq.RequestType.Name == "orphan"
-    assert pkgreq.PackageBaseName == package.PackageBase.Name
-    assert pkgreq.Comments == "We want to disown this."
-
-
-def test_pkgbase_request_post_auto_orphan(client: TestClient, user: User,
-                                          package: Package):
-    now = int(datetime.utcnow().timestamp())
-    auto_orphan_age = config.getint("options", "auto_orphan_age")
-    with db.begin():
-        package.PackageBase.OutOfDateTS = now - auto_orphan_age - 1
-
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "orphan",
-            "comments": "We want to disown this."
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    pkgreq = db.query(PackageRequest).filter(
-        PackageRequest.PackageBaseID == package.PackageBase.ID
-    ).first()
-    assert pkgreq is not None
-    assert pkgreq.Status == ACCEPTED_ID
-
-
-def test_pkgbase_request_post_merge(client: TestClient, user: User,
-                                    package: Package):
-    with db.begin():
-        pkgbase2 = db.create(PackageBase, Name="new-pkgbase",
-                             Submitter=user, Maintainer=user, Packager=user)
-        target = db.create(Package, PackageBase=pkgbase2,
-                           Name=pkgbase2.Name, Version="1.0.0")
-
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "merge",
-            "merge_into": target.PackageBase.Name,
-            "comments": "We want to merge this."
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    pkgreq = db.query(PackageRequest).filter(
-        PackageRequest.PackageBaseID == package.PackageBase.ID
-    ).first()
-    assert pkgreq is not None
-    assert pkgreq.RequestType.Name == "merge"
-    assert pkgreq.PackageBaseName == package.PackageBase.Name
-    assert pkgreq.MergeBaseName == target.PackageBase.Name
-    assert pkgreq.Comments == "We want to merge this."
-
-
 def test_pkgbase_request_post_not_found(client: TestClient, user: User):
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
@@ -1718,22 +1635,6 @@ def test_pkgbase_request_post_merge_self_error(client: TestClient, user: User,
     assert error.text.strip() == expected
 
 
-@pytest.fixture
-def pkgreq(user: User, package: Package) -> PackageRequest:
-    reqtype = db.query(RequestType).filter(
-        RequestType.ID == DELETION_ID
-    ).first()
-    with db.begin():
-        pkgreq = db.create(PackageRequest,
-                           RequestType=reqtype,
-                           User=user,
-                           PackageBase=package.PackageBase,
-                           PackageBaseName=package.PackageBase.Name,
-                           Comments=str(),
-                           ClosureComment=str())
-    yield pkgreq
-
-
 def test_requests_close(client: TestClient, user: User,
                         pkgreq: PackageRequest):
     cookies = {"AURSID": user.login(Request(), "testPassword")}
@@ -1753,16 +1654,6 @@ def test_requests_close_unauthorized(client: TestClient, maintainer: User,
     assert resp.headers.get("location") == "/"
 
 
-def test_requests_close_post_invalid_reason(client: TestClient, user: User,
-                                            pkgreq: PackageRequest):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
-            "reason": 0
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-
-
 def test_requests_close_post_unauthorized(client: TestClient, maintainer: User,
                                           pkgreq: PackageRequest):
     cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
@@ -1778,9 +1669,8 @@ def test_requests_close_post(client: TestClient, user: User,
                              pkgreq: PackageRequest):
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
-        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
-            "reason": REJECTED_ID
-        }, cookies=cookies, allow_redirects=False)
+        resp = request.post(f"/requests/{pkgreq.ID}/close",
+                            cookies=cookies, allow_redirects=False)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
 
     assert pkgreq.Status == REJECTED_ID
@@ -1792,9 +1682,8 @@ def test_requests_close_post_rejected(client: TestClient, user: User,
                                       pkgreq: PackageRequest):
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
-        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
-            "reason": REJECTED_ID
-        }, cookies=cookies, allow_redirects=False)
+        resp = request.post(f"/requests/{pkgreq.ID}/close",
+                            cookies=cookies, allow_redirects=False)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
 
     assert pkgreq.Status == REJECTED_ID
@@ -1971,18 +1860,6 @@ def test_pkgbase_vote(client: TestClient, user: User, package: Package):
     assert pkgbase.NumVotes == 0
 
 
-def test_pkgbase_disown_as_tu(client: TestClient, tu_user: User,
-                              package: Package):
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
-
-    # But we do here.
-    with client as request:
-        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-
 def test_pkgbase_disown_as_sole_maintainer(client: TestClient,
                                            maintainer: User,
                                            package: Package):
@@ -2114,6 +1991,38 @@ def test_pkgbase_delete(client: TestClient, tu_user: User, package: Package):
     ).first()
     assert record is None
 
+    # Two emails should've been sent out; an autogenerated
+    # request's accepted notification and a deletion notification.
+    assert Email.count() == 1
+
+    req_close = Email(1).parse()
+    expr = r"^\[PRQ#\d+\] Deletion Request for [^ ]+ Accepted$"
+    subject = req_close.headers.get("Subject")
+    assert re.match(expr, subject)
+
+
+def test_pkgbase_delete_with_request(client: TestClient, tu_user: User,
+                                     pkgbase: PackageBase,
+                                     pkgreq: PackageRequest):
+    # TODO: Test that a previously existing request gets Accepted when
+    # a TU deleted the package.
+
+    # Delete the package as `tu_user` via POST request.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == "/packages"
+
+    # We should've just sent one closure email since `pkgreq` exists.
+    assert Email.count() == 1
+
+    # Make sure it was a closure for the deletion request.
+    email = Email(1).parse()
+    expr = r"^\[PRQ#\d+\] Deletion Request for [^ ]+ Accepted$"
+    assert re.match(expr, email.headers.get("Subject"))
+
 
 def test_packages_post_unknown_action(client: TestClient, user: User,
                                       package: Package):
@@ -2371,9 +2280,11 @@ def test_packages_post_adopt(client: TestClient, user: User,
     assert successes[0].text.strip() == expected
 
 
-def test_packages_post_disown(client: TestClient, user: User,
-                              maintainer: User, package: Package):
-    # Initially prove that we have a maintainer: `maintainer`.
+def test_packages_post_disown_as_maintainer(client: TestClient, user: User,
+                                            maintainer: User,
+                                            package: Package):
+    """ Disown packages as a maintainer. """
+    # Initially prove that we have a maintainer.
     assert package.PackageBase.Maintainer is not None
     assert package.PackageBase.Maintainer == maintainer
 
@@ -2430,9 +2341,24 @@ def test_packages_post_disown(client: TestClient, user: User,
     assert successes[0].text.strip() == expected
 
 
+def test_packages_post_disown(client: TestClient, tu_user: User,
+                              maintainer: User, package: Package):
+    """ Disown packages as a Trusted User, which cannot bypass idle time. """
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={
+            "action": "disown",
+            "IDs": [package.ID],
+            "confirm": True
+        }, cookies=cookies)
+
+    errors = get_errors(resp.text)
+    expected = r"^No due existing orphan requests to accept for .+\.$"
+    assert re.match(expected, errors[0].text.strip())
+
+
 def test_packages_post_delete(caplog: pytest.fixture, client: TestClient,
                               user: User, tu_user: User, package: Package):
-
     # First, let's try to use the delete action with no packages IDs.
     user_cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
@@ -2556,23 +2482,19 @@ def test_pkgbase_merge_post_self_invalid(client: TestClient, tu_user: User,
 
 
 def test_pkgbase_merge_post(client: TestClient, tu_user: User,
-                            packages: List[Package]):
-    package, target = packages[:2]
+                            package: Package,
+                            pkgbase: PackageBase,
+                            target: PackageBase,
+                            pkgreq: PackageRequest):
     pkgname = package.Name
-    pkgbasename = package.PackageBase.Name
+    pkgbasename = pkgbase.Name
 
     # Create a merge request destined for another target.
     # This will allow our test code to exercise closing
     # such a request after merging the pkgbase in question.
     with db.begin():
-        pkgreq = db.create(PackageRequest,
-                           User=tu_user,
-                           ReqTypeID=MERGE_ID,
-                           PackageBase=package.PackageBase,
-                           PackageBaseName=pkgbasename,
-                           MergeBaseName="test",
-                           Comments="Test comment.",
-                           ClosureComment="Test closure.")
+        pkgreq.ReqTypeID = MERGE_ID
+        pkgreq.MergeBaseName = target.Name
 
     # Vote for the package.
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
@@ -2604,32 +2526,37 @@ def test_pkgbase_merge_post(client: TestClient, tu_user: User,
     endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
     with client as request:
         resp = request.post(endpoint, data={
-            "into": target.PackageBase.Name,
+            "into": target.Name,
             "confirm": True
         }, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
     loc = resp.headers.get("location")
-    assert loc == f"/pkgbase/{target.PackageBase.Name}"
+    assert loc == f"/pkgbase/{target.Name}"
+
+    # Two emails should've been sent out.
+    assert Email.count() == 1
+    email_body = Email(1).parse().glue()
+    assert f"Merge Request for {pkgbasename} Accepted" in email_body
 
     # Assert that the original comments, notifs and votes we setup
     # got migrated to target as intended.
-    assert comments == target.PackageBase.comments.all()
-    assert notifs == target.PackageBase.notifications.all()
-    assert votes == target.PackageBase.package_votes.all()
+    assert comments == target.comments.all()
+    assert notifs == target.notifications.all()
+    assert votes == target.package_votes.all()
 
     # ...and that the package got deleted.
     package = db.query(Package).filter(Package.Name == pkgname).first()
     assert package is None
 
-    # Our fake target request should have gotten rejected.
-    assert pkgreq.Status == REJECTED_ID
+    # Our previously-made request should have gotten accepted.
+    assert pkgreq.Status == ACCEPTED_ID
     assert pkgreq.Closer is not None
 
     # A PackageRequest is always created when merging this way.
     pkgreq = db.query(PackageRequest).filter(
         and_(PackageRequest.ReqTypeID == MERGE_ID,
              PackageRequest.PackageBaseName == pkgbasename,
-             PackageRequest.MergeBaseName == target.PackageBase.Name)
+             PackageRequest.MergeBaseName == target.Name)
     ).first()
     assert pkgreq is not None
 
diff --git a/test/test_requests.py b/test/test_requests.py
new file mode 100644
index 00000000..867a64a0
--- /dev/null
+++ b/test/test_requests.py
@@ -0,0 +1,558 @@
+import re
+
+from datetime import datetime
+from http import HTTPStatus
+from logging import DEBUG
+
+import pytest
+
+from fastapi.testclient import TestClient
+
+from aurweb import asgi, config, db
+from aurweb.models import Package, PackageBase, PackageRequest, User
+from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
+from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
+from aurweb.packages.requests import ClosureFactory
+from aurweb.testing.email import Email
+from aurweb.testing.html import get_errors
+from aurweb.testing.requests import Request
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test) -> None:
+    """ Setup the database. """
+    return
+
+
+@pytest.fixture
+def client() -> TestClient:
+    """ Yield a TestClient. """
+    yield TestClient(app=asgi.app)
+
+
+def create_user(username: str, email: str) -> User:
+    """
+    Create a user based on `username` and `email`.
+
+    :param username: User.Username
+    :param email: User.Email
+    :return: User instance
+    """
+    with db.begin():
+        user = db.create(User, Username=username, Email=email,
+                         Passwd="testPassword", AccountTypeID=USER_ID)
+    return user
+
+
+@pytest.fixture
+def user() -> User:
+    """ Yield a User instance. """
+    user = create_user("test", "test@example.org")
+    yield user
+
+
+@pytest.fixture
+def auser(user: User) -> User:
+    """ Yield an authenticated User instance. """
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    user.cookies = cookies
+    yield user
+
+
+@pytest.fixture
+def user2() -> User:
+    """ Yield a secondary non-maintainer User instance. """
+    user = create_user("test2", "test2@example.org")
+    yield user
+
+
+@pytest.fixture
+def auser2(user2: User) -> User:
+    """ Yield an authenticated secondary non-maintainer User instance. """
+    cookies = {"AURSID": user2.login(Request(), "testPassword")}
+    user2.cookies = cookies
+    yield user2
+
+
+@pytest.fixture
+def tu_user() -> User:
+    """ Yield an authenticated Trusted User instance. """
+    user = create_user("test_tu", "test_tu@example.org")
+    with db.begin():
+        user.AccountTypeID = TRUSTED_USER_ID
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    user.cookies = cookies
+    yield user
+
+
+def create_pkgbase(user: User, name: str) -> PackageBase:
+    """
+    Create a package base based on `user` and `name`.
+
+    This function also creates a matching Package record.
+
+    :param user: User instance
+    :param name: PackageBase.Name
+    :return: PackageBase instance
+    """
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name=name,
+                            Maintainer=user, Packager=user,
+                            SubmittedTS=now, ModifiedTS=now)
+        db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase)
+    return pkgbase
+
+
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    """ Yield a package base. """
+    pkgbase = create_pkgbase(user, "test-package")
+    yield pkgbase
+
+
+@pytest.fixture
+def target(user: User) -> PackageBase:
+    """ Yield a merge target (package base). """
+    with db.begin():
+        target = db.create(PackageBase, Name="target-package",
+                           Maintainer=user, Packager=user)
+    yield target
+
+
+def create_request(reqtype_id: int, user: User, pkgbase: PackageBase,
+                   comments: str) -> PackageRequest:
+    """
+    Create a package request based on `reqtype_id`, `user`,
+    `pkgbase` and `comments`.
+
+    :param reqtype_id: RequestType.ID
+    :param user: User instance
+    :param pkgbase: PackageBase instance
+    :param comments: PackageRequest.Comments
+    :return: PackageRequest instance
+    """
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgreq = db.create(PackageRequest, ReqTypeID=reqtype_id,
+                           User=user, PackageBase=pkgbase,
+                           PackageBaseName=pkgbase.Name,
+                           RequestTS=now,
+                           Comments=comments,
+                           ClosureComment=str())
+    return pkgreq
+
+
+@pytest.fixture
+def pkgreq(user: User, pkgbase: PackageBase):
+    """ Yield a package request. """
+    pkgreq = create_request(DELETION_ID, user, pkgbase, "Test request.")
+    yield pkgreq
+
+
+def create_notification(user: User, pkgbase: PackageBase):
+    """ Create a notification for a `user` on `pkgbase`. """
+    with db.begin():
+        notif = db.create(PackageNotification, User=user, PackageBase=pkgbase)
+    return notif
+
+
+def test_request(client: TestClient, auser: User, pkgbase: PackageBase):
+    """ Test the standard pkgbase request route GET method. """
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+    with client as request:
+        resp = request.get(endpoint, cookies=auser.cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+
+def test_request_post_deletion(client: TestClient, auser2: User,
+                               pkgbase: PackageBase):
+    """ Test the POST route for creating a deletion request works. """
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+    data = {"comments": "Test request.", "type": "deletion"}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=auser2.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = pkgbase.requests.first()
+    assert pkgreq is not None
+    assert pkgreq.ReqTypeID == DELETION_ID
+    assert pkgreq.Status == PENDING_ID
+
+    # A RequestOpenNotification should've been sent out.
+    assert Email.count() == 1
+    email = Email(1)
+    expr = r"^\[PRQ#%d\] Deletion Request for [^ ]+$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+
+def test_request_post_deletion_as_maintainer(client: TestClient, auser: User,
+                                             pkgbase: PackageBase):
+    """ Test the POST route for creating a deletion request as maint works. """
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+    data = {"comments": "Test request.", "type": "deletion"}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=auser.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Check the pkgreq record got created and accepted.
+    pkgreq = db.query(PackageRequest).first()
+    assert pkgreq is not None
+    assert pkgreq.ReqTypeID == DELETION_ID
+    assert pkgreq.Status == ACCEPTED_ID
+
+    # Should've gotten two emails.
+    assert Email.count() == 2
+
+    # A RequestOpenNotification should've been sent out.
+    email = Email(1)
+    expr = r"^\[PRQ#%d\] Deletion Request for [^ ]+$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+    # Check the content of the close notification.
+    email = Email(2)
+    expr = r"^\[PRQ#%d\] Deletion Request for [^ ]+ Accepted$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+
+def test_request_post_deletion_autoaccept(client: TestClient, auser: User,
+                                          pkgbase: PackageBase,
+                                          caplog: pytest.LogCaptureFixture):
+    """ Test the request route for deletion as maintainer. """
+    caplog.set_level(DEBUG)
+
+    now = int(datetime.utcnow().timestamp())
+    auto_delete_age = config.getint("options", "auto_delete_age")
+    with db.begin():
+        pkgbase.ModifiedTS = now - auto_delete_age + 100
+
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+    data = {"comments": "Test request.", "type": "deletion"}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=auser.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = db.query(PackageRequest).filter(
+        PackageRequest.PackageBaseName == pkgbase.Name
+    ).first()
+    assert pkgreq is not None
+    assert pkgreq.ReqTypeID == DELETION_ID
+    assert pkgreq.Status == ACCEPTED_ID
+
+    # A RequestOpenNotification should've been sent out.
+    assert Email.count() == 2
+    Email.dump()
+
+    # Check the content of the open notification.
+    email = Email(1)
+    expr = r"^\[PRQ#%d\] Deletion Request for [^ ]+$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+    # Check the content of the close notification.
+    email = Email(2)
+    expr = r"^\[PRQ#%d\] Deletion Request for [^ ]+ Accepted$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+    # Check logs.
+    expr = r"New request #\d+ is marked for auto-deletion."
+    assert re.search(expr, caplog.text)
+
+
+def test_request_post_merge(client: TestClient, auser: User,
+                            pkgbase: PackageBase, target: PackageBase):
+    """ Test the request route for merge as maintainer. """
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+    data = {
+        "type": "merge",
+        "merge_into": target.Name,
+        "comments": "Test request.",
+    }
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=auser.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = pkgbase.requests.first()
+    assert pkgreq is not None
+    assert pkgreq.ReqTypeID == MERGE_ID
+    assert pkgreq.Status == PENDING_ID
+    assert pkgreq.MergeBaseName == target.Name
+
+    # A RequestOpenNotification should've been sent out.
+    assert Email.count() == 1
+    email = Email(1)
+    expr = r"^\[PRQ#%d\] Merge Request for [^ ]+$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+
+def test_request_post_orphan(client: TestClient, auser: User,
+                             pkgbase: PackageBase):
+    """ Test the POST route for creating an orphan request works. """
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+    data = {
+        "type": "orphan",
+        "comments": "Test request.",
+    }
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=auser.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = pkgbase.requests.first()
+    assert pkgreq is not None
+    assert pkgreq.ReqTypeID == ORPHAN_ID
+    assert pkgreq.Status == PENDING_ID
+
+    # A RequestOpenNotification should've been sent out.
+    assert Email.count() == 1
+
+    email = Email(1)
+    expr = r"^\[PRQ#%d\] Orphan Request for [^ ]+$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+
+def test_deletion_request(client: TestClient, user: User, tu_user: User,
+                          pkgbase: PackageBase, pkgreq: PackageRequest):
+    """ Test deleting a package with a preexisting request. """
+    # `pkgreq`.ReqTypeID is already DELETION_ID.
+    create_request(DELETION_ID, user, pkgbase, "Other request.")
+
+    # Create a notification record for another user. They should then
+    # also receive a DeleteNotification.
+    user2 = create_user("test2", "test2@example.org")
+    create_notification(user2, pkgbase)
+
+    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
+    comments = "Test closure."
+    data = {"comments": comments, "confirm": True}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == "/packages"
+
+    # Ensure that `pkgreq`.ClosureComment was left alone when specified.
+    assert pkgreq.ClosureComment == comments
+
+    # We should've gotten three emails. Two accepted requests and
+    # a DeleteNotification.
+    assert Email.count() == 3
+
+    # Both requests should have gotten accepted and had a notification
+    # sent out for them.
+    for i in range(Email.count() - 1):
+        email = Email(i + 1).parse()
+        expr = r"^\[PRQ#\d+\] Deletion Request for [^ ]+ Accepted$"
+        assert re.match(expr, email.headers.get("Subject"))
+
+    # We should've also had a DeleteNotification sent out.
+    email = Email(3).parse()
+    subject = r"^AUR Package deleted: [^ ]+$"
+    assert re.match(subject, email.headers.get("Subject"))
+    body = r"%s [1] deleted %s [2]." % (tu_user.Username, pkgbase.Name)
+    assert body in email.body
+
+
+def test_deletion_autorequest(client: TestClient, tu_user: User,
+                              pkgbase: PackageBase):
+    """ Test deleting a package without a request. """
+    # `pkgreq`.ReqTypeID is already DELETION_ID.
+    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
+    data = {"confirm": True}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    assert resp.headers.get("location") == "/packages"
+    assert Email.count() == 1
+
+    email = Email(1).parse()
+    subject = r"^\[PRQ#\d+\] Deletion Request for [^ ]+ Accepted$"
+    assert re.match(subject, email.headers.get("Subject"))
+    assert "[Autogenerated]" in email.body
+
+
+def test_merge_request(client: TestClient, user: User, tu_user: User,
+                       pkgbase: PackageBase, target: PackageBase,
+                       pkgreq: PackageRequest):
+    """ Test merging a package with a pre - existing request. """
+    with db.begin():
+        pkgreq.ReqTypeID = MERGE_ID
+        pkgreq.MergeBaseName = target.Name
+
+    other_target = create_pkgbase(user, "other-target")
+    other_request = create_request(MERGE_ID, user, pkgbase, "Other request.")
+    other_target2 = create_pkgbase(user, "other-target2")
+    other_request2 = create_request(MERGE_ID, user, pkgbase, "Other request2.")
+    with db.begin():
+        other_request.MergeBaseName = other_target.Name
+        other_request2.MergeBaseName = other_target2.Name
+
+    # `pkgreq`.ReqTypeID is already DELETION_ID.
+    endpoint = f"/pkgbase/{pkgbase.Name}/merge"
+    comments = "Test merge closure."
+    data = {"into": target.Name, "comments": comments, "confirm": True}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{target.Name}"
+
+    # Ensure that `pkgreq`.ClosureComment was left alone when specified.
+    assert pkgreq.ClosureComment == comments
+
+    # We should've gotten 3 emails: an accepting and two rejections.
+    assert Email.count() == 3
+
+    # Assert specific IDs match up in the subjects.
+    accepted = Email(1).parse()
+    subj = r"^\[PRQ#%d\] Merge Request for [^ ]+ Accepted$" % pkgreq.ID
+    assert re.match(subj, accepted.headers.get("Subject"))
+
+    # In the accepted case, we already supplied a closure comment,
+    # which stops one from being autogenerated by the algorithm.
+    assert "[Autogenerated]" not in accepted.body
+
+    # Test rejection emails, which do have autogenerated closures.
+    rejected = Email(2).parse()
+    subj = r"^\[PRQ#%d\] Merge Request for [^ ]+ Rejected$" % other_request.ID
+    assert re.match(subj, rejected.headers.get("Subject"))
+    assert "[Autogenerated]" in rejected.body
+
+    rejected = Email(3).parse()
+    subj = r"^\[PRQ#%d\] Merge Request for [^ ]+ Rejected$" % other_request2.ID
+    assert re.match(subj, rejected.headers.get("Subject"))
+    assert "[Autogenerated]" in rejected.body
+
+
+def test_merge_autorequest(client: TestClient, user: User, tu_user: User,
+                           pkgbase: PackageBase, target: PackageBase):
+    """ Test merging a package without a request. """
+    with db.begin():
+        pkgreq.ReqTypeID = MERGE_ID
+        pkgreq.MergeBaseName = target.Name
+
+    # `pkgreq`.ReqTypeID is already DELETION_ID.
+    endpoint = f"/pkgbase/{pkgbase.Name}/merge"
+    data = {"into": target.Name, "confirm": True}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{target.Name}"
+
+    # Should've gotten one email; an [Autogenerated] one.
+    assert Email.count() == 1
+
+    # Test accepted merge request notification.
+    email = Email(1).parse()
+    subj = r"^\[PRQ#\d+\] Merge Request for [^ ]+ Accepted$"
+    assert re.match(subj, email.headers.get("Subject"))
+    assert "[Autogenerated]" in email.body
+
+
+def test_orphan_request(client: TestClient, user: User, tu_user: User,
+                        pkgbase: PackageBase, pkgreq: PackageRequest):
+    """ Test the standard orphan request route. """
+    idle_time = config.getint("options", "request_idle_time")
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgreq.ReqTypeID = ORPHAN_ID
+        # Set the request time so it's seen as due (idle_time has passed).
+        pkgreq.RequestTS = now - idle_time - 10
+
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+    comments = "Test orphan closure."
+    data = {"comments": comments, "confirm": True}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    # Ensure that `pkgreq`.ClosureComment was left alone when specified.
+    assert pkgreq.ClosureComment == comments
+
+    # Check the email we expect.
+    assert Email.count() == 1
+    email = Email(1).parse()
+    subj = r"^\[PRQ#%d\] Orphan Request for [^ ]+ Accepted$" % pkgreq.ID
+    assert re.match(subj, email.headers.get("Subject"))
+
+
+def test_request_post_orphan_autoaccept(client: TestClient, auser: User,
+                                        pkgbase: PackageBase,
+                                        caplog: pytest.LogCaptureFixture):
+    """ Test the standard pkgbase request route GET method. """
+    caplog.set_level(DEBUG)
+    now = int(datetime.utcnow().timestamp())
+    auto_orphan_age = config.getint("options", "auto_orphan_age")
+    with db.begin():
+        pkgbase.OutOfDateTS = now - auto_orphan_age - 100
+
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+    data = {
+        "type": "orphan",
+        "comments": "Test request.",
+    }
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=auser.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    pkgreq = pkgbase.requests.first()
+    assert pkgreq is not None
+    assert pkgreq.ReqTypeID == ORPHAN_ID
+
+    # A Request(Open|Close)Notification should've been sent out.
+    assert Email.count() == 2
+
+    # Check the first email; should be our open request.
+    email = Email(1)
+    expr = r"^\[PRQ#%d\] Orphan Request for [^ ]+$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+    # And the second should be the automated closure.
+    email = Email(2)
+    expr = r"^\[PRQ#%d\] Orphan Request for [^ ]+ Accepted$" % pkgreq.ID
+    assert re.match(expr, email.headers.get("Subject"))
+
+    # Check logs.
+    expr = r"New request #\d+ is marked for auto-orphan."
+    assert re.search(expr, caplog.text)
+
+
+def test_orphan_as_maintainer(client: TestClient, auser: User,
+                              pkgbase: PackageBase):
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+    data = {"confirm": True}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=auser.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    assert Email.count() == 1
+    email = Email(1)
+    expr = r"^\[PRQ#\d+\] Orphan Request for [^ ]+ Accepted$"
+    assert re.match(expr, email.headers.get("Subject"))
+
+
+def test_orphan_without_requests(client: TestClient, tu_user: User,
+                                 pkgbase: PackageBase):
+    """ Test orphans are automatically accepted past a certain date. """
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+    data = {"confirm": True}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    errors = get_errors(resp.text)
+    expected = r"^No due existing orphan requests to accept for .+\.$"
+    assert re.match(expected, errors[0].text.strip())
+
+    assert Email.count() == 0
+
+
+def test_closure_factory_invalid_reqtype_id():
+    """ Test providing an invalid reqtype_id raises NotImplementedError. """
+    automated = ClosureFactory()
+    match = r"^Unsupported '.+' value\.$"
+    with pytest.raises(NotImplementedError, match=match):
+        automated.get_closure(666, None, None, None, ACCEPTED_ID)
+    with pytest.raises(NotImplementedError, match=match):
+        automated.get_closure(666, None, None, None, REJECTED_ID)

From 1fede8d2a308e9cdc16cb4024cb0d6a3bcdb0294 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 9 Dec 2021 20:27:40 -0800
Subject: [PATCH 726/844] change(requests): closures are now handled by pkgbase
 actions

Workflow has changed and TUs should now depend on actions taken closing
requests which exist for the package base (deletion, merge, disown|orphan).

The `/requests/{id}/close` route is now purely used for rejecting
requests. The deletion, merge and orphan closures have been added
into their related action routes. See the lists below.

Disowning can only be done if an existing orphan request can be found
for the action by TUs. Maintainers can disown their own packages at
any time.

Actions which provide request closures:
--------------------------------------
- `/pkgbase/{name}/delete`: deletion request closure
- `/pkgbase/{name}/merge`: merge request closure
- `/pkgbase/{name}/disown`: orphan request closure

To close a request:
------------------
- `/requests/{id}/close`: close a request with rejected status

For deletion and merge actions, if no request yet exists, one
will be autogenerated and closed.

For orphan requests, a preexisting require is required and an
error is now returned in cases where one cannot be found.

For all closure actions, if the new comments field is left empty,
a closure comment will be autogenerated.

Note: This is a documentation commit summing up UX changes from
recent commits.

Signed-off-by: Kevin Morris <kevr@0cost.org>

From 3a43e2b98c98194ef1e3b6f0fc76588d92f8270b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 9 Dec 2021 21:03:37 -0800
Subject: [PATCH 727/844] fix(docker): reduce health check interval to 2s

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index af522b6e..5347569a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     command: /docker/scripts/run-ca.sh
     healthcheck:
       test: "bash /docker/health/run-ca.sh"
-      interval: 3s
+      interval: 2s
 
   memcached:
     image: aurweb:latest
@@ -40,7 +40,7 @@ services:
     command: /docker/scripts/run-memcached.sh
     healthcheck:
       test: "bash /docker/health/memcached.sh"
-      interval: 3s
+      interval: 2s
  
   redis:
     image: aurweb:latest
@@ -49,7 +49,7 @@ services:
     command: /docker/scripts/run-redis.sh
     healthcheck:
       test: "bash /docker/health/redis.sh"
-      interval: 3s
+      interval: 2s
     ports:
       - "127.0.0.1:16379:6379"
 
@@ -67,7 +67,7 @@ services:
       - mariadb_data:/var/lib/mysql
     healthcheck:
       test: "bash /docker/health/mariadb.sh"
-      interval: 3s
+      interval: 2s
 
   mariadb_init:
     image: aurweb:latest
@@ -98,7 +98,7 @@ services:
       - mariadb_test_run:/var/run/mysqld # Bind socket in this volume.
     healthcheck:
       test: "bash /docker/health/mariadb.sh"
-      interval: 3s
+      interval: 2s
 
   git:
     image: aurweb:latest
@@ -113,7 +113,7 @@ services:
       - "2222:2222"
     healthcheck:
       test: "bash /docker/health/sshd.sh"
-      interval: 3s
+      interval: 2s
     depends_on:
       mariadb_init:
         condition: service_started
@@ -129,7 +129,7 @@ services:
     command: /docker/scripts/run-smartgit.sh
     healthcheck:
       test: "bash /docker/health/smartgit.sh"
-      interval: 3s
+      interval: 2s
 
   cgit-php:
     image: aurweb:latest
@@ -142,7 +142,7 @@ services:
     command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
       test: "bash /docker/health/cgit.sh 3000"
-      interval: 3s
+      interval: 2s
     depends_on:
       git:
         condition: service_healthy
@@ -162,7 +162,7 @@ services:
     command: /docker/scripts/run-cgit.sh 3000
     healthcheck:
       test: "bash /docker/health/cgit.sh 3000"
-      interval: 3s
+      interval: 2s
     depends_on:
       git:
         condition: service_healthy
@@ -198,7 +198,7 @@ services:
     command: /docker/scripts/run-php.sh
     healthcheck:
       test: "bash /docker/health/php.sh"
-      interval: 3s
+      interval: 2s
     depends_on:
       ca:
         condition: service_started
@@ -229,7 +229,7 @@ services:
     command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
     healthcheck:
       test: "bash /docker/health/fastapi.sh ${FASTAPI_BACKEND}"
-      interval: 3s
+      interval: 2s
     depends_on:
       ca:
         condition: service_started
@@ -256,7 +256,7 @@ services:
       - "127.0.0.1:8444:8444" # FastAPI
     healthcheck:
       test: "bash /docker/health/nginx.sh"
-      interval: 3s
+      interval: 2s
     depends_on:
       cgit-php:
         condition: service_healthy

From 19bd3766d24b8c60bfcc23cb42f851f8509e3230 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 9 Dec 2021 21:11:23 -0800
Subject: [PATCH 728/844] fix(gitlab-ci): only run services we need for
 deployment

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0166db2c..6478eb04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,6 +73,7 @@ deploy:
     - sed -ri "s/^(disable_http_login).*$/\1 = 1/" conf/config.dev
     - docker-compose build
     - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d
+      cron fastapi cgit-fastapi php-fpm cgit-php smartgit
     - docker image prune -f
     - docker container prune -f
     - docker volume prune -f

From d0e183a738a189e1d29982aa30ac8d6e2c7a0e36 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 9 Dec 2021 21:24:26 -0800
Subject: [PATCH 729/844] Revert "fix(gitlab-ci): only run services we need for
 deployment"

We'll need to update the nginx config to do this; putting
this off into an MR.

This reverts commit 19bd3766d24b8c60bfcc23cb42f851f8509e3230.
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6478eb04..0166db2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,7 +73,6 @@ deploy:
     - sed -ri "s/^(disable_http_login).*$/\1 = 1/" conf/config.dev
     - docker-compose build
     - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d
-      cron fastapi cgit-fastapi php-fpm cgit-php smartgit
     - docker image prune -f
     - docker container prune -f
     - docker volume prune -f

From c47578f158f935926727a59c5b849a565e81c2a1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 9 Dec 2021 23:01:45 -0800
Subject: [PATCH 730/844] fix(auth): refresh the user record on successful auth

This will ensure the state of `request.user` is good to go
for any other users which obtain it after the backend.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index 5f55e2fb..b683b1df 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -122,6 +122,7 @@ class BasicAuthBackend(AuthenticationBackend):
         # exists, due to ForeignKey constraints in the schema upheld
         # by mysqlclient.
         user = db.query(User).filter(User.ID == record.UsersID).first()
+        db.refresh(user)
         user.nonce = util.make_nonce()
         user.authenticated = True
 

From de671e9b9cc941a098294da884e0c44879d11a61 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 9 Dec 2021 23:03:26 -0800
Subject: [PATCH 731/844] fix(time): fall through and prefer AURTZ for timezone

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/time.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/time.py b/aurweb/time.py
index 0b1dff11..84118356 100644
--- a/aurweb/time.py
+++ b/aurweb/time.py
@@ -57,7 +57,7 @@ def get_request_timezone(request: Request):
 
     @param request FastAPI request
     """
-    if request.user.is_authenticated():
-        return request.user.Timezone
     default_tz = aurweb.config.get("options", "default_timezone")
+    if request.user.is_authenticated():
+        default_tz = request.user.Timezone
     return request.cookies.get("AURTZ", default_tz)

From 95a215ec58a2f32243bef2eded81f33ec70a52f4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 13 Dec 2021 00:11:26 -0800
Subject: [PATCH 732/844] change(poetry): dep on python >= 3.9 < 3.11

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f164967c..bcf14747 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,7 +43,7 @@ build-backend = "poetry.masonry.api"
 "Request Mailing List" = "https://lists.archlinux.org/listinfo/aur-requests"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.10"
+python = ">=3.9,<3.11"
 
 # poetry-dynamic-versioning is used to produce tool.poetry.version
 # based on git tags.

From 918593c3e63e1aed72b4b518a7922571bee25590 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 13 Dec 2021 00:24:17 -0800
Subject: [PATCH 733/844] change(poetry): bump dependency versions

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock | 552 +++++++++++++++++++++++++++-------------------------
 1 file changed, 283 insertions(+), 269 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index d56ce458..4f688a29 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -8,7 +8,7 @@ python-versions = ">=3.6,<4.0"
 
 [[package]]
 name = "alembic"
-version = "1.7.4"
+version = "1.7.5"
 description = "A database migration tool for SQLAlchemy."
 category = "main"
 optional = false
@@ -23,7 +23,7 @@ tz = ["python-dateutil"]
 
 [[package]]
 name = "anyio"
-version = "3.3.4"
+version = "3.4.0"
 description = "High level compatibility layer for multiple asynchronous event loop implementations"
 category = "main"
 optional = false
@@ -35,7 +35,7 @@ sniffio = ">=1.1"
 
 [package.extras]
 doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"]
-test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"]
+test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "contextlib2", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"]
 trio = ["trio (>=0.16)"]
 
 [[package]]
@@ -135,7 +135,7 @@ pycparser = "*"
 
 [[package]]
 name = "charset-normalizer"
-version = "2.0.7"
+version = "2.0.9"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
@@ -165,7 +165,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "coverage"
-version = "6.1.1"
+version = "6.2"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -179,7 +179,7 @@ toml = ["tomli"]
 
 [[package]]
 name = "cryptography"
-version = "35.0.0"
+version = "36.0.0"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 category = "main"
 optional = false
@@ -190,7 +190,7 @@ cffi = ">=1.12"
 
 [package.extras]
 docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
-docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
+docstest = ["pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
 pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
 sdist = ["setuptools_rust (>=0.11.4)"]
 ssh = ["bcrypt (>=3.1.5)"]
@@ -247,7 +247,7 @@ testing = ["pre-commit"]
 
 [[package]]
 name = "fakeredis"
-version = "1.6.1"
+version = "1.7.0"
 description = "Fake implementation of redis API for testing purposes."
 category = "main"
 optional = false
@@ -255,7 +255,7 @@ python-versions = ">=3.5"
 
 [package.dependencies]
 packaging = "*"
-redis = "<3.6.0"
+redis = "<4.1.0"
 six = ">=1.12"
 sortedcontainers = "*"
 
@@ -302,7 +302,7 @@ python-dateutil = "*"
 
 [[package]]
 name = "filelock"
-version = "3.3.2"
+version = "3.4.0"
 description = "A platform independent file lock."
 category = "main"
 optional = false
@@ -461,7 +461,7 @@ python-versions = "*"
 
 [[package]]
 name = "isort"
-version = "5.10.0"
+version = "5.10.1"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
@@ -483,7 +483,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "jinja2"
-version = "3.0.2"
+version = "3.0.3"
 description = "A very fast and expressive template engine."
 category = "main"
 optional = false
@@ -497,7 +497,7 @@ i18n = ["Babel (>=2.7)"]
 
 [[package]]
 name = "lxml"
-version = "4.6.4"
+version = "4.6.5"
 description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
 category = "main"
 optional = false
@@ -511,7 +511,7 @@ source = ["Cython (>=0.29.7)"]
 
 [[package]]
 name = "mako"
-version = "1.1.5"
+version = "1.1.6"
 description = "A super-fast templating language that borrows the  best ideas from the existing templating languages."
 category = "main"
 optional = false
@@ -561,7 +561,7 @@ python-versions = "*"
 
 [[package]]
 name = "mysqlclient"
-version = "2.0.3"
+version = "2.1.0"
 description = "Python interface to MySQL"
 category = "main"
 optional = false
@@ -569,7 +569,7 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "orjson"
-version = "3.6.4"
+version = "3.6.5"
 description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 category = "main"
 optional = false
@@ -577,14 +577,14 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "packaging"
-version = "21.2"
+version = "21.3"
 description = "Core utilities for Python packages"
 category = "main"
 optional = false
 python-versions = ">=3.6"
 
 [package.dependencies]
-pyparsing = ">=2.0.2,<3"
+pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
 
 [[package]]
 name = "paginate"
@@ -715,22 +715,25 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pygit2"
-version = "1.7.0"
+version = "1.7.2"
 description = "Python bindings for libgit2."
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
 
 [package.dependencies]
 cffi = ">=1.4.0"
 
 [[package]]
 name = "pyparsing"
-version = "2.4.7"
+version = "3.0.6"
 description = "Python parsing module"
 category = "main"
 optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+python-versions = ">=3.6"
+
+[package.extras]
+diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
@@ -784,11 +787,11 @@ testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtuale
 
 [[package]]
 name = "pytest-forked"
-version = "1.3.0"
+version = "1.4.0"
 description = "run tests in isolated forked subprocesses"
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.6"
 
 [package.dependencies]
 py = "*"
@@ -808,7 +811,7 @@ pytest = ">=3.0"
 
 [[package]]
 name = "pytest-xdist"
-version = "2.4.0"
+version = "2.5.0"
 description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
 category = "main"
 optional = false
@@ -816,7 +819,7 @@ python-versions = ">=3.6"
 
 [package.dependencies]
 execnet = ">=1.1"
-pytest = ">=6.0.0"
+pytest = ">=6.2.0"
 pytest-forked = "*"
 
 [package.extras]
@@ -915,7 +918,7 @@ python-versions = "*"
 
 [[package]]
 name = "sqlalchemy"
-version = "1.4.26"
+version = "1.4.28"
 description = "Database Abstraction Library"
 category = "main"
 optional = false
@@ -996,11 +999,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "typing-extensions"
-version = "3.10.0.2"
-description = "Backported and Experimental Type Hints for Python 3.5+"
+version = "4.0.1"
+description = "Backported and Experimental Type Hints for Python 3.6+"
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "urllib3"
@@ -1063,8 +1066,8 @@ h11 = ">=0.9.0,<1"
 
 [metadata]
 lock-version = "1.1"
-python-versions = ">=3.9,<3.10"
-content-hash = "43b3dd494890ef9d419260a06ccd0190638573fdf0b92a226016f1dd5ee87579"
+python-versions = ">=3.9,<3.11"
+content-hash = "e950fbe8a0099e8b8858105e451b2f91edf9410e2ce93d2f983a29b5e3ca985e"
 
 [metadata.files]
 aiofiles = [
@@ -1072,12 +1075,12 @@ aiofiles = [
     {file = "aiofiles-0.7.0.tar.gz", hash = "sha256:a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"},
 ]
 alembic = [
-    {file = "alembic-1.7.4-py3-none-any.whl", hash = "sha256:e3cab9e59778b3b6726bb2da9ced451c6622d558199fd3ef914f3b1e8f4ef704"},
-    {file = "alembic-1.7.4.tar.gz", hash = "sha256:9d33f3ff1488c4bfab1e1a6dfebbf085e8a8e1a3e047a43ad29ad1f67f012a1d"},
+    {file = "alembic-1.7.5-py3-none-any.whl", hash = "sha256:a9dde941534e3d7573d9644e8ea62a2953541e27bc1793e166f60b777ae098b4"},
+    {file = "alembic-1.7.5.tar.gz", hash = "sha256:7c328694a2e68f03ee971e63c3bd885846470373a5b532cf2c9f1601c413b153"},
 ]
 anyio = [
-    {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"},
-    {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"},
+    {file = "anyio-3.4.0-py3-none-any.whl", hash = "sha256:2855a9423524abcdd652d942f8932fda1735210f77a6b392eafd9ff34d3fe020"},
+    {file = "anyio-3.4.0.tar.gz", hash = "sha256:24adc69309fb5779bc1e06158e143e0b6d2c56b302a3ac3de3083c705a6ed39d"},
 ]
 asgiref = [
     {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"},
@@ -1165,8 +1168,8 @@ cffi = [
     {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"},
 ]
 charset-normalizer = [
-    {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"},
-    {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"},
+    {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"},
+    {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"},
 ]
 click = [
     {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
@@ -1177,77 +1180,76 @@ colorama = [
     {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
 ]
 coverage = [
-    {file = "coverage-6.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:42a1fb5dee3355df90b635906bb99126faa7936d87dfc97eacc5293397618cb7"},
-    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a00284dbfb53b42e35c7dd99fc0e26ef89b4a34efff68078ed29d03ccb28402a"},
-    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:51a441011a30d693e71dea198b2a6f53ba029afc39f8e2aeb5b77245c1b282ef"},
-    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e76f017b6d4140a038c5ff12be1581183d7874e41f1c0af58ecf07748d36a336"},
-    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7833c872718dc913f18e51ee97ea0dece61d9930893a58b20b3daf09bb1af6b6"},
-    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8186b5a4730c896cbe1e4b645bdc524e62d874351ae50e1db7c3e9f5dc81dc26"},
-    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bbca34dca5a2d60f81326d908d77313816fad23d11b6069031a3d6b8c97a54f9"},
-    {file = "coverage-6.1.1-cp310-cp310-win32.whl", hash = "sha256:72bf437d54186d104388cbae73c9f2b0f8a3e11b6e8d7deb593bd14625c96026"},
-    {file = "coverage-6.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:994ce5a7b3d20981b81d83618aa4882f955bfa573efdbef033d5632b58597ba9"},
-    {file = "coverage-6.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ab6a0fe4c96f8058d41948ddf134420d3ef8c42d5508b5a341a440cce7a37a1d"},
-    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10ab138b153e4cc408b43792cb7f518f9ee02f4ff55cd1ab67ad6fd7e9905c7e"},
-    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7e083d32965d2eb6638a77e65b622be32a094fdc0250f28ce6039b0732fbcaa8"},
-    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:359a32515e94e398a5c0fa057e5887a42e647a9502d8e41165cf5cb8d3d1ca67"},
-    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:bf656cd74ff7b4ed7006cdb2a6728150aaad69c7242b42a2a532f77b63ea233f"},
-    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:dc5023be1c2a8b0a0ab5e31389e62c28b2453eb31dd069f4b8d1a0f9814d951a"},
-    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:557594a50bfe3fb0b1b57460f6789affe8850ad19c1acf2d14a3e12b2757d489"},
-    {file = "coverage-6.1.1-cp36-cp36m-win32.whl", hash = "sha256:9eb0a1923354e0fdd1c8a6f53f5db2e6180d670e2b587914bf2e79fa8acfd003"},
-    {file = "coverage-6.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:04a92a6cf9afd99f9979c61348ec79725a9f9342fb45e63c889e33c04610d97b"},
-    {file = "coverage-6.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:479228e1b798d3c246ac89b09897ee706c51b3e5f8f8d778067f38db73ccc717"},
-    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78287731e3601ea5ce9d6468c82d88a12ef8fe625d6b7bdec9b45d96c1ad6533"},
-    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c95257aa2ccf75d3d91d772060538d5fea7f625e48157f8ca44594f94d41cb33"},
-    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9ad5895938a894c368d49d8470fe9f519909e5ebc6b8f8ea5190bd0df6aa4271"},
-    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:326d944aad0189603733d646e8d4a7d952f7145684da973c463ec2eefe1387c2"},
-    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e7d5606b9240ed4def9cbdf35be4308047d11e858b9c88a6c26974758d6225ce"},
-    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:572f917267f363101eec375c109c9c1118037c7cc98041440b5eabda3185ac7b"},
-    {file = "coverage-6.1.1-cp37-cp37m-win32.whl", hash = "sha256:35cd2230e1ed76df7d0081a997f0fe705be1f7d8696264eb508076e0d0b5a685"},
-    {file = "coverage-6.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:65ad3ff837c89a229d626b8004f0ee32110f9bfdb6a88b76a80df36ccc60d926"},
-    {file = "coverage-6.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:977ce557d79577a3dd510844904d5d968bfef9489f512be65e2882e1c6eed7d8"},
-    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62512c0ec5d307f56d86504c58eace11c1bc2afcdf44e3ff20de8ca427ca1d0e"},
-    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2e5b9c17a56b8bf0c0a9477fcd30d357deb486e4e1b389ed154f608f18556c8a"},
-    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:666c6b32b69e56221ad1551d377f718ed00e6167c7a1b9257f780b105a101271"},
-    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:fb2fa2f6506c03c48ca42e3fe5a692d7470d290c047ee6de7c0f3e5fa7639ac9"},
-    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f0f80e323a17af63eac6a9db0c9188c10f1fd815c3ab299727150cc0eb92c7a4"},
-    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:738e823a746841248b56f0f3bd6abf3b73af191d1fd65e4c723b9c456216f0ad"},
-    {file = "coverage-6.1.1-cp38-cp38-win32.whl", hash = "sha256:8605add58e6a960729aa40c0fd9a20a55909dd9b586d3e8104cc7f45869e4c6b"},
-    {file = "coverage-6.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:6e994003e719458420e14ffb43c08f4c14990e20d9e077cb5cad7a3e419bbb54"},
-    {file = "coverage-6.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e3c4f5211394cd0bf6874ac5d29684a495f9c374919833dcfff0bd6d37f96201"},
-    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e14bceb1f3ae8a14374be2b2d7bc12a59226872285f91d66d301e5f41705d4d6"},
-    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0147f7833c41927d84f5af9219d9b32f875c0689e5e74ac8ca3cb61e73a698f9"},
-    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b1d0a1bce919de0dd8da5cff4e616b2d9e6ebf3bd1410ff645318c3dd615010a"},
-    {file = "coverage-6.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ae6de0e41f44794e68d23644636544ed8003ce24845f213b24de097cbf44997f"},
-    {file = "coverage-6.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db2797ed7a7e883b9ab76e8e778bb4c859fc2037d6fd0644d8675e64d58d1653"},
-    {file = "coverage-6.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c40966b683d92869b72ea3c11fd6b99a091fd30e12652727eca117273fc97366"},
-    {file = "coverage-6.1.1-cp39-cp39-win32.whl", hash = "sha256:a11a2c019324fc111485e79d55907e7289e53d0031275a6c8daed30690bc50c0"},
-    {file = "coverage-6.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:4d8b453764b9b26b0dd2afb83086a7c3f9379134e340288d2a52f8a91592394b"},
-    {file = "coverage-6.1.1-pp36-none-any.whl", hash = "sha256:3b270c6b48d3ff5a35deb3648028ba2643ad8434b07836782b1139cf9c66313f"},
-    {file = "coverage-6.1.1-pp37-none-any.whl", hash = "sha256:ffa8fee2b1b9e60b531c4c27cf528d6b5d5da46b1730db1f4d6eee56ff282e07"},
-    {file = "coverage-6.1.1-pp38-none-any.whl", hash = "sha256:4cd919057636f63ab299ccb86ea0e78b87812400c76abab245ca385f17d19fb5"},
-    {file = "coverage-6.1.1.tar.gz", hash = "sha256:b8e4f15b672c9156c1154249a9c5746e86ac9ae9edc3799ee3afebc323d9d9e0"},
+    {file = "coverage-6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6dbc1536e105adda7a6312c778f15aaabe583b0e9a0b0a324990334fd458c94b"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:174cf9b4bef0db2e8244f82059a5a72bd47e1d40e71c68ab055425172b16b7d0"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92b8c845527eae547a2a6617d336adc56394050c3ed8a6918683646328fbb6da"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c7912d1526299cb04c88288e148c6c87c0df600eca76efd99d84396cfe00ef1d"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5d2033d5db1d58ae2d62f095e1aefb6988af65b4b12cb8987af409587cc0739"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3feac4084291642165c3a0d9eaebedf19ffa505016c4d3db15bfe235718d4971"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:276651978c94a8c5672ea60a2656e95a3cce2a3f31e9fb2d5ebd4c215d095840"},
+    {file = "coverage-6.2-cp310-cp310-win32.whl", hash = "sha256:f506af4f27def639ba45789fa6fde45f9a217da0be05f8910458e4557eed020c"},
+    {file = "coverage-6.2-cp310-cp310-win_amd64.whl", hash = "sha256:3f7c17209eef285c86f819ff04a6d4cbee9b33ef05cbcaae4c0b4e8e06b3ec8f"},
+    {file = "coverage-6.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:13362889b2d46e8d9f97c421539c97c963e34031ab0cb89e8ca83a10cc71ac76"},
+    {file = "coverage-6.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:22e60a3ca5acba37d1d4a2ee66e051f5b0e1b9ac950b5b0cf4aa5366eda41d47"},
+    {file = "coverage-6.2-cp311-cp311-win_amd64.whl", hash = "sha256:b637c57fdb8be84e91fac60d9325a66a5981f8086c954ea2772efe28425eaf64"},
+    {file = "coverage-6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f467bbb837691ab5a8ca359199d3429a11a01e6dfb3d9dcc676dc035ca93c0a9"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2641f803ee9f95b1f387f3e8f3bf28d83d9b69a39e9911e5bfee832bea75240d"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1219d760ccfafc03c0822ae2e06e3b1248a8e6d1a70928966bafc6838d3c9e48"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9a2b5b52be0a8626fcbffd7e689781bf8c2ac01613e77feda93d96184949a98e"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:8e2c35a4c1f269704e90888e56f794e2d9c0262fb0c1b1c8c4ee44d9b9e77b5d"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:5d6b09c972ce9200264c35a1d53d43ca55ef61836d9ec60f0d44273a31aa9f17"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e3db840a4dee542e37e09f30859f1612da90e1c5239a6a2498c473183a50e781"},
+    {file = "coverage-6.2-cp36-cp36m-win32.whl", hash = "sha256:4e547122ca2d244f7c090fe3f4b5a5861255ff66b7ab6d98f44a0222aaf8671a"},
+    {file = "coverage-6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:01774a2c2c729619760320270e42cd9e797427ecfddd32c2a7b639cdc481f3c0"},
+    {file = "coverage-6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb8b8ee99b3fffe4fd86f4c81b35a6bf7e4462cba019997af2fe679365db0c49"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:619346d57c7126ae49ac95b11b0dc8e36c1dd49d148477461bb66c8cf13bb521"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0a7726f74ff63f41e95ed3a89fef002916c828bb5fcae83b505b49d81a066884"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cfd9386c1d6f13b37e05a91a8583e802f8059bebfccde61a418c5808dea6bbfa"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:17e6c11038d4ed6e8af1407d9e89a2904d573be29d51515f14262d7f10ef0a64"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c254b03032d5a06de049ce8bca8338a5185f07fb76600afff3c161e053d88617"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dca38a21e4423f3edb821292e97cec7ad38086f84313462098568baedf4331f8"},
+    {file = "coverage-6.2-cp37-cp37m-win32.whl", hash = "sha256:600617008aa82032ddeace2535626d1bc212dfff32b43989539deda63b3f36e4"},
+    {file = "coverage-6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:bf154ba7ee2fd613eb541c2bc03d3d9ac667080a737449d1a3fb342740eb1a74"},
+    {file = "coverage-6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f9afb5b746781fc2abce26193d1c817b7eb0e11459510fba65d2bd77fe161d9e"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edcada2e24ed68f019175c2b2af2a8b481d3d084798b8c20d15d34f5c733fa58"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a9c8c4283e17690ff1a7427123ffb428ad6a52ed720d550e299e8291e33184dc"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f614fc9956d76d8a88a88bb41ddc12709caa755666f580af3a688899721efecd"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9365ed5cce5d0cf2c10afc6add145c5037d3148585b8ae0e77cc1efdd6aa2953"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8bdfe9ff3a4ea37d17f172ac0dff1e1c383aec17a636b9b35906babc9f0f5475"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:63c424e6f5b4ab1cf1e23a43b12f542b0ec2e54f99ec9f11b75382152981df57"},
+    {file = "coverage-6.2-cp38-cp38-win32.whl", hash = "sha256:49dbff64961bc9bdd2289a2bda6a3a5a331964ba5497f694e2cbd540d656dc1c"},
+    {file = "coverage-6.2-cp38-cp38-win_amd64.whl", hash = "sha256:9a29311bd6429be317c1f3fe4bc06c4c5ee45e2fa61b2a19d4d1d6111cb94af2"},
+    {file = "coverage-6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:03b20e52b7d31be571c9c06b74746746d4eb82fc260e594dc662ed48145e9efd"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:215f8afcc02a24c2d9a10d3790b21054b58d71f4b3c6f055d4bb1b15cecce685"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a4bdeb0a52d1d04123b41d90a4390b096f3ef38eee35e11f0b22c2d031222c6c"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c332d8f8d448ded473b97fefe4a0983265af21917d8b0cdcb8bb06b2afe632c3"},
+    {file = "coverage-6.2-cp39-cp39-win32.whl", hash = "sha256:6e1394d24d5938e561fbeaa0cd3d356207579c28bd1792f25a068743f2d5b282"},
+    {file = "coverage-6.2-cp39-cp39-win_amd64.whl", hash = "sha256:86f2e78b1eff847609b1ca8050c9e1fa3bd44ce755b2ec30e70f2d3ba3844644"},
+    {file = "coverage-6.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:5829192582c0ec8ca4a2532407bc14c2f338d9878a10442f5d03804a95fac9de"},
+    {file = "coverage-6.2.tar.gz", hash = "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"},
 ]
 cryptography = [
-    {file = "cryptography-35.0.0-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:d57e0cdc1b44b6cdf8af1d01807db06886f10177469312fbde8f44ccbb284bc9"},
-    {file = "cryptography-35.0.0-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:ced40344e811d6abba00295ced98c01aecf0c2de39481792d87af4fa58b7b4d6"},
-    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:54b2605e5475944e2213258e0ab8696f4f357a31371e538ef21e8d61c843c28d"},
-    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:7b7ceeff114c31f285528ba8b390d3e9cfa2da17b56f11d366769a807f17cbaa"},
-    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d69645f535f4b2c722cfb07a8eab916265545b3475fdb34e0be2f4ee8b0b15e"},
-    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a2d0e0acc20ede0f06ef7aa58546eee96d2592c00f450c9acb89c5879b61992"},
-    {file = "cryptography-35.0.0-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:07bb7fbfb5de0980590ddfc7f13081520def06dc9ed214000ad4372fb4e3c7f6"},
-    {file = "cryptography-35.0.0-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:7eba2cebca600a7806b893cb1d541a6e910afa87e97acf2021a22b32da1df52d"},
-    {file = "cryptography-35.0.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:18d90f4711bf63e2fb21e8c8e51ed8189438e6b35a6d996201ebd98a26abbbe6"},
-    {file = "cryptography-35.0.0-cp36-abi3-win32.whl", hash = "sha256:c10c797ac89c746e488d2ee92bd4abd593615694ee17b2500578b63cad6b93a8"},
-    {file = "cryptography-35.0.0-cp36-abi3-win_amd64.whl", hash = "sha256:7075b304cd567694dc692ffc9747f3e9cb393cc4aa4fb7b9f3abd6f5c4e43588"},
-    {file = "cryptography-35.0.0-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a688ebcd08250eab5bb5bca318cc05a8c66de5e4171a65ca51db6bd753ff8953"},
-    {file = "cryptography-35.0.0-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d99915d6ab265c22873f1b4d6ea5ef462ef797b4140be4c9d8b179915e0985c6"},
-    {file = "cryptography-35.0.0-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:928185a6d1ccdb816e883f56ebe92e975a262d31cc536429041921f8cb5a62fd"},
-    {file = "cryptography-35.0.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:ebeddd119f526bcf323a89f853afb12e225902a24d29b55fe18dd6fcb2838a76"},
-    {file = "cryptography-35.0.0-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:22a38e96118a4ce3b97509443feace1d1011d0571fae81fc3ad35f25ba3ea999"},
-    {file = "cryptography-35.0.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eb80e8a1f91e4b7ef8b33041591e6d89b2b8e122d787e87eeb2b08da71bb16ad"},
-    {file = "cryptography-35.0.0-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:abb5a361d2585bb95012a19ed9b2c8f412c5d723a9836418fab7aaa0243e67d2"},
-    {file = "cryptography-35.0.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:1ed82abf16df40a60942a8c211251ae72858b25b7421ce2497c2eb7a1cee817c"},
-    {file = "cryptography-35.0.0.tar.gz", hash = "sha256:9933f28f70d0517686bd7de36166dda42094eac49415459d9bdf5e7df3e0086d"},
+    {file = "cryptography-36.0.0-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:9511416e85e449fe1de73f7f99b21b3aa04fba4c4d335d30c486ba3756e3a2a6"},
+    {file = "cryptography-36.0.0-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:97199a13b772e74cdcdb03760c32109c808aff7cd49c29e9cf4b7754bb725d1d"},
+    {file = "cryptography-36.0.0-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:494106e9cd945c2cadfce5374fa44c94cfadf01d4566a3b13bb487d2e6c7959e"},
+    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6fbbbb8aab4053fa018984bb0e95a16faeb051dd8cca15add2a27e267ba02b58"},
+    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:684993ff6f67000a56454b41bdc7e015429732d65a52d06385b6e9de6181c71e"},
+    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c702855cd3174666ef0d2d13dcc879090aa9c6c38f5578896407a7028f75b9f"},
+    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d91bc9f535599bed58f6d2e21a2724cb0c3895bf41c6403fe881391d29096f1d"},
+    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:b17d83b3d1610e571fedac21b2eb36b816654d6f7496004d6a0d32f99d1d8120"},
+    {file = "cryptography-36.0.0-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:8982c19bb90a4fa2aad3d635c6d71814e38b643649b4000a8419f8691f20ac44"},
+    {file = "cryptography-36.0.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:24469d9d33217ffd0ce4582dfcf2a76671af115663a95328f63c99ec7ece61a4"},
+    {file = "cryptography-36.0.0-cp36-abi3-win32.whl", hash = "sha256:f6a5a85beb33e57998dc605b9dbe7deaa806385fdf5c4810fb849fcd04640c81"},
+    {file = "cryptography-36.0.0-cp36-abi3-win_amd64.whl", hash = "sha256:2deab5ec05d83ddcf9b0916319674d3dae88b0e7ee18f8962642d3cde0496568"},
+    {file = "cryptography-36.0.0-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2049f8b87f449fc6190350de443ee0c1dd631f2ce4fa99efad2984de81031681"},
+    {file = "cryptography-36.0.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a776bae1629c8d7198396fd93ec0265f8dd2341c553dc32b976168aaf0e6a636"},
+    {file = "cryptography-36.0.0-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:aa94d617a4cd4cdf4af9b5af65100c036bce22280ebb15d8b5262e8273ebc6ba"},
+    {file = "cryptography-36.0.0-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:5c49c9e8fb26a567a2b3fa0343c89f5d325447956cc2fc7231c943b29a973712"},
+    {file = "cryptography-36.0.0-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ef216d13ac8d24d9cd851776662f75f8d29c9f2d05cdcc2d34a18d32463a9b0b"},
+    {file = "cryptography-36.0.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:231c4a69b11f6af79c1495a0e5a85909686ea8db946935224b7825cfb53827ed"},
+    {file = "cryptography-36.0.0-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:f92556f94e476c1b616e6daec5f7ddded2c082efa7cee7f31c7aeda615906ed8"},
+    {file = "cryptography-36.0.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:d73e3a96c38173e0aa5646c31bf8473bc3564837977dd480f5cbeacf1d7ef3a3"},
+    {file = "cryptography-36.0.0.tar.gz", hash = "sha256:52f769ecb4ef39865719aedc67b4b7eae167bafa48dbc2a26dd36fa56460507f"},
 ]
 dnspython = [
     {file = "dnspython-2.1.0-py3-none-any.whl", hash = "sha256:95d12f6ef0317118d2a1a6fc49aac65ffec7eb8087474158f42f26a639135216"},
@@ -1266,16 +1268,16 @@ execnet = [
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
 fakeredis = [
-    {file = "fakeredis-1.6.1-py3-none-any.whl", hash = "sha256:5eb1516f1fe1813e9da8f6c482178fc067af09f53de587ae03887ef5d9d13024"},
-    {file = "fakeredis-1.6.1.tar.gz", hash = "sha256:0d06a9384fb79da9f2164ce96e34eb9d4e2ea46215070805ea6fd3c174590b47"},
+    {file = "fakeredis-1.7.0-py3-none-any.whl", hash = "sha256:6f1e04f64557ad3b6835bdc6e5a8d022cbace4bdc24a47ad58f6a72e0fbff760"},
+    {file = "fakeredis-1.7.0.tar.gz", hash = "sha256:c9bd12e430336cbd3e189fae0e91eb99997b93e76dbfdd6ed67fa352dc684c71"},
 ]
 fastapi = []
 feedgen = [
     {file = "feedgen-0.9.0.tar.gz", hash = "sha256:8e811bdbbed6570034950db23a4388453628a70e689a6e8303ccec430f5a804a"},
 ]
 filelock = [
-    {file = "filelock-3.3.2-py3-none-any.whl", hash = "sha256:bb2a1c717df74c48a2d00ed625e5a66f8572a3a30baacb7657add1d7bac4097b"},
-    {file = "filelock-3.3.2.tar.gz", hash = "sha256:7afc856f74fa7006a289fd10fa840e1eebd8bbff6bffb69c26c54a0512ea8cf8"},
+    {file = "filelock-3.4.0-py3-none-any.whl", hash = "sha256:2e139a228bcf56dd8b2274a65174d005c4a6b68540ee0bdbb92c76f43f29f7e8"},
+    {file = "filelock-3.4.0.tar.gz", hash = "sha256:93d512b32a23baf4cac44ffd72ccf70732aeff7b8050fcaf6d3ec406d954baf4"},
 ]
 flake8 = [
     {file = "flake8-4.0.1-py2.py3-none-any.whl", hash = "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d"},
@@ -1374,82 +1376,82 @@ iniconfig = [
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 isort = [
-    {file = "isort-5.10.0-py3-none-any.whl", hash = "sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f"},
-    {file = "isort-5.10.0.tar.gz", hash = "sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345"},
+    {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
+    {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
 itsdangerous = [
     {file = "itsdangerous-2.0.1-py3-none-any.whl", hash = "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c"},
     {file = "itsdangerous-2.0.1.tar.gz", hash = "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0"},
 ]
 jinja2 = [
-    {file = "Jinja2-3.0.2-py3-none-any.whl", hash = "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"},
-    {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"},
+    {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"},
+    {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"},
 ]
 lxml = [
-    {file = "lxml-4.6.4-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:bbf2dc330bd44bfc0254ab37677ec60f7c7ecea55ad8ba1b8b2ea7bf20c265f5"},
-    {file = "lxml-4.6.4-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b667c51682fe9b9788c69465956baa8b6999531876ccedcafc895c74ad716cd8"},
-    {file = "lxml-4.6.4-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:72e730d33fe2e302fd07285f14624fca5e5e2fb2bb4fb2c3941e318c41c443d1"},
-    {file = "lxml-4.6.4-cp27-cp27m-win32.whl", hash = "sha256:433df8c7dde0f9e41cbf4f36b0829d50a378116ef5e962ba3881f2f5f025c7be"},
-    {file = "lxml-4.6.4-cp27-cp27m-win_amd64.whl", hash = "sha256:35752ee40f7bbf6adc9ff4e1f4b84794a3593736dcce80db32e3c2aa85e294ac"},
-    {file = "lxml-4.6.4-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5ff5bb2a198ea67403bb6818705e9a4f90e0313f2215428ec51001ce56d939fb"},
-    {file = "lxml-4.6.4-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:9b87727561c1150c0cc91c5d9d389448b37a7d15f0ba939ed3d1acb2f11bf6c5"},
-    {file = "lxml-4.6.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:45fdb2899c755138722797161547a40b3e2a06feda620cc41195ee7e97806d81"},
-    {file = "lxml-4.6.4-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:38b9de0de3aa689fe9fb9877ae1be1e83b8cf9621f7e62049d0436b9ecf4ad64"},
-    {file = "lxml-4.6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:662523cd2a0246740225c7e32531f2e766544122e58bee70e700a024cfc0cf81"},
-    {file = "lxml-4.6.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:4aa349c5567651f34d4eaae7de6ed5b523f6d70a288f9c6fbac22d13a0784e04"},
-    {file = "lxml-4.6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:08eb9200d88b376a8ed5e50f1dc1d1a45b49305169674002a3b5929943390591"},
-    {file = "lxml-4.6.4-cp310-cp310-win32.whl", hash = "sha256:bdc224f216ead849e902151112efef6e96c41ee1322e15d4e5f7c8a826929aee"},
-    {file = "lxml-4.6.4-cp310-cp310-win_amd64.whl", hash = "sha256:ab6db93a2b6b66cbf62b4e4a7135f476e708e8c5c990d186584142c77d7f975a"},
-    {file = "lxml-4.6.4-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:50790313df028aa05cf22be9a8da033b86c42fa32523e4fd944827b482b17bf0"},
-    {file = "lxml-4.6.4-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6764998345552b1dfc9326a932d2bad6367c6b37a176bb73ada6b9486bf602f7"},
-    {file = "lxml-4.6.4-cp35-cp35m-win32.whl", hash = "sha256:543b239b191bb3b6d9bef5f09f1fb2be5b7eb09ab4d386aa655e4d53fbe9ff47"},
-    {file = "lxml-4.6.4-cp35-cp35m-win_amd64.whl", hash = "sha256:a75c1ad05eedb1a3ff2a34a52a4f0836cfaa892e12796ba39a7732c82701eff4"},
-    {file = "lxml-4.6.4-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:47e955112ce64241fdb357acf0216081f9f3255b3ac9c502ca4b3323ec1ca558"},
-    {file = "lxml-4.6.4-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:20d7c8d90d449c6a353b15ee0459abae8395dbe59ad01e406ccbf30cd81c6f98"},
-    {file = "lxml-4.6.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:240db6f3228d26e3c6f4fad914b9ddaaf8707254e8b3efd564dc680c8ec3c264"},
-    {file = "lxml-4.6.4-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:351482da8dd028834028537f08724b1de22d40dcf3bb723b469446564f409074"},
-    {file = "lxml-4.6.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e678a643177c0e5ec947b645fa7bc84260dfb9b6bf8fb1fdd83008dfc2ca5928"},
-    {file = "lxml-4.6.4-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:15d0381feb56f08f78c5cc4fc385ddfe0bde1456e37f54a9322833371aec4060"},
-    {file = "lxml-4.6.4-cp36-cp36m-win32.whl", hash = "sha256:4ba74afe5ee5cb5e28d83b513a6e8f0875fda1dc1a9aea42cc0065f029160d2a"},
-    {file = "lxml-4.6.4-cp36-cp36m-win_amd64.whl", hash = "sha256:9c91a73971a922c13070fd8fa5a114c858251791ba2122a941e6aa781c713e44"},
-    {file = "lxml-4.6.4-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:6020c70ff695106bf80651953a23e37718ef1fee9abd060dcad8e32ab2dc13f3"},
-    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f5dd358536b8a964bf6bd48de038754c1609e72e5f17f5d21efe2dda17594dbf"},
-    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:7ae7089d81fc502df4b217ad77f03c54039fe90dac0acbe70448d7e53bfbc57e"},
-    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:80d10d53d3184837445ff8562021bdd37f57c4cadacbf9d8726cc16220a00d54"},
-    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e95da348d57eb448d226a44b868ff2ca5786fbcbe417ac99ff62d0a7d724b9c7"},
-    {file = "lxml-4.6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:ffd65cfa33fed01735c82aca640fde4cc63f0414775cba11e06f84fae2085a6e"},
-    {file = "lxml-4.6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:877666418598f6cb289546c77ff87590cfd212f903b522b0afa0b9fb73b3ccfb"},
-    {file = "lxml-4.6.4-cp37-cp37m-win32.whl", hash = "sha256:e91d24623e747eeb2d8121f4a94c6a7ad27dc48e747e2dc95bfe88632bd028a2"},
-    {file = "lxml-4.6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:4ec9a80dd5704ecfde54319b6964368daf02848c8954d3bacb9b64d1c7659159"},
-    {file = "lxml-4.6.4-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:2901625f4a878a055d275beedc20ba9cb359cefc4386a967222fee29eb236038"},
-    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b567178a74a2261345890eac66fbf394692a6e002709d329f28a673ca6042473"},
-    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4717123f7c11c81e0da69989e5a64079c3f402b0efeb4c6241db6c369d657bd8"},
-    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:cf201bf5594d1aab139fe53e3fca457e4f8204a5bbd65d48ab3b82a16f517868"},
-    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a77a3470ba37e11872c75ca95baf9b3312133a3d5a5dc720803b23098c653976"},
-    {file = "lxml-4.6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:619c6d2b552bba00491e96c0518aad94002651c108a0f7364ff2d7798812c00e"},
-    {file = "lxml-4.6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:601f0ab75538b280aaf1e720eb9d68d4fa104ac274e1e9e6971df488f4dcdb0f"},
-    {file = "lxml-4.6.4-cp38-cp38-win32.whl", hash = "sha256:75d3c5bbc0ddbad03bb68b9be638599f67e4b98ed3dcd0fec9f6f39e41ee96cb"},
-    {file = "lxml-4.6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4341d135f5660db10184963d9c3418c3e28d7f868aaf8b11a323ebf85813f7f4"},
-    {file = "lxml-4.6.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:9db24803fa71e3305fe4a7812782b708da21a0b774b130dd1860cf40a6d7a3ee"},
-    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:afd60230ad9d8bcba005945ec3a343722f09e0b7f8ae804246e5d2cfc6bd71a6"},
-    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:0c15e1cd55055956e77b0732270f1c6005850696bc3ef3e03d01e78af84eaa42"},
-    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:6d422b3c729737d8a39279a25fa156c983a56458f8b2f97661ee6fb22b80b1d6"},
-    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2eb90f6ec3c236ef2f1bb38aee7c0d23e77d423d395af6326e7cca637519a4cb"},
-    {file = "lxml-4.6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:51a0e5d243687596f46e24e464121d4b232ad772e2d1785b2a2c0eb413c285d4"},
-    {file = "lxml-4.6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d43bd68714049c84e297c005456a15ecdec818f7b5aa5868c8b0a865cfb78a44"},
-    {file = "lxml-4.6.4-cp39-cp39-win32.whl", hash = "sha256:ee9e4b07b0eba4b6a521509e9e1877476729c1243246b6959de697ebea739643"},
-    {file = "lxml-4.6.4-cp39-cp39-win_amd64.whl", hash = "sha256:48eaac2991b3036175b42ee8d3c23f4cca13f2be8426bf29401a690ab58c88f4"},
-    {file = "lxml-4.6.4-pp37-pypy37_pp73-macosx_10_14_x86_64.whl", hash = "sha256:2b06a91cf7b8acea7793006e4ae50646cef0fe35ce5acd4f5cb1c77eb228e4a1"},
-    {file = "lxml-4.6.4-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:523f195948a1ba4f9f5b7294d83c6cd876547dc741820750a7e5e893a24bbe38"},
-    {file = "lxml-4.6.4-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:b0ca0ada9d3bc18bd6f611bd001a28abdd49ab9698bd6d717f7f5394c8e94628"},
-    {file = "lxml-4.6.4-pp38-pypy38_pp73-macosx_10_14_x86_64.whl", hash = "sha256:197b7cb7a753cf553a45115739afd8458464a28913da00f5c525063f94cd3f48"},
-    {file = "lxml-4.6.4-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:6298f5b42a26581206ef63fffa97c754245d329414108707c525512a5197f2ba"},
-    {file = "lxml-4.6.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:0b12c95542f04d10cba46b3ff28ea52ea56995b78cf918f0b11b05e75812bb79"},
-    {file = "lxml-4.6.4.tar.gz", hash = "sha256:daf9bd1fee31f1c7a5928b3e1059e09a8d683ea58fb3ffc773b6c88cb8d1399c"},
+    {file = "lxml-4.6.5-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:abcf7daa5ebcc89328326254f6dd6d566adb483d4d00178892afd386ab389de2"},
+    {file = "lxml-4.6.5-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3884476a90d415be79adfa4e0e393048630d0d5bcd5757c4c07d8b4b00a1096b"},
+    {file = "lxml-4.6.5-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:add017c5bd6b9ec3a5f09248396b6ee2ce61c5621f087eb2269c813cd8813808"},
+    {file = "lxml-4.6.5-cp27-cp27m-win32.whl", hash = "sha256:a702005e447d712375433ed0499cb6e1503fadd6c96a47f51d707b4d37b76d3c"},
+    {file = "lxml-4.6.5-cp27-cp27m-win_amd64.whl", hash = "sha256:da07c7e7fc9a3f40446b78c54dbba8bfd5c9100dfecb21b65bfe3f57844f5e71"},
+    {file = "lxml-4.6.5-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a708c291900c40a7ecf23f1d2384ed0bc0604e24094dd13417c7e7f8f7a50d93"},
+    {file = "lxml-4.6.5-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:f33d8efb42e4fc2b31b3b4527940b25cdebb3026fb56a80c1c1c11a4271d2352"},
+    {file = "lxml-4.6.5-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:f6befb83bca720b71d6bd6326a3b26e9496ae6649e26585de024890fe50f49b8"},
+    {file = "lxml-4.6.5-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:59d77bfa3bea13caee95bc0d3f1c518b15049b97dd61ea8b3d71ce677a67f808"},
+    {file = "lxml-4.6.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:68a851176c931e2b3de6214347b767451243eeed3bea34c172127bbb5bf6c210"},
+    {file = "lxml-4.6.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a7790a273225b0c46e5f859c1327f0f659896cc72eaa537d23aa3ad9ff2a1cc1"},
+    {file = "lxml-4.6.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6548fc551de15f310dd0564751d9dc3d405278d45ea9b2b369ed1eccf142e1f5"},
+    {file = "lxml-4.6.5-cp310-cp310-win32.whl", hash = "sha256:dc8a0dbb2a10ae8bb609584f5c504789f0f3d0d81840da4849102ec84289f952"},
+    {file = "lxml-4.6.5-cp310-cp310-win_amd64.whl", hash = "sha256:1ccbfe5d17835db906f2bab6f15b34194db1a5b07929cba3cf45a96dbfbfefc0"},
+    {file = "lxml-4.6.5-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ca9a40497f7e97a2a961c04fa8a6f23d790b0521350a8b455759d786b0bcb203"},
+    {file = "lxml-4.6.5-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e5b4b0d9440046ead3bd425eb2b852499241ee0cef1ae151038e4f87ede888c4"},
+    {file = "lxml-4.6.5-cp35-cp35m-win32.whl", hash = "sha256:87f8f7df70b90fbe7b49969f07b347e3f978f8bd1046bb8ecae659921869202b"},
+    {file = "lxml-4.6.5-cp35-cp35m-win_amd64.whl", hash = "sha256:ce52aad32ec6e46d1a91ff8b8014a91538800dd533914bfc4a82f5018d971408"},
+    {file = "lxml-4.6.5-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:8021eeff7fabde21b9858ed058a8250ad230cede91764d598c2466b0ba70db8b"},
+    {file = "lxml-4.6.5-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:cab343b265e38d4e00649cbbad9278b734c5715f9bcbb72c85a1f99b1a58e19a"},
+    {file = "lxml-4.6.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:3534d7c468c044f6aef3c0aff541db2826986a29ea73f2ca831f5d5284d9b570"},
+    {file = "lxml-4.6.5-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:bdb98f4c9e8a1735efddfaa995b0c96559792da15d56b76428bdfc29f77c4cdb"},
+    {file = "lxml-4.6.5-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:5ea121cb66d7e5cb396b4c3ca90471252b94e01809805cfe3e4e44be2db3a99c"},
+    {file = "lxml-4.6.5-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:121fc6f71c692b49af6c963b84ab7084402624ffbe605287da362f8af0668ea3"},
+    {file = "lxml-4.6.5-cp36-cp36m-win32.whl", hash = "sha256:1a2a7659b8eb93c6daee350a0d844994d49245a0f6c05c747f619386fb90ba04"},
+    {file = "lxml-4.6.5-cp36-cp36m-win_amd64.whl", hash = "sha256:2f77556266a8fe5428b8759fbfc4bd70be1d1d9c9b25d2a414f6a0c0b0f09120"},
+    {file = "lxml-4.6.5-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:558485218ee06458643b929765ac1eb04519ca3d1e2dcc288517de864c747c33"},
+    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:ba0006799f21d83c3717fe20e2707a10bbc296475155aadf4f5850f6659b96b9"},
+    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:916d457ad84e05b7db52700bad0a15c56e0c3000dcaf1263b2fb7a56fe148996"},
+    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:c580c2a61d8297a6e47f4d01f066517dbb019be98032880d19ece7f337a9401d"},
+    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a21b78af7e2e13bec6bea12fc33bc05730197674f3e5402ce214d07026ccfebd"},
+    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:46515773570a33eae13e451c8fcf440222ef24bd3b26f40774dd0bd8b6db15b2"},
+    {file = "lxml-4.6.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:124f09614f999551ac65e5b9875981ce4b66ac4b8e2ba9284572f741935df3d9"},
+    {file = "lxml-4.6.5-cp37-cp37m-win32.whl", hash = "sha256:b4015baed99d046c760f09a4c59d234d8f398a454380c3cf0b859aba97136090"},
+    {file = "lxml-4.6.5-cp37-cp37m-win_amd64.whl", hash = "sha256:12ae2339d32a2b15010972e1e2467345b7bf962e155671239fba74c229564b7f"},
+    {file = "lxml-4.6.5-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:76b6c296e4f7a1a8a128aec42d128646897f9ae9a700ef6839cdc9b3900db9b5"},
+    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:534032a5ceb34bba1da193b7d386ac575127cc39338379f39a164b10d97ade89"},
+    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:60aeb14ff9022d2687ef98ce55f6342944c40d00916452bb90899a191802137a"},
+    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:9801bcd52ac9c795a7d81ea67471a42cffe532e46cfb750cd5713befc5c019c0"},
+    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3b95fb7e6f9c2f53db88f4642231fc2b8907d854e614710996a96f1f32018d5c"},
+    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:642eb4cabd997c9b949a994f9643cd8ae00cf4ca8c5cd9c273962296fadf1c44"},
+    {file = "lxml-4.6.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:af4139172ff0263d269abdcc641e944c9de4b5d660894a3ec7e9f9db63b56ac9"},
+    {file = "lxml-4.6.5-cp38-cp38-win32.whl", hash = "sha256:57cf05466917e08f90e323f025b96f493f92c0344694f5702579ab4b7e2eb10d"},
+    {file = "lxml-4.6.5-cp38-cp38-win_amd64.whl", hash = "sha256:4f415624cf8b065796649a5e4621773dc5c9ea574a944c76a7f8a6d3d2906b41"},
+    {file = "lxml-4.6.5-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:7679bb6e4d9a3978a46ab19a3560e8d2b7265ef3c88152e7fdc130d649789887"},
+    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:c34234a1bc9e466c104372af74d11a9f98338a3f72fae22b80485171a64e0144"},
+    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4b9390bf973e3907d967b75be199cf1978ca8443183cf1e78ad80ad8be9cf242"},
+    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fcc849b28f584ed1dbf277291ded5c32bb3476a37032df4a1d523b55faa5f944"},
+    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:46f21f2600d001af10e847df9eb3b832e8a439f696c04891bcb8a8cedd859af9"},
+    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:99cf827f5a783038eb313beee6533dddb8bdb086d7269c5c144c1c952d142ace"},
+    {file = "lxml-4.6.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:925174cafb0f1179a7fd38da90302555d7445e34c9ece68019e53c946be7f542"},
+    {file = "lxml-4.6.5-cp39-cp39-win32.whl", hash = "sha256:12d8d6fe3ddef629ac1349fa89a638b296a34b6529573f5055d1cb4e5245f73b"},
+    {file = "lxml-4.6.5-cp39-cp39-win_amd64.whl", hash = "sha256:a52e8f317336a44836475e9c802f51c2dc38d612eaa76532cb1d17690338b63b"},
+    {file = "lxml-4.6.5-pp37-pypy37_pp73-macosx_10_14_x86_64.whl", hash = "sha256:11ae552a78612620afd15625be9f1b82e3cc2e634f90d6b11709b10a100cba59"},
+    {file = "lxml-4.6.5-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:473701599665d874919d05bb33b56180447b3a9da8d52d6d9799f381ce23f95c"},
+    {file = "lxml-4.6.5-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:7f00cc64b49d2ef19ddae898a3def9dd8fda9c3d27c8a174c2889ee757918e71"},
+    {file = "lxml-4.6.5-pp38-pypy38_pp73-macosx_10_14_x86_64.whl", hash = "sha256:73e8614258404b2689a26cb5d002512b8bc4dfa18aca86382f68f959aee9b0c8"},
+    {file = "lxml-4.6.5-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:ff44de36772b05c2eb74f2b4b6d1ae29b8f41ed5506310ce1258d44826ee38c1"},
+    {file = "lxml-4.6.5-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:5d5254c815c186744c8f922e2ce861a2bdeabc06520b4b30b2f7d9767791ce6e"},
+    {file = "lxml-4.6.5.tar.gz", hash = "sha256:6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca"},
 ]
 mako = [
-    {file = "Mako-1.1.5-py2.py3-none-any.whl", hash = "sha256:6804ee66a7f6a6416910463b00d76a7b25194cd27f1918500c5bd7be2a088a23"},
-    {file = "Mako-1.1.5.tar.gz", hash = "sha256:169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"},
+    {file = "Mako-1.1.6-py2.py3-none-any.whl", hash = "sha256:afaf8e515d075b22fad7d7b8b30e4a1c90624ff2f3733a06ec125f5a5f043a57"},
+    {file = "Mako-1.1.6.tar.gz", hash = "sha256:4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2"},
 ]
 markdown = [
     {file = "Markdown-3.3.4-py3-none-any.whl", hash = "sha256:96c3ba1261de2f7547b46a00ea8463832c921d3f9d6aba3f255a6f71386db20c"},
@@ -1519,38 +1521,41 @@ mysql-connector = [
     {file = "mysql-connector-2.2.9.tar.gz", hash = "sha256:1733e6ce52a049243de3264f1fbc22a852cb35458c4ad739ba88189285efdf32"},
 ]
 mysqlclient = [
-    {file = "mysqlclient-2.0.3-cp36-cp36m-win_amd64.whl", hash = "sha256:3381ca1a4f37ff1155fcfde20836b46416d66531add8843f6aa6d968982731c3"},
-    {file = "mysqlclient-2.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:0ac0dd759c4ca02c35a9fedc24bc982cf75171651e8187c2495ec957a87dfff7"},
-    {file = "mysqlclient-2.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:71c4b330cf2313bbda0307fc858cc9055e64493ba9bf28454d25cf8b3ee8d7f5"},
-    {file = "mysqlclient-2.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:fc575093cf81b6605bed84653e48b277318b880dc9becf42dd47fa11ffd3e2b6"},
-    {file = "mysqlclient-2.0.3.tar.gz", hash = "sha256:f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432"},
+    {file = "mysqlclient-2.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:02c8826e6add9b20f4cb12dcf016485f7b1d6e30356a1204d05431867a1b3947"},
+    {file = "mysqlclient-2.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:b62d23c11c516cedb887377c8807628c1c65d57593b57853186a6ee18b0c6a5b"},
+    {file = "mysqlclient-2.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:2c8410f54492a3d2488a6a53e2d85b7e016751a1e7d116e7aea9c763f59f5e8c"},
+    {file = "mysqlclient-2.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:e6279263d5a9feca3e0edbc2b2a52c057375bf301d47da2089c075ff76331d14"},
+    {file = "mysqlclient-2.1.0.tar.gz", hash = "sha256:973235686f1b720536d417bf0a0d39b4ab3d5086b2b6ad5e6752393428c02b12"},
 ]
 orjson = [
-    {file = "orjson-3.6.4-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:48a69fed90f551bf9e9bb7a63e363fed4f67fc7c6e6bfb057054dc78f6721e9e"},
-    {file = "orjson-3.6.4-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:3722f02f50861d5e2a6be9d50bfe8da27a5155bb60043118a4e1ceb8c7040cf7"},
-    {file = "orjson-3.6.4-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:6cd300421b41f7e84e388b1792a18c3fc4c440ae3039434b9320956be05f0102"},
-    {file = "orjson-3.6.4-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:e55ef66ee1d35b1c43db275aff3a1ba7e0408b31e624912a612bd799df14e73e"},
-    {file = "orjson-3.6.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef8d332af8e6f7d6d2c1f3b5384c8d239800c1405b136da5f1710e802918d57"},
-    {file = "orjson-3.6.4-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:8896e242a92733e454378e22711bd43a55fda4e80604fcefcc064ca977623673"},
-    {file = "orjson-3.6.4-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:bdfa6f29f7b6aad70ce14591b99fba651008afa6bc3759f158887bcdc568b452"},
-    {file = "orjson-3.6.4-cp37-none-win_amd64.whl", hash = "sha256:7c16c44872d33da0b97050a9ea8f7bc04e930c56e8185657bc200e1875a671da"},
-    {file = "orjson-3.6.4-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:b467551f3be1dd08aff70c261cc883b63483eb0e31861ffe2cd8dac4fec7cfa9"},
-    {file = "orjson-3.6.4-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:7bf61afef12f6416db3ea377f3491ca8ac677d3cac6db1ebffb7a5fe92cce3ca"},
-    {file = "orjson-3.6.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:014ea74d4a5dd6a7e98540768072d5bd8c2fedbcbbedcbbaecbb614e66080e81"},
-    {file = "orjson-3.6.4-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:705cb90c536b4b9336c06b4a62c3c62e50354ddf20a2e48eb62bf34fb93d5b1f"},
-    {file = "orjson-3.6.4-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:159e2240fc36720a5cb51a1cbc9905dcb8758aad50b3e7f14f6178ce2e842004"},
-    {file = "orjson-3.6.4-cp38-none-win_amd64.whl", hash = "sha256:d2ae087866a1050de83c2a28490850badb41aeeb8a4605c84dd6004d4e58b5a4"},
-    {file = "orjson-3.6.4-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b4a7efe039b1154b23e5df8787ac01e4621213aed303b6304a5f8ad89c01455d"},
-    {file = "orjson-3.6.4-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:7b24f97ed76005f447e152b0e493abce8c60f010131998295175446312a71caf"},
-    {file = "orjson-3.6.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1121187e2a721864b52e5dbb3cf8dd4a4546519a5fef1e13fa777347fb8884a2"},
-    {file = "orjson-3.6.4-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:4edffd9e2298ff4f4f939aa67248eba043dc65c9e7d940c28a62c5502c6f2aa8"},
-    {file = "orjson-3.6.4-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:e236fe94d8a77532f0065870fe265bd53e229012f39af99f79f5f1d4a8b0067c"},
-    {file = "orjson-3.6.4-cp39-none-win_amd64.whl", hash = "sha256:5448cc1edd4c4bafc968404f92f0e9a582b4326ca442346bd1d1179a6faf52d9"},
-    {file = "orjson-3.6.4.tar.gz", hash = "sha256:f8dbc428fc6d7420f231a7133d8dff4c882e64acb585dcf2fda74bdcfe1a6d9d"},
+    {file = "orjson-3.6.5-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:6c444edc073eb69cf85b28851a7a957807a41ce9bb3a9c14eefa8b33030cf050"},
+    {file = "orjson-3.6.5-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:432c6da3d8d4630739f5303dcc45e8029d357b7ff8e70b7239be7bd047df6b19"},
+    {file = "orjson-3.6.5-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:0fa32319072fadf0732d2c1746152f868a1b0f83c8cce2cad4996f5f3ca4e979"},
+    {file = "orjson-3.6.5-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:0d65cc67f2e358712e33bc53810022ef5181c2378a7603249cd0898aa6cd28d4"},
+    {file = "orjson-3.6.5-cp310-none-win_amd64.whl", hash = "sha256:fa8e3d0f0466b7d771a8f067bd8961bc17ca6ea4c89a91cd34d6648e6b1d1e47"},
+    {file = "orjson-3.6.5-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:470596fbe300a7350fd7bbcf94d2647156401ab6465decb672a00e201af1813a"},
+    {file = "orjson-3.6.5-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:d2680d9edc98171b0c59e52c1ed964619be5cb9661289c0dd2e667773fa87f15"},
+    {file = "orjson-3.6.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:001962a334e1ab2162d2f695f2770d2383c7ffd2805cec6dbb63ea2ad96bf0ad"},
+    {file = "orjson-3.6.5-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:522c088679c69e0dd2c72f43cd26a9e73df4ccf9ed725ac73c151bbe816fe51a"},
+    {file = "orjson-3.6.5-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:d2b871a745a64f72631b633271577c99da628a9b63e10bd5c9c20706e19fe282"},
+    {file = "orjson-3.6.5-cp37-none-win_amd64.whl", hash = "sha256:51ab01fed3b3e21561f21386a2f86a0415338541938883b6ca095001a3014a3e"},
+    {file = "orjson-3.6.5-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:fc7e62edbc7ece95779a034d9e206d7ba9e2b638cc548fd3a82dc5225f656625"},
+    {file = "orjson-3.6.5-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:0720d60db3fa25956011a573274a269eb37de98070f3bc186582af1222a2d084"},
+    {file = "orjson-3.6.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e169a8876aed7a5bff413c53257ef1fa1d9b68c855eb05d658c4e73ed8dff508"},
+    {file = "orjson-3.6.5-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:331f9a3bdba30a6913ad1d149df08e4837581e3ce92bf614277d84efccaf796f"},
+    {file = "orjson-3.6.5-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:ece5dfe346b91b442590a41af7afe61df0af369195fed13a1b29b96b1ba82905"},
+    {file = "orjson-3.6.5-cp38-none-win_amd64.whl", hash = "sha256:6a5e9eb031b44b7a429c705ca48820371d25b9467c9323b6ae7a712daf15fbef"},
+    {file = "orjson-3.6.5-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:206237fa5e45164a678b12acc02aac7c5b50272f7f31116e1e08f8bcaf654f93"},
+    {file = "orjson-3.6.5-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:d5aceeb226b060d11ccb5a84a4cfd760f8024289e3810ec446ef2993a85dbaca"},
+    {file = "orjson-3.6.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80dba3dbc0563c49719e8cc7d1568a5cf738accfcd1aa6ca5e8222b57436e75e"},
+    {file = "orjson-3.6.5-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:443f39bc5e7966880142430ce091e502aea068b38cb9db5f1ffdcfee682bc2d4"},
+    {file = "orjson-3.6.5-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:a06f2dd88323a480ac1b14d5829fb6cdd9b0d72d505fabbfbd394da2e2e07f6f"},
+    {file = "orjson-3.6.5-cp39-none-win_amd64.whl", hash = "sha256:82cb42dbd45a3856dbad0a22b54deb5e90b2567cdc2b8ea6708e0c4fe2e12be3"},
+    {file = "orjson-3.6.5.tar.gz", hash = "sha256:eb3a7d92d783c89df26951ef3e5aca9d96c9c6f2284c752aa3382c736f950597"},
 ]
 packaging = [
-    {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
-    {file = "packaging-21.2.tar.gz", hash = "sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"},
+    {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
+    {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
 paginate = [
     {file = "paginate-0.5.6.tar.gz", hash = "sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d"},
@@ -1650,29 +1655,40 @@ pyflakes = [
     {file = "pyflakes-2.4.0.tar.gz", hash = "sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"},
 ]
 pygit2 = [
-    {file = "pygit2-1.7.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ca4c0e445efa0144082a385e83316abea92c749a95368397a64bc988aedc088e"},
-    {file = "pygit2-1.7.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ef6da92eb3be2a5342759a194be7d7f8b1997ef6023eed75f7a97d7cf7ec191"},
-    {file = "pygit2-1.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb91e8ba783e79111805595155a2177fbb2efedd796673c4b5daba0e50cb24"},
-    {file = "pygit2-1.7.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2e6fc9cb4213d501f7dd11c23b02d9e6206e1a5615e23cfbc95aaeb300a0f5d6"},
-    {file = "pygit2-1.7.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2ec6c77194e337c133c4a40c11992597a8c55ac91219cd03ec054de9d20b486"},
-    {file = "pygit2-1.7.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc6758852a3969b7feb2f6395c3d6b90bc7c337f574134c1ed718216009aef98"},
-    {file = "pygit2-1.7.0-cp37-cp37m-win32.whl", hash = "sha256:4d6b8742fd30931e85bbc792237a9ec23a84548707d0f59312b59a96583565b1"},
-    {file = "pygit2-1.7.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ddbba54869e0ed7878a3ef9ffebc756f47f1609294130c04b83a08896bff0b18"},
-    {file = "pygit2-1.7.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d3cbc2d212ea1c0c802a0f8141b3a4b6690ceb8c858731cb10cb60a41c6bc188"},
-    {file = "pygit2-1.7.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9817105a3c116d3eb678b0289d6fae04668904018d5a08f61adc4f64707fb2ed"},
-    {file = "pygit2-1.7.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3475d8a0171314e32e8559e689a573e4d6cf5fc6e4c9067c3b4e3e96fbec501b"},
-    {file = "pygit2-1.7.0-cp38-cp38-win32.whl", hash = "sha256:e550bd9e8e20dcfd2593a60ff95225ad615419cfad4b66c50f40de64cb48bcf7"},
-    {file = "pygit2-1.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:2a012222743ecdd8f1e676e9bb9afc2e6b69abb3f350b8012b87d83749b85bb1"},
-    {file = "pygit2-1.7.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:85c570305bf2c694e1224124e608cd72d4c2d6b92b0c677164cc015634dca17a"},
-    {file = "pygit2-1.7.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:352a249778ea944d69bb58a0b43c715ba6e88b472f50583c6fbbfd0ce52540fc"},
-    {file = "pygit2-1.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:422c588e6f00d1b3c13480afcd2776a835b442b89720e7f55f2212f8c292afae"},
-    {file = "pygit2-1.7.0-cp39-cp39-win32.whl", hash = "sha256:61bfec915ae4f6dc885127978d041996ed9702a7c7ae55f1476f620ca33f561d"},
-    {file = "pygit2-1.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:542aa9b855eb542b5fbe3b4e49fb29852775cc61959bca83eff03d8638e905c9"},
-    {file = "pygit2-1.7.0.tar.gz", hash = "sha256:602bffa8b4dbc185a6c7f36515563b600e0ee9002583c97ae3150eedaf340edb"},
+    {file = "pygit2-1.7.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a4a9a031bb0d2c5cf964da1f6d7a193416a97664655ec43ec349d3609bbde154"},
+    {file = "pygit2-1.7.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:afcfb8ba97cfedcb8f890ff1e74c4d63755234cca1ca22c2a969e91b8059ae3e"},
+    {file = "pygit2-1.7.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f87498ce717302a7525dad1ee604badc85bdff7bd453473d601077ac58e7cae"},
+    {file = "pygit2-1.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2355cf24719a35542a88075988c8e11cd155aa375a1f12d62b980986da992eb4"},
+    {file = "pygit2-1.7.2-cp310-cp310-win32.whl", hash = "sha256:0d72bd05dd3cf514ea2e2df32a2d361f6f29da7d5f02cf0980ea149f49cdfb37"},
+    {file = "pygit2-1.7.2-cp310-cp310-win_amd64.whl", hash = "sha256:1b7ff5b656db280ca5d31ecdb17709ed7eaf4e9f419b2fa66f7ff92d8234f621"},
+    {file = "pygit2-1.7.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6aa018c101056c2a8e1fb6467c10281afa088b3b7bc7c17defb404f66039669a"},
+    {file = "pygit2-1.7.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a27f8cab6dbef912ccdd690b97948dbf978cffc2ef96ee01b1a8944bfb713f0b"},
+    {file = "pygit2-1.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c538a0234baa091a02342895d31e5b7c29d85ada44a0b9b4a5fdf78b5607cd48"},
+    {file = "pygit2-1.7.2-cp37-cp37m-win32.whl", hash = "sha256:b15579b69381ba41199f5eb7fc85f153105d535c91b8da0321aaa14fec19f09c"},
+    {file = "pygit2-1.7.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6c2ee00048862e193b2b88267f880632735f53db0f2c7f9ebebb21a43d22e58b"},
+    {file = "pygit2-1.7.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:8c24f3413522c970ae46e79b645ac0978a5be98863a6c6619e8f710bb137e1cb"},
+    {file = "pygit2-1.7.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d42a7cc4b53cc369b82266c7257fe1808ec0e30c34f1796a0b0fa12a0db9ebe"},
+    {file = "pygit2-1.7.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b1694ad8b4702e9e83a79a97bf3f1b44674057ae9d40bc7eb92e4b4baf79d94"},
+    {file = "pygit2-1.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a382db82ad4ba3109e74c7b82d6c6c1e451200ee379bad8a17936027c65ea98"},
+    {file = "pygit2-1.7.2-cp38-cp38-win32.whl", hash = "sha256:6c168efd7e3bdaeeccfa5ccbe2718107a1fe65cda959586f88a73228217a8783"},
+    {file = "pygit2-1.7.2-cp38-cp38-win_amd64.whl", hash = "sha256:041e34f7efd96c7edbea2f478704756fc189082561611c88bc95cf2d085923b5"},
+    {file = "pygit2-1.7.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:ef34b881da55b6702087575ea48a90a08e1077a7f64faa909d9840e16f36c63b"},
+    {file = "pygit2-1.7.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0e6368a96058cf619ad574de2b4575f58d363f3f6d4de8e172e1e5d10e1fad36"},
+    {file = "pygit2-1.7.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0748b413966da9b3d3ca8a0a79c63f6581a89b883d2ba64355bbfdb250f2e066"},
+    {file = "pygit2-1.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2d34954c21f109f176d8104b253fc8ce2ca17efb43cfe228d6530c200f362b83"},
+    {file = "pygit2-1.7.2-cp39-cp39-win32.whl", hash = "sha256:32979cb98ffd183ed0458c519e6615deeb6a8cc1252223396eee8f526f09989f"},
+    {file = "pygit2-1.7.2-cp39-cp39-win_amd64.whl", hash = "sha256:56d55452dc3eca844d92503d755c8e11699b7ab3b845b81cf365f85d6385d7e0"},
+    {file = "pygit2-1.7.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:409c76dea47c2c678295c42f55798da7a0a9adcc6394fe75c061864254bafeef"},
+    {file = "pygit2-1.7.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:be038fecd27a9a7046cd45b4a6e847955dab2d6e2352ff41ab3b55f700aa0f3d"},
+    {file = "pygit2-1.7.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c3e91afd629b90b528b756ca2a0fbd5bf8df2cdc08ccd5ab144fbfe69bfc587d"},
+    {file = "pygit2-1.7.2-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:17b06a1ecc16b90fa652cf5cf9698dfb16a87501b76f7001e1d4934a38a49737"},
+    {file = "pygit2-1.7.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5fe7cdd56d0e5a89ed7754d1aedc6516349f16072225ccfc7b9349ab6448a052"},
+    {file = "pygit2-1.7.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2a766b5a988ab373a040d1769e0e1df4618a9f8f33464746b9b2a3c92576df4"},
+    {file = "pygit2-1.7.2.tar.gz", hash = "sha256:70a4536a35452c31f823b59b6fdb665aa3778a43b73ccda3a4f79fa9962ad2bb"},
 ]
 pyparsing = [
-    {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
-    {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
+    {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"},
+    {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"},
 ]
 pytest = [
     {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"},
@@ -1687,16 +1703,16 @@ pytest-cov = [
     {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"},
 ]
 pytest-forked = [
-    {file = "pytest-forked-1.3.0.tar.gz", hash = "sha256:6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"},
-    {file = "pytest_forked-1.3.0-py2.py3-none-any.whl", hash = "sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815"},
+    {file = "pytest-forked-1.4.0.tar.gz", hash = "sha256:8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e"},
+    {file = "pytest_forked-1.4.0-py3-none-any.whl", hash = "sha256:bbbb6717efc886b9d64537b41fb1497cfaf3c9601276be8da2cccfea5a3c8ad8"},
 ]
 pytest-tap = [
     {file = "pytest-tap-3.3.tar.gz", hash = "sha256:5f0919a147cf0396b2f10d64d365a0bf8062e06543e93c675c9d37f5605e983c"},
     {file = "pytest_tap-3.3-py3-none-any.whl", hash = "sha256:4fbbc0e090c2e94f6199bee4e4f68ab3c5e176b37a72a589ad84e0f72a2fce55"},
 ]
 pytest-xdist = [
-    {file = "pytest-xdist-2.4.0.tar.gz", hash = "sha256:89b330316f7fc475f999c81b577c2b926c9569f3d397ae432c0c2e2496d61ff9"},
-    {file = "pytest_xdist-2.4.0-py3-none-any.whl", hash = "sha256:7b61ebb46997a0820a263553179d6d1e25a8c50d8a8620cd1aa1e20e3be99168"},
+    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
+    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
 ]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
@@ -1730,42 +1746,41 @@ sortedcontainers = [
     {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"},
 ]
 sqlalchemy = [
-    {file = "SQLAlchemy-1.4.26-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:c2f2114b0968a280f94deeeaa31cfbac9175e6ac7bd3058b3ce6e054ecd762b3"},
-    {file = "SQLAlchemy-1.4.26-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:91efbda4e6d311812f23996242bad7665c1392209554f8a31ec6db757456db5c"},
-    {file = "SQLAlchemy-1.4.26-cp27-cp27m-win32.whl", hash = "sha256:de996756d894a2d52c132742e3b6d64ecd37e0919ddadf4dc3981818777c7e67"},
-    {file = "SQLAlchemy-1.4.26-cp27-cp27m-win_amd64.whl", hash = "sha256:463ef692259ff8189be42223e433542347ae17e33f91c1013e9c5c64e2798088"},
-    {file = "SQLAlchemy-1.4.26-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c757ba1279b85b3460e72e8b92239dae6f8b060a75fb24b3d9be984dd78cfa55"},
-    {file = "SQLAlchemy-1.4.26-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:c24c01dcd03426a5fe5ee7af735906bec6084977b9027a3605d11d949a565c01"},
-    {file = "SQLAlchemy-1.4.26-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c46f013ff31b80cbe36410281675e1fb4eaf3e25c284fd8a69981c73f6fa4cb4"},
-    {file = "SQLAlchemy-1.4.26-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fb2aa74a6e3c2cebea38dd21633671841fbe70ea486053cba33d68e3e22ccc0a"},
-    {file = "SQLAlchemy-1.4.26-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad7e403fc1e3cb76e802872694e30d6ca6129b9bc6ad4e7caa48ca35f8a144f8"},
-    {file = "SQLAlchemy-1.4.26-cp310-cp310-win32.whl", hash = "sha256:7ef421c3887b39c6f352e5022a53ac18de8387de331130481cb956b2d029cad6"},
-    {file = "SQLAlchemy-1.4.26-cp310-cp310-win_amd64.whl", hash = "sha256:908fad32c53b17aad12d722379150c3c5317c422437e44032256a77df1746292"},
-    {file = "SQLAlchemy-1.4.26-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:1ef37c9ec2015ce2f0dc1084514e197f2f199d3dc3514190db7620b78e6004c8"},
-    {file = "SQLAlchemy-1.4.26-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:090536fd23bf49077ee94ff97142bc5ee8bad24294c3d7c8d5284267c885dde7"},
-    {file = "SQLAlchemy-1.4.26-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e700d48056475d077f867e6a36e58546de71bdb6fdc3d34b879e3240827fefab"},
-    {file = "SQLAlchemy-1.4.26-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:295b90efef1278f27fe27d94a45460ae3c17f5c5c2b32c163e29c359740a1599"},
-    {file = "SQLAlchemy-1.4.26-cp36-cp36m-win32.whl", hash = "sha256:cc6b21f19bc9d4cd77cbcba5f3b260436ce033f1053cea225b6efea2603d201e"},
-    {file = "SQLAlchemy-1.4.26-cp36-cp36m-win_amd64.whl", hash = "sha256:ba84026e84379326bbf2f0c50792f2ae56ab9c01937df5597b6893810b8ca369"},
-    {file = "SQLAlchemy-1.4.26-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:f1e97c5f36b94542f72917b62f3a2f92be914b2cf33b80fa69cede7529241d2a"},
-    {file = "SQLAlchemy-1.4.26-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c185c928e2638af9bae13acc3f70e0096eac76471a1101a10f96b80666b8270"},
-    {file = "SQLAlchemy-1.4.26-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bca660b76672e15d70a7dba5e703e1ce451a0257b6bd2028e62b0487885e8ae9"},
-    {file = "SQLAlchemy-1.4.26-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff8f91a7b1c4a1c7772caa9efe640f2768828897044748f2458b708f1026e2d4"},
-    {file = "SQLAlchemy-1.4.26-cp37-cp37m-win32.whl", hash = "sha256:a95bf9c725012dcd7ea3cac16bf647054e0d62b31d67467d228338e6a163e4ff"},
-    {file = "SQLAlchemy-1.4.26-cp37-cp37m-win_amd64.whl", hash = "sha256:07ac4461a1116b317519ddf6f34bcb00b011b5c1370ebeaaf56595504ffc7e84"},
-    {file = "SQLAlchemy-1.4.26-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:5039faa365e7522a8eb4736a54afd24a7e75dcc33b81ab2f0e6c456140f1ad64"},
-    {file = "SQLAlchemy-1.4.26-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7e8ef103eaa72a857746fd57dda5b8b5961e8e82a528a3f8b7e2884d8506f0b7"},
-    {file = "SQLAlchemy-1.4.26-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:31f4426cfad19b5a50d07153146b2bcb372a279975d5fa39f98883c0ef0f3313"},
-    {file = "SQLAlchemy-1.4.26-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2feb028dc75e13ba93456a42ac042b255bf94dbd692bf80b47b22653bb25ccf8"},
-    {file = "SQLAlchemy-1.4.26-cp38-cp38-win32.whl", hash = "sha256:2ce42ad1f59eb85c55c44fb505f8854081ee23748f76b62a7f569cfa9b6d0604"},
-    {file = "SQLAlchemy-1.4.26-cp38-cp38-win_amd64.whl", hash = "sha256:dbf588ab09e522ac2cbd010919a592c6aae2f15ccc3cd9a96d01c42fbc13f63e"},
-    {file = "SQLAlchemy-1.4.26-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:a6506c17b0b6016656783232d0bdd03fd333f1f654d51a14d93223f953903646"},
-    {file = "SQLAlchemy-1.4.26-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a882dedb9dfa6f33524953c3e3d72bcf518a5defd6d5863150a821928b19ad3"},
-    {file = "SQLAlchemy-1.4.26-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1dee515578d04bc80c4f9a8c8cfe93f455db725059e885f1b1da174d91c4d077"},
-    {file = "SQLAlchemy-1.4.26-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c0c5f54560a92691d54b0768d67b4d3159e514b426cfcb1258af8c195577e8f"},
-    {file = "SQLAlchemy-1.4.26-cp39-cp39-win32.whl", hash = "sha256:b86f762cee3709722ab4691981958cbec475ea43406a6916a7ec375db9cbd9e9"},
-    {file = "SQLAlchemy-1.4.26-cp39-cp39-win_amd64.whl", hash = "sha256:5c6774b34782116ad9bdec61c2dbce9faaca4b166a0bc8e7b03c2b870b121d94"},
-    {file = "SQLAlchemy-1.4.26.tar.gz", hash = "sha256:6bc7f9d7d90ef55e8c6db1308a8619cd8f40e24a34f759119b95e7284dca351a"},
+    {file = "SQLAlchemy-1.4.28-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:e659f256b7d402338563913bdeba53bf1eadd4c09e6f6dc93cc47938f7962a8f"},
+    {file = "SQLAlchemy-1.4.28-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:38df997ffa9007e953ad574f2263f61b9b683fd63ae397480ea4960be9bda0fd"},
+    {file = "SQLAlchemy-1.4.28-cp27-cp27m-win_amd64.whl", hash = "sha256:6dd6fa51cf08d9433d28802228d2204e175324f1a284c4492e4af2dd36a2d485"},
+    {file = "SQLAlchemy-1.4.28-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:bb2d8530b7cc94b7fd9341843c3e49b6db48ea22313a8db9df21c41615b5e7b1"},
+    {file = "SQLAlchemy-1.4.28-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:3b64f5d1c1d0e5f2ed4aa66f2b65ff6bdcdf4c5cc83b71c4bbf69695b09e9e19"},
+    {file = "SQLAlchemy-1.4.28-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c02991e22ddce134ef1093ef5a9d5de448fc87b91432e4f879826e93cd1c7"},
+    {file = "SQLAlchemy-1.4.28-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:387365c157e96eceacdd6c5468815ad05a523ba778680de4c8139a029e1fe044"},
+    {file = "SQLAlchemy-1.4.28-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5639800f1cfe751569af2242041b30a08a6c0b9e5d95ed674ec8082d381eff13"},
+    {file = "SQLAlchemy-1.4.28-cp310-cp310-win32.whl", hash = "sha256:261fcb3ff8c59e17ec44f9e61713a44ceaa97ae816da978d5cd1dc2c36f32478"},
+    {file = "SQLAlchemy-1.4.28-cp310-cp310-win_amd64.whl", hash = "sha256:29d10796e5604ab7bc067eda7231a2d2411a51eda43082673641245a49d1c4bb"},
+    {file = "SQLAlchemy-1.4.28-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:4490b10f83cd56ca2cdcd94b140d89911ac331e42a727b79157963b1b04fdd0c"},
+    {file = "SQLAlchemy-1.4.28-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83ee7f6fa5faed23996c67044376d46815f65183ad6d744d94d68b18cdef060b"},
+    {file = "SQLAlchemy-1.4.28-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f667a947378bcb12a371ab38bed1b708f3a682d1ba30176422652082919285a2"},
+    {file = "SQLAlchemy-1.4.28-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61965abc63c8b54038574698888e91a126753a4bdc0ec001397acb14501834e0"},
+    {file = "SQLAlchemy-1.4.28-cp36-cp36m-win32.whl", hash = "sha256:41a02030f8934b0de843341e7014192a0c16ee2726a06da154c81153fbe56b33"},
+    {file = "SQLAlchemy-1.4.28-cp36-cp36m-win_amd64.whl", hash = "sha256:c3497cd63c5f90112b8882ea4dd694052166f779ce9055cd5c4305e0b76d72d9"},
+    {file = "SQLAlchemy-1.4.28-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:5d91dce14ac3347bce301062ca825e7fb7e15c133f3909f15989e94878b1082f"},
+    {file = "SQLAlchemy-1.4.28-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08e39d65b38d4c3f77c4c9bf090b0ba4ec5721a6e0a74b63d2a9781cdcacf142"},
+    {file = "SQLAlchemy-1.4.28-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c85ead1d17acc5e8b282c578394dba253728bcbcbeb66e4ef0e25f4bab53935a"},
+    {file = "SQLAlchemy-1.4.28-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:daddcd6ba1706cc5fcc9cfaa913aa4bf331172dc7efd385fe3ee1feae3b513bc"},
+    {file = "SQLAlchemy-1.4.28-cp37-cp37m-win32.whl", hash = "sha256:ce4f2b34378561bc2e42635888fe86efe13d104ba1d95b5ca67b4d60d8e53e67"},
+    {file = "SQLAlchemy-1.4.28-cp37-cp37m-win_amd64.whl", hash = "sha256:4999b03daa6c9afb9a0bf9e3b8769128ef1880557dacfca86fa7562920c49f6b"},
+    {file = "SQLAlchemy-1.4.28-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:dd041324328cece3ccdf70cfbd71b5ab968e564a22318ffd88b054f5eadeb9be"},
+    {file = "SQLAlchemy-1.4.28-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf2c1d64c4ee0f30e08e1844ff0acf3c1b6c4277c0e89ec3e8bf1722d245b108"},
+    {file = "SQLAlchemy-1.4.28-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:525e962af8f25fc24ce019e6f237d49f8720d757a8a56c9b4caa2d91e2c66111"},
+    {file = "SQLAlchemy-1.4.28-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b72744fed32ecf2bf786d2e2f6756c04126c323ba939f47177b9722775626889"},
+    {file = "SQLAlchemy-1.4.28-cp38-cp38-win32.whl", hash = "sha256:b5541355b8d4970753d4f7292f73a320704b20406e06cd29b469d156f0a484d8"},
+    {file = "SQLAlchemy-1.4.28-cp38-cp38-win_amd64.whl", hash = "sha256:cf3a3c2f32d53a4166b2eb8de35f93bcb640e51c32033024af500017d8e8a8c9"},
+    {file = "SQLAlchemy-1.4.28-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:dfa093bd8ecfceafff62078910178567323005e44fbe4d7933e6cbce4512cea2"},
+    {file = "SQLAlchemy-1.4.28-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:555d56b71f61b4c9fa55fe203fe6e1e561c9385fa97c5849783ae050a89113af"},
+    {file = "SQLAlchemy-1.4.28-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c90b21360cf14d33c8a004f991aa336c7906a8db825d4ec38722c5ff1c47dada"},
+    {file = "SQLAlchemy-1.4.28-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2019b332cf4f9a513133fdf056dc4cecec7fbae7016ebc574d0f310103eed7ee"},
+    {file = "SQLAlchemy-1.4.28-cp39-cp39-win32.whl", hash = "sha256:ca500f30619daf863ab1c66d57d53a0987361a8f3266454290198aabd18f2599"},
+    {file = "SQLAlchemy-1.4.28-cp39-cp39-win_amd64.whl", hash = "sha256:853de08e881dae0305647dd61b4429758f11d1bf02a9faf02793cad44bb2e0d5"},
+    {file = "SQLAlchemy-1.4.28.tar.gz", hash = "sha256:7fdb7b775fb0739d3e71461509f978beb788935bc0aa9e47df14837cb33e5226"},
 ]
 starlette = [
     {file = "starlette-0.17.0-py3-none-any.whl", hash = "sha256:64ffd950183d474df2cf7a4018c8bbb31a481367691c70f5ace4b2d376235f72"},
@@ -1788,9 +1803,8 @@ tomlkit = [
     {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"},
 ]
 typing-extensions = [
-    {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
-    {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"},
-    {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"},
+    {file = "typing_extensions-4.0.1-py3-none-any.whl", hash = "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"},
+    {file = "typing_extensions-4.0.1.tar.gz", hash = "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e"},
 ]
 urllib3 = [
     {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},

From 02a62532dab5ad77a90c08dc66fc58ececcbb268 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 13 Dec 2021 16:34:17 -0800
Subject: [PATCH 734/844] fix(python): fix difference parsing of comaintainers

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index eb4cab74..76f82ffb 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -512,10 +512,10 @@ async def package_base_comaintainers_post(
         return RedirectResponse(f"/pkgbase/{name}",
                                 status_code=HTTPStatus.SEE_OTHER)
 
-    users = set(users.split("\n"))
-    users.remove(str())  # Remove any empty strings from the set.
+    users = {e.strip() for e in users.split("\n") if bool(e.strip())}
     records = {c.User.Username for c in pkgbase.comaintainers}
 
+    logger.debug(f"RemoveComaintainers: {records.difference(users)}")
     pkgutil.remove_comaintainers(pkgbase, records.difference(users))
 
     # Default priority (lowest value; most preferred).
@@ -533,6 +533,7 @@ async def package_base_comaintainers_post(
     if last_priority:
         priority = last_priority.Priority + 1
 
+    logger.debug(f"AddComaintainers: {users.difference(records)}")
     error = pkgutil.add_comaintainers(request, pkgbase, priority,
                                       users.difference(records))
     if error:

From c7751d5d63285d814e6b69ae211d1946bf433c6b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 14 Dec 2021 14:30:08 -0800
Subject: [PATCH 735/844] fix(util): fix account_url's base url generation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index 542dfc2e..10a7953b 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -103,11 +103,9 @@ def valid_ssh_pubkey(pk):
 
 
 @pass_context
-def account_url(context, user):
-    request = context.get("request")
-    base = f"{request.url.scheme}://{request.url.hostname}"
-    if request.url.scheme == "http" and request.url.port != 80:
-        base += f":{request.url.port}"
+def account_url(context: Dict[str, Any],
+                user: "aurweb.models.user.User") -> str:
+    base = aurweb.config.get("options", "aur_location")
     return f"{base}/account/{user.Username}"
 
 

From 48973fe036b982eff3e6db9339c9e195d7bd6cf8 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Tue, 14 Dec 2021 16:56:29 -0600
Subject: [PATCH 736/844] Fixed incorrect syntax usage and missing environment
 variables in cron jobs

---
 docker/config/aurweb-cron | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/config/aurweb-cron b/docker/config/aurweb-cron
index 149b9d19..0d1d9285 100644
--- a/docker/config/aurweb-cron
+++ b/docker/config/aurweb-cron
@@ -1,2 +1,3 @@
-*/5 * * * * bash -c 'aurweb-aurblup && echo "[$(date -u)] executed aurblup" >> /var/log/mkpkglists.log'
-*/5 * * * * bash -c 'aurweb-mkpkglists --extended && echo "[$(date -u)] executed mkpkglists" >> /var/log/mkpkglists.log'
+AUR_CONFIG='/aurweb/conf/config'
+*/5 * * * * root bash -c 'aurweb-aurblup && echo "[$(date -u)] executed aurblup" >> /var/log/mkpkglists.log'
+*/5 * * * * root bash -c 'aurweb-mkpkglists --extended && echo "[$(date -u)] executed mkpkglists" >> /var/log/mkpkglists.log'

From 2e12417a6c43acd137e82a060aa17633abc179d5 Mon Sep 17 00:00:00 2001
From: Hunter Wittenborn <hunter@hunterwittenborn.com>
Date: Tue, 14 Dec 2021 17:02:36 -0600
Subject: [PATCH 737/844] Added '-x proc' flag to 'crond' command

---
 docker/scripts/run-cron.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/run-cron.sh b/docker/scripts/run-cron.sh
index 83ad6566..03bc55ff 100755
--- a/docker/scripts/run-cron.sh
+++ b/docker/scripts/run-cron.sh
@@ -11,4 +11,4 @@ if [ $? -eq 0 ]; then
     echo "[$(date -u)] executed mkpkglists" >> /var/log/mkpkglists.log
 fi
 
-exec /usr/bin/crond -n
+exec /usr/bin/crond -nx proc

From f357615bfb608456887b1863aa34a39ebd1d73ef Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 14 Dec 2021 14:31:46 -0800
Subject: [PATCH 738/844] change(users.validate): users can't edit their own
 account types

This commit also decouples testing regarding this feature
into several test functions.

Signed-off-by: Kevin Morris <kevr@0cost.org>

bump

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/users/validate.py             |  18 ++-
 templates/partials/account_form.html |  35 ++---
 test/test_accounts_routes.py         | 221 ++++++++++++++-------------
 3 files changed, 146 insertions(+), 128 deletions(-)

diff --git a/aurweb/users/validate.py b/aurweb/users/validate.py
index 4959e316..5b2f8819 100644
--- a/aurweb/users/validate.py
+++ b/aurweb/users/validate.py
@@ -11,13 +11,16 @@ from typing import List, Optional, Tuple
 from fastapi import Request
 from sqlalchemy import and_
 
-from aurweb import config, db, l10n, models, time, util
+from aurweb import config, db, l10n, logging, models, time, util
+from aurweb.auth import creds
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.exceptions import ValidationError
 from aurweb.models import account_type as at
 from aurweb.models.account_type import ACCOUNT_TYPE_NAME
 from aurweb.models.ssh_pub_key import get_fingerprint
 
+logger = logging.get_logger(__name__)
+
 
 def invalid_fields(E: str = str(), U: str = str(), **kwargs) \
         -> Optional[Tuple[bool, List[str]]]:
@@ -171,26 +174,31 @@ def invalid_account_type(T: int = None, request: Request = None,
                          _: l10n.Translator = None,
                          **kwargs) -> None:
     if T is not None and (T := int(T)) != user.AccountTypeID:
+        has_cred = request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE)
         if T not in ACCOUNT_TYPE_NAME:
             raise ValidationError(["Invalid account type provided."])
-        elif not request.user.is_elevated():
+        elif not has_cred:
             raise ValidationError([
                 "You do not have permission to change account types."])
 
         credential_checks = {
             at.USER_ID: request.user.is_trusted_user,
             at.TRUSTED_USER_ID: request.user.is_trusted_user,
-            at.DEVELOPER_ID: lambda: request.user.is_developer(),
+            at.DEVELOPER_ID: request.user.is_developer,
             at.TRUSTED_USER_AND_DEV_ID: (lambda: request.user.is_trusted_user()
                                          and request.user.is_developer())
         }
         credential_check = credential_checks.get(T)
 
-        if not credential_check():
-            name = ACCOUNT_TYPE_NAME.get(T)
+        name = ACCOUNT_TYPE_NAME.get(T)
+        if not credential_check() or request.user == user:
             error = _("You do not have permission to change "
                       "this user's account type to %s.") % name
             raise ValidationError([error])
+        else:
+            logger.debug(f"Trusted User '{request.user.Username}' has "
+                         f"modified '{user.Username}' account's type to"
+                         f" {name}.")
 
 
 def invalid_captcha(captcha_salt: str = None, captcha: str = None, **kwargs) \
diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 37bb85c4..fc46f8c4 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -43,24 +43,25 @@
         </p>
 
         {% if request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE) %}
-            <p>
-                <label for="id_type">
-                    {% trans %}Account Type{% endtrans %}:
-                </label>
-                <select name="T" id="id_type">
-                    {% for value, type in account_types %}
-                        <option value="{{ value }}"
-                                {% if request.user.AccountType.ID == value %}
-                                selected="selected"
-                                {% endif %}
-                        >
-                            {{ type | tr }}
-                        </option>
-                    {% endfor %}
-
-                </select>
-            </p>
+            {% if request.user != user %}
+                <p>
+                    <label for="id_type">
+                        {% trans %}Account Type{% endtrans %}:
+                    </label>
+                    <select name="T" id="id_type">
+                        {% for value, type in account_types %}
+                            <option value="{{ value }}"
+                                    {% if request.user.AccountType.ID == value %}
+                                    selected="selected"
+                                    {% endif %}
+                            >
+                                {{ type | tr }}
+                            </option>
+                        {% endfor %}
 
+                    </select>
+                </p>
+            {% endif %}
             <p>
                 <label for="id_suspended">
                     {% trans %}Account Suspended{% endtrans %}:
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index d3435089..57a2d38e 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -3,6 +3,7 @@ import tempfile
 
 from datetime import datetime
 from http import HTTPStatus
+from logging import DEBUG
 from subprocess import Popen
 
 import lxml.html
@@ -14,7 +15,8 @@ from aurweb import captcha, db, logging
 from aurweb.asgi import app
 from aurweb.db import create, query
 from aurweb.models.accepted_term import AcceptedTerm
-from aurweb.models.account_type import DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID, USER_ID, AccountType
+from aurweb.models.account_type import (DEVELOPER_ID, TRUSTED_USER, TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID, USER_ID,
+                                        AccountType)
 from aurweb.models.ban import Ban
 from aurweb.models.session import Session
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
@@ -54,13 +56,18 @@ def client() -> TestClient:
     yield TestClient(app=app)
 
 
+def create_user(username: str) -> User:
+    email = f"{username}@example.org"
+    user = create(User, Username=username, Email=email,
+                  Passwd="testPassword",
+                  AccountTypeID=USER_ID)
+    return user
+
+
 @pytest.fixture
 def user() -> User:
     with db.begin():
-        user = create(User, Username=TEST_USERNAME, Email=TEST_EMAIL,
-                      RealName="Test UserZ", Passwd="testPassword",
-                      IRCNick="testZ", AccountTypeID=USER_ID)
-
+        user = create_user(TEST_USERNAME)
     yield user
 
 
@@ -986,118 +993,130 @@ def test_post_account_edit_password(client: TestClient, user: User):
     assert user.valid_password("newPassword")
 
 
-def test_post_account_edit_account_types(client: TestClient, user: User):
-    request = Request()
-    sid = user.login(request, "testPassword")
-    cookies = {"AURSID": sid}
+def test_post_account_edit_self_type_as_user(client: TestClient, user: User):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
     endpoint = f"/account/{user.Username}/edit"
 
-    # As a normal user, we cannot see the "Account Type:" input.
     with client as request:
         resp = request.get(endpoint, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.OK)
     assert "id_type" not in resp.text
 
-    # Invalid account types return an error.
-    post_data = {
-        "U": user.Username,
-        "E": user.Email,
-        "T": 0,  # Invalid type ID
-        "passwd": "testPassword"
-    }
-    with client as request:
-        resp = request.post(endpoint, data=post_data, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-    errors = get_errors(resp.text)
-    expected = "Invalid account type provided."
-    assert errors[0].text.strip() == expected
-
-    # Nor can we change any account types.
-    post_data = {
+    data = {
         "U": user.Username,
         "E": user.Email,
         "T": TRUSTED_USER_ID,
         "passwd": "testPassword"
     }
     with client as request:
-        resp = request.post(endpoint, data=post_data, cookies=cookies)
+        resp = request.post(endpoint, data=data, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
     errors = get_errors(resp.text)
     expected = "You do not have permission to change account types."
     assert errors[0].text.strip() == expected
 
-    # Change user from USER_ID to TRUSTED_USER_ID.
+
+def test_post_account_edit_other_user_as_user(client: TestClient, user: User):
     with db.begin():
-        user.AccountTypeID = TRUSTED_USER_ID
+        user2 = create_user("test2")
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
 
-    # As a trusted user, we can see the "Account Type:" input.
     with client as request:
-        resp = request.get(endpoint, cookies=cookies)
+        resp = request.get(endpoint, cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/account/{user2.Username}"
+
+
+def test_post_account_edit_self_type_as_tu(client: TestClient, tu_user: User):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{tu_user.Username}/edit"
+
+    # We cannot see the Account Type field on our own edit page.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
     assert resp.status_code == int(HTTPStatus.OK)
-    assert "id_type" in resp.text
+    assert "id_type" not in resp.text
 
-    # As a trusted user, we cannot change account type to DEVELOPER_ID.
-    post_data = {
-        "U": user.Username,
-        "E": user.Email,
-        "T": DEVELOPER_ID,
-        "passwd": "testPassword"
-    }
-    with client as request:
-        resp = request.post(endpoint, data=post_data, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-    errors = get_errors(resp.text)
-    expected = ("You do not have permission to change "
-                "this user's account type to Developer.")
-    assert errors[0].text.strip() == expected
-
-    # However, we can modify our account type to USER_ID.
-    post_data = {
-        "U": user.Username,
-        "E": user.Email,
+    # We cannot modify our own account type.
+    data = {
+        "U": tu_user.Username,
+        "E": tu_user.Email,
         "T": USER_ID,
         "passwd": "testPassword"
     }
     with client as request:
-        resp = request.post(endpoint, data=post_data, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    # No errors should be displayed.
-    errors = get_errors(resp.text)
-    assert not errors
-
-    # Make sure it got changed to USER_ID as we intended.
-    assert user.AccountTypeID == USER_ID
-
-    # Change user to a TU & Dev, which can change themselves to a Developer.
-    with db.begin():
-        user.AccountTypeID = TRUSTED_USER_AND_DEV_ID
-
-    # As a TU & Dev, we can absolutely change all account types.
-    # For example, from TRUSTED_USER_AND_DEV_ID to DEVELOPER_ID:
-    post_data = {
-        "U": user.Username,
-        "E": user.Email,
-        "T": DEVELOPER_ID,
-        "passwd": "testPassword"
-    }
-    with client as request:
-        resp = request.post(endpoint, data=post_data, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-    assert user.AccountTypeID == DEVELOPER_ID
-
-    # But we can't change a user to a Trusted User & Developer when
-    # we're just a Developer.
-    post_data = {
-        "U": user.Username,
-        "E": user.Email,
-        "T": TRUSTED_USER_AND_DEV_ID,
-        "passwd": "testPassword"
-    }
-    with client as request:
-        resp = request.post(endpoint, data=post_data, cookies=cookies)
+        resp = request.post(endpoint, data=data, cookies=cookies)
     assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-    assert user.AccountTypeID == DEVELOPER_ID
+
+    errors = get_errors(resp.text)
+    expected = ("You do not have permission to change this "
+                "user's account type to User.")
+    assert errors[0].text.strip() == expected
+
+
+def test_post_account_edit_other_user_type_as_tu(
+        client: TestClient, tu_user: User, caplog: pytest.LogCaptureFixture):
+    caplog.set_level(DEBUG)
+
+    with db.begin():
+        user2 = create_user("test2")
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
+
+    # As a TU, we can see the Account Type field for other users.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert "id_type" in resp.text
+
+    # As a TU, we can modify other user's account types.
+    data = {
+        "U": user2.Username,
+        "E": user2.Email,
+        "T": TRUSTED_USER_ID,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Let's make sure the DB got updated properly.
+    assert user2.AccountTypeID == TRUSTED_USER_ID
+
+    # and also that this got logged out at DEBUG level.
+    expected = (f"Trusted User '{tu_user.Username}' has "
+                f"modified '{user2.Username}' account's type to"
+                f" {TRUSTED_USER}.")
+    assert expected in caplog.text
+
+
+def test_post_account_edit_other_user_type_as_tu_invalid_type(
+        client: TestClient, tu_user: User, caplog: pytest.LogCaptureFixture):
+    with db.begin():
+        user2 = create_user("test2")
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
+
+    # As a TU, we can modify other user's account types.
+    data = {
+        "U": user2.Username,
+        "E": user2.Email,
+        "T": 0,
+        "passwd": "testPassword"
+    }
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    errors = get_errors(resp.text)
+    expected = "Invalid account type provided."
+    assert errors[0].text.strip() == expected
 
 
 def test_get_account(client: TestClient, user: User):
@@ -1199,11 +1218,7 @@ def test_post_accounts(client: TestClient, user: User, tu_user: User):
     users = [user]
     with db.begin():
         for i in range(10):
-            _user = create(User, Username=f"test_{i}",
-                           Email=f"test_{i}@example.org",
-                           RealName=f"Test #{i}",
-                           Passwd="testPassword",
-                           IRCNick=f"test_#{i}")
+            _user = create_user(f"test_{i}")
             users.append(_user)
 
     sid = user.login(Request(), "testPassword")
@@ -1230,8 +1245,8 @@ def test_post_accounts(client: TestClient, user: User, tu_user: User):
 
         assert atype.text.strip() == str(_user.AccountType)
         assert suspended.text.strip() == "Active"
-        assert real_name.text.strip() == _user.RealName
-        assert irc_nick.text == _user.IRCNick
+        assert real_name.text == (_user.RealName or None)
+        assert irc_nick.text == (_user.IRCNick or None)
         assert pgp_key.text == (_user.PGPKey or None)
 
         edit = edit.xpath("./a")
@@ -1435,15 +1450,9 @@ def test_post_accounts_irc(client: TestClient, user: User, tu_user: User):
 
 def test_post_accounts_sortby(client: TestClient, user: User, tu_user: User):
     # Create a second user so we can compare sorts.
-    account_type = query(AccountType,
-                         AccountType.ID == DEVELOPER_ID).first()
     with db.begin():
-        create(User, Username="test2",
-               Email="test2@example.org",
-               RealName="Test User 2",
-               Passwd="testPassword",
-               IRCNick="test2",
-               AccountType=account_type)
+        user_ = create_user("test2")
+        user_.AccountTypeID = DEVELOPER_ID
 
     sid = user.login(Request(), "testPassword")
     cookies = {"AURSID": sid}
@@ -1464,8 +1473,8 @@ def test_post_accounts_sortby(client: TestClient, user: User, tu_user: User):
     assert len(rows) == 2
 
     def compare_text_values(column, lhs, rhs):
-        return [row[column].text.strip() for row in lhs] \
-            == [row[column].text.strip() for row in rhs]
+        return [row[column].text for row in lhs] \
+            == [row[column].text for row in rhs]
 
     # Test the username rows are ordered the same.
     assert compare_text_values(0, first_rows, rows) is True

From 3b878da59a0fe4e2b2431b26e751ffa51a61e3a7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 14 Dec 2021 14:32:37 -0800
Subject: [PATCH 739/844] fix(templates): a user can set Inactive on themselves

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/account_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index fc46f8c4..1a444582 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -75,7 +75,7 @@
             </p>
         {% endif %}
 
-        {% if request.user.is_elevated() %}
+        {% if request.user.has_credential(creds.ACCOUNT_EDIT, approved=[user]) %}
             <p>
                 <label for="id_inactive">{% trans %}Inactive{% endtrans %}:</label>
                 <input id="id_inactive" type="checkbox" name="J"

From 703d655a5e36c1cf97fc9f15c38b2b48d28697ae Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 14 Dec 2021 16:44:42 -0800
Subject: [PATCH 740/844] fix(users.validate): fix type hints

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/users/validate.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/aurweb/users/validate.py b/aurweb/users/validate.py
index 5b2f8819..32146094 100644
--- a/aurweb/users/validate.py
+++ b/aurweb/users/validate.py
@@ -6,8 +6,6 @@ out of form data from /account/register or /account/{username}/edit.
 All functions in this module raise aurweb.exceptions.ValidationError
 when encountering invalid criteria and return silently otherwise.
 """
-from typing import List, Optional, Tuple
-
 from fastapi import Request
 from sqlalchemy import and_
 
@@ -22,8 +20,7 @@ from aurweb.models.ssh_pub_key import get_fingerprint
 logger = logging.get_logger(__name__)
 
 
-def invalid_fields(E: str = str(), U: str = str(), **kwargs) \
-        -> Optional[Tuple[bool, List[str]]]:
+def invalid_fields(E: str = str(), U: str = str(), **kwargs) -> None:
     if not E or not U:
         raise ValidationError(["Missing a required field."])
 
@@ -31,15 +28,15 @@ def invalid_fields(E: str = str(), U: str = str(), **kwargs) \
 def invalid_suspend_permission(request: Request = None,
                                user: models.User = None,
                                J: bool = False,
-                               **kwargs) \
-        -> Optional[Tuple[bool, List[str]]]:
+                               **kwargs) -> None:
     if not request.user.is_elevated() and J != bool(user.InactivityTS):
         raise ValidationError([
             "You do not have permission to suspend accounts."])
 
 
-def invalid_username(request: Request = None, U: str = str(), _=None,
-                     **kwargs):
+def invalid_username(request: Request = None, U: str = str(),
+                     _: l10n.Translator = None,
+                     **kwargs) -> None:
     if not util.valid_username(U):
         username_min_len = config.getint("options", "username_min_len")
         username_max_len = config.getint("options", "username_max_len")
@@ -201,8 +198,8 @@ def invalid_account_type(T: int = None, request: Request = None,
                          f" {name}.")
 
 
-def invalid_captcha(captcha_salt: str = None, captcha: str = None, **kwargs) \
-        -> None:
+def invalid_captcha(captcha_salt: str = None, captcha: str = None,
+                    **kwargs) -> None:
     if captcha_salt and captcha_salt not in get_captcha_salts():
         raise ValidationError(["This CAPTCHA has expired. Please try again."])
 

From c86f71a4b42050f946360a636d1caf73c2348059 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 15 Dec 2021 14:01:20 -0800
Subject: [PATCH 741/844] fix(time): unquote timezone when producing it

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/time.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aurweb/time.py b/aurweb/time.py
index 84118356..bf13ca23 100644
--- a/aurweb/time.py
+++ b/aurweb/time.py
@@ -2,6 +2,7 @@ import zoneinfo
 
 from collections import OrderedDict
 from datetime import datetime
+from urllib.parse import unquote
 
 from fastapi import Request
 
@@ -60,4 +61,4 @@ def get_request_timezone(request: Request):
     default_tz = aurweb.config.get("options", "default_timezone")
     if request.user.is_authenticated():
         default_tz = request.user.Timezone
-    return request.cookies.get("AURTZ", default_tz)
+    return unquote(request.cookies.get("AURTZ", default_tz))

From e1543f2e91a4f076169bbd9e92144190c2bfd3f7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 15 Dec 2021 16:06:37 -0800
Subject: [PATCH 742/844] fix(templates): import aurweb.auth.creds directly

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 635b22b4..5eea1d3e 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -14,9 +14,10 @@ import jinja2
 from fastapi import Request
 from fastapi.responses import HTMLResponse
 
+import aurweb.auth.creds
 import aurweb.config
 
-from aurweb import auth, captcha, cookies, l10n, time, util
+from aurweb import captcha, cookies, l10n, time, util
 
 # Prepare jinja2 objects.
 _loader = jinja2.FileSystemLoader(os.path.join(
@@ -107,7 +108,7 @@ def make_context(request: Request, title: str, next: str = None):
         "now": datetime.now(tz=zoneinfo.ZoneInfo(timezone)),
         "utcnow": int(datetime.utcnow().timestamp()),
         "config": aurweb.config,
-        "creds": auth.creds,
+        "creds": aurweb.auth.creds,
         "next": next if next else request.url.path
     }
 

From f273cfc87dcd35c0b8457d62bb20db62b783a1b2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 15 Dec 2021 17:46:15 -0800
Subject: [PATCH 743/844] change(templates): omit page count in pager partial
 if pages <= 0

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/widgets/pager.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/partials/widgets/pager.html b/templates/partials/widgets/pager.html
index 4809accf..1adc354b 100644
--- a/templates/partials/widgets/pager.html
+++ b/templates/partials/widgets/pager.html
@@ -16,7 +16,9 @@ Inputs required:
 <div class="pkglist-stats">
     <p>
         {{ total | tn(singular, plural) | format(total) }}
-        {{ "Page %d of %d." | tr | format(page + 1, pages) }}
+        {% if pages %}
+            {{ "Page %d of %d." | tr | format(page + 1, pages) }}
+        {% endif %}
     </p>
     {% if pages > 1 %}
         <p class="pkglist-nav">

From e17389485bf3e0390aec060bb6ba16b1ba9525fc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 15 Dec 2021 17:46:48 -0800
Subject: [PATCH 744/844] test(templates): add pager tests

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_templates.py | 46 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/test/test_templates.py b/test/test_templates.py
index a483cb51..f7be969b 100644
--- a/test/test_templates.py
+++ b/test/test_templates.py
@@ -1,7 +1,14 @@
+import re
+
+from typing import Any, Dict
+
 import pytest
 
+import aurweb.filters  # noqa: F401
+
 from aurweb import config, templates
-from aurweb.templates import register_filter, register_function
+from aurweb.templates import base_template, register_filter, register_function
+from aurweb.testing.html import parse_root
 from aurweb.testing.requests import Request
 
 
@@ -70,3 +77,40 @@ def test_commit_hash():
     context = templates.make_context(request, "Test Context")
     render = templates.render_raw_template(request, "index.html", context)
     assert commit_hash not in render
+
+
+def pager_context(num_packages: int) -> Dict[str, Any]:
+    return {
+        "request": Request(),
+        "singular": "%d package found.",
+        "plural": "%d packages found.",
+        "prefix": "/packages",
+        "total": num_packages,
+        "O": 0,
+        "PP": 50
+    }
+
+
+def test_pager_no_results():
+    """ Test the pager partial with no results. """
+    num_packages = 0
+    context = pager_context(num_packages)
+    body = base_template("partials/widgets/pager.html").render(context)
+
+    root = parse_root(body)
+    stats = root.xpath('//div[@class="pkglist-stats"]/p')
+    expected = "0 packages found."
+    assert stats[0].text.strip() == expected
+
+
+def test_pager():
+    """ Test the pager partial with two pages of results. """
+    num_packages = 100
+    context = pager_context(num_packages)
+    body = base_template("partials/widgets/pager.html").render(context)
+
+    root = parse_root(body)
+    stats = root.xpath('//div[@class="pkglist-stats"]/p')
+    stats = re.sub(r"\s{2,}", " ", stats[0].text.strip())
+    expected = f"{num_packages} packages found. Page 1 of 2."
+    assert stats == expected

From 94e8d34948aec19bf47ca41cad8392230ef5e2f1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 16 Dec 2021 16:10:01 -0800
Subject: [PATCH 745/844] fix(routers.accounts): use target user's account type
 for autofill

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py           |  2 +-
 templates/partials/account_form.html |  2 +-
 test/test_accounts_routes.py         | 77 +++++++++++++++++++++++++---
 3 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 8eecaa31..86dd993e 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -170,7 +170,7 @@ def make_account_form_context(context: dict,
     context = copy.copy(context)
 
     context["account_types"] = [
-        (at.USER_ID, "Normal User"),
+        (at.USER_ID, f"Normal {at.USER}"),
         (at.TRUSTED_USER_ID, at.TRUSTED_USER)
     ]
 
diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 1a444582..8ed01ce7 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -51,7 +51,7 @@
                     <select name="T" id="id_type">
                         {% for value, type in account_types %}
                             <option value="{{ value }}"
-                                    {% if request.user.AccountType.ID == value %}
+                                    {% if user.AccountType.ID == value %}
                                     selected="selected"
                                     {% endif %}
                             >
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 57a2d38e..bca87d59 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -11,6 +11,8 @@ import pytest
 
 from fastapi.testclient import TestClient
 
+import aurweb.models.account_type as at
+
 from aurweb import captcha, db, logging
 from aurweb.asgi import app
 from aurweb.db import create, query
@@ -611,17 +613,78 @@ def test_post_register_with_ssh_pubkey(client: TestClient):
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_get_account_edit(client: TestClient, user: User):
-    request = Request()
-    sid = user.login(request, "testPassword")
+def test_get_account_edit_self_as_tu(client: TestClient, tu_user: User):
+    """ Test edit get route of ourselves as a TU. """
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{tu_user.Username}/edit"
 
     with client as request:
-        response = request.get("/account/test/edit", cookies={
-            "AURSID": sid
-        }, allow_redirects=False)
-
+        response = request.get(endpoint, cookies=cookies)
     assert response.status_code == int(HTTPStatus.OK)
 
+    # Account type can't be modified when editing ourselves.
+    root = parse_root(response.text)
+    atype = root.xpath('//select[@id="id_type"]/option[@selected="selected"]')
+    assert not atype
+
+    # But other fields should be available and match up.
+    username = root.xpath('//input[@id="id_username"]')[0]
+    assert username.attrib["value"] == tu_user.Username
+    email = root.xpath('//input[@id="id_email"]')[0]
+    assert email.attrib["value"] == tu_user.Email
+
+
+def test_get_account_edit_tu_as_tu(client: TestClient, tu_user: User):
+    """ Test edit get route of another TU as a TU. """
+    with db.begin():
+        user2 = create_user("test2")
+        user2.AccountTypeID = at.TRUSTED_USER_ID
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
+
+    with client as request:
+        response = request.get(endpoint, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Verify that we have an account type selection and that the
+    # "{at.TRUSTED_USER}" option is selected.
+    root = parse_root(response.text)
+    atype = root.xpath('//select[@id="id_type"]/option[@selected="selected"]')
+    expected = at.TRUSTED_USER
+    assert atype[0].text.strip() == expected
+
+    username = root.xpath('//input[@id="id_username"]')[0]
+    assert username.attrib["value"] == user2.Username
+    email = root.xpath('//input[@id="id_email"]')[0]
+    assert email.attrib["value"] == user2.Email
+
+
+def test_get_account_edit_as_tu(client: TestClient, tu_user: User):
+    """ Test edit get route of another user as a TU. """
+    with db.begin():
+        user2 = create_user("test2")
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
+
+    with client as request:
+        response = request.get(endpoint, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    # Verify that we have an account type selection and that the
+    # "Normal {at.USER}" option is selected.
+    root = parse_root(response.text)
+    atype = root.xpath('//select[@id="id_type"]/option[@selected="selected"]')
+    expected = f"Normal {at.USER}"
+    assert atype[0].text.strip() == expected
+
+    # Other fields should be available and match up.
+    username = root.xpath('//input[@id="id_username"]')[0]
+    assert username.attrib["value"] == user2.Username
+    email = root.xpath('//input[@id="id_email"]')[0]
+    assert email.attrib["value"] == user2.Email
+
 
 def test_get_account_edit_unauthorized(client: TestClient, user: User):
     request = Request()

From d6d41cdbadd4df5f1653aba2afafdaf01249d002 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 16 Dec 2021 22:01:14 -0800
Subject: [PATCH 746/844] fix(templates): add missing empty package results
 text

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/packages.html      | 15 +++++++++++++++
 test/test_packages_routes.py | 11 +++++++++++
 2 files changed, 26 insertions(+)

diff --git a/templates/packages.html b/templates/packages.html
index 40a4414b..9e4a71d1 100644
--- a/templates/packages.html
+++ b/templates/packages.html
@@ -10,6 +10,21 @@
         </ul>
         {% include "partials/packages/search.html" %}
 
+    {% elif not packages_count %}
+
+        {% include "partials/packages/search.html" %}        
+        <div id="pkglist-results" class="box">
+            <p>{{ "No packages matched your search criteria." | tr }}</p>
+        </div>
+
+        {% if success %}
+            <ul class="success">
+                {% for message in success %}
+                    <li>{{ message | tr }}</li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+
     {% else %}
 
         {% set pages = (packages_count / PP) | ceil %}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index cccdcba4..c1b27627 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -564,6 +564,17 @@ def test_packages(client: TestClient, packages: List[Package]):
     assert len(rows) == 50  # Default per-page
 
 
+def test_packages_empty(client: TestClient):
+    with client as request:
+        response = request.get("/packages")
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    results = root.xpath('//div[@id="pkglist-results"]/p')
+    expected = "No packages matched your search criteria."
+    assert results[0].text.strip() == expected
+
+
 def test_packages_search_by_name(client: TestClient, packages: List[Package]):
     with client as request:
         response = request.get("/packages", params={

From 36bc9ae29bcd2850c4cb15479bcbbed0a123b858 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 17 Dec 2021 17:23:41 -0800
Subject: [PATCH 747/844] fix(notify): gracefully fail notifications

Instead of allowing an exception to propogate through the framework
routes, catch it and log out an error about notifications not being
sent.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/scripts/notify.py | 14 ++++++++++++--
 test/test_notify.py      | 30 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index e49024d9..20e8a5d5 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -13,10 +13,12 @@ import aurweb.config
 import aurweb.db
 import aurweb.l10n
 
-from aurweb import db
+from aurweb import db, logging
 from aurweb.models import (PackageBase, PackageComaintainer, PackageComment, PackageNotification, PackageRequest, RequestType,
                            TUVote, User)
 
+logger = logging.get_logger(__name__)
+
 aur_location = aurweb.config.get('options', 'aur_location')
 
 
@@ -49,7 +51,7 @@ class Notification:
             body += '\n' + '[%d] %s' % (i + 1, ref)
         return body.rstrip()
 
-    def send(self):
+    def _send(self) -> None:
         sendmail = aurweb.config.get('notifications', 'sendmail')
         sender = aurweb.config.get('notifications', 'sender')
         reply_to = aurweb.config.get('notifications', 'reply-to')
@@ -111,6 +113,14 @@ class Notification:
                 server.sendmail(sender, deliver_to, msg.as_bytes())
                 server.quit()
 
+    def send(self) -> None:
+        try:
+            self._send()
+        except OSError as exc:
+            logger.error("Unable to emit notification due to an "
+                         "OSError (precise exception following).")
+            logger.error(str(exc))
+
 
 class ResetKeyNotification(Notification):
     def __init__(self, uid):
diff --git a/test/test_notify.py b/test/test_notify.py
index dc6e7e3e..e0035976 100644
--- a/test/test_notify.py
+++ b/test/test_notify.py
@@ -1,4 +1,5 @@
 from datetime import datetime
+from logging import ERROR
 from typing import List
 from unittest import mock
 
@@ -634,3 +635,32 @@ def test_notification_defaults():
     assert notif.get_refs() == tuple()
     assert notif.get_headers() == dict()
     assert notif.get_cc() == list()
+
+
+def test_notification_oserror(user: User, caplog: pytest.LogCaptureFixture):
+    """ Try sending a notification with a bad SMTP configuration. """
+    caplog.set_level(ERROR)
+    config_get = config.get
+
+    mocked_options = {
+        "sendmail": str(),
+        "smtp-server": "mail.server.xyz",
+        "smtp-port": "587",
+        "smtp-user": "notify@server.xyz",
+        "smtp-password": "notify_server_xyz",
+        "sender": "notify@server.xyz",
+        "reply-to": "no-reply@server.xyz"
+    }
+
+    def mock_config_get(section: str, key: str) -> str:
+        if section == "notifications":
+            if key in mocked_options:
+                return mocked_options.get(key)
+        return config_get(section, key)
+
+    notif = notify.WelcomeNotification(user.ID)
+    with mock.patch("aurweb.config.get", side_effect=mock_config_get):
+        notif.send()
+
+    expected = "Unable to emit notification due to an OSError"
+    assert expected in caplog.text

From 0c07c148604ad64e1c43066f8668d19213aabcac Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 19 Dec 2021 15:54:31 -0800
Subject: [PATCH 748/844] change(poetry): update Markdown to 3.3.6

Previous versions when encountered with an updated `importlib_metadata`
produce a deprecation warning. This update resolves that deprecation.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 47 +++++++++++++++++++++++++++++++++++++++++++----
 pyproject.toml |  2 +-
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4f688a29..6b10887c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -451,6 +451,22 @@ category = "main"
 optional = false
 python-versions = ">=3.5"
 
+[[package]]
+name = "importlib-metadata"
+version = "4.9.0"
+description = "Read metadata from Python packages"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.dependencies]
+zipp = ">=0.5"
+
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+perf = ["ipython"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
+
 [[package]]
 name = "iniconfig"
 version = "1.1.1"
@@ -526,12 +542,15 @@ lingua = ["lingua"]
 
 [[package]]
 name = "markdown"
-version = "3.3.4"
+version = "3.3.6"
 description = "Python implementation of Markdown."
 category = "main"
 optional = false
 python-versions = ">=3.6"
 
+[package.dependencies]
+importlib-metadata = {version = ">=4.4", markers = "python_version < \"3.10\""}
+
 [package.extras]
 testing = ["coverage", "pyyaml"]
 
@@ -1064,10 +1083,22 @@ python-versions = ">=3.6.1"
 [package.dependencies]
 h11 = ">=0.9.0,<1"
 
+[[package]]
+name = "zipp"
+version = "3.6.0"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
+
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "e950fbe8a0099e8b8858105e451b2f91edf9410e2ce93d2f983a29b5e3ca985e"
+content-hash = "0b5f346f2710359aacba93f854cdb6d4035d082a4b8c5cc9e225e36988dacfd5"
 
 [metadata.files]
 aiofiles = [
@@ -1371,6 +1402,10 @@ idna = [
     {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
     {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
 ]
+importlib-metadata = [
+    {file = "importlib_metadata-4.9.0-py3-none-any.whl", hash = "sha256:e8b45564028bc25f8c99f546616112a6df5de6655893d7eb74c9a99680dc9751"},
+    {file = "importlib_metadata-4.9.0.tar.gz", hash = "sha256:ee50794eccb0ec340adbc838344ebb9a6ff2bcba78f752d31fc716497e2149d6"},
+]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
@@ -1454,8 +1489,8 @@ mako = [
     {file = "Mako-1.1.6.tar.gz", hash = "sha256:4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2"},
 ]
 markdown = [
-    {file = "Markdown-3.3.4-py3-none-any.whl", hash = "sha256:96c3ba1261de2f7547b46a00ea8463832c921d3f9d6aba3f255a6f71386db20c"},
-    {file = "Markdown-3.3.4.tar.gz", hash = "sha256:31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49"},
+    {file = "Markdown-3.3.6-py3-none-any.whl", hash = "sha256:9923332318f843411e9932237530df53162e29dc7a4e2b91e35764583c46c9a3"},
+    {file = "Markdown-3.3.6.tar.gz", hash = "sha256:76df8ae32294ec39dcf89340382882dfa12975f87f45c3ed1ecdb1e8cefc7006"},
 ]
 markupsafe = [
     {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
@@ -1826,3 +1861,7 @@ wsproto = [
     {file = "wsproto-1.0.0-py3-none-any.whl", hash = "sha256:d8345d1808dd599b5ffb352c25a367adb6157e664e140dbecba3f9bc007edb9f"},
     {file = "wsproto-1.0.0.tar.gz", hash = "sha256:868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38"},
 ]
+zipp = [
+    {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"},
+    {file = "zipp-3.6.0.tar.gz", hash = "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"},
+]
diff --git a/pyproject.toml b/pyproject.toml
index bcf14747..c7d79cb0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -74,7 +74,7 @@ alembic = "^1.7.4"
 mysqlclient = "^2.0.3"
 Authlib = "^0.15.5"
 Jinja2 = "^3.0.2"
-Markdown = "3.3.4"
+Markdown = "^3.3.6"
 Werkzeug = "^2.0.2"
 SQLAlchemy = "^1.4.26"
 

From 22093c5c38688f7d39caaf4505b5409f9db56493 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 19 Dec 2021 14:48:40 -0800
Subject: [PATCH 749/844] fix(routers.packages): restrict
 /pkgbase/{name}/voters to those with creds

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               |  5 +++++
 templates/partials/packages/details.html |  6 +++---
 test/test_packages_routes.py             | 27 +++++++++++++++++++-----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 76f82ffb..fc292610 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -254,6 +254,11 @@ async def package_base(request: Request, name: str) -> Response:
 async def package_base_voters(request: Request, name: str) -> Response:
     # Get the PackageBase.
     pkgbase = get_pkg_or_base(name, models.PackageBase)
+
+    if not request.user.has_credential(creds.PKGBASE_LIST_VOTERS):
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
     context = make_context(request, "Voters")
     context["pkgbase"] = pkgbase
     return render_template(request, "pkgbase/voters.html", context)
diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 78e0ad1c..ae7c45f4 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -131,14 +131,14 @@
     </tr>
     <tr>
         <th>{{ "Votes" | tr }}:</th>
-        {% if not is_maintainer %}
-            <td>{{ pkgbase.NumVotes }}</td>
-        {% else %}
+        {% if request.user.has_credential(creds.PKGBASE_LIST_VOTERS) %}
             <td>
                 <a href="/pkgbase/{{ pkgbase.Name }}/voters">
                     {{ pkgbase.NumVotes }}
                 </a>
             </td>
+        {% else %}
+            <td>{{ pkgbase.NumVotes }}</td>
         {% endif %}
     </tr>
     <tr>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index c1b27627..03ab5ab8 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1078,22 +1078,39 @@ def test_packages_per_page(client: TestClient, maintainer: User):
     assert len(rows) == 250
 
 
-def test_pkgbase_voters(client: TestClient, maintainer: User, package: Package):
+def test_pkgbase_voters(client: TestClient, tu_user: User, package: Package):
     pkgbase = package.PackageBase
     endpoint = f"/pkgbase/{pkgbase.Name}/voters"
 
     now = int(datetime.utcnow().timestamp())
     with db.begin():
-        db.create(PackageVote, User=maintainer, PackageBase=pkgbase,
-                  VoteTS=now)
+        db.create(PackageVote, User=tu_user, PackageBase=pkgbase, VoteTS=now)
 
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:
-        resp = request.get(endpoint)
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
     assert resp.status_code == int(HTTPStatus.OK)
 
+    # We should've gotten one link to the voter, tu_user.
     root = parse_root(resp.text)
-    rows = root.xpath('//div[@class="box"]//ul/li')
+    rows = root.xpath('//div[@class="box"]//ul/li/a')
     assert len(rows) == 1
+    assert rows[0].text.strip() == tu_user.Username
+
+
+def test_pkgbase_voters_unauthorized(client: TestClient, user: User,
+                                     package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/voters"
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        db.create(PackageVote, User=user, PackageBase=pkgbase, VoteTS=now)
+
+    with client as request:
+        resp = request.get(endpoint, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
 
 
 def test_pkgbase_comment_not_found(client: TestClient, maintainer: User,

From 5142447b7e350171e5b8b069222a1bbd31534e2e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 21 Dec 2021 15:26:25 -0800
Subject: [PATCH 750/844] fix(models.package_source): fix primary key
 constraints

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_source.py                   | 8 +++++++-
 aurweb/routers/packages.py                        | 3 ++-
 templates/partials/packages/package_metadata.html | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/aurweb/models/package_source.py b/aurweb/models/package_source.py
index 59046bbd..4ea1645b 100644
--- a/aurweb/models/package_source.py
+++ b/aurweb/models/package_source.py
@@ -10,7 +10,10 @@ class PackageSource(Base):
     __table__ = schema.PackageSources
     __tablename__ = __table__.name
     __mapper_args__ = {
-        "primary_key": [__table__.c.PackageID]
+        "primary_key": [
+            __table__.c.PackageID,
+            __table__.c.Source
+        ]
     }
 
     Package = relationship(
@@ -26,3 +29,6 @@ class PackageSource(Base):
                 statement="Foreign key PackageID cannot be null.",
                 orig="PackageSources.PackageID",
                 params=("NULL"))
+
+        if not self.Source:
+            self.Source = "/dev/null"
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index fc292610..382a096a 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -201,7 +201,8 @@ async def package(request: Request, name: str) -> Response:
     context["package"] = pkg
 
     # Package sources.
-    context["sources"] = pkg.package_sources
+    context["sources"] = pkg.package_sources.order_by(
+        models.PackageSource.Source.asc()).all()
 
     # Package dependencies.
     dependencies = db.query(models.PackageDependency).join(
diff --git a/templates/partials/packages/package_metadata.html b/templates/partials/packages/package_metadata.html
index e7b1aefb..9f5c8854 100644
--- a/templates/partials/packages/package_metadata.html
+++ b/templates/partials/packages/package_metadata.html
@@ -45,14 +45,14 @@
 </div>
 
 <div id="pkgfiles" class="listing">
-    <h3>Sources ({{ sources.count() }})</h3>
+    <h3>Sources ({{ sources | length }})</h3>
 </div>
 
 <div>
     <ul id="pkgsrcslist">
-        {% for source in sources.all() %}
+        {% for src in sources %}
             <li>
-                <a href="{{ source.Source }}">{{ source.Source }}</a>
+                <a href="{{ src.Source }}">{{ src.Source }}</a>
             </li>
         {% endfor %}
     </ul>

From 50eec96dd0bc75ff75fc9015bae5aef54284c0cf Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 21 Dec 2021 18:02:37 -0800
Subject: [PATCH 751/844] fix(routers.packages): fix related package metadata

Closes #218

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py                       | 27 +++++++++++++-----
 aurweb/routers/packages.py                    | 28 ++++++++++++-------
 .../partials/packages/package_metadata.html   | 26 +++++++++--------
 test/test_packages_routes.py                  | 12 ++++----
 4 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 4fb6cbe4..b6739c98 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -9,30 +9,35 @@ from sqlalchemy import and_, orm
 
 from aurweb import db, l10n, models, util
 from aurweb.models.official_provider import OFFICIAL_BASE
+from aurweb.models.package import Package
+from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.relation_type import PROVIDES_ID
 from aurweb.redis import redis_connection
 from aurweb.scripts import notify
 from aurweb.templates import register_filter
 
 
+def dep_extra_with_arch(dep: models.PackageDependency, annotation: str) -> str:
+    output = [annotation]
+    if dep.DepArch:
+        output.append(dep.DepArch)
+    return f"({', '.join(output)})"
+
+
 def dep_depends_extra(dep: models.PackageDependency) -> str:
-    """ A function used to produce extra text for dependency display. """
     return str()
 
 
 def dep_makedepends_extra(dep: models.PackageDependency) -> str:
-    """ A function used to produce extra text for dependency display. """
-    return "(make)"
+    return dep_extra_with_arch(dep, "make")
 
 
 def dep_checkdepends_extra(dep: models.PackageDependency) -> str:
-    """ A function used to produce extra text for dependency display. """
-    return "(check)"
+    return dep_extra_with_arch(dep, "check")
 
 
 def dep_optdepends_extra(dep: models.PackageDependency) -> str:
-    """ A function used to produce extra text for dependency display. """
-    return "(optional)"
+    return dep_extra_with_arch(dep, "optional")
 
 
 @register_filter("dep_extra")
@@ -304,3 +309,11 @@ def add_comaintainers(request: Request, pkgbase: models.PackageBase,
 
     # Send out notifications.
     util.apply_all(notifications, lambda n: n.send())
+
+
+def pkg_required(pkgname: str, provides: List[str], limit: int):
+    targets = set(provides + [pkgname])
+    query = db.query(PackageDependency).join(Package).filter(
+        PackageDependency.DepName.in_(targets)
+    ).order_by(Package.Name.asc()).limit(limit)
+    return query.all()
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 382a096a..1ffd30a3 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -1,3 +1,4 @@
+from collections import defaultdict
 from datetime import datetime
 from http import HTTPStatus
 from typing import Any, Dict, List
@@ -9,7 +10,7 @@ from sqlalchemy import and_, case
 import aurweb.filters
 import aurweb.packages.util
 
-from aurweb import db, defaults, l10n, logging, models, util
+from aurweb import config, db, defaults, l10n, logging, models, util
 from aurweb.auth import auth_required, creds
 from aurweb.exceptions import InvariantError, ValidationError
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
@@ -196,6 +197,16 @@ async def package(request: Request, name: str) -> Response:
     pkg = get_pkg_or_base(name, models.Package)
     pkgbase = pkg.PackageBase
 
+    rels = pkg.package_relations.order_by(models.PackageRelation.RelName.asc())
+    rels_data = defaultdict(list)
+    for rel in rels:
+        if rel.RelTypeID == CONFLICTS_ID:
+            rels_data["c"].append(rel)
+        elif rel.RelTypeID == PROVIDES_ID:
+            rels_data["p"].append(rel)
+        elif rel.RelTypeID == REPLACES_ID:
+            rels_data["r"].append(rel)
+
     # Add our base information.
     context = await make_single_context(request, pkgbase)
     context["package"] = pkg
@@ -205,17 +216,14 @@ async def package(request: Request, name: str) -> Response:
         models.PackageSource.Source.asc()).all()
 
     # Package dependencies.
-    dependencies = db.query(models.PackageDependency).join(
-        models.Package).join(models.PackageBase).filter(
-        models.PackageBase.ID == pkgbase.ID)
-    context["dependencies"] = dependencies
+    max_depends = config.getint("options", "max_depends")
+    context["dependencies"] = pkg.package_dependencies.order_by(
+        models.PackageDependency.DepName.desc()
+    ).limit(max_depends).all()
 
     # Package requirements (other packages depend on this one).
-    required_by = db.query(models.PackageDependency).join(
-        models.Package).filter(
-        models.PackageDependency.DepName == pkgbase.Name).order_by(
-        models.Package.Name.asc())
-    context["required_by"] = required_by
+    context["required_by"] = pkgutil.pkg_required(
+        pkg.Name, [p.RelName for p in rels_data.get("p", [])], max_depends)
 
     context["licenses"] = pkg.package_licenses
 
diff --git a/templates/partials/packages/package_metadata.html b/templates/partials/packages/package_metadata.html
index 9f5c8854..7f132c61 100644
--- a/templates/partials/packages/package_metadata.html
+++ b/templates/partials/packages/package_metadata.html
@@ -1,7 +1,7 @@
 <div id="pkgdeps" class="listing">
-    <h3>Dependencies ({{ dependencies.count() }})</h3>
+    <h3>Dependencies ({{ dependencies | length }})</h3>
     <ul id="pkgdepslist">
-        {% for dep in dependencies.all() %}
+        {% for dep in dependencies %}
             <li>
                 {% set broken = not dep.is_package() %}
                 {% if broken %}
@@ -16,10 +16,7 @@
                     </a>
                 {% endif %}
                 {{ dep.Package | provides_list(dep.DepName) | safe }}
-                {% if dep.DepArch %}
-                    <em>({{ dep.DepArch }})</em>
-                {% endif %}
-                <!-- If this dependency type is an optdepends (id: 4). -->
+                {# If this dependency type is an optdepends (id: 4). #}
                 {% if dep.DepTypeID == 4 %}
                     <em>{{ dep | dep_extra_desc }}</em>
                 {% else %}
@@ -31,14 +28,21 @@
 </div>
 
 <div id="pkgreqs" class="listing">
-    <h3>Required by ({{ required_by.count() }})</h3>
+    <h3>Required by ({{ required_by | length }})</h3>
     <ul id="pkgreqslist">
-        {% for depender in required_by.all() %}
+        {% for dep in required_by %}
             <li>
-                <a href="{{ depender.Package | package_link }}">
-                    {{ depender.Package.Name }}
+                <a href="{{ dep.Package | package_link }}">
+                    {{ dep.Package.Name }}
                 </a>
-                <em>{{ depender | dep_extra }}</em>
+
+                {% if dep.DepName != package.Name %}
+                    <span class="virtual-dep">
+                        ({{ "requires %s" | tr | format(dep.DepName) }})
+                    </span>
+                {% endif %}
+
+                <em>{{ dep | dep_extra }}</em>
             </li>
         {% endfor %}
     </ul>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 03ab5ab8..ffe05248 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -446,12 +446,12 @@ def test_package_dependencies(client: TestClient, maintainer: User,
     with db.begin():
         dep_pkg = create_package("test-dep-1", maintainer)
         dep = create_package_dep(package, dep_pkg.Name)
-        dep.DepArch = "x86_64"
 
         # Also, create a makedepends.
         make_dep_pkg = create_package("test-dep-2", maintainer)
         make_dep = create_package_dep(package, make_dep_pkg.Name,
                                       dep_type_name="makedepends")
+        make_dep.DepArch = "x86_64"
 
         # And... a checkdepends!
         check_dep_pkg = create_package("test-dep-3", maintainer)
@@ -496,13 +496,13 @@ def test_package_dependencies(client: TestClient, maintainer: User,
         official_dep.DepName
     ]
     pkgdeps = root.findall('.//ul[@id="pkgdepslist"]/li/a')
-    for i, expectation in enumerate(expected):
+    for i, expectation in enumerate(reversed(expected)):
         assert pkgdeps[i].text.strip() == expectation
 
-    # Let's make sure the DepArch was displayed for our first dep.
-    arch = root.findall('.//ul[@id="pkgdepslist"]/li')[0]
-    arch = arch.xpath('./em')[1]
-    assert arch.text.strip() == "(x86_64)"
+    # Let's make sure the DepArch was displayed for our target make dep.
+    arch = root.findall('.//ul[@id="pkgdepslist"]/li')[-2]
+    arch = arch.xpath('./em')[0]
+    assert arch.text.strip() == "(make, x86_64)"
 
     broken_node = root.find('.//ul[@id="pkgdepslist"]/li/span')
     assert broken_node.text.strip() == broken_dep.DepName

From 56bd60559cdaa2f394e7743b82cb1692319ed8fc Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 23 Dec 2021 19:20:10 -0800
Subject: [PATCH 752/844] fix(packages.search): fix default ordering & improve
 performance

- Use queries more closely aligned to PHP's implementation; removes
  the need for separate vote/notification queries.
- Default sort by popularity

Closes #214

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/search.py                     | 163 +++++++++++-------
 aurweb/packages/util.py                       |   4 +-
 aurweb/routers/packages.py                    |  31 +++-
 templates/packages.html                       |   4 +-
 .../partials/packages/search_results.html     |  17 +-
 test/test_packages_routes.py                  |  27 +++
 test/test_rpc.py                              |   5 +-
 7 files changed, 161 insertions(+), 90 deletions(-)

diff --git a/aurweb/packages/search.py b/aurweb/packages/search.py
index a14fe19b..c4ab36fe 100644
--- a/aurweb/packages/search.py
+++ b/aurweb/packages/search.py
@@ -1,9 +1,12 @@
 from sqlalchemy import and_, case, or_, orm
 
-from aurweb import config, db, models, util
+from aurweb import db, models, util
+from aurweb.models import Package, PackageBase, User
 from aurweb.models.dependency_type import CHECKDEPENDS_ID, DEPENDS_ID, MAKEDEPENDS_ID, OPTDEPENDS_ID
-
-DEFAULT_MAX_RESULTS = 2500
+from aurweb.models.package_comaintainer import PackageComaintainer
+from aurweb.models.package_keyword import PackageKeyword
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_vote import PackageVote
 
 
 class PackageSearch:
@@ -13,23 +16,21 @@ class PackageSearch:
     FULL_SORT_ORDER = {"d": "desc", "a": "asc"}
 
     def __init__(self, user: models.User = None):
+        self.query = db.query(Package).join(PackageBase)
+
         self.user = user
-        self.query = db.query(models.Package).join(models.PackageBase)
-
         if self.user:
-            PackageVote = models.PackageVote
-            join_vote_on = and_(
-                PackageVote.PackageBaseID == models.PackageBase.ID,
-                PackageVote.UsersID == self.user.ID)
-
-            PackageNotification = models.PackageNotification
-            join_notif_on = and_(
-                PackageNotification.PackageBaseID == models.PackageBase.ID,
-                PackageNotification.UserID == self.user.ID)
-
             self.query = self.query.join(
-                models.PackageVote, join_vote_on, isouter=True
-            ).join(models.PackageNotification, join_notif_on, isouter=True)
+                PackageVote,
+                and_(PackageVote.PackageBaseID == PackageBase.ID,
+                     PackageVote.UsersID == self.user.ID),
+                isouter=True
+            ).join(
+                PackageNotification,
+                and_(PackageNotification.PackageBaseID == PackageBase.ID,
+                     PackageNotification.UserID == self.user.ID),
+                isouter=True
+            )
 
         self.ordering = "d"
 
@@ -58,70 +59,92 @@ class PackageSearch:
             "l": self._sort_by_last_modified
         }
 
+    def _join_user(self, outer: bool = True) -> orm.Query:
+        """ Centralized joining of a package base's maintainer. """
+        self.query = self.query.join(
+            User,
+            User.ID == PackageBase.MaintainerUID,
+            isouter=outer
+        )
+        return self.query
+
     def _search_by_namedesc(self, keywords: str) -> orm.Query:
+        self._join_user()
         self.query = self.query.filter(
-            or_(models.Package.Name.like(f"%{keywords}%"),
-                models.Package.Description.like(f"%{keywords}%"))
+            or_(Package.Name.like(f"%{keywords}%"),
+                Package.Description.like(f"%{keywords}%"))
         )
         return self
 
     def _search_by_name(self, keywords: str) -> orm.Query:
-        self.query = self.query.filter(
-            models.Package.Name.like(f"%{keywords}%"))
+        self._join_user()
+        self.query = self.query.filter(Package.Name.like(f"%{keywords}%"))
         return self
 
     def _search_by_exact_name(self, keywords: str) -> orm.Query:
-        self.query = self.query.filter(
-            models.Package.Name == keywords)
+        self._join_user()
+        self.query = self.query.filter(Package.Name == keywords)
         return self
 
     def _search_by_pkgbase(self, keywords: str) -> orm.Query:
-        self.query = self.query.filter(
-            models.PackageBase.Name.like(f"%{keywords}%"))
+        self._join_user()
+        self.query = self.query.filter(PackageBase.Name.like(f"%{keywords}%"))
         return self
 
     def _search_by_exact_pkgbase(self, keywords: str) -> orm.Query:
-        self.query = self.query.filter(
-            models.PackageBase.Name == keywords)
+        self._join_user()
+        self.query = self.query.filter(PackageBase.Name == keywords)
         return self
 
     def _search_by_keywords(self, keywords: str) -> orm.Query:
-        self.query = self.query.join(models.PackageKeyword).filter(
-            models.PackageKeyword.Keyword == keywords
+        self._join_user()
+        self.query = self.query.join(PackageKeyword).filter(
+            PackageKeyword.Keyword == keywords
         )
         return self
 
     def _search_by_maintainer(self, keywords: str) -> orm.Query:
+        self._join_user()
         if keywords:
-            self.query = self.query.join(
-                models.User, models.User.ID == models.PackageBase.MaintainerUID
-            ).filter(models.User.Username == keywords)
-        else:
             self.query = self.query.filter(
-                models.PackageBase.MaintainerUID.is_(None))
+                and_(User.Username == keywords,
+                     User.ID == PackageBase.MaintainerUID)
+            )
+        else:
+            self.query = self.query.filter(PackageBase.MaintainerUID.is_(None))
         return self
 
     def _search_by_comaintainer(self, keywords: str) -> orm.Query:
-        self.query = self.query.join(models.PackageComaintainer).join(
-            models.User, models.User.ID == models.PackageComaintainer.UsersID
-        ).filter(models.User.Username == keywords)
+        self._join_user()
+        exists_subq = db.query(PackageComaintainer).join(User).filter(
+            and_(PackageComaintainer.PackageBaseID == PackageBase.ID,
+                 User.Username == keywords)
+        ).exists()
+        self.query = self.query.filter(db.query(exists_subq).scalar_subquery())
         return self
 
     def _search_by_co_or_maintainer(self, keywords: str) -> orm.Query:
-        self.query = self.query.join(
-            models.PackageComaintainer,
-            isouter=True
-        ).join(
-            models.User,
-            or_(models.User.ID == models.PackageBase.MaintainerUID,
-                models.User.ID == models.PackageComaintainer.UsersID)
-        ).filter(models.User.Username == keywords)
+        self._join_user()
+        exists_subq = db.query(PackageComaintainer).join(User).filter(
+            and_(PackageComaintainer.PackageBaseID == PackageBase.ID,
+                 User.Username == keywords)
+        ).exists()
+        self.query = self.query.filter(
+            or_(and_(User.Username == keywords,
+                     User.ID == PackageBase.MaintainerUID),
+                db.query(exists_subq).scalar_subquery())
+        )
         return self
 
     def _search_by_submitter(self, keywords: str) -> orm.Query:
-        self.query = self.query.join(
-            models.User, models.User.ID == models.PackageBase.SubmitterUID
-        ).filter(models.User.Username == keywords)
+        self._join_user()
+
+        uid = 0
+        user = db.query(User).filter(User.Username == keywords).first()
+        if user:
+            uid = user.ID
+
+        self.query = self.query.filter(PackageBase.SubmitterUID == uid)
         return self
 
     def search_by(self, search_by: str, keywords: str) -> orm.Query:
@@ -138,12 +161,14 @@ class PackageSearch:
 
     def _sort_by_votes(self, order: str):
         column = getattr(models.PackageBase.NumVotes, order)
-        self.query = self.query.order_by(column())
+        name = getattr(models.Package.Name, order)
+        self.query = self.query.order_by(column(), name())
         return self
 
     def _sort_by_popularity(self, order: str):
         column = getattr(models.PackageBase.Popularity, order)
-        self.query = self.query.order_by(column())
+        name = getattr(models.Package.Name, order)
+        self.query = self.query.order_by(column(), name())
         return self
 
     def _sort_by_voted(self, order: str):
@@ -154,7 +179,8 @@ class PackageSearch:
             case([(models.PackageVote.UsersID == self.user.ID, 1)], else_=0),
             order
         )
-        self.query = self.query.order_by(column(), models.Package.Name.desc())
+        name = getattr(models.Package.Name, order)
+        self.query = self.query.order_by(column(), name())
         return self
 
     def _sort_by_notify(self, order: str):
@@ -166,39 +192,42 @@ class PackageSearch:
                  else_=0),
             order
         )
-        self.query = self.query.order_by(column(), models.Package.Name.desc())
+        name = getattr(models.Package.Name, order)
+        self.query = self.query.order_by(column(), name())
         return self
 
     def _sort_by_maintainer(self, order: str):
         column = getattr(models.User.Username, order)
-        self.query = self.query.join(
-            models.User,
-            models.User.ID == models.PackageBase.MaintainerUID,
-            isouter=True
-        ).order_by(column())
+        name = getattr(models.Package.Name, order)
+        self.query = self.query.order_by(column(), name())
         return self
 
     def _sort_by_last_modified(self, order: str):
         column = getattr(models.PackageBase.ModifiedTS, order)
-        self.query = self.query.order_by(column())
+        name = getattr(models.Package.Name, order)
+        self.query = self.query.order_by(column(), name())
         return self
 
     def sort_by(self, sort_by: str, ordering: str = "d") -> orm.Query:
         if sort_by not in self.sort_by_cb:
-            sort_by = "n"  # Default: Name.
+            sort_by = "p"  # Default: Popularity
         callback = self.sort_by_cb.get(sort_by)
         if ordering not in self.FULL_SORT_ORDER:
-            ordering = "d"  # Default: Descending.
+            ordering = "d"  # Default: Descending
         ordering = self.FULL_SORT_ORDER.get(ordering)
         return callback(ordering)
 
-    def results(self) -> orm.Query:
-        # Store the total count of all records found up to limit.
-        limit = (config.getint("options", "max_search_results")
-                 or DEFAULT_MAX_RESULTS)
-        self.total_count = self.query.limit(limit).count()
+    def count(self, limit: int) -> int:
+        """
+        Return internal query's count up to `limit`.
 
-        # Return the query to the user.
+        :param limit: Upper bound
+        :return: Database count up to `limit`
+        """
+        return self.query.limit(limit).count()
+
+    def results(self) -> orm.Query:
+        """ Return internal query. """
         return self.query
 
 
@@ -279,4 +308,4 @@ class RPCSearch(PackageSearch):
         return result
 
     def results(self) -> orm.Query:
-        return self.query
+        return self.query.filter(models.PackageBase.PackagerUID.isnot(None))
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index b6739c98..ffbc5eb5 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -200,7 +200,7 @@ def query_voted(query: List[models.Package],
     :return: Vote state dict (PackageBase.ID: int -> bool)
     """
     output = defaultdict(bool)
-    query_set = {pkg.PackageBase.ID for pkg in query}
+    query_set = {pkg.PackageBaseID for pkg in query}
     voted = db.query(models.PackageVote).join(
         models.PackageBase,
         models.PackageBase.ID.in_(query_set)
@@ -223,7 +223,7 @@ def query_notified(query: List[models.Package],
     :return: Notification state dict (PackageBase.ID: int -> bool)
     """
     output = defaultdict(bool)
-    query_set = {pkg.PackageBase.ID for pkg in query}
+    query_set = {pkg.PackageBaseID for pkg in query}
     notified = db.query(models.PackageNotification).join(
         models.PackageBase,
         models.PackageBase.ID.in_(query_set)
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 1ffd30a3..de4e32b6 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -20,7 +20,7 @@ from aurweb.packages import util as pkgutil
 from aurweb.packages import validate
 from aurweb.packages.requests import handle_request, update_closure_comment
 from aurweb.packages.search import PackageSearch
-from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, get_pkgreq_by_id, query_notified, query_voted
+from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, get_pkgreq_by_id
 from aurweb.scripts import notify, popupdate
 from aurweb.scripts.rendercomment import update_comment_render_fastapi
 from aurweb.templates import make_context, make_variable_context, render_raw_template, render_template
@@ -45,7 +45,7 @@ async def packages_get(request: Request, context: Dict[str, Any],
     search_by = context["SeB"] = request.query_params.get("SeB", "nd")
 
     # Query sort by.
-    sort_by = context["SB"] = request.query_params.get("SB", "n")
+    sort_by = context["SB"] = request.query_params.get("SB", "p")
 
     # Query sort order.
     sort_order = request.query_params.get("SO", None)
@@ -61,6 +61,12 @@ async def packages_get(request: Request, context: Dict[str, Any],
     for keyword in keywords:
         search.search_by(search_by, keyword)
 
+    # Collect search result count here; we've applied our keywords.
+    # Including more query operations below, like ordering, will
+    # increase the amount of time required to collect a count.
+    limit = config.getint("options", "max_search_results")
+    num_packages = search.count(limit)
+
     flagged = request.query_params.get("outdated", None)
     if flagged:
         # If outdated was given, set it up in the context.
@@ -96,16 +102,23 @@ async def packages_get(request: Request, context: Dict[str, Any],
     context["SO"] = sort_order
 
     # Insert search results into the context.
-    results = search.results()
+    results = search.results().with_entities(
+        models.Package.ID,
+        models.Package.Name,
+        models.Package.PackageBaseID,
+        models.Package.Version,
+        models.Package.Description,
+        models.PackageBase.Popularity,
+        models.PackageBase.NumVotes,
+        models.PackageBase.OutOfDateTS,
+        models.User.Username.label("Maintainer"),
+        models.PackageVote.PackageBaseID.label("Voted"),
+        models.PackageNotification.PackageBaseID.label("Notify")
+    )
 
     packages = results.limit(per_page).offset(offset)
-    util.apply_all(packages, db.refresh)
     context["packages"] = packages
-    context["packages_voted"] = query_voted(
-        context.get("packages"), request.user)
-    context["packages_notified"] = query_notified(
-        context.get("packages"), request.user)
-    context["packages_count"] = search.total_count
+    context["packages_count"] = num_packages
 
     return render_template(request, "packages.html", context,
                            status_code=status_code)
diff --git a/templates/packages.html b/templates/packages.html
index 9e4a71d1..61533524 100644
--- a/templates/packages.html
+++ b/templates/packages.html
@@ -45,7 +45,7 @@
             {# /packages does things a bit roundabout-wise:
 
             If SeB is not given, "nd" is the default.
-            If SB is not given, "n" is the default.
+            If SB is not given, "p" is the default.
             If SO is not given, "d" is the default.
 
             However, we depend on flipping SO for column sorting.
@@ -56,7 +56,7 @@
                 {% set SeB = "nd" %}
             {% endif %}
             {% if not SB %}
-                {% set SB = "n" %}
+                {% set SB = "p" %}
             {% endif %}
             {% if not SO %}
                 {% set SO = "d" %}
diff --git a/templates/partials/packages/search_results.html b/templates/partials/packages/search_results.html
index 28cf0b48..680891c4 100644
--- a/templates/partials/packages/search_results.html
+++ b/templates/partials/packages/search_results.html
@@ -64,7 +64,7 @@
     </thead>
     <tbody>
         {% for pkg in packages %}
-            {% set flagged = pkg.PackageBase.OutOfDateTS %}
+            {% set flagged = pkg.OutOfDateTS %}
             <tr>
                 {% if request.user.is_authenticated() %}
                     <td>
@@ -81,28 +81,27 @@
                 {% else %}
                     <td>{{ pkg.Version }}</td>
                 {% endif %}
-                <td>{{ pkg.PackageBase.NumVotes }}</td>
+                <td>{{ pkg.NumVotes }}</td>
                 <td>
-                    {{ pkg.PackageBase.Popularity | number_format(2) }}
+                    {{ pkg.Popularity | number_format(2) }}
                 </td>
                 {% if request.user.is_authenticated() %}
                     <td>
-                        {% if pkg.PackageBase.ID in voted %}
+                        {% if pkg.Voted %}
                             {{ "Yes" | tr }}
                         {% endif %}
                     </td>
                     <td>
-                        {% if pkg.PackageBase.ID in notified %}
+                        {% if pkg.Notify %}
                             {{ "Yes" | tr }}
                         {% endif %}
                     </td>
                 {% endif %}
                 <td class="wrap">{{ pkg.Description or '' }}</td>
                 <td>
-                    {% set maintainer = pkg.PackageBase.Maintainer %}
-                    {% if maintainer %}
-                        <a href="/account/{{ maintainer.Username }}">
-                            {{ maintainer.Username }}
+                    {% if pkg.Maintainer %}
+                        <a href="/account/{{ pkg.Maintainer }}">
+                            {{ pkg.Maintainer }}
                         </a>
                     {% else %}
                         <span class="error">{{ "orphan" | tr }}</span>
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index ffe05248..1f590a1e 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -816,6 +816,33 @@ def test_packages_search_by_submitter(client: TestClient,
     assert len(rows) == 1
 
 
+def test_packages_sort_by_name(client: TestClient, packages: List[Package]):
+    with client as request:
+        response = request.get("/packages", params={
+            "SB": "n",  # Name
+            "SO": "a",  # Ascending
+            "PP": "150"
+        })
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    rows = [row.xpath('./td/a')[0].text.strip() for row in rows]
+
+    with client as request:
+        response2 = request.get("/packages", params={
+            "SB": "n",  # Name
+            "SO": "d",  # Ascending
+            "PP": "150"
+        })
+    assert response2.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response2.text)
+    rows2 = root.xpath('//table[@class="results"]/tbody/tr')
+    rows2 = [row.xpath('./td/a')[0].text.strip() for row in rows2]
+    assert rows == list(reversed(rows2))
+
+
 def test_packages_sort_by_votes(client: TestClient,
                                 maintainer: User,
                                 packages: List[Package]):
diff --git a/test/test_rpc.py b/test/test_rpc.py
index acb82cad..6540b4a5 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -656,6 +656,9 @@ def test_rpc_msearch(client: TestClient, user: User, packages: List[Package]):
     data = response.json()
     assert data.get("resultcount") == 0
 
+    with db.begin():
+        packages[0].PackageBase.Maintainer = None
+
     # A missing arg still succeeds, but it returns all orphans.
     # Just verify that we receive no error and the orphaned result.
     params.pop("arg")
@@ -663,7 +666,7 @@ def test_rpc_msearch(client: TestClient, user: User, packages: List[Package]):
     data = response.json()
     assert data.get("resultcount") == 1
     result = data.get("results")[0]
-    assert result.get("Name") == "woogly-chungus"
+    assert result.get("Name") == "big-chungus"
 
 
 def test_rpc_search_depends(client: TestClient, packages: List[Package],

From 84a54bb6e661eb7aba5fad832e1b4f5f4250a290 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 26 Dec 2021 15:33:00 -0800
Subject: [PATCH 753/844] fix(routers.packages): fix package dependency
 ordering

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index de4e32b6..e8455fec 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -231,7 +231,8 @@ async def package(request: Request, name: str) -> Response:
     # Package dependencies.
     max_depends = config.getint("options", "max_depends")
     context["dependencies"] = pkg.package_dependencies.order_by(
-        models.PackageDependency.DepName.desc()
+        models.PackageDependency.DepTypeID.asc(),
+        models.PackageDependency.DepName.asc()
     ).limit(max_depends).all()
 
     # Package requirements (other packages depend on this one).

From 2baf061b96e20bfa682d33bb1c60333da0f31bd7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 26 Dec 2021 17:03:16 -0800
Subject: [PATCH 754/844] test(routers.packages): fix package view dependency
 test

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_packages_routes.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 1f590a1e..24e4933c 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -455,13 +455,13 @@ def test_package_dependencies(client: TestClient, maintainer: User,
 
         # And... a checkdepends!
         check_dep_pkg = create_package("test-dep-3", maintainer)
-        check_dep = create_package_dep(package, check_dep_pkg.Name,
-                                       dep_type_name="checkdepends")
+        create_package_dep(package, check_dep_pkg.Name,
+                           dep_type_name="checkdepends")
 
         # Geez. Just stop. This is optdepends.
         opt_dep_pkg = create_package("test-dep-4", maintainer)
-        opt_dep = create_package_dep(package, opt_dep_pkg.Name,
-                                     dep_type_name="optdepends")
+        create_package_dep(package, opt_dep_pkg.Name,
+                           dep_type_name="optdepends")
 
         # Heh. Another optdepends to test one with a description.
         opt_desc_dep_pkg = create_package("test-dep-5", maintainer)
@@ -475,7 +475,7 @@ def test_package_dependencies(client: TestClient, maintainer: User,
         # Create an official provider record.
         db.create(OfficialProvider, Name="test-dep-99",
                   Repo="core", Provides="test-dep-99")
-        official_dep = create_package_dep(package, "test-dep-99")
+        create_package_dep(package, "test-dep-99")
 
         # Also, create a provider who provides our test-dep-99.
         provider = create_package("test-provider", maintainer)
@@ -485,25 +485,25 @@ def test_package_dependencies(client: TestClient, maintainer: User,
         resp = request.get(package_endpoint(package))
     assert resp.status_code == int(HTTPStatus.OK)
 
+    # Let's make sure all the non-broken deps are ordered as we expect.
+    expected = list(filter(
+        lambda e: e.is_package(),
+        package.package_dependencies.order_by(
+            PackageDependency.DepTypeID.asc(),
+            PackageDependency.DepName.asc()
+        ).all()
+    ))
     root = parse_root(resp.text)
-
-    expected = [
-        dep.DepName,
-        make_dep.DepName,
-        check_dep.DepName,
-        opt_dep.DepName,
-        opt_desc_dep.DepName,
-        official_dep.DepName
-    ]
     pkgdeps = root.findall('.//ul[@id="pkgdepslist"]/li/a')
-    for i, expectation in enumerate(reversed(expected)):
-        assert pkgdeps[i].text.strip() == expectation
+    for i, expectation in enumerate(expected):
+        assert pkgdeps[i].text.strip() == expectation.DepName
 
     # Let's make sure the DepArch was displayed for our target make dep.
-    arch = root.findall('.//ul[@id="pkgdepslist"]/li')[-2]
+    arch = root.findall('.//ul[@id="pkgdepslist"]/li')[3]
     arch = arch.xpath('./em')[0]
     assert arch.text.strip() == "(make, x86_64)"
 
+    # And let's make sure that the broken package was displayed.
     broken_node = root.find('.//ul[@id="pkgdepslist"]/li/span')
     assert broken_node.text.strip() == broken_dep.DepName
 

From b27dab99d8369705bb8f3fe09faece656eee9980 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 26 Dec 2021 18:35:38 -0800
Subject: [PATCH 755/844] fix(routers.accounts): correct disable decision for
 More button

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py              | 5 +++--
 templates/partials/account/results.html | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 86dd993e..6472ccae 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -529,7 +529,6 @@ async def accounts_post(request: Request,
     # Get a query handle to users, populate the total user
     # count into a jinja2 context variable.
     query = db.query(models.User).join(models.AccountType)
-    context["total_users"] = query.count()
 
     # Populate this list with any additional statements to
     # be ANDed together.
@@ -551,8 +550,10 @@ async def accounts_post(request: Request,
     if statements:
         query = query.filter(and_(*statements))
 
+    context["total_users"] = query.count()
+
     # Finally, order and truncate our users for the current page.
-    users = query.order_by(*order_by).limit(pp).offset(offset)
+    users = query.order_by(*order_by).limit(pp).offset(offset).all()
     context["users"] = util.apply_all(users, db.refresh)
 
     return render_template(request, "account/index.html", context)
diff --git a/templates/partials/account/results.html b/templates/partials/account/results.html
index ec2f269c..1c398ce1 100644
--- a/templates/partials/account/results.html
+++ b/templates/partials/account/results.html
@@ -64,11 +64,11 @@
                     <input type="hidden" name="O"
                            value="{{ offset + pp }}" />
                     {% for k, v in params.items() %}
-                        <input type="hidden" name="{{ k }}"
-                               value="{{ v }}" />
+                        <input type="hidden" name="{{ k }}" value="{{ v }}" />
                     {% endfor %}
+
                     <button type="submit" class="button page-next"
-                        {% if offset + pp >= total_users %}
+                        {% if (offset + pp) >= total_users %}
                             disabled
                         {% endif %}
                     >

From 260b67c49e52702d36f71453f7054e5657c5424e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 27 Dec 2021 00:07:44 -0800
Subject: [PATCH 756/844] change(models.user): can_edit_user should check
 account type id priority

The credential alone does not completely encapsulate our new
requirements for editing an account.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py | 24 +++++++++++-----
 test/test_user.py     | 66 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 5ead606e..9f1a9c17 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -182,14 +182,24 @@ class User(Base):
             aurweb.models.account_type.TRUSTED_USER_AND_DEV_ID,
         }
 
-    def can_edit_user(self, user):
-        """ Can this account record edit the target user? It must either
-        be the target user or a user with enough permissions to do so.
-
-        :param user: Target user
-        :return: Boolean indicating whether this instance can edit `user`
+    def can_edit_user(self, target: "User") -> bool:
         """
-        return self == user or self.is_trusted_user() or self.is_developer()
+        Whether this User instance can edit `target`.
+
+        This User can edit user `target` if we both: have credentials and
+        self.AccountTypeID is greater or equal to `target`.AccountTypeID.
+
+        In short, a user must at least have credentials and be at least
+        the same account type as the target.
+
+        User < Trusted User < Developer < Trusted User & Developer
+
+        :param target: Target User to be edited
+        :return: Boolean indicating whether `self` can edit `target`
+        """
+        from aurweb.auth import creds
+        has_cred = self.has_credential(creds.ACCOUNT_EDIT, approved=[target])
+        return has_cred and self.AccountTypeID >= target.AccountTypeID
 
     def voted_for(self, package) -> bool:
         """ Has this User voted for package? """
diff --git a/test/test_user.py b/test/test_user.py
index 2c8dd847..7871cd61 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -12,6 +12,7 @@ import aurweb.models.account_type as at
 
 from aurweb import db
 from aurweb.auth import creds
+from aurweb.models.account_type import DEVELOPER_ID, TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID, USER_ID
 from aurweb.models.ban import Ban
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -28,12 +29,36 @@ def setup(db_test):
     return
 
 
+def create_user(username: str, account_type_id: int):
+    with db.begin():
+        user = db.create(User, Username=username,
+                         Email=f"{username}@example.org",
+                         RealName=username.title(), Passwd="testPassword",
+                         AccountTypeID=account_type_id)
+    return user
+
+
 @pytest.fixture
 def user() -> User:
-    with db.begin():
-        user = db.create(User, Username="test", Email="test@example.org",
-                         RealName="Test User", Passwd="testPassword",
-                         AccountTypeID=at.USER_ID)
+    user = create_user("test", USER_ID)
+    yield user
+
+
+@pytest.fixture
+def tu_user() -> User:
+    user = create_user("test_tu", TRUSTED_USER_ID)
+    yield user
+
+
+@pytest.fixture
+def dev_user() -> User:
+    user = create_user("test_dev", DEVELOPER_ID)
+    yield user
+
+
+@pytest.fixture
+def tu_and_dev_user() -> User:
+    user = create_user("test_tu_and_dev", TRUSTED_USER_AND_DEV_ID)
     yield user
 
 
@@ -256,3 +281,36 @@ def test_user_notified(user: User, package: Package):
 
 def test_user_packages(user: User, package: Package):
     assert package in user.packages()
+
+
+def test_can_edit_user(user: User, tu_user: User, dev_user: User,
+                       tu_and_dev_user: User):
+    # User can edit.
+    assert user.can_edit_user(user)
+
+    # User cannot edit.
+    assert not user.can_edit_user(tu_user)
+    assert not user.can_edit_user(dev_user)
+    assert not user.can_edit_user(tu_and_dev_user)
+
+    # Trusted User can edit.
+    assert tu_user.can_edit_user(user)
+    assert tu_user.can_edit_user(tu_user)
+
+    # Trusted User cannot edit.
+    assert not tu_user.can_edit_user(dev_user)
+    assert not tu_user.can_edit_user(tu_and_dev_user)
+
+    # Developer can edit.
+    assert dev_user.can_edit_user(user)
+    assert dev_user.can_edit_user(tu_user)
+    assert dev_user.can_edit_user(dev_user)
+
+    # Developer cannot edit.
+    assert not dev_user.can_edit_user(tu_and_dev_user)
+
+    # Trusted User & Developer can edit.
+    assert tu_and_dev_user.can_edit_user(user)
+    assert tu_and_dev_user.can_edit_user(tu_user)
+    assert tu_and_dev_user.can_edit_user(dev_user)
+    assert tu_and_dev_user.can_edit_user(tu_and_dev_user)

From 80ee7f3d4b5aa43f9896d396143c5da52958816d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 27 Dec 2021 00:35:20 -0800
Subject: [PATCH 757/844] fix(routers.accounts): use User.can_edit_user across
 the board

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py  | 2 +-
 templates/account/show.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 6472ccae..4e0ce33b 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -341,7 +341,7 @@ def cannot_edit(request: Request, user: models.User) \
     :param user: Target user to be edited
     :return: RedirectResponse if approval != granted else None
     """
-    approved = request.user.has_credential(creds.ACCOUNT_EDIT, approved=[user])
+    approved = request.user.can_edit_user(user)
     if not approved and (to := "/"):
         if user:
             to = f"/account/{user.Username}"
diff --git a/templates/account/show.html b/templates/account/show.html
index c6a53f4a..26cfbc21 100644
--- a/templates/account/show.html
+++ b/templates/account/show.html
@@ -86,7 +86,7 @@
                                                     | safe
                                                     }}
                                                 </li>
-                                                {% if request.user.has_credential(creds.ACCOUNT_EDIT, approved=[user]) %}
+                                                {% if request.user.can_edit_user(user) %}
                                                     <li>
                                                         {{ "%sEdit this user's account%s"
                                                         | tr

From d55dab93da0f5c82ac570bc56cc8f54b26de6fd2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 27 Dec 2021 17:42:56 -0800
Subject: [PATCH 758/844] revert account type permission changes

While this does make more sense to me personally, there is no need
to change how the AUR treats its users; it has been accepted for
ages and not found to be ridden with flaws. Stay with the tried
and true method.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/accounts.py           |  24 +++--
 aurweb/users/validate.py             |  27 ++----
 templates/partials/account_form.html |  34 ++++---
 test/test_accounts_routes.py         | 129 ++++++++++++++++++++-------
 4 files changed, 132 insertions(+), 82 deletions(-)

diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 4e0ce33b..6fffd79c 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -10,7 +10,7 @@ from sqlalchemy import and_, or_
 import aurweb.config
 
 from aurweb import cookies, db, l10n, logging, models, util
-from aurweb.auth import account_type_required, auth_required, creds
+from aurweb.auth import account_type_required, auth_required
 from aurweb.captcha import get_captcha_salts
 from aurweb.exceptions import ValidationError
 from aurweb.l10n import get_translator_for_request
@@ -169,17 +169,15 @@ def make_account_form_context(context: dict,
     # Do not modify the original context.
     context = copy.copy(context)
 
-    context["account_types"] = [
-        (at.USER_ID, f"Normal {at.USER}"),
-        (at.TRUSTED_USER_ID, at.TRUSTED_USER)
-    ]
-
-    user_account_type_id = context.get("account_types")[0][0]
-
-    if request.user.has_credential(creds.ACCOUNT_EDIT_DEV):
-        context["account_types"].append((at.DEVELOPER_ID, at.DEVELOPER))
-        context["account_types"].append((at.TRUSTED_USER_AND_DEV_ID,
-                                         at.TRUSTED_USER_AND_DEV))
+    context["account_types"] = list(filter(
+        lambda e: request.user.AccountTypeID >= e[0],
+        [
+            (at.USER_ID, f"Normal {at.USER}"),
+            (at.TRUSTED_USER_ID, at.TRUSTED_USER),
+            (at.DEVELOPER_ID, at.DEVELOPER),
+            (at.TRUSTED_USER_AND_DEV_ID, at.TRUSTED_USER_AND_DEV)
+        ]
+    ))
 
     if request.user.is_authenticated():
         context["username"] = args.get("U", user.Username)
@@ -202,7 +200,7 @@ def make_account_form_context(context: dict,
         context["inactive"] = args.get("J", user.InactivityTS != 0)
     else:
         context["username"] = args.get("U", str())
-        context["account_type"] = args.get("T", user_account_type_id)
+        context["account_type"] = args.get("T", at.USER_ID)
         context["suspended"] = args.get("S", False)
         context["email"] = args.get("E", str())
         context["hide_email"] = args.get("H", False)
diff --git a/aurweb/users/validate.py b/aurweb/users/validate.py
index 32146094..bbd6082a 100644
--- a/aurweb/users/validate.py
+++ b/aurweb/users/validate.py
@@ -13,7 +13,6 @@ from aurweb import config, db, l10n, logging, models, time, util
 from aurweb.auth import creds
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.exceptions import ValidationError
-from aurweb.models import account_type as at
 from aurweb.models.account_type import ACCOUNT_TYPE_NAME
 from aurweb.models.ssh_pub_key import get_fingerprint
 
@@ -171,31 +170,23 @@ def invalid_account_type(T: int = None, request: Request = None,
                          _: l10n.Translator = None,
                          **kwargs) -> None:
     if T is not None and (T := int(T)) != user.AccountTypeID:
+        name = ACCOUNT_TYPE_NAME.get(T, None)
         has_cred = request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE)
-        if T not in ACCOUNT_TYPE_NAME:
+        if name is None:
             raise ValidationError(["Invalid account type provided."])
         elif not has_cred:
             raise ValidationError([
                 "You do not have permission to change account types."])
-
-        credential_checks = {
-            at.USER_ID: request.user.is_trusted_user,
-            at.TRUSTED_USER_ID: request.user.is_trusted_user,
-            at.DEVELOPER_ID: request.user.is_developer,
-            at.TRUSTED_USER_AND_DEV_ID: (lambda: request.user.is_trusted_user()
-                                         and request.user.is_developer())
-        }
-        credential_check = credential_checks.get(T)
-
-        name = ACCOUNT_TYPE_NAME.get(T)
-        if not credential_check() or request.user == user:
+        elif T > request.user.AccountTypeID:
+            # If the chosen account type is higher than the editor's account
+            # type, the editor doesn't have permission to set the new type.
             error = _("You do not have permission to change "
                       "this user's account type to %s.") % name
             raise ValidationError([error])
-        else:
-            logger.debug(f"Trusted User '{request.user.Username}' has "
-                         f"modified '{user.Username}' account's type to"
-                         f" {name}.")
+
+        logger.debug(f"Trusted User '{request.user.Username}' has "
+                     f"modified '{user.Username}' account's type to"
+                     f" {name}.")
 
 
 def invalid_captcha(captcha_salt: str = None, captcha: str = None,
diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 8ed01ce7..f6a24c66 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -43,25 +43,23 @@
         </p>
 
         {% if request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE) %}
-            {% if request.user != user %}
-                <p>
-                    <label for="id_type">
-                        {% trans %}Account Type{% endtrans %}:
-                    </label>
-                    <select name="T" id="id_type">
-                        {% for value, type in account_types %}
-                            <option value="{{ value }}"
-                                    {% if user.AccountType.ID == value %}
-                                    selected="selected"
-                                    {% endif %}
-                            >
-                                {{ type | tr }}
-                            </option>
-                        {% endfor %}
+            <p>
+                <label for="id_type">
+                    {% trans %}Account Type{% endtrans %}:
+                </label>
+                <select name="T" id="id_type">
+                    {% for value, type in account_types %}
+                        <option value="{{ value }}"
+                                {% if user.AccountType.ID == value %}
+                                selected="selected"
+                                {% endif %}
+                        >
+                            {{ type | tr }}
+                        </option>
+                    {% endfor %}
 
-                    </select>
-                </p>
-            {% endif %}
+                </select>
+            </p>
             <p>
                 <label for="id_suspended">
                     {% trans %}Account Suspended{% endtrans %}:
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index bca87d59..3b7c7161 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -613,27 +613,6 @@ def test_post_register_with_ssh_pubkey(client: TestClient):
     assert response.status_code == int(HTTPStatus.OK)
 
 
-def test_get_account_edit_self_as_tu(client: TestClient, tu_user: User):
-    """ Test edit get route of ourselves as a TU. """
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    endpoint = f"/account/{tu_user.Username}/edit"
-
-    with client as request:
-        response = request.get(endpoint, cookies=cookies)
-    assert response.status_code == int(HTTPStatus.OK)
-
-    # Account type can't be modified when editing ourselves.
-    root = parse_root(response.text)
-    atype = root.xpath('//select[@id="id_type"]/option[@selected="selected"]')
-    assert not atype
-
-    # But other fields should be available and match up.
-    username = root.xpath('//input[@id="id_username"]')[0]
-    assert username.attrib["value"] == tu_user.Username
-    email = root.xpath('//input[@id="id_email"]')[0]
-    assert email.attrib["value"] == tu_user.Email
-
-
 def test_get_account_edit_tu_as_tu(client: TestClient, tu_user: User):
     """ Test edit get route of another TU as a TU. """
     with db.begin():
@@ -686,6 +665,33 @@ def test_get_account_edit_as_tu(client: TestClient, tu_user: User):
     assert email.attrib["value"] == user2.Email
 
 
+def test_get_account_edit_type(client: TestClient, user: User):
+    """ Test that users do not have an Account Type field. """
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user.Username}/edit"
+
+    with client as request:
+        response = request.get(endpoint, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+    assert "id_type" not in response.text
+
+
+def test_get_account_edit_type_as_tu(client: TestClient, tu_user: User):
+    with db.begin():
+        user2 = create_user("test_tu")
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
+
+    with client as request:
+        response = request.get(endpoint, cookies=cookies)
+    assert response.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(response.text)
+    atype = root.xpath('//select[@id="id_type"]/option[@selected="selected"]')
+    assert atype[0].text.strip() == f"Normal {at.USER}"
+
+
 def test_get_account_edit_unauthorized(client: TestClient, user: User):
     request = Request()
     sid = user.login(request, "testPassword")
@@ -727,7 +733,68 @@ def test_post_account_edit(client: TestClient, user: User):
     assert expected in response.content.decode()
 
 
-def test_post_account_edit_dev(client: TestClient, user: User):
+def test_post_account_edit_type_as_tu(client: TestClient, tu_user: User):
+    with db.begin():
+        user2 = create_user("test_tu")
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
+    data = {
+        "U": user2.Username,
+        "E": user2.Email,
+        "T": at.USER_ID,
+        "passwd": "testPassword",
+    }
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+
+def test_post_account_edit_type_as_dev(client: TestClient, tu_user: User):
+    with db.begin():
+        user2 = create_user("test2")
+        tu_user.AccountTypeID = at.DEVELOPER_ID
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
+    data = {
+        "U": user2.Username,
+        "E": user2.Email,
+        "T": at.DEVELOPER_ID,
+        "passwd": "testPassword",
+    }
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert user2.AccountTypeID == at.DEVELOPER_ID
+
+
+def test_post_account_edit_invalid_type_as_tu(client: TestClient,
+                                              tu_user: User):
+    with db.begin():
+        user2 = create_user("test_tu")
+        tu_user.AccountTypeID = at.TRUSTED_USER_ID
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/account/{user2.Username}/edit"
+    data = {
+        "U": user2.Username,
+        "E": user2.Email,
+        "T": at.DEVELOPER_ID,
+        "passwd": "testPassword",
+    }
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    assert user2.AccountTypeID == at.USER_ID
+
+    errors = get_errors(resp.text)
+    expected = ("You do not have permission to change this user's "
+                f"account type to {at.DEVELOPER}.")
+    assert errors[0].text.strip() == expected
+
+
+def test_post_account_edit_dev(client: TestClient, tu_user: User):
     # Modify our user to be a "Trusted User & Developer"
     name = "Trusted User & Developer"
     tu_or_dev = query(AccountType, AccountType.AccountType == name).first()
@@ -735,7 +802,7 @@ def test_post_account_edit_dev(client: TestClient, user: User):
         user.AccountType = tu_or_dev
 
     request = Request()
-    sid = user.login(request, "testPassword")
+    sid = tu_user.login(request, "testPassword")
 
     post_data = {
         "U": "test",
@@ -743,11 +810,10 @@ def test_post_account_edit_dev(client: TestClient, user: User):
         "passwd": "testPassword"
     }
 
+    endpoint = f"/account/{tu_user.Username}/edit"
     with client as request:
-        response = request.post("/account/test/edit", cookies={
-            "AURSID": sid
-        }, data=post_data, allow_redirects=False)
-
+        response = request.post(endpoint, cookies={"AURSID": sid},
+                                data=post_data, allow_redirects=False)
     assert response.status_code == int(HTTPStatus.OK)
 
     expected = "The account, <strong>test</strong>, "
@@ -1102,7 +1168,7 @@ def test_post_account_edit_self_type_as_tu(client: TestClient, tu_user: User):
     with client as request:
         resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
     assert resp.status_code == int(HTTPStatus.OK)
-    assert "id_type" not in resp.text
+    assert "id_type" in resp.text
 
     # We cannot modify our own account type.
     data = {
@@ -1113,12 +1179,9 @@ def test_post_account_edit_self_type_as_tu(client: TestClient, tu_user: User):
     }
     with client as request:
         resp = request.post(endpoint, data=data, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    assert resp.status_code == int(HTTPStatus.OK)
 
-    errors = get_errors(resp.text)
-    expected = ("You do not have permission to change this "
-                "user's account type to User.")
-    assert errors[0].text.strip() == expected
+    assert tu_user.AccountTypeID == USER_ID
 
 
 def test_post_account_edit_other_user_type_as_tu(

From 34cb8ec268f87bd7f2aad330c287b9d0cdc61bed Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 28 Dec 2021 13:13:46 -0800
Subject: [PATCH 759/844] fix(routers.packages): all authenticated users can
 see sshd clone uri

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index ae7c45f4..9aeb81ec 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -4,7 +4,7 @@
         <th>{{ "Git Clone URL" | tr }}:</th>
         <td>
             <a class="copy" href="{{ git_clone_uri_anon | format(pkgbase.Name) }}">{{ git_clone_uri_anon | format(pkgbase.Name) }}</a> ({{ "read-only" | tr }}, {{ "click to copy" | tr }})
-            {% if is_maintainer %}
+            {% if request.user.is_authenticated() %}
                 <br /> <a class="copy" href="{{ git_clone_uri_priv | format(pkgbase.Name) }}">{{ git_clone_uri_priv | format(pkgbase.Name) }}</a> ({{ "click to copy" | tr }})
             {% endif %}
         </td>

From 3a771fc807853af9997a9a18b1be685b6c348146 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 28 Dec 2021 18:31:21 -0800
Subject: [PATCH 760/844] fix(packages.requests): disown as maintainer does not
 need handle_requests

As a maintainer, we don't deal with requests at all.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/requests.py |  4 ----
 aurweb/routers/packages.py  |  2 +-
 test/test_requests.py       | 35 +++++++++++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/aurweb/packages/requests.py b/aurweb/packages/requests.py
index d68f9688..bb21ed9e 100644
--- a/aurweb/packages/requests.py
+++ b/aurweb/packages/requests.py
@@ -102,10 +102,6 @@ def update_closure_comment(pkgbase: PackageBase, reqtype_id: int,
 
 def verify_orphan_request(user: User, pkgbase: PackageBase):
     """ Verify that an undue orphan request exists in `requests`. """
-    is_maint = user == pkgbase.Maintainer
-    if is_maint:
-        return True
-
     requests = pkgbase.requests.filter(
         PackageRequest.ReqTypeID == ORPHAN_ID)
     for pkgreq in requests:
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index e8455fec..08e1ff58 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -924,9 +924,9 @@ async def pkgbase_unvote(request: Request, name: str):
 def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
     disowner = request.user
     notifs = [notify.DisownNotification(disowner.ID, pkgbase.ID)]
-    notifs += handle_request(request, ORPHAN_ID, pkgbase)
 
     if disowner != pkgbase.Maintainer:
+        notifs += handle_request(request, ORPHAN_ID, pkgbase)
         with db.begin():
             pkgbase.Maintainer = None
     else:
diff --git a/test/test_requests.py b/test/test_requests.py
index 867a64a0..8228e171 100644
--- a/test/test_requests.py
+++ b/test/test_requests.py
@@ -476,6 +476,33 @@ def test_orphan_request(client: TestClient, user: User, tu_user: User,
     assert re.match(subj, email.headers.get("Subject"))
 
 
+def test_request_post_orphan_autogenerated_closure(client: TestClient,
+                                                   tu_user: User,
+                                                   pkgbase: PackageBase,
+                                                   pkgreq: PackageRequest):
+    idle_time = config.getint("options", "request_idle_time")
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgreq.ReqTypeID = ORPHAN_ID
+        # Set the request time so it's seen as due (idle_time has passed).
+        pkgreq.RequestTS = now - idle_time - 10
+
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+    data = {"confirm": True}
+    with client as request:
+        resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    assert Email.count() == 1
+    email = Email(1)
+    expr = r"^\[PRQ#\d+\] Orphan Request for .+ Accepted$"
+    assert re.match(expr, email.headers.get("Subject"))
+
+    expr = r"\[Autogenerated\] Accepted orphan for .+\."
+    assert re.search(expr, email.body)
+
+
 def test_request_post_orphan_autoaccept(client: TestClient, auser: User,
                                         pkgbase: PackageBase,
                                         caplog: pytest.LogCaptureFixture):
@@ -526,10 +553,10 @@ def test_orphan_as_maintainer(client: TestClient, auser: User,
     assert resp.status_code == int(HTTPStatus.SEE_OTHER)
     assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
 
-    assert Email.count() == 1
-    email = Email(1)
-    expr = r"^\[PRQ#\d+\] Orphan Request for [^ ]+ Accepted$"
-    assert re.match(expr, email.headers.get("Subject"))
+    # As the pkgbase maintainer, disowning the package just ends up
+    # either promoting the lowest priority comaintainer or removing
+    # the associated maintainer relationship altogether.
+    assert pkgbase.Maintainer is None
 
 
 def test_orphan_without_requests(client: TestClient, tu_user: User,

From 9d3e77bab19a245e96ec6ed97b6ebdd91718e359 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 29 Dec 2021 01:02:12 -0800
Subject: [PATCH 761/844] fix(packages.util.pkg_required): correct type hints
 and docstring

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index ffbc5eb5..cce6be2a 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -311,8 +311,17 @@ def add_comaintainers(request: Request, pkgbase: models.PackageBase,
     util.apply_all(notifications, lambda n: n.send())
 
 
-def pkg_required(pkgname: str, provides: List[str], limit: int):
-    targets = set(provides + [pkgname])
+def pkg_required(pkgname: str, provides: List[str], limit: int) \
+        -> List[PackageDependency]:
+    """
+    Get dependencies that match a string in `[pkgname] + provides`.
+
+    :param pkgname: Package.Name
+    :param provides: List of PackageRelation.Name
+    :param limit: Maximum number of dependencies to query
+    :return: List of PackageDependency instances
+    """
+    targets = set([pkgname] + provides)
     query = db.query(PackageDependency).join(Package).filter(
         PackageDependency.DepName.in_(targets)
     ).order_by(Package.Name.asc()).limit(limit)

From fc229d755bc29bdd0ebdd12721f3f94af5544609 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 29 Dec 2021 01:28:56 -0800
Subject: [PATCH 762/844] change(python): refactor & centralize comaintainer
 management

This commit centralizes comaintainer management with a few new
functions and uses them more appropriately within routes:

- aurweb.packages.util.latest_priority
- aurweb.packages.util.remove_comaintainer
- aurweb.packages.util.remove_comaintainers
- aurweb.packages.util.add_comaintainer
- aurweb.packages.util.add_comaintainers
- aurweb.packages.util.rotate_comaintainers

Closes #117

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py      | 160 +++++++++++++++++++++++++----------
 aurweb/routers/packages.py   |  58 ++++++-------
 test/test_packages_routes.py |  15 ++--
 3 files changed, 151 insertions(+), 82 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index cce6be2a..4c544397 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -8,8 +8,9 @@ from fastapi import HTTPException, Request
 from sqlalchemy import and_, orm
 
 from aurweb import db, l10n, models, util
+from aurweb.models import Package, PackageBase, User
 from aurweb.models.official_provider import OFFICIAL_BASE
-from aurweb.models.package import Package
+from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.relation_type import PROVIDES_ID
 from aurweb.redis import redis_connection
@@ -235,82 +236,151 @@ def query_notified(query: List[models.Package],
     return output
 
 
-def remove_comaintainers(pkgbase: models.PackageBase,
-                         usernames: List[str]) -> None:
+def remove_comaintainer(comaint: PackageComaintainer) \
+        -> notify.ComaintainerRemoveNotification:
+    """
+    Remove a PackageComaintainer.
+
+    This function does *not* begin any database transaction and
+    must be used **within** a database transaction, e.g.:
+
+    with db.begin():
+       remove_comaintainer(comaint)
+
+    :param comaint: Target PackageComaintainer to be deleted
+    :return: ComaintainerRemoveNotification
+    """
+    pkgbase = comaint.PackageBase
+    notif = notify.ComaintainerRemoveNotification(comaint.User.ID, pkgbase.ID)
+    db.delete(comaint)
+    rotate_comaintainers(pkgbase)
+    return notif
+
+
+def remove_comaintainers(pkgbase: PackageBase, usernames: List[str]) -> None:
     """
     Remove comaintainers from `pkgbase`.
 
     :param pkgbase: PackageBase instance
     :param usernames: Iterable of username strings
-    :return: None
     """
     notifications = []
     with db.begin():
-        for username in usernames:
-            # We know that the users we passed here are in the DB.
-            # No need to check for their existence.
-            comaintainer = pkgbase.comaintainers.join(models.User).filter(
-                models.User.Username == username
-            ).first()
-            notifications.append(
-                notify.ComaintainerRemoveNotification(
-                    comaintainer.User.ID, pkgbase.ID)
-            )
-            db.delete(comaintainer)
+        comaintainers = pkgbase.comaintainers.join(User).filter(
+            User.Username.in_(usernames)
+        ).all()
+        notifications = [
+            notify.ComaintainerRemoveNotification(co.User.ID, pkgbase.ID)
+            for co in comaintainers
+        ]
+        db.delete_all(comaintainers)
 
-    # Send out notifications if need be.
+    # Rotate comaintainer priority values.
+    with db.begin():
+        rotate_comaintainers(pkgbase)
+
+    # Send out notifications.
     util.apply_all(notifications, lambda n: n.send())
 
 
+def latest_priority(pkgbase: PackageBase) -> int:
+    """
+    Return the highest Priority column related to `pkgbase`.
+
+    :param pkgbase: PackageBase instance
+    :return: Highest Priority found or 0 if no records exist
+    """
+
+    # Order comaintainers related to pkgbase by Priority DESC.
+    record = pkgbase.comaintainers.order_by(
+        PackageComaintainer.Priority.desc()).first()
+
+    # Use Priority column if record exists, otherwise 0.
+    return record.Priority if record else 0
+
+
+class NoopComaintainerNotification:
+    """ A noop notification stub used as an error-state return value. """
+
+    def send(self) -> None:
+        """ noop """
+        return
+
+
+def add_comaintainer(pkgbase: PackageBase, comaintainer: User) \
+        -> notify.ComaintainerAddNotification:
+    """
+    Add a new comaintainer to `pkgbase`.
+
+    :param pkgbase: PackageBase instance
+    :param comaintainer: User instance used for new comaintainer record
+    :return: ComaintainerAddNotification
+    """
+    # Skip given `comaintainers` who are already maintainer.
+    if pkgbase.Maintainer == comaintainer:
+        return NoopComaintainerNotification()
+
+    # Priority for the new comaintainer is +1 more than the highest.
+    new_prio = latest_priority(pkgbase) + 1
+
+    with db.begin():
+        db.create(PackageComaintainer, PackageBase=pkgbase,
+                  User=comaintainer, Priority=new_prio)
+
+    return notify.ComaintainerAddNotification(comaintainer.ID, pkgbase.ID)
+
+
 def add_comaintainers(request: Request, pkgbase: models.PackageBase,
-                      priority: int, usernames: List[str]) -> None:
+                      usernames: List[str]) -> None:
     """
     Add comaintainers to `pkgbase`.
 
     :param request: FastAPI request
     :param pkgbase: PackageBase instance
-    :param priority: Initial priority value
     :param usernames: Iterable of username strings
-    :return: None on success, an error string on failure
+    :return: Error string on failure else None
     """
-
-    # First, perform a check against all usernames given; for each
-    # username, add its related User object to memo.
-    _ = l10n.get_translator_for_request(request)
-    memo = {}
+    # For each username in usernames, perform validation of the username
+    # and append the User record to `users` if no errors occur.
+    users = []
     for username in usernames:
-        user = db.query(models.User).filter(
-            models.User.Username == username).first()
+        user = db.query(User).filter(User.Username == username).first()
         if not user:
+            _ = l10n.get_translator_for_request(request)
             return _("Invalid user name: %s") % username
-        memo[username] = user
+        users.append(user)
 
-    # Alright, now that we got past the check, add them all to the DB.
     notifications = []
-    with db.begin():
-        for username in usernames:
-            user = memo.get(username)
-            if pkgbase.Maintainer == user:
-                # Already a maintainer. Move along.
-                continue
 
-            # If we get here, our user model object is in the memo.
-            comaintainer = db.create(
-                models.PackageComaintainer,
-                PackageBase=pkgbase,
-                User=user,
-                Priority=priority)
-            priority += 1
+    def add_comaint(user: User):
+        nonlocal notifications
+        # Populate `notifications` with add_comaintainer's return value,
+        # which is a ComaintainerAddNotification.
+        notifications.append(add_comaintainer(pkgbase, user))
 
-            notifications.append(
-                notify.ComaintainerAddNotification(
-                    comaintainer.User.ID, pkgbase.ID)
-            )
+    # Move along: add all `users` as new `pkgbase` comaintainers.
+    util.apply_all(users, add_comaint)
 
     # Send out notifications.
     util.apply_all(notifications, lambda n: n.send())
 
 
+def rotate_comaintainers(pkgbase: PackageBase) -> None:
+    """
+    Rotate `pkgbase` comaintainers.
+
+    This function resets the Priority column of all PackageComaintainer
+    instances related to `pkgbase` to seqential 1 .. n values with
+    persisted order.
+
+    :param pkgbase: PackageBase instance
+    """
+    comaintainers = pkgbase.comaintainers.order_by(
+        models.PackageComaintainer.Priority.asc())
+    for i, comaint in enumerate(comaintainers):
+        comaint.Priority = i + 1
+
+
 def pkg_required(pkgname: str, provides: List[str], limit: int) \
         -> List[PackageDependency]:
     """
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 08e1ff58..9152ef9a 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -543,27 +543,13 @@ async def package_base_comaintainers_post(
     users = {e.strip() for e in users.split("\n") if bool(e.strip())}
     records = {c.User.Username for c in pkgbase.comaintainers}
 
-    logger.debug(f"RemoveComaintainers: {records.difference(users)}")
-    pkgutil.remove_comaintainers(pkgbase, records.difference(users))
+    users_to_rm = records.difference(users)
+    pkgutil.remove_comaintainers(pkgbase, users_to_rm)
+    logger.debug(f"{request.user} removed comaintainers from "
+                 f"{pkgbase.Name}: {users_to_rm}")
 
-    # Default priority (lowest value; most preferred).
-    priority = 1
-
-    # Get the highest priority in the comaintainer set.
-    last_priority = pkgbase.comaintainers.order_by(
-        models.PackageComaintainer.Priority.desc()
-    ).limit(1).first()
-
-    # If that record exists, we use a priority which is 1 higher.
-    # TODO: This needs to ensure that it wraps around and preserves
-    # ordering in the case where we hit the max number allowed by
-    # the Priority column type.
-    if last_priority:
-        priority = last_priority.Priority + 1
-
-    logger.debug(f"AddComaintainers: {users.difference(records)}")
-    error = pkgutil.add_comaintainers(request, pkgbase, priority,
-                                      users.difference(records))
+    users_to_add = users.difference(records)
+    error = pkgutil.add_comaintainers(request, pkgbase, users_to_add)
     if error:
         context = make_context(request, "Manage Co-maintainers")
         context["pkgbase"] = pkgbase
@@ -573,6 +559,9 @@ async def package_base_comaintainers_post(
         context["errors"] = [error]
         return render_template(request, "pkgbase/comaintainers.html", context)
 
+    logger.debug(f"{request.user} added comaintainers to "
+                 f"{pkgbase.Name}: {users_to_add}")
+
     return RedirectResponse(f"/pkgbase/{pkgbase.Name}",
                             status_code=HTTPStatus.SEE_OTHER)
 
@@ -925,21 +914,26 @@ def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
     disowner = request.user
     notifs = [notify.DisownNotification(disowner.ID, pkgbase.ID)]
 
-    if disowner != pkgbase.Maintainer:
+    is_maint = disowner == pkgbase.Maintainer
+    if is_maint:
+        with db.begin():
+            # Comaintainer with the lowest Priority value; next-in-line.
+            prio_comaint = pkgbase.comaintainers.order_by(
+                models.PackageComaintainer.Priority.asc()
+            ).first()
+            if prio_comaint:
+                # If there is such a comaintainer, promote them to maint.
+                pkgbase.Maintainer = prio_comaint.User
+                notifs.append(pkgutil.remove_comaintainer(prio_comaint))
+            else:
+                # Otherwise, just orphan the package completely.
+                pkgbase.Maintainer = None
+    elif request.user.has_credential(creds.PKGBASE_DISOWN):
+        # Otherwise, the request user performing this disownage is a
+        # Trusted User and we treat it like a standard orphan request.
         notifs += handle_request(request, ORPHAN_ID, pkgbase)
         with db.begin():
             pkgbase.Maintainer = None
-    else:
-        co = pkgbase.comaintainers.order_by(
-            models.PackageComaintainer.Priority.asc()
-        ).limit(1).first()
-
-        with db.begin():
-            if co:
-                pkgbase.Maintainer = co.User
-                db.delete(co)
-            else:
-                pkgbase.Maintainer = None
 
     util.apply_all(notifs, lambda n: n.send())
 
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 24e4933c..3a3415c5 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -75,14 +75,19 @@ def client() -> TestClient:
     yield TestClient(app=asgi.app)
 
 
+def create_user(username: str) -> User:
+    with db.begin():
+        user = db.create(User, Username=username,
+                         Email=f"{username}@example.org",
+                         Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+    return user
+
+
 @pytest.fixture
 def user() -> User:
     """ Yield a user. """
-    with db.begin():
-        user = db.create(User, Username="test",
-                         Email="test@example.org",
-                         Passwd="testPassword",
-                         AccountTypeID=USER_ID)
+    user = create_user("test")
     yield user
 
 

From 6fdaeee026ecb6dd21e7ebd997d8a493f5c4b923 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 30 Dec 2021 19:07:39 -0800
Subject: [PATCH 763/844] change(packages.util): handle queried record links
 via .is_official

This removes an unneeded query from our path.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/official_provider.py |  3 +++
 aurweb/models/package.py           |  3 +++
 aurweb/packages/util.py            | 16 +++++++---------
 test/test_packages_util.py         | 19 ++++++++++++-------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/aurweb/models/official_provider.py b/aurweb/models/official_provider.py
index ff70fe43..e111569e 100644
--- a/aurweb/models/official_provider.py
+++ b/aurweb/models/official_provider.py
@@ -11,6 +11,9 @@ class OfficialProvider(Base):
     __tablename__ = __table__.name
     __mapper_args__ = {"primary_key": [__table__.c.ID]}
 
+    # OfficialProvider instances are official packages.
+    is_official = True
+
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
diff --git a/aurweb/models/package.py b/aurweb/models/package.py
index cfb27634..64c6a195 100644
--- a/aurweb/models/package.py
+++ b/aurweb/models/package.py
@@ -16,6 +16,9 @@ class Package(Base):
                                       cascade="all, delete"),
         foreign_keys=[__table__.c.PackageBaseID])
 
+    # No Package instances are official packages.
+    is_official = False
+
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 4c544397..9a7b48d9 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -9,7 +9,7 @@ from sqlalchemy import and_, orm
 
 from aurweb import db, l10n, models, util
 from aurweb.models import Package, PackageBase, User
-from aurweb.models.official_provider import OFFICIAL_BASE
+from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.relation_type import PROVIDES_ID
@@ -61,20 +61,18 @@ def dep_extra_desc(dep: models.PackageDependency) -> str:
 
 @register_filter("pkgname_link")
 def pkgname_link(pkgname: str) -> str:
-    base = "/".join([OFFICIAL_BASE, "packages"])
-    official = db.query(models.OfficialProvider).filter(
-        models.OfficialProvider.Name == pkgname).exists()
+    official = db.query(OfficialProvider).filter(
+        OfficialProvider.Name == pkgname).exists()
     if db.query(official).scalar():
+        base = "/".join([OFFICIAL_BASE, "packages"])
         return f"{base}/?q={pkgname}"
     return f"/packages/{pkgname}"
 
 
 @register_filter("package_link")
-def package_link(package: models.Package) -> str:
-    base = "/".join([OFFICIAL_BASE, "packages"])
-    official = db.query(models.OfficialProvider).filter(
-        models.OfficialProvider.Name == package.Name).exists()
-    if db.query(official).scalar():
+def package_link(package: Union[Package, OfficialProvider]) -> str:
+    if package.is_official:
+        base = "/".join([OFFICIAL_BASE, "packages"])
         return f"{base}/?q={package.Name}"
     return f"/packages/{package.Name}"
 
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index cd0982b2..0e5e896b 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -46,16 +46,21 @@ def client() -> TestClient:
     yield TestClient(app=asgi.app)
 
 
-def test_package_link(client: TestClient, maintainer: User, package: Package):
-    with db.begin():
-        db.create(OfficialProvider,
-                  Name=package.Name,
-                  Repo="core",
-                  Provides=package.Name)
-    expected = f"{OFFICIAL_BASE}/packages/?q={package.Name}"
+def test_package_link(client: TestClient, package: Package):
+    expected = f"/packages/{package.Name}"
     assert util.package_link(package) == expected
 
 
+def test_official_package_link(client: TestClient, package: Package):
+    with db.begin():
+        provider = db.create(OfficialProvider,
+                             Name=package.Name,
+                             Repo="core",
+                             Provides=package.Name)
+    expected = f"{OFFICIAL_BASE}/packages/?q={package.Name}"
+    assert util.package_link(provider) == expected
+
+
 def test_updated_packages(maintainer: User, package: Package):
     expected = {
         "Name": package.Name,

From be7a96076e47f372f853f66f35d739a46f1b9dba Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 30 Dec 2021 19:11:21 -0800
Subject: [PATCH 764/844] fix: handle broken packages which have valid provides

Closes #226

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_dependency.py           | 25 +++++++++++++++++
 aurweb/packages/util.py                       | 28 ++++++-------------
 .../partials/packages/package_metadata.html   | 24 +++++++++++-----
 3 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index c4c5f6c1..44d9c839 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -1,3 +1,6 @@
+from typing import List
+
+from sqlalchemy import and_, literal
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
@@ -6,6 +9,7 @@ from aurweb.models.declarative import Base
 from aurweb.models.dependency_type import DependencyType as _DependencyType
 from aurweb.models.official_provider import OfficialProvider as _OfficialProvider
 from aurweb.models.package import Package as _Package
+from aurweb.models.package_relation import PackageRelation
 
 
 class PackageDependency(Base):
@@ -51,3 +55,24 @@ class PackageDependency(Base):
         official = db.query(_OfficialProvider).filter(
             _OfficialProvider.Name == self.DepName).exists()
         return db.query(pkg).scalar() or db.query(official).scalar()
+
+    def provides(self) -> List[PackageRelation]:
+        from aurweb.models.relation_type import PROVIDES_ID
+
+        rels = db.query(PackageRelation).join(_Package).filter(
+            and_(PackageRelation.RelTypeID == PROVIDES_ID,
+                 PackageRelation.RelName == self.DepName)
+        ).with_entities(
+            _Package.Name,
+            literal(False).label("is_official")
+        ).order_by(_Package.Name.asc())
+
+        official_rels = db.query(_OfficialProvider).filter(
+            and_(_OfficialProvider.Provides == self.DepName,
+                 _OfficialProvider.Name != self.DepName)
+        ).with_entities(
+            _OfficialProvider.Name,
+            literal(True).label("is_official")
+        ).order_by(_OfficialProvider.Name.asc())
+
+        return rels.union(official_rels).all()
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 9a7b48d9..53af4446 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -5,18 +5,20 @@ from typing import Dict, List, Union
 import orjson
 
 from fastapi import HTTPException, Request
-from sqlalchemy import and_, orm
+from sqlalchemy import orm
 
 from aurweb import db, l10n, models, util
 from aurweb.models import Package, PackageBase, User
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_dependency import PackageDependency
-from aurweb.models.relation_type import PROVIDES_ID
+from aurweb.models.package_relation import PackageRelation
 from aurweb.redis import redis_connection
 from aurweb.scripts import notify
 from aurweb.templates import register_filter
 
+Providers = List[Union[PackageRelation, OfficialProvider]]
+
 
 def dep_extra_with_arch(dep: models.PackageDependency, annotation: str) -> str:
     output = [annotation]
@@ -77,27 +79,13 @@ def package_link(package: Union[Package, OfficialProvider]) -> str:
     return f"/packages/{package.Name}"
 
 
-@register_filter("provides_list")
-def provides_list(package: models.Package, depname: str) -> list:
-    providers = db.query(models.Package).join(
-        models.PackageRelation).join(models.RelationType).filter(
-        and_(
-            models.PackageRelation.RelName == depname,
-            models.RelationType.ID == PROVIDES_ID
-        )
-    )
-
-    string = ", ".join([
+@register_filter("provides_markup")
+def provides_markup(provides: Providers) -> str:
+    return ", ".join([
         f'<a href="{package_link(pkg)}">{pkg.Name}</a>'
-        for pkg in providers
+        for pkg in provides
     ])
 
-    if string:
-        # If we actually constructed a string, wrap it.
-        string = f"<em>({string})</em>"
-
-    return string
-
 
 def get_pkg_or_base(
         name: str,
diff --git a/templates/partials/packages/package_metadata.html b/templates/partials/packages/package_metadata.html
index 7f132c61..5f831711 100644
--- a/templates/partials/packages/package_metadata.html
+++ b/templates/partials/packages/package_metadata.html
@@ -1,23 +1,33 @@
 <div id="pkgdeps" class="listing">
-    <h3>Dependencies ({{ dependencies | length }})</h3>
+    <h3>{{ "Dependencies" | tr }} ({{ dependencies | length }})</h3>
     <ul id="pkgdepslist">
         {% for dep in dependencies %}
+            {# Collect provides for `dep`. #}
+            {% set provides = dep.provides() %}
             <li>
                 {% set broken = not dep.is_package() %}
                 {% if broken %}
-                    <span class="broken">
+                    {% if not provides %}
+                        <span class="broken">
+                    {% endif %}
                 {% else %}
                     <a href="{{ dep.DepName | pkgname_link }}">
                 {% endif %}
                     {{ dep.DepName }}
                 {% if broken %}
-                    </span>
+                    {% if not provides %}
+                        </span>
+                    {% endif %}
                 {% else %}
                     </a>
                 {% endif %}
-                {{ dep.Package | provides_list(dep.DepName) | safe }}
-                {# If this dependency type is an optdepends (id: 4). #}
+
+                {% if provides %}
+                    <em>({{ provides | provides_markup | safe }})</em>
+                {% endif %}
+
                 {% if dep.DepTypeID == 4 %}
+                    {# If this dependency type is an optdepends (id: 4). #}
                     <em>{{ dep | dep_extra_desc }}</em>
                 {% else %}
                     <em>{{ dep | dep_extra }}</em>
@@ -28,7 +38,7 @@
 </div>
 
 <div id="pkgreqs" class="listing">
-    <h3>Required by ({{ required_by | length }})</h3>
+    <h3>{{ "Required by" | tr }} ({{ required_by | length }})</h3>
     <ul id="pkgreqslist">
         {% for dep in required_by %}
             <li>
@@ -49,7 +59,7 @@
 </div>
 
 <div id="pkgfiles" class="listing">
-    <h3>Sources ({{ sources | length }})</h3>
+    <h3>{{ "Sources" | tr }} ({{ sources | length }})</h3>
 </div>
 
 <div>

From 8f8929f324657665545728df3305878a9f43a8db Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 30 Dec 2021 23:04:39 -0800
Subject: [PATCH 765/844] fix(routers.packages): handle package source display

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py                       | 31 ++++++++++++++--
 .../partials/packages/package_metadata.html   |  3 +-
 test/test_packages_util.py                    | 36 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 53af4446..987061c9 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -1,13 +1,13 @@
 from collections import defaultdict
 from http import HTTPStatus
-from typing import Dict, List, Union
+from typing import Dict, List, Tuple, Union
 
 import orjson
 
 from fastapi import HTTPException, Request
 from sqlalchemy import orm
 
-from aurweb import db, l10n, models, util
+from aurweb import config, db, l10n, models, util
 from aurweb.models import Package, PackageBase, User
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package_comaintainer import PackageComaintainer
@@ -382,3 +382,30 @@ def pkg_required(pkgname: str, provides: List[str], limit: int) \
         PackageDependency.DepName.in_(targets)
     ).order_by(Package.Name.asc()).limit(limit)
     return query.all()
+
+
+@register_filter("source_uri")
+def source_uri(pkgsrc: models.PackageSource) -> Tuple[str, str]:
+    """
+    Produce a (text, uri) tuple out of `pkgsrc`.
+
+    In this filter, we cover various cases:
+    1. If "::" is anywhere in the Source column, split the string,
+       which should produce a (text, uri), where text is before "::"
+       and uri is after "::".
+    2. Otherwise, if "://" is anywhere in the Source column, it's just
+       some sort of URI, which we'll return varbatim as both text and uri.
+    3. Otherwise, we'll return a path to the source file in a uri produced
+       out of options.source_file_uri formatted with the source file and
+       the package base name.
+
+    :param pkgsrc: PackageSource instance
+    :return (text, uri) tuple
+    """
+    if "::" in pkgsrc.Source:
+        return pkgsrc.Source.split("::", 1)
+    elif "://" in pkgsrc.Source:
+        return (pkgsrc.Source, pkgsrc.Source)
+    path = config.get("options", "source_file_uri")
+    pkgbasename = pkgsrc.Package.PackageBase.Name
+    return (pkgsrc.Source, path % (pkgsrc.Source, pkgbasename))
diff --git a/templates/partials/packages/package_metadata.html b/templates/partials/packages/package_metadata.html
index 5f831711..6f58c2be 100644
--- a/templates/partials/packages/package_metadata.html
+++ b/templates/partials/packages/package_metadata.html
@@ -65,8 +65,9 @@
 <div>
     <ul id="pkgsrcslist">
         {% for src in sources %}
+            {% set file, uri = (src | source_uri) %}
             <li>
-                <a href="{{ src.Source }}">{{ src.Source }}</a>
+                <a href="{{ uri }}">{{ file }}</a>
             </li>
         {% endfor %}
     </ul>
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index 0e5e896b..3474f847 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -5,12 +5,13 @@ import pytest
 from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
-from aurweb import asgi, db
+from aurweb import asgi, config, db
 from aurweb.models.account_type import USER_ID
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.user import User
 from aurweb.packages import util
@@ -100,3 +101,36 @@ def test_query_notified(maintainer: User, package: Package):
 def test_pkgreq_by_id_not_found():
     with pytest.raises(HTTPException):
         util.get_pkgreq_by_id(0)
+
+
+def test_source_uri_file(package: Package):
+    FILE = "test_file"
+
+    with db.begin():
+        pkgsrc = db.create(PackageSource, Source=FILE,
+                           Package=package, SourceArch="x86_64")
+    source_file_uri = config.get("options", "source_file_uri")
+    file, uri = util.source_uri(pkgsrc)
+    expected = source_file_uri % (pkgsrc.Source, package.PackageBase.Name)
+    assert (file, uri) == (FILE, expected)
+
+
+def test_source_uri_named_uri(package: Package):
+    FILE = "test"
+    URL = "https://test.xyz"
+
+    with db.begin():
+        pkgsrc = db.create(PackageSource, Source=f"{FILE}::{URL}",
+                           Package=package, SourceArch="x86_64")
+    file, uri = util.source_uri(pkgsrc)
+    assert (file, uri) == (FILE, URL)
+
+
+def test_source_uri_unnamed_uri(package: Package):
+    URL = "https://test.xyz"
+
+    with db.begin():
+        pkgsrc = db.create(PackageSource, Source=f"{URL}",
+                           Package=package, SourceArch="x86_64")
+    file, uri = util.source_uri(pkgsrc)
+    assert (file, uri) == (URL, URL)

From cab86035e99821f6908c93bbea403481f07aebaa Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 31 Dec 2021 17:37:36 -0800
Subject: [PATCH 766/844] feat(poetry): add pyalpm dependency & update some
 others

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 36 +++++++++++++++++++++++++++++++++++-
 pyproject.toml |  1 +
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index 6b10887c..4d6587df 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -693,6 +693,14 @@ category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
+[[package]]
+name = "pyalpm"
+version = "0.10.6"
+description = "libalpm bindings for Python 3"
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "pycodestyle"
 version = "2.8.0"
@@ -1098,7 +1106,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "0b5f346f2710359aacba93f854cdb6d4035d082a4b8c5cc9e225e36988dacfd5"
+content-hash = "e9e5ecd8b8a0453b03468a5874844048f1ca171e4252b57bf38643b9e61da005"
 
 [metadata.files]
 aiofiles = [
@@ -1130,10 +1138,13 @@ authlib = [
     {file = "Authlib-0.15.5.tar.gz", hash = "sha256:b83cf6360c8e92b0e9df0d1f32d675790bcc4e3c03977499b1eed24dcdef4252"},
 ]
 bcrypt = [
+    {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:b589229207630484aefe5899122fb938a5b017b0f4349f769b8c13e78d99a8fd"},
     {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6"},
     {file = "bcrypt-3.2.0-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:63d4e3ff96188e5898779b6057878fecf3f11cfe6ec3b313ea09955d587ec7a7"},
     {file = "bcrypt-3.2.0-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1"},
     {file = "bcrypt-3.2.0-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d"},
+    {file = "bcrypt-3.2.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a0584a92329210fcd75eb8a3250c5a941633f8bfaf2a18f81009b097732839b7"},
+    {file = "bcrypt-3.2.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:56e5da069a76470679f312a7d3d23deb3ac4519991a0361abc11da837087b61d"},
     {file = "bcrypt-3.2.0-cp36-abi3-win32.whl", hash = "sha256:a67fb841b35c28a59cebed05fbd3e80eea26e6d75851f0574a9273c80f3e9b55"},
     {file = "bcrypt-3.2.0-cp36-abi3-win_amd64.whl", hash = "sha256:81fec756feff5b6818ea7ab031205e1d323d8943d237303baca2c5f9c7846f34"},
     {file = "bcrypt-3.2.0.tar.gz", hash = "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"},
@@ -1326,6 +1337,7 @@ greenlet = [
     {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97e5306482182170ade15c4b0d8386ded995a07d7cc2ca8f27958d34d6736497"},
     {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e6a36bb9474218c7a5b27ae476035497a6990e21d04c279884eb10d9b290f1b1"},
     {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:abb7a75ed8b968f3061327c433a0fbd17b729947b400747c334a9c29a9af6c58"},
+    {file = "greenlet-1.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b336501a05e13b616ef81ce329c0e09ac5ed8c732d9ba7e3e983fcc1a9e86965"},
     {file = "greenlet-1.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:14d4f3cd4e8b524ae9b8aa567858beed70c392fdec26dbdb0a8a418392e71708"},
     {file = "greenlet-1.1.2-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:17ff94e7a83aa8671a25bf5b59326ec26da379ace2ebc4411d690d80a7fbcf23"},
     {file = "greenlet-1.1.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9f3cba480d3deb69f6ee2c1825060177a22c7826431458c697df88e6aeb3caee"},
@@ -1338,6 +1350,7 @@ greenlet = [
     {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9d29ca8a77117315101425ec7ec2a47a22ccf59f5593378fc4077ac5b754fce"},
     {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:21915eb821a6b3d9d8eefdaf57d6c345b970ad722f856cd71739493ce003ad08"},
     {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eff9d20417ff9dcb0d25e2defc2574d10b491bf2e693b4e491914738b7908168"},
+    {file = "greenlet-1.1.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:b8c008de9d0daba7b6666aa5bbfdc23dcd78cafc33997c9b7741ff6353bafb7f"},
     {file = "greenlet-1.1.2-cp36-cp36m-win32.whl", hash = "sha256:32ca72bbc673adbcfecb935bb3fb1b74e663d10a4b241aaa2f5a75fe1d1f90aa"},
     {file = "greenlet-1.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:f0214eb2a23b85528310dad848ad2ac58e735612929c8072f6093f3585fd342d"},
     {file = "greenlet-1.1.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:b92e29e58bef6d9cfd340c72b04d74c4b4e9f70c9fa7c78b674d1fec18896dc4"},
@@ -1346,6 +1359,7 @@ greenlet = [
     {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e12bdc622676ce47ae9abbf455c189e442afdde8818d9da983085df6312e7a1"},
     {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8c790abda465726cfb8bb08bd4ca9a5d0a7bd77c7ac1ca1b839ad823b948ea28"},
     {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f276df9830dba7a333544bd41070e8175762a7ac20350786b322b714b0e654f5"},
+    {file = "greenlet-1.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c5d5b35f789a030ebb95bff352f1d27a93d81069f2adb3182d99882e095cefe"},
     {file = "greenlet-1.1.2-cp37-cp37m-win32.whl", hash = "sha256:64e6175c2e53195278d7388c454e0b30997573f3f4bd63697f88d855f7a6a1fc"},
     {file = "greenlet-1.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b11548073a2213d950c3f671aa88e6f83cda6e2fb97a8b6317b1b5b33d850e06"},
     {file = "greenlet-1.1.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:9633b3034d3d901f0a46b7939f8c4d64427dfba6bbc5a36b1a67364cf148a1b0"},
@@ -1354,6 +1368,7 @@ greenlet = [
     {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e859fcb4cbe93504ea18008d1df98dee4f7766db66c435e4882ab35cf70cac43"},
     {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00e44c8afdbe5467e4f7b5851be223be68adb4272f44696ee71fe46b7036a711"},
     {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec8c433b3ab0419100bd45b47c9c8551248a5aee30ca5e9d399a0b57ac04651b"},
+    {file = "greenlet-1.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2bde6792f313f4e918caabc46532aa64aa27a0db05d75b20edfc5c6f46479de2"},
     {file = "greenlet-1.1.2-cp38-cp38-win32.whl", hash = "sha256:288c6a76705dc54fba69fbcb59904ae4ad768b4c768839b8ca5fdadec6dd8cfd"},
     {file = "greenlet-1.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:8d2f1fb53a421b410751887eb4ff21386d119ef9cde3797bf5e7ed49fb51a3b3"},
     {file = "greenlet-1.1.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:166eac03e48784a6a6e0e5f041cfebb1ab400b394db188c48b3a84737f505b67"},
@@ -1362,6 +1377,7 @@ greenlet = [
     {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1692f7d6bc45e3200844be0dba153612103db241691088626a33ff1f24a0d88"},
     {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7227b47e73dedaa513cdebb98469705ef0d66eb5a1250144468e9c3097d6b59b"},
     {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ff61ff178250f9bb3cd89752df0f1dd0e27316a8bd1465351652b1b4a4cdfd3"},
+    {file = "greenlet-1.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0051c6f1f27cb756ffc0ffbac7d2cd48cb0362ac1736871399a739b2885134d3"},
     {file = "greenlet-1.1.2-cp39-cp39-win32.whl", hash = "sha256:f70a9e237bb792c7cc7e44c531fd48f5897961701cdaa06cf22fc14965c496cf"},
     {file = "greenlet-1.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:013d61294b6cd8fe3242932c1c5e36e5d1db2c8afb58606c5a67efce62c1f5fd"},
     {file = "greenlet-1.1.2.tar.gz", hash = "sha256:e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a"},
@@ -1498,6 +1514,9 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
     {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
     {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"},
     {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
     {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
@@ -1509,6 +1528,9 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
@@ -1520,6 +1542,9 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
@@ -1532,6 +1557,9 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
@@ -1544,6 +1572,9 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
     {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
@@ -1653,6 +1684,9 @@ py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
 ]
+pyalpm = [
+    {file = "pyalpm-0.10.6.tar.gz", hash = "sha256:99e6ec73b8c46bb12466013f228f831ee0d18e8ab664b91a01c2a3c40de07c7f"},
+]
 pycodestyle = [
     {file = "pycodestyle-2.8.0-py2.py3-none-any.whl", hash = "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20"},
     {file = "pycodestyle-2.8.0.tar.gz", hash = "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"},
diff --git a/pyproject.toml b/pyproject.toml
index c7d79cb0..708a5939 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -87,6 +87,7 @@ prometheus-fastapi-instrumentator = "^5.7.1"
 pytest-xdist = "^2.4.0"
 filelock = "^3.3.2"
 posix-ipc = "^1.0.5"
+pyalpm = "^0.10.6"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^4.0.1"

From 67dd432e86a172927b5e54b2d9e7798115ca4555 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 31 Dec 2021 15:10:54 -0800
Subject: [PATCH 767/844] feat(testing.requests): add Request.__init__

This new constructor is a beginning to making Request a bit more easy
to deal with for standard testing needs. With this commit, users can
now specify a `user` and `authenticated` state while constructing a
Request:

    request = Request(user=some_user, authenticated=True)

By default, the `authenticated` kwarg is set to False and `user` is
set to `aurweb.testing.requests.User()`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/testing/requests.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aurweb/testing/requests.py b/aurweb/testing/requests.py
index 76f7afca..be13ab77 100644
--- a/aurweb/testing/requests.py
+++ b/aurweb/testing/requests.py
@@ -29,13 +29,17 @@ class URL:
 class Request:
     """ A fake Request object which mimics a FastAPI Request for tests. """
     client = Client()
-    user = User()
     url = URL()
 
     def __init__(self,
+                 user: User = User(),
+                 authenticated: bool = False,
                  method: str = "GET",
                  headers: Dict[str, str] = dict(),
                  cookies: Dict[str, str] = dict()) -> "Request":
+        self.user = user
+        self.user.authenticated = authenticated
+
         self.method = method.upper()
         self.headers = headers
         self.cookies = cookies

From 278490e1037bfb12518e2f68c6d8f0b958e8ddf6 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 31 Dec 2021 15:52:41 -0800
Subject: [PATCH 768/844] feat(models.user): add User.__str__ -> User.Username

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/user.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 9f1a9c17..fe342eac 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -254,6 +254,9 @@ class User(Base):
         return "<User(ID='%s', AccountType='%s', Username='%s')>" % (
             self.ID, str(self.AccountType), self.Username)
 
+    def __str__(self) -> str:
+        return self.Username
+
 
 def generate_resetkey():
     return util.make_random_string(32)

From 53fabdfaeada6a65ad60eec186a0eb254be28521 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 31 Dec 2021 01:02:40 -0800
Subject: [PATCH 769/844] fix(templates): require valid User relationships for
 <a> usage

Previously, when the relationship was None, an <a> would still
wrap the None value erroneously. This addresses that for all
three user fields.

In addition, this commit adds direct testing for the
`templates/partials/packages/details.html` template.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/details.html |  12 +-
 test/test_templates.py                   | 226 ++++++++++++++++++++++-
 2 files changed, 230 insertions(+), 8 deletions(-)

diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index 9aeb81ec..6dc8ae77 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -96,9 +96,9 @@
     <tr>
         <th>{{ "Submitter" | tr }}:</th>
         <td>
-            {% if request.user.is_authenticated() %}
+            {% if request.user.is_authenticated() and pkgbase.Submitter %}
                 <a href="/account/{{ pkgbase.Submitter.Username }}">
-                    {{ pkgbase.Submitter.Username | default("None" | tr) }}
+                    {{ pkgbase.Submitter.Username }}
                 </a>
             {% else %}
                 {{ pkgbase.Submitter.Username | default("None" | tr) }}
@@ -108,9 +108,9 @@
     <tr>
         <th>{{ "Maintainer" | tr }}:</th>
         <td>
-            {% if request.user.is_authenticated() %}
+            {% if request.user.is_authenticated() and pkgbase.Maintainer %}
                 <a href="/account/{{ pkgbase.Maintainer.Username }}">
-                    {{ pkgbase.Maintainer.Username | default("None" | tr) }}
+                    {{ pkgbase.Maintainer.Username }}
                 </a>
             {% else %}
                 {{ pkgbase.Maintainer.Username | default("None" | tr) }}
@@ -120,9 +120,9 @@
     <tr>
         <th>{{ "Last Packager" | tr }}:</th>
         <td>
-            {% if request.user.is_authenticated() %}
+            {% if request.user.is_authenticated() and pkgbase.Packager %}
                 <a href="/account/{{ pkgbase.Packager.Username }}">
-                    {{ pkgbase.Packager.Username | default("None" | tr) }}
+                    {{ pkgbase.Packager.Username }}
                 </a>
             {% else %}
                 {{ pkgbase.Packager.Username | default("None" | tr) }}
diff --git a/test/test_templates.py b/test/test_templates.py
index f7be969b..6104c126 100644
--- a/test/test_templates.py
+++ b/test/test_templates.py
@@ -1,15 +1,27 @@
 import re
 
+from datetime import datetime
 from typing import Any, Dict
 
 import pytest
 
 import aurweb.filters  # noqa: F401
 
-from aurweb import config, templates
-from aurweb.templates import base_template, register_filter, register_function
+from aurweb import config, db, templates
+from aurweb.models import Package, PackageBase, User
+from aurweb.models.account_type import USER_ID
+from aurweb.models.license import License
+from aurweb.models.package_license import PackageLicense
+from aurweb.models.package_relation import PackageRelation
+from aurweb.models.relation_type import PROVIDES_ID, REPLACES_ID
+from aurweb.templates import base_template, make_context, register_filter, register_function
 from aurweb.testing.html import parse_root
 from aurweb.testing.requests import Request
+from aurweb.util import as_timezone, number_format
+from aurweb.util import timestamp_to_datetime as to_dt
+
+GIT_CLONE_URI_ANON = "anon_%s"
+GIT_CLONE_URI_PRIV = "priv_%s"
 
 
 @register_filter("func")
@@ -22,6 +34,51 @@ def function():
     pass
 
 
+def create_user(username: str) -> User:
+    with db.begin():
+        user = db.create(User, Username=username,
+                         Email=f"{username}@example.org",
+                         Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+    return user
+
+
+def create_pkgrel(package: Package, reltype_id: int, relname: str) \
+        -> PackageRelation:
+    return db.create(PackageRelation,
+                     Package=package,
+                     RelTypeID=reltype_id,
+                     RelName=relname)
+
+
+@pytest.fixture
+def user(db_test) -> User:
+    user = create_user("test")
+    yield user
+
+
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="test-pkg", Maintainer=user,
+                            SubmittedTS=now, ModifiedTS=now)
+    yield pkgbase
+
+
+@pytest.fixture
+def package(user: User, pkgbase: PackageBase) -> Package:
+    with db.begin():
+        pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    yield pkg
+
+
+def create_license(pkg: Package, license_name: str) -> PackageLicense:
+    lic = db.create(License, Name=license_name)
+    pkglic = db.create(PackageLicense, License=lic, Package=pkg)
+    return pkglic
+
+
 def test_register_filter_exists_key_error():
     """ Most instances of register_filter are tested through module
     imports or template renders, so we only test failures here. """
@@ -114,3 +171,168 @@ def test_pager():
     stats = re.sub(r"\s{2,}", " ", stats[0].text.strip())
     expected = f"{num_packages} packages found. Page 1 of 2."
     assert stats == expected
+
+
+def check_package_details(content: str, pkg: Package) -> None:
+    """
+    Perform assertion checks against package details.
+    """
+    pkgbase = pkg.PackageBase
+
+    root = parse_root(content)
+    pkginfo = root.xpath('//table[@id="pkginfo"]')[0]
+    rows = pkginfo.xpath("./tr")
+
+    # Check Git Clone URL.
+    git_clone_uris = rows[0].xpath("./td/a")
+    anon_uri, priv_uri = git_clone_uris
+    pkgbasename = pkgbase.Name
+    assert anon_uri.text.strip() == GIT_CLONE_URI_ANON % pkgbasename
+    assert priv_uri.text.strip() == GIT_CLONE_URI_PRIV % pkgbasename
+
+    # Check Package Base.
+    pkgbase_markup = rows[1].xpath("./td/a")[0]
+    assert pkgbase_markup.text.strip() == pkgbasename
+
+    # Check Description.
+    desc = rows[2].xpath("./td")[0]
+    assert desc.text.strip() == str(pkg.Description)
+
+    # Check URL, for which we have none. In this case, no <a> should
+    # be used since we have nothing to link.
+    url = rows[3].xpath("./td")[0]
+    assert url.text.strip() == str(pkg.URL)
+
+    # Check Keywords, which should be empty.
+    keywords = rows[4].xpath("./td/form/div/input")[0]
+    assert keywords.attrib["value"] == str()
+
+    i = 4
+    licenses = pkg.package_licenses.all()
+    if licenses:
+        i += 1
+        expected = ", ".join([p.License.Name for p in licenses])
+        license_markup = rows[i].xpath("./td")[0]
+        assert license_markup.text.strip() == expected
+    else:
+        assert "Licenses" not in content
+
+    provides = pkg.package_relations.filter(
+        PackageRelation.RelTypeID == PROVIDES_ID
+    ).all()
+    if provides:
+        i += 1
+        expected = ", ".join([p.RelName for p in provides])
+        provides_markup = rows[i].xpath("./td")[0]
+        assert provides_markup.text.strip() == expected
+    else:
+        assert "Provides" not in content
+
+    replaces = pkg.package_relations.filter(
+        PackageRelation.RelTypeID == REPLACES_ID
+    ).all()
+    if replaces:
+        i += 1
+        expected = ", ".join([r.RelName for r in replaces])
+        replaces_markup = rows[i].xpath("./td")[0]
+        assert replaces_markup.text.strip() == expected
+    else:
+        assert "Replaces" not in content
+
+    # Check Submitter.
+    selector = "./td" if not pkg.PackageBase.Submitter else "./td/a"
+    i += 1
+    submitter = rows[i].xpath(selector)[0]
+    assert submitter.text.strip() == str(pkg.PackageBase.Submitter)
+
+    # Check Maintainer.
+    selector = "./td" if not pkg.PackageBase.Maintainer else "./td/a"
+    i += 1
+    maintainer = rows[i].xpath(selector)[0]
+    assert maintainer.text.strip() == str(pkg.PackageBase.Maintainer)
+
+    # Check Packager.
+    selector = "./td" if not pkg.PackageBase.Packager else "./td/a"
+    i += 1
+    packager = rows[i].xpath(selector)[0]
+    assert packager.text.strip() == str(pkg.PackageBase.Packager)
+
+    # Check Votes.
+    i += 1
+    votes = rows[i].xpath("./td")[0]
+    assert votes.text.strip() == str(pkg.PackageBase.NumVotes)
+
+    # Check Popularity; for this package, a number_format of 6 places is used.
+    i += 1
+    pop = rows[i].xpath("./td")[0]
+    assert pop.text.strip() == number_format(0, 6)
+
+    # Check First Submitted
+    date_fmt = "%Y-%m-%d %H:%M"
+    i += 1
+    first_submitted = rows[i].xpath("./td")[0]
+    converted_dt = as_timezone(to_dt(pkg.PackageBase.SubmittedTS), "UTC")
+    expected = converted_dt.strftime(date_fmt)
+    assert first_submitted.text.strip() == expected
+
+    # Check Last Updated.
+    i += 1
+    last_updated = rows[i].xpath("./td")[0]
+    converted_dt = as_timezone(to_dt(pkg.PackageBase.ModifiedTS), "UTC")
+    expected = converted_dt.strftime(date_fmt)
+    assert last_updated.text.strip() == expected
+
+
+def test_package_details(user: User, package: Package):
+    """ Test package details with most fields populated, but not all. """
+    request = Request(user=user, authenticated=True)
+    context = make_context(request, "Test Details")
+    context.update({
+        "request": request,
+        "git_clone_uri_anon": GIT_CLONE_URI_ANON,
+        "git_clone_uri_priv": GIT_CLONE_URI_PRIV,
+        "pkgbase": package.PackageBase,
+        "pkg": package
+    })
+
+    base = base_template("partials/packages/details.html")
+    body = base.render(context, show_package_details=True)
+    check_package_details(body, package)
+
+
+def test_package_details_filled(user: User, package: Package):
+    """ Test package details with all fields populated. """
+
+    pkgbase = package.PackageBase
+    with db.begin():
+        # Setup Submitter and Packager; Maintainer is already set to `user`.
+        pkgbase.Submitter = pkgbase.Packager = user
+
+        # Create two licenses.
+        create_license(package, "TPL")  # Testing Public License
+        create_license(package, "TPL2")  # Testing Public License 2
+
+        # Add provides.
+        create_pkgrel(package, PROVIDES_ID, "test-provider")
+
+        # Add replaces.
+        create_pkgrel(package, REPLACES_ID, "test-replacement")
+
+    request = Request(user=user, authenticated=True)
+    context = make_context(request, "Test Details")
+    context.update({
+        "request": request,
+        "git_clone_uri_anon": GIT_CLONE_URI_ANON,
+        "git_clone_uri_priv": GIT_CLONE_URI_PRIV,
+        "pkgbase": package.PackageBase,
+        "pkg": package,
+        "licenses": package.package_licenses,
+        "provides": package.package_relations.filter(
+            PackageRelation.RelTypeID == PROVIDES_ID),
+        "replaces": package.package_relations.filter(
+            PackageRelation.RelTypeID == REPLACES_ID),
+    })
+
+    base = base_template("partials/packages/details.html")
+    body = base.render(context, show_package_details=True)
+    check_package_details(body, package)

From c735f9868b6722a1af1d6ed4a6bedba2169e6f76 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 1 Jan 2022 12:29:50 -0800
Subject: [PATCH 770/844] change(routers.packages): delete_package ->
 pkgbase_delete_instance

`delete_package` was processing package deletions through `Package`
instances. This doesn't make sense; if we delete a package, we want
to target its package base.

This new function vastly simplifies the previous.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py   | 69 +++++++++++-------------------------
 test/test_packages_routes.py |  4 +--
 2 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 9152ef9a..585c62ee 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -130,39 +130,18 @@ async def packages(request: Request) -> Response:
     return await packages_get(request, context)
 
 
-def delete_package(request: Request, package: models.Package,
-                   merge_into: models.PackageBase = None,
-                   comments: str = str()):
-    bases_to_delete = []
+def pkgbase_delete_instance(request: Request, pkgbase: models.PackageBase,
+                            comments: str = str()) \
+        -> List[notify.Notification]:
+    notifs = handle_request(request, DELETION_ID, pkgbase) + [
+        notify.DeleteNotification(request.user.ID, pkgbase.ID)
+    ]
 
-    target = db.query(models.PackageBase).filter(
-        models.PackageBase.Name == merge_into
-    ).first()
-
-    notifs = []
-    # In all cases, though, just delete the Package in question.
-    if package.PackageBase.packages.count() == 1:
-        notifs = handle_request(request, DELETION_ID, package.PackageBase,
-                                target=target)
-
-        bases_to_delete.append(package.PackageBase)
-
-        with db.begin():
-            update_closure_comment(package.PackageBase, DELETION_ID, comments,
-                                   target=target)
-
-        # Prepare DeleteNotification.
-        notifs.append(
-            notify.DeleteNotification(request.user.ID, package.PackageBase.ID)
-        )
-
-    # Perform all the deletions.
     with db.begin():
-        db.delete(package)
-        db.delete_all(bases_to_delete)
+        update_closure_comment(pkgbase, DELETION_ID, comments)
+        db.delete(pkgbase)
 
-    # Send out all the notifications.
-    util.apply_all(notifs, lambda n: n.send())
+    return notifs
 
 
 async def make_single_context(request: Request,
@@ -675,9 +654,8 @@ async def pkgbase_request_post(request: Request, name: str,
         logger.debug(f"New request #{pkgreq.ID} is marked for auto-orphan.")
     elif type == "deletion" and is_maintainer and outdated:
         # This request should be auto-accepted.
-        packages = pkgbase.packages.all()
-        for package in packages:
-            delete_package(request, package)
+        notifs = pkgbase_delete_instance(request, pkgbase, comments=comments)
+        util.apply_all(notifs, lambda n: n.send())
         logger.debug(f"New request #{pkgreq.ID} is marked for auto-deletion.")
 
     # Redirect the submitting user to /packages.
@@ -1054,11 +1032,8 @@ async def pkgbase_delete_post(request: Request, name: str,
             for pkgreq in requests:
                 pkgreq.ClosureComment = comments
 
-    # Obtain deletion locks and delete the packages.
-    packages = pkgbase.packages.all()
-    for package in packages:
-        delete_package(request, package, comments=comments)
-
+    notifs = pkgbase_delete_instance(request, pkgbase, comments=comments)
+    util.apply_all(notifs, lambda n: n.send())
     return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
 
 
@@ -1255,10 +1230,6 @@ async def packages_delete(request: Request, package_ids: List[int] = [],
     if not request.user.has_credential(creds.PKGBASE_DELETE):
         return (False, ["You do not have permission to delete packages."])
 
-    # A "memo" used to store names of packages that we delete.
-    # We'll use this to log out a message about the deletions that occurred.
-    deleted_pkgs = []
-
     # set-ify package_ids and query the database for related records.
     package_ids = set(package_ids)
     packages = db.query(models.Package).filter(
@@ -1270,16 +1241,18 @@ async def packages_delete(request: Request, package_ids: List[int] = [],
         # TODO: This error has not yet been translated.
         return (False, ["One of the packages you selected does not exist."])
 
-    # Now let's actually walk through and delete all of the packages,
-    # using the same method we use in our /pkgbase/{name}/delete route.
-    for pkg in packages:
-        deleted_pkgs.append(pkg.Name)
-        delete_package(request, pkg)
+    # Make a set out of all package bases related to `packages`.
+    bases = {pkg.PackageBase for pkg in packages}
+    deleted_bases, notifs = [], []
+    for pkgbase in bases:
+        deleted_bases.append(pkgbase.Name)
+        notifs += pkgbase_delete_instance(request, pkgbase)
 
     # Log out the fact that this happened for accountability.
     logger.info(f"Privileged user '{request.user.Username}' deleted the "
-                f"following packages: {str(deleted_pkgs)}.")
+                f"following package bases: {str(deleted_bases)}.")
 
+    util.apply_all(notifs, lambda n: n.send())
     return (True, ["The selected packages have been deleted."])
 
 # A mapping of action string -> callback functions used within the
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 3a3415c5..ba724f19 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -2483,9 +2483,9 @@ def test_packages_post_delete(caplog: pytest.fixture, client: TestClient,
     assert successes[0].text.strip() == expected
 
     # Expect that the package deletion was logged.
-    packages = [package.Name]
+    pkgbases = [package.PackageBase.Name]
     expected = (f"Privileged user '{tu_user.Username}' deleted the "
-                f"following packages: {str(packages)}.")
+                f"following package bases: {str(pkgbases)}.")
     assert expected in caplog.text
 
 

From bd2ad9b616ba62c4d9e876b3a11c5f127b39fb99 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 1 Jan 2022 20:09:22 -0800
Subject: [PATCH 771/844] change(python): put pkgbase routes & impl into their
 own modules

Introduces new router:
- `aurweb.routers.pkgbase`

Introduces new package:
- `aurweb.pkgbase`

Introduces new modules:
- `aurweb.pkgbase.actions`
- `aurweb.pkgbase.util`

Changes:
- `pkgbase_{action}_instance` functions are now located in
  `aurweb.pkgbase.actions`.
- `pkgbase`-wise routes have been moved to
  `aurweb.routers.pkgbase`.
- `make_single_context` was moved to
  `aurweb.pkgbase.util.make_context`.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py             |   3 +-
 aurweb/pkgbase/__init__.py |   0
 aurweb/pkgbase/actions.py  | 142 +++++++
 aurweb/pkgbase/util.py     |  47 +++
 aurweb/routers/packages.py | 794 +------------------------------------
 aurweb/routers/pkgbase.py  | 701 ++++++++++++++++++++++++++++++++
 6 files changed, 910 insertions(+), 777 deletions(-)
 create mode 100644 aurweb/pkgbase/__init__.py
 create mode 100644 aurweb/pkgbase/actions.py
 create mode 100644 aurweb/pkgbase/util.py
 create mode 100644 aurweb/routers/pkgbase.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index ef8d5933..88e72052 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -21,7 +21,7 @@ from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
 from aurweb.prometheus import http_api_requests_total, http_requests_total, instrumentator
-from aurweb.routers import accounts, auth, html, packages, rpc, rss, sso, trusted_user
+from aurweb.routers import accounts, auth, html, packages, pkgbase, rpc, rss, sso, trusted_user
 from aurweb.templates import make_context, render_template
 
 # Setup the FastAPI app.
@@ -81,6 +81,7 @@ async def app_startup():
     app.include_router(trusted_user.router)
     app.include_router(rss.router)
     app.include_router(packages.router)
+    app.include_router(pkgbase.router)
     app.include_router(rpc.router)
 
     # Initialize the database engine and ORM.
diff --git a/aurweb/pkgbase/__init__.py b/aurweb/pkgbase/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/aurweb/pkgbase/actions.py b/aurweb/pkgbase/actions.py
new file mode 100644
index 00000000..00098d2e
--- /dev/null
+++ b/aurweb/pkgbase/actions.py
@@ -0,0 +1,142 @@
+from typing import List
+
+from fastapi import Request
+
+from aurweb import db, logging, util
+from aurweb.auth import creds
+from aurweb.models import PackageBase
+from aurweb.models.package_comaintainer import PackageComaintainer
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
+from aurweb.packages.requests import handle_request, update_closure_comment
+from aurweb.scripts import notify, popupdate
+
+logger = logging.get_logger(__name__)
+
+
+def pkgbase_notify_instance(request: Request, pkgbase: PackageBase) -> None:
+    notif = db.query(pkgbase.notifications.filter(
+        PackageNotification.UserID == request.user.ID
+    ).exists()).scalar()
+    has_cred = request.user.has_credential(creds.PKGBASE_NOTIFY)
+    if has_cred and not notif:
+        with db.begin():
+            db.create(PackageNotification,
+                      PackageBase=pkgbase,
+                      User=request.user)
+
+
+def pkgbase_unnotify_instance(request: Request, pkgbase: PackageBase) -> None:
+    notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == request.user.ID
+    ).first()
+    has_cred = request.user.has_credential(creds.PKGBASE_NOTIFY)
+    if has_cred and notif:
+        with db.begin():
+            db.delete(notif)
+
+
+def pkgbase_unflag_instance(request: Request, pkgbase: PackageBase) -> None:
+    has_cred = request.user.has_credential(
+        creds.PKGBASE_UNFLAG, approved=[pkgbase.Flagger, pkgbase.Maintainer])
+    if has_cred:
+        with db.begin():
+            pkgbase.OutOfDateTS = None
+            pkgbase.Flagger = None
+            pkgbase.FlaggerComment = str()
+
+
+def pkgbase_disown_instance(request: Request, pkgbase: PackageBase) -> None:
+    import aurweb.packages.util as pkgutil
+
+    disowner = request.user
+    notifs = [notify.DisownNotification(disowner.ID, pkgbase.ID)]
+
+    is_maint = disowner == pkgbase.Maintainer
+    if is_maint:
+        with db.begin():
+            # Comaintainer with the lowest Priority value; next-in-line.
+            prio_comaint = pkgbase.comaintainers.order_by(
+                PackageComaintainer.Priority.asc()
+            ).first()
+            if prio_comaint:
+                # If there is such a comaintainer, promote them to maint.
+                pkgbase.Maintainer = prio_comaint.User
+                notifs.append(pkgutil.remove_comaintainer(prio_comaint))
+            else:
+                # Otherwise, just orphan the package completely.
+                pkgbase.Maintainer = None
+    elif request.user.has_credential(creds.PKGBASE_DISOWN):
+        # Otherwise, the request user performing this disownage is a
+        # Trusted User and we treat it like a standard orphan request.
+        notifs += handle_request(request, ORPHAN_ID, pkgbase)
+        with db.begin():
+            pkgbase.Maintainer = None
+
+    util.apply_all(notifs, lambda n: n.send())
+
+
+def pkgbase_adopt_instance(request: Request, pkgbase: PackageBase) -> None:
+    with db.begin():
+        pkgbase.Maintainer = request.user
+
+    notif = notify.AdoptNotification(request.user.ID, pkgbase.ID)
+    notif.send()
+
+
+def pkgbase_delete_instance(request: Request, pkgbase: PackageBase,
+                            comments: str = str()) \
+        -> List[notify.Notification]:
+    notifs = handle_request(request, DELETION_ID, pkgbase) + [
+        notify.DeleteNotification(request.user.ID, pkgbase.ID)
+    ]
+
+    with db.begin():
+        update_closure_comment(pkgbase, DELETION_ID, comments)
+        db.delete(pkgbase)
+
+    return notifs
+
+
+def pkgbase_merge_instance(request: Request, pkgbase: PackageBase,
+                           target: PackageBase, comments: str = str()) -> None:
+    pkgbasename = str(pkgbase.Name)
+
+    # Create notifications.
+    notifs = handle_request(request, MERGE_ID, pkgbase, target)
+
+    # Target votes and notifications sets of user IDs that are
+    # looking to be migrated.
+    target_votes = set(v.UsersID for v in target.package_votes)
+    target_notifs = set(n.UserID for n in target.notifications)
+
+    with db.begin():
+        # Merge pkgbase's comments.
+        for comment in pkgbase.comments:
+            comment.PackageBase = target
+
+        # Merge notifications that don't yet exist in the target.
+        for notif in pkgbase.notifications:
+            if notif.UserID not in target_notifs:
+                notif.PackageBase = target
+
+        # Merge votes that don't yet exist in the target.
+        for vote in pkgbase.package_votes:
+            if vote.UsersID not in target_votes:
+                vote.PackageBase = target
+
+    # Run popupdate.
+    popupdate.run_single(target)
+
+    with db.begin():
+        # Delete pkgbase and its packages now that everything's merged.
+        for pkg in pkgbase.packages:
+            db.delete(pkg)
+        db.delete(pkgbase)
+
+    # Log this out for accountability purposes.
+    logger.info(f"Trusted User '{request.user.Username}' merged "
+                f"'{pkgbasename}' into '{target.Name}'.")
+
+    # Send notifications.
+    util.apply_all(notifs, lambda n: n.send())
diff --git a/aurweb/pkgbase/util.py b/aurweb/pkgbase/util.py
new file mode 100644
index 00000000..e348d5f0
--- /dev/null
+++ b/aurweb/pkgbase/util.py
@@ -0,0 +1,47 @@
+from typing import Any, Dict
+
+from fastapi import Request
+
+from aurweb import config
+from aurweb.models import PackageBase
+from aurweb.models.package_comment import PackageComment
+from aurweb.models.package_request import PackageRequest
+from aurweb.models.package_vote import PackageVote
+from aurweb.templates import make_context as _make_context
+
+
+def make_context(request: Request, pkgbase: PackageBase) -> Dict[str, Any]:
+    """ Make a basic context for package or pkgbase.
+
+    :param request: FastAPI request
+    :param pkgbase: PackageBase instance
+    :return: A pkgbase context without specific differences
+    """
+    context = _make_context(request, pkgbase.Name)
+
+    context["git_clone_uri_anon"] = config.get("options", "git_clone_uri_anon")
+    context["git_clone_uri_priv"] = config.get("options", "git_clone_uri_priv")
+    context["pkgbase"] = pkgbase
+    context["packages_count"] = pkgbase.packages.count()
+    context["keywords"] = pkgbase.keywords
+    context["comments"] = pkgbase.comments.order_by(
+        PackageComment.CommentTS.desc()
+    )
+    context["pinned_comments"] = pkgbase.comments.filter(
+        PackageComment.PinnedTS != 0
+    ).order_by(PackageComment.CommentTS.desc())
+
+    context["is_maintainer"] = bool(request.user == pkgbase.Maintainer)
+    context["notified"] = request.user.notified(pkgbase)
+
+    context["out_of_date"] = bool(pkgbase.OutOfDateTS)
+
+    context["voted"] = request.user.package_votes.filter(
+        PackageVote.PackageBaseID == pkgbase.ID
+    ).scalar()
+
+    context["requests"] = pkgbase.requests.filter(
+        PackageRequest.ClosedTS.is_(None)
+    ).count()
+
+    return context
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 585c62ee..eda83c3f 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -3,27 +3,26 @@ from datetime import datetime
 from http import HTTPStatus
 from typing import Any, Dict, List
 
-from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
-from fastapi.responses import JSONResponse, RedirectResponse
-from sqlalchemy import and_, case
+from fastapi import APIRouter, Form, Query, Request, Response
+from fastapi.responses import RedirectResponse
+from sqlalchemy import case
 
 import aurweb.filters
 import aurweb.packages.util
 
-from aurweb import config, db, defaults, l10n, logging, models, util
+from aurweb import config, db, defaults, logging, models, util
 from aurweb.auth import auth_required, creds
 from aurweb.exceptions import InvariantError, ValidationError
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
-from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
 from aurweb.packages import util as pkgutil
 from aurweb.packages import validate
-from aurweb.packages.requests import handle_request, update_closure_comment
 from aurweb.packages.search import PackageSearch
-from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, get_pkgreq_by_id
-from aurweb.scripts import notify, popupdate
-from aurweb.scripts.rendercomment import update_comment_render_fastapi
-from aurweb.templates import make_context, make_variable_context, render_raw_template, render_template
+from aurweb.packages.util import get_pkg_or_base, get_pkgreq_by_id
+from aurweb.pkgbase import actions as pkgbase_actions
+from aurweb.pkgbase import util as pkgbaseutil
+from aurweb.scripts import notify
+from aurweb.templates import make_context, make_variable_context, render_template
 
 logger = logging.get_logger(__name__)
 router = APIRouter()
@@ -130,59 +129,6 @@ async def packages(request: Request) -> Response:
     return await packages_get(request, context)
 
 
-def pkgbase_delete_instance(request: Request, pkgbase: models.PackageBase,
-                            comments: str = str()) \
-        -> List[notify.Notification]:
-    notifs = handle_request(request, DELETION_ID, pkgbase) + [
-        notify.DeleteNotification(request.user.ID, pkgbase.ID)
-    ]
-
-    with db.begin():
-        update_closure_comment(pkgbase, DELETION_ID, comments)
-        db.delete(pkgbase)
-
-    return notifs
-
-
-async def make_single_context(request: Request,
-                              pkgbase: models.PackageBase) -> Dict[str, Any]:
-    """ Make a basic context for package or pkgbase.
-
-    :param request: FastAPI request
-    :param pkgbase: PackageBase instance
-    :return: A pkgbase context without specific differences
-    """
-    context = make_context(request, pkgbase.Name)
-    context["git_clone_uri_anon"] = aurweb.config.get("options",
-                                                      "git_clone_uri_anon")
-    context["git_clone_uri_priv"] = aurweb.config.get("options",
-                                                      "git_clone_uri_priv")
-    context["pkgbase"] = pkgbase
-    context["packages_count"] = pkgbase.packages.count()
-    context["keywords"] = pkgbase.keywords
-    context["comments"] = pkgbase.comments.order_by(
-        models.PackageComment.CommentTS.desc()
-    )
-    context["pinned_comments"] = pkgbase.comments.filter(
-        models.PackageComment.PinnedTS != 0
-    ).order_by(models.PackageComment.CommentTS.desc())
-
-    context["is_maintainer"] = (request.user.is_authenticated()
-                                and request.user.ID == pkgbase.MaintainerUID)
-    context["notified"] = request.user.notified(pkgbase)
-
-    context["out_of_date"] = bool(pkgbase.OutOfDateTS)
-
-    context["voted"] = request.user.package_votes.filter(
-        models.PackageVote.PackageBaseID == pkgbase.ID).scalar()
-
-    context["requests"] = pkgbase.requests.filter(
-        models.PackageRequest.ClosedTS.is_(None)
-    ).count()
-
-    return context
-
-
 @router.get("/packages/{name}")
 async def package(request: Request, name: str) -> Response:
     # Get the Package.
@@ -200,7 +146,7 @@ async def package(request: Request, name: str) -> Response:
             rels_data["r"].append(rel)
 
     # Add our base information.
-    context = await make_single_context(request, pkgbase)
+    context = pkgbaseutil.make_context(request, pkgbase)
     context["package"] = pkg
 
     # Package sources.
@@ -235,249 +181,6 @@ async def package(request: Request, name: str) -> Response:
     return render_template(request, "packages/show.html", context)
 
 
-@router.get("/pkgbase/{name}")
-async def package_base(request: Request, name: str) -> Response:
-    # Get the PackageBase.
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    # If this is not a split package, redirect to /packages/{name}.
-    if pkgbase.packages.count() == 1:
-        return RedirectResponse(f"/packages/{name}",
-                                status_code=int(HTTPStatus.SEE_OTHER))
-
-    # Add our base information.
-    context = await make_single_context(request, pkgbase)
-    context["packages"] = pkgbase.packages.all()
-
-    return render_template(request, "pkgbase.html", context)
-
-
-@router.get("/pkgbase/{name}/voters")
-async def package_base_voters(request: Request, name: str) -> Response:
-    # Get the PackageBase.
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    if not request.user.has_credential(creds.PKGBASE_LIST_VOTERS):
-        return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=HTTPStatus.SEE_OTHER)
-
-    context = make_context(request, "Voters")
-    context["pkgbase"] = pkgbase
-    return render_template(request, "pkgbase/voters.html", context)
-
-
-@router.post("/pkgbase/{name}/comments")
-@auth_required()
-async def pkgbase_comments_post(
-        request: Request, name: str,
-        comment: str = Form(default=str()),
-        enable_notifications: bool = Form(default=False)):
-    """ Add a new comment. """
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    if not comment:
-        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST)
-
-    # If the provided comment is different than the record's version,
-    # update the db record.
-    now = int(datetime.utcnow().timestamp())
-    with db.begin():
-        comment = db.create(models.PackageComment, User=request.user,
-                            PackageBase=pkgbase,
-                            Comments=comment, RenderedComment=str(),
-                            CommentTS=now)
-
-        if enable_notifications and not request.user.notified(pkgbase):
-            db.create(models.PackageNotification,
-                      User=request.user,
-                      PackageBase=pkgbase)
-    update_comment_render_fastapi(comment)
-
-    # Redirect to the pkgbase page.
-    return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{comment.ID}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.get("/pkgbase/{name}/comments/{id}/form")
-@auth_required()
-async def pkgbase_comment_form(request: Request, name: str, id: int,
-                               next: str = Query(default=None)):
-    """ Produce a comment form for comment {id}. """
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    comment = pkgbase.comments.filter(models.PackageComment.ID == id).first()
-    if not comment:
-        return JSONResponse({}, status_code=HTTPStatus.NOT_FOUND)
-
-    if not request.user.is_elevated() and request.user != comment.User:
-        return JSONResponse({}, status_code=HTTPStatus.UNAUTHORIZED)
-
-    context = await make_single_context(request, pkgbase)
-    context["comment"] = comment
-
-    if not next:
-        next = f"/pkgbase/{name}"
-
-    context["next"] = next
-
-    form = render_raw_template(
-        request, "partials/packages/comment_form.html", context)
-    return JSONResponse({"form": form})
-
-
-@router.post("/pkgbase/{name}/comments/{id}")
-@auth_required()
-async def pkgbase_comment_post(
-        request: Request, name: str, id: int,
-        comment: str = Form(default=str()),
-        enable_notifications: bool = Form(default=False),
-        next: str = Form(default=None)):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    db_comment = get_pkgbase_comment(pkgbase, id)
-
-    if not comment:
-        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST)
-
-    # If the provided comment is different than the record's version,
-    # update the db record.
-    now = int(datetime.utcnow().timestamp())
-    if db_comment.Comments != comment:
-        with db.begin():
-            db_comment.Comments = comment
-            db_comment.Editor = request.user
-            db_comment.EditedTS = now
-
-            db_notif = request.user.notifications.filter(
-                models.PackageNotification.PackageBaseID == pkgbase.ID
-            ).first()
-            if enable_notifications and not db_notif:
-                db.create(models.PackageNotification,
-                          User=request.user,
-                          PackageBase=pkgbase)
-    update_comment_render_fastapi(db_comment)
-
-    if not next:
-        next = f"/pkgbase/{pkgbase.Name}"
-
-    # Redirect to the pkgbase page anchored to the updated comment.
-    return RedirectResponse(f"{next}#comment-{db_comment.ID}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.get("/pkgbase/{name}/comments/{id}/edit")
-@auth_required()
-async def pkgbase_comment_edit(request: Request, name: str, id: int,
-                               next: str = Form(default=None)):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    comment = get_pkgbase_comment(pkgbase, id)
-
-    if not next:
-        next = f"/pkgbase/{name}"
-
-    context = await make_variable_context(request, "Edit comment", next=next)
-    context["comment"] = comment
-    return render_template(request, "packages/comments/edit.html", context)
-
-
-@router.post("/pkgbase/{name}/comments/{id}/delete")
-@auth_required()
-async def pkgbase_comment_delete(request: Request, name: str, id: int,
-                                 next: str = Form(default=None)):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    comment = get_pkgbase_comment(pkgbase, id)
-
-    authorized = request.user.has_credential(creds.COMMENT_DELETE,
-                                             [comment.User])
-    if not authorized:
-        _ = l10n.get_translator_for_request(request)
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail=_("You are not allowed to delete this comment."))
-
-    now = int(datetime.utcnow().timestamp())
-    with db.begin():
-        comment.Deleter = request.user
-        comment.DelTS = now
-
-    if not next:
-        next = f"/pkgbase/{name}"
-
-    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.post("/pkgbase/{name}/comments/{id}/undelete")
-@auth_required()
-async def pkgbase_comment_undelete(request: Request, name: str, id: int,
-                                   next: str = Form(default=None)):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    comment = get_pkgbase_comment(pkgbase, id)
-
-    has_cred = request.user.has_credential(creds.COMMENT_UNDELETE,
-                                           approved=[comment.User])
-    if not has_cred:
-        _ = l10n.get_translator_for_request(request)
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail=_("You are not allowed to undelete this comment."))
-
-    with db.begin():
-        comment.Deleter = None
-        comment.DelTS = None
-
-    if not next:
-        next = f"/pkgbase/{name}"
-
-    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.post("/pkgbase/{name}/comments/{id}/pin")
-@auth_required()
-async def pkgbase_comment_pin(request: Request, name: str, id: int,
-                              next: str = Form(default=None)):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    comment = get_pkgbase_comment(pkgbase, id)
-
-    has_cred = request.user.has_credential(creds.COMMENT_PIN,
-                                           approved=[pkgbase.Maintainer])
-    if not has_cred:
-        _ = l10n.get_translator_for_request(request)
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail=_("You are not allowed to pin this comment."))
-
-    now = int(datetime.utcnow().timestamp())
-    with db.begin():
-        comment.PinnedTS = now
-
-    if not next:
-        next = f"/pkgbase/{name}"
-
-    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.post("/pkgbase/{name}/comments/{id}/unpin")
-@auth_required()
-async def pkgbase_comment_unpin(request: Request, name: str, id: int,
-                                next: str = Form(default=None)):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    comment = get_pkgbase_comment(pkgbase, id)
-
-    has_cred = request.user.has_credential(creds.COMMENT_PIN,
-                                           approved=[pkgbase.Maintainer])
-    if not has_cred:
-        _ = l10n.get_translator_for_request(request)
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail=_("You are not allowed to unpin this comment."))
-
-    with db.begin():
-        comment.PinnedTS = 0
-
-    if not next:
-        next = f"/pkgbase/{name}"
-
-    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
-
-
 @router.get("/pkgbase/{name}/comaintainers")
 @auth_required()
 async def package_base_comaintainers(request: Request, name: str) -> Response:
@@ -654,7 +357,8 @@ async def pkgbase_request_post(request: Request, name: str,
         logger.debug(f"New request #{pkgreq.ID} is marked for auto-orphan.")
     elif type == "deletion" and is_maintainer and outdated:
         # This request should be auto-accepted.
-        notifs = pkgbase_delete_instance(request, pkgbase, comments=comments)
+        notifs = pkgbase_actions.pkgbase_delete_instance(
+            request, pkgbase, comments=comments)
         util.apply_all(notifs, lambda n: n.send())
         logger.debug(f"New request #{pkgreq.ID} is marked for auto-deletion.")
 
@@ -704,339 +408,6 @@ async def requests_close_post(request: Request, id: int,
     return RedirectResponse("/requests", status_code=HTTPStatus.SEE_OTHER)
 
 
-@router.post("/pkgbase/{name}/keywords")
-async def pkgbase_keywords(request: Request, name: str,
-                           keywords: str = Form(default=str())):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    keywords = set(keywords.split(" "))
-
-    # Delete all keywords which are not supplied by the user.
-    other_keywords = pkgbase.keywords.filter(
-        ~models.PackageKeyword.Keyword.in_(keywords))
-    other_keyword_strings = [kwd.Keyword for kwd in other_keywords]
-
-    existing_keywords = set(
-        kwd.Keyword for kwd in
-        pkgbase.keywords.filter(
-            ~models.PackageKeyword.Keyword.in_(other_keyword_strings))
-    )
-    with db.begin():
-        db.delete_all(other_keywords)
-        for keyword in keywords.difference(existing_keywords):
-            db.create(models.PackageKeyword,
-                      PackageBase=pkgbase,
-                      Keyword=keyword)
-
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.get("/pkgbase/{name}/flag")
-@auth_required()
-async def pkgbase_flag_get(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    has_cred = request.user.has_credential(creds.PKGBASE_FLAG)
-    if not has_cred or pkgbase.Flagger is not None:
-        return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=HTTPStatus.SEE_OTHER)
-
-    context = make_context(request, "Flag Package Out-Of-Date")
-    context["pkgbase"] = pkgbase
-    return render_template(request, "packages/flag.html", context)
-
-
-@router.post("/pkgbase/{name}/flag")
-@auth_required()
-async def pkgbase_flag_post(request: Request, name: str,
-                            comments: str = Form(default=str())):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    if not comments:
-        context = make_context(request, "Flag Package Out-Of-Date")
-        context["pkgbase"] = pkgbase
-        context["errors"] = ["The selected packages have not been flagged, "
-                             "please enter a comment."]
-        return render_template(request, "packages/flag.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    has_cred = request.user.has_credential(creds.PKGBASE_FLAG)
-    if has_cred and not pkgbase.Flagger:
-        now = int(datetime.utcnow().timestamp())
-        with db.begin():
-            pkgbase.OutOfDateTS = now
-            pkgbase.Flagger = request.user
-            pkgbase.FlaggerComment = comments
-
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.get("/pkgbase/{name}/flag-comment")
-async def pkgbase_flag_comment(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    if pkgbase.Flagger is None:
-        return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=HTTPStatus.SEE_OTHER)
-
-    context = make_context(request, "Flag Comment")
-    context["pkgbase"] = pkgbase
-    return render_template(request, "packages/flag-comment.html", context)
-
-
-def pkgbase_unflag_instance(request: Request, pkgbase: models.PackageBase):
-    has_cred = request.user.has_credential(
-        creds.PKGBASE_UNFLAG, approved=[pkgbase.Flagger, pkgbase.Maintainer])
-    if has_cred:
-        with db.begin():
-            pkgbase.OutOfDateTS = None
-            pkgbase.Flagger = None
-            pkgbase.FlaggerComment = str()
-
-
-@router.post("/pkgbase/{name}/unflag")
-@auth_required()
-async def pkgbase_unflag(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    pkgbase_unflag_instance(request, pkgbase)
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-def pkgbase_notify_instance(request: Request, pkgbase: models.PackageBase):
-    notif = db.query(pkgbase.notifications.filter(
-        models.PackageNotification.UserID == request.user.ID
-    ).exists()).scalar()
-    has_cred = request.user.has_credential(creds.PKGBASE_NOTIFY)
-    if has_cred and not notif:
-        with db.begin():
-            db.create(models.PackageNotification,
-                      PackageBase=pkgbase,
-                      User=request.user)
-
-
-@router.post("/pkgbase/{name}/notify")
-@auth_required()
-async def pkgbase_notify(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    pkgbase_notify_instance(request, pkgbase)
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-def pkgbase_unnotify_instance(request: Request, pkgbase: models.PackageBase):
-    notif = pkgbase.notifications.filter(
-        models.PackageNotification.UserID == request.user.ID
-    ).first()
-    has_cred = request.user.has_credential(creds.PKGBASE_NOTIFY)
-    if has_cred and notif:
-        with db.begin():
-            db.delete(notif)
-
-
-@router.post("/pkgbase/{name}/unnotify")
-@auth_required()
-async def pkgbase_unnotify(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    pkgbase_unnotify_instance(request, pkgbase)
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.post("/pkgbase/{name}/vote")
-@auth_required()
-async def pkgbase_vote(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    vote = pkgbase.package_votes.filter(
-        models.PackageVote.UsersID == request.user.ID
-    ).first()
-    has_cred = request.user.has_credential(creds.PKGBASE_VOTE)
-    if has_cred and not vote:
-        now = int(datetime.utcnow().timestamp())
-        with db.begin():
-            db.create(models.PackageVote,
-                      User=request.user,
-                      PackageBase=pkgbase,
-                      VoteTS=now)
-
-        # Update NumVotes/Popularity.
-        popupdate.run_single(pkgbase)
-
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.post("/pkgbase/{name}/unvote")
-@auth_required()
-async def pkgbase_unvote(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    vote = pkgbase.package_votes.filter(
-        models.PackageVote.UsersID == request.user.ID
-    ).first()
-    has_cred = request.user.has_credential(creds.PKGBASE_VOTE)
-    if has_cred and vote:
-        with db.begin():
-            db.delete(vote)
-
-        # Update NumVotes/Popularity.
-        popupdate.run_single(pkgbase)
-
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-def pkgbase_disown_instance(request: Request, pkgbase: models.PackageBase):
-    disowner = request.user
-    notifs = [notify.DisownNotification(disowner.ID, pkgbase.ID)]
-
-    is_maint = disowner == pkgbase.Maintainer
-    if is_maint:
-        with db.begin():
-            # Comaintainer with the lowest Priority value; next-in-line.
-            prio_comaint = pkgbase.comaintainers.order_by(
-                models.PackageComaintainer.Priority.asc()
-            ).first()
-            if prio_comaint:
-                # If there is such a comaintainer, promote them to maint.
-                pkgbase.Maintainer = prio_comaint.User
-                notifs.append(pkgutil.remove_comaintainer(prio_comaint))
-            else:
-                # Otherwise, just orphan the package completely.
-                pkgbase.Maintainer = None
-    elif request.user.has_credential(creds.PKGBASE_DISOWN):
-        # Otherwise, the request user performing this disownage is a
-        # Trusted User and we treat it like a standard orphan request.
-        notifs += handle_request(request, ORPHAN_ID, pkgbase)
-        with db.begin():
-            pkgbase.Maintainer = None
-
-    util.apply_all(notifs, lambda n: n.send())
-
-
-@router.get("/pkgbase/{name}/disown")
-@auth_required()
-async def pkgbase_disown_get(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    has_cred = request.user.has_credential(creds.PKGBASE_DISOWN,
-                                           approved=[pkgbase.Maintainer])
-    if not has_cred:
-        return RedirectResponse(f"/pkgbase/{name}",
-                                HTTPStatus.SEE_OTHER)
-
-    context = make_context(request, "Disown Package")
-    context["pkgbase"] = pkgbase
-    return render_template(request, "packages/disown.html", context)
-
-
-@router.post("/pkgbase/{name}/disown")
-@auth_required()
-async def pkgbase_disown_post(request: Request, name: str,
-                              comments: str = Form(default=str()),
-                              confirm: bool = Form(default=False)):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    has_cred = request.user.has_credential(creds.PKGBASE_DISOWN,
-                                           approved=[pkgbase.Maintainer])
-    if not has_cred:
-        return RedirectResponse(f"/pkgbase/{name}",
-                                HTTPStatus.SEE_OTHER)
-
-    context = make_context(request, "Disown Package")
-    context["pkgbase"] = pkgbase
-    if not confirm:
-        context["errors"] = [("The selected packages have not been disowned, "
-                              "check the confirmation checkbox.")]
-        return render_template(request, "packages/disown.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    with db.begin():
-        update_closure_comment(pkgbase, ORPHAN_ID, comments)
-
-    try:
-        pkgbase_disown_instance(request, pkgbase)
-    except InvariantError as exc:
-        context["errors"] = [str(exc)]
-        return render_template(request, "packages/disown.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-def pkgbase_adopt_instance(request: Request, pkgbase: models.PackageBase):
-    with db.begin():
-        pkgbase.Maintainer = request.user
-
-    notif = notify.AdoptNotification(request.user.ID, pkgbase.ID)
-    notif.send()
-
-
-@router.post("/pkgbase/{name}/adopt")
-@auth_required()
-async def pkgbase_adopt_post(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    has_cred = request.user.has_credential(creds.PKGBASE_ADOPT)
-    if has_cred or not pkgbase.Maintainer:
-        # If the user has credentials, they'll adopt the package regardless
-        # of maintainership. Otherwise, we'll promote the user to maintainer
-        # if no maintainer currently exists.
-        pkgbase_adopt_instance(request, pkgbase)
-
-    return RedirectResponse(f"/pkgbase/{name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.get("/pkgbase/{name}/delete")
-@auth_required()
-async def pkgbase_delete_get(request: Request, name: str):
-    if not request.user.has_credential(creds.PKGBASE_DELETE):
-        return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=HTTPStatus.SEE_OTHER)
-
-    context = make_context(request, "Package Deletion")
-    context["pkgbase"] = get_pkg_or_base(name, models.PackageBase)
-    return render_template(request, "packages/delete.html", context)
-
-
-@router.post("/pkgbase/{name}/delete")
-@auth_required()
-async def pkgbase_delete_post(request: Request, name: str,
-                              confirm: bool = Form(default=False),
-                              comments: str = Form(default=str())):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    if not request.user.has_credential(creds.PKGBASE_DELETE):
-        return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=HTTPStatus.SEE_OTHER)
-
-    if not confirm:
-        context = make_context(request, "Package Deletion")
-        context["pkgbase"] = pkgbase
-        context["errors"] = [("The selected packages have not been deleted, "
-                              "check the confirmation checkbox.")]
-        return render_template(request, "packages/delete.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    if comments:
-        # Update any existing deletion requests' ClosureComment.
-        with db.begin():
-            requests = pkgbase.requests.filter(
-                and_(models.PackageRequest.Status == PENDING_ID,
-                     models.PackageRequest.ReqTypeID == DELETION_ID)
-            )
-            for pkgreq in requests:
-                pkgreq.ClosureComment = comments
-
-    notifs = pkgbase_delete_instance(request, pkgbase, comments=comments)
-    util.apply_all(notifs, lambda n: n.send())
-    return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
-
-
 async def packages_unflag(request: Request, package_ids: List[int] = [],
                           **kwargs):
     if not package_ids:
@@ -1059,7 +430,7 @@ async def packages_unflag(request: Request, package_ids: List[int] = [],
             bases.update({pkg.PackageBase})
 
     for pkgbase in bases:
-        pkgbase_unflag_instance(request, pkgbase)
+        pkgbase_actions.pkgbase_unflag_instance(request, pkgbase)
     return (True, ["The selected packages have been unflagged."])
 
 
@@ -1096,7 +467,7 @@ async def packages_notify(request: Request, package_ids: List[int] = [],
 
     # If we get here, user input is good.
     for pkgbase in bases:
-        pkgbase_notify_instance(request, pkgbase)
+        pkgbase_actions.pkgbase_notify_instance(request, pkgbase)
 
     # TODO: This message does not yet have a translation.
     return (True, ["The selected packages' notifications have been enabled."])
@@ -1133,7 +504,7 @@ async def packages_unnotify(request: Request, package_ids: List[int] = [],
             return error_tuple
 
     for pkgbase in bases:
-        pkgbase_unnotify_instance(request, pkgbase)
+        pkgbase_actions.pkgbase_unnotify_instance(request, pkgbase)
 
     # TODO: This message does not yet have a translation.
     return (True, ["The selected packages' notifications have been removed."])
@@ -1167,7 +538,7 @@ async def packages_adopt(request: Request, package_ids: List[int] = [],
 
     # Now, really adopt the bases.
     for pkgbase in bases:
-        pkgbase_adopt_instance(request, pkgbase)
+        pkgbase_actions.pkgbase_adopt_instance(request, pkgbase)
 
     return (True, ["The selected packages have been adopted."])
 
@@ -1177,7 +548,7 @@ def disown_all(request: Request, pkgbases: List[models.PackageBase]) \
     errors = []
     for pkgbase in pkgbases:
         try:
-            pkgbase_disown_instance(request, pkgbase)
+            pkgbase_actions.pkgbase_disown_instance(request, pkgbase)
         except InvariantError as exc:
             errors.append(str(exc))
     return errors
@@ -1246,7 +617,7 @@ async def packages_delete(request: Request, package_ids: List[int] = [],
     deleted_bases, notifs = [], []
     for pkgbase in bases:
         deleted_bases.append(pkgbase.Name)
-        notifs += pkgbase_delete_instance(request, pkgbase)
+        notifs += pkgbase_actions.pkgbase_delete_instance(request, pkgbase)
 
     # Log out the fact that this happened for accountability.
     logger.info(f"Privileged user '{request.user.Username}' deleted the "
@@ -1298,132 +669,3 @@ async def packages_post(request: Request,
             context["success"] = messages
 
     return await packages_get(request, context)
-
-
-@router.get("/pkgbase/{name}/merge")
-@auth_required()
-async def pkgbase_merge_get(request: Request, name: str,
-                            into: str = Query(default=str()),
-                            next: str = Query(default=str())):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    if not next:
-        next = f"/pkgbase/{pkgbase.Name}"
-
-    context = make_context(request, "Package Merging")
-    context.update({
-        "pkgbase": pkgbase,
-        "into": into,
-        "next": next
-    })
-
-    status_code = HTTPStatus.OK
-    # TODO: Lookup errors from credential instead of hardcoding them.
-    # Idea: Something like credential_errors(creds.PKGBASE_MERGE).
-    # Perhaps additionally: bad_credential_status_code(creds.PKGBASE_MERGE).
-    # Don't take these examples verbatim. We should find good naming.
-    if not request.user.has_credential(creds.PKGBASE_MERGE):
-        context["errors"] = [
-            "Only Trusted Users and Developers can merge packages."]
-        status_code = HTTPStatus.UNAUTHORIZED
-
-    return render_template(request, "pkgbase/merge.html", context,
-                           status_code=status_code)
-
-
-def pkgbase_merge_instance(request: Request, pkgbase: models.PackageBase,
-                           target: models.PackageBase, comments: str = str()):
-    pkgbasename = str(pkgbase.Name)
-
-    # Create notifications.
-    notifs = handle_request(request, MERGE_ID, pkgbase, target)
-
-    # Target votes and notifications sets of user IDs that are
-    # looking to be migrated.
-    target_votes = set(v.UsersID for v in target.package_votes)
-    target_notifs = set(n.UserID for n in target.notifications)
-
-    with db.begin():
-        # Merge pkgbase's comments.
-        for comment in pkgbase.comments:
-            comment.PackageBase = target
-
-        # Merge notifications that don't yet exist in the target.
-        for notif in pkgbase.notifications:
-            if notif.UserID not in target_notifs:
-                notif.PackageBase = target
-
-        # Merge votes that don't yet exist in the target.
-        for vote in pkgbase.package_votes:
-            if vote.UsersID not in target_votes:
-                vote.PackageBase = target
-
-    # Run popupdate.
-    popupdate.run_single(target)
-
-    with db.begin():
-        # Delete pkgbase and its packages now that everything's merged.
-        for pkg in pkgbase.packages:
-            db.delete(pkg)
-        db.delete(pkgbase)
-
-    # Log this out for accountability purposes.
-    logger.info(f"Trusted User '{request.user.Username}' merged "
-                f"'{pkgbasename}' into '{target.Name}'.")
-
-    # Send notifications.
-    util.apply_all(notifs, lambda n: n.send())
-
-
-@router.post("/pkgbase/{name}/merge")
-@auth_required()
-async def pkgbase_merge_post(request: Request, name: str,
-                             into: str = Form(default=str()),
-                             comments: str = Form(default=str()),
-                             confirm: bool = Form(default=False),
-                             next: str = Form(default=str())):
-
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    context = await make_variable_context(request, "Package Merging")
-    context["pkgbase"] = pkgbase
-
-    # TODO: Lookup errors from credential instead of hardcoding them.
-    if not request.user.has_credential(creds.PKGBASE_MERGE):
-        context["errors"] = [
-            "Only Trusted Users and Developers can merge packages."]
-        return render_template(request, "pkgbase/merge.html", context,
-                               status_code=HTTPStatus.UNAUTHORIZED)
-
-    if not confirm:
-        context["errors"] = ["The selected packages have not been deleted, "
-                             "check the confirmation checkbox."]
-        return render_template(request, "pkgbase/merge.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    try:
-        target = get_pkg_or_base(into, models.PackageBase)
-    except HTTPException:
-        context["errors"] = [
-            "Cannot find package to merge votes and comments into."]
-        return render_template(request, "pkgbase/merge.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    if pkgbase == target:
-        context["errors"] = ["Cannot merge a package base with itself."]
-        return render_template(request, "pkgbase/merge.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    with db.begin():
-        update_closure_comment(pkgbase, MERGE_ID, comments, target=target)
-
-    # Merge pkgbase into target.
-    pkgbase_merge_instance(request, pkgbase, target, comments=comments)
-
-    # Run popupdate on the target.
-    popupdate.run_single(target)
-
-    if not next:
-        next = f"/pkgbase/{target.Name}"
-
-    # Redirect to the newly merged into package.
-    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
new file mode 100644
index 00000000..a6c02118
--- /dev/null
+++ b/aurweb/routers/pkgbase.py
@@ -0,0 +1,701 @@
+from datetime import datetime
+from http import HTTPStatus
+
+from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
+from fastapi.responses import JSONResponse, RedirectResponse
+from sqlalchemy import and_
+
+from aurweb import db, l10n, templates, util
+from aurweb.auth import auth_required, creds
+from aurweb.exceptions import InvariantError
+from aurweb.models import PackageBase
+from aurweb.models.package_comment import PackageComment
+from aurweb.models.package_keyword import PackageKeyword
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_request import PENDING_ID, PackageRequest
+from aurweb.models.package_vote import PackageVote
+from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
+from aurweb.packages.requests import update_closure_comment
+from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment
+from aurweb.pkgbase import actions
+from aurweb.pkgbase import util as pkgbaseutil
+from aurweb.scripts import popupdate
+from aurweb.scripts.rendercomment import update_comment_render_fastapi
+from aurweb.templates import make_variable_context, render_template
+
+router = APIRouter()
+
+
+@router.get("/pkgbase/{name}")
+async def pkgbase(request: Request, name: str) -> Response:
+    """
+    Single package base view.
+
+    :param request: FastAPI Request
+    :param name: PackageBase.Name
+    :return: HTMLResponse
+    """
+    # Get the PackageBase.
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    # If this is not a split package, redirect to /packages/{name}.
+    if pkgbase.packages.count() == 1:
+        return RedirectResponse(f"/packages/{name}",
+                                status_code=int(HTTPStatus.SEE_OTHER))
+
+    # Add our base information.
+    context = pkgbaseutil.make_context(request, pkgbase)
+    context["packages"] = pkgbase.packages.all()
+
+    return render_template(request, "pkgbase.html", context)
+
+
+@router.get("/pkgbase/{name}/voters")
+async def pkgbase_voters(request: Request, name: str) -> Response:
+    """
+    View of package base voters.
+
+    Requires `request.user` has creds.PKGBASE_LIST_VOTERS credential.
+
+    :param request: FastAPI Request
+    :param name: PackageBase.Name
+    :return: HTMLResponse
+    """
+    # Get the PackageBase.
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    if not request.user.has_credential(creds.PKGBASE_LIST_VOTERS):
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
+    context = templates.make_context(request, "Voters")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "pkgbase/voters.html", context)
+
+
+@router.get("/pkgbase/{name}/flag-comment")
+async def pkgbase_flag_comment(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    if pkgbase.Flagger is None:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
+    context = templates.make_context(request, "Flag Comment")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "packages/flag-comment.html", context)
+
+
+@router.post("/pkgbase/{name}/keywords")
+async def pkgbase_keywords(request: Request, name: str,
+                           keywords: str = Form(default=str())):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    keywords = set(keywords.split(" "))
+
+    # Delete all keywords which are not supplied by the user.
+    other_keywords = pkgbase.keywords.filter(
+        ~PackageKeyword.Keyword.in_(keywords))
+    other_keyword_strings = [kwd.Keyword for kwd in other_keywords]
+
+    existing_keywords = set(
+        kwd.Keyword for kwd in
+        pkgbase.keywords.filter(
+            ~PackageKeyword.Keyword.in_(other_keyword_strings))
+    )
+    with db.begin():
+        db.delete_all(other_keywords)
+        for keyword in keywords.difference(existing_keywords):
+            db.create(PackageKeyword,
+                      PackageBase=pkgbase,
+                      Keyword=keyword)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.get("/pkgbase/{name}/flag")
+@auth_required()
+async def pkgbase_flag_get(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential(creds.PKGBASE_FLAG)
+    if not has_cred or pkgbase.Flagger is not None:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
+    context = templates.make_context(request, "Flag Package Out-Of-Date")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "packages/flag.html", context)
+
+
+@router.post("/pkgbase/{name}/flag")
+@auth_required()
+async def pkgbase_flag_post(request: Request, name: str,
+                            comments: str = Form(default=str())):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    if not comments:
+        context = templates.make_context(request, "Flag Package Out-Of-Date")
+        context["pkgbase"] = pkgbase
+        context["errors"] = ["The selected packages have not been flagged, "
+                             "please enter a comment."]
+        return render_template(request, "packages/flag.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    has_cred = request.user.has_credential(creds.PKGBASE_FLAG)
+    if has_cred and not pkgbase.Flagger:
+        now = int(datetime.utcnow().timestamp())
+        with db.begin():
+            pkgbase.OutOfDateTS = now
+            pkgbase.Flagger = request.user
+            pkgbase.FlaggerComment = comments
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/comments")
+@auth_required()
+async def pkgbase_comments_post(
+        request: Request, name: str,
+        comment: str = Form(default=str()),
+        enable_notifications: bool = Form(default=False)):
+    """ Add a new comment via POST request. """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    if not comment:
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST)
+
+    # If the provided comment is different than the record's version,
+    # update the db record.
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment = db.create(PackageComment, User=request.user,
+                            PackageBase=pkgbase,
+                            Comments=comment, RenderedComment=str(),
+                            CommentTS=now)
+
+        if enable_notifications and not request.user.notified(pkgbase):
+            db.create(PackageNotification,
+                      User=request.user,
+                      PackageBase=pkgbase)
+    update_comment_render_fastapi(comment)
+
+    # Redirect to the pkgbase page.
+    return RedirectResponse(f"/pkgbase/{pkgbase.Name}#comment-{comment.ID}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.get("/pkgbase/{name}/comments/{id}/form")
+@auth_required()
+async def pkgbase_comment_form(request: Request, name: str, id: int,
+                               next: str = Query(default=None)):
+    """
+    Produce a comment form for comment {id}.
+
+    This route is used as a partial HTML endpoint when editing
+    package comments via Javascript. This endpoint used to be
+    part of the RPC as type=get-comment-form and has been
+    relocated here because the form returned cannot be used
+    externally and requires a POST request by the user.
+
+    :param request: FastAPI Request
+    :param name: PackageBase.Name
+    :param id: PackageComment.ID
+    :param next: Optional `next` value used for the comment form
+    :return: JSONResponse
+    """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = pkgbase.comments.filter(PackageComment.ID == id).first()
+    if not comment:
+        return JSONResponse({}, status_code=HTTPStatus.NOT_FOUND)
+
+    if not request.user.is_elevated() and request.user != comment.User:
+        return JSONResponse({}, status_code=HTTPStatus.UNAUTHORIZED)
+
+    context = pkgbaseutil.make_context(request, pkgbase)
+    context["comment"] = comment
+
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    context["next"] = next
+
+    form = templates.render_raw_template(
+        request, "partials/packages/comment_form.html", context)
+    return JSONResponse({"form": form})
+
+
+@router.get("/pkgbase/{name}/comments/{id}/edit")
+@auth_required()
+async def pkgbase_comment_edit(request: Request, name: str, id: int,
+                               next: str = Form(default=None)):
+    """
+    Render the non-javascript edit form.
+
+    :param request: FastAPI Request
+    :param name: PackageBase.Name
+    :param id: PackageComment.ID
+    :param next: Optional `next` parameter used in the POST request
+    :return: HTMLResponse
+    """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    context = await make_variable_context(request, "Edit comment", next=next)
+    context["comment"] = comment
+    return render_template(request, "packages/comments/edit.html", context)
+
+
+@router.post("/pkgbase/{name}/comments/{id}")
+@auth_required()
+async def pkgbase_comment_post(
+        request: Request, name: str, id: int,
+        comment: str = Form(default=str()),
+        enable_notifications: bool = Form(default=False),
+        next: str = Form(default=None)):
+    """ Edit an existing comment. """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    db_comment = get_pkgbase_comment(pkgbase, id)
+
+    if not comment:
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST)
+
+    # If the provided comment is different than the record's version,
+    # update the db record.
+    now = int(datetime.utcnow().timestamp())
+    if db_comment.Comments != comment:
+        with db.begin():
+            db_comment.Comments = comment
+            db_comment.Editor = request.user
+            db_comment.EditedTS = now
+
+            db_notif = request.user.notifications.filter(
+                PackageNotification.PackageBaseID == pkgbase.ID
+            ).first()
+            if enable_notifications and not db_notif:
+                db.create(PackageNotification,
+                          User=request.user,
+                          PackageBase=pkgbase)
+    update_comment_render_fastapi(db_comment)
+
+    if not next:
+        next = f"/pkgbase/{pkgbase.Name}"
+
+    # Redirect to the pkgbase page anchored to the updated comment.
+    return RedirectResponse(f"{next}#comment-{db_comment.ID}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/comments/{id}/pin")
+@auth_required()
+async def pkgbase_comment_pin(request: Request, name: str, id: int,
+                              next: str = Form(default=None)):
+    """
+    Pin a comment.
+
+    :param request: FastAPI Request
+    :param name: PackageBase.Name
+    :param id: PackageComment.ID
+    :param next: Optional `next` parameter used in the POST request
+    :return: RedirectResponse to `next`
+    """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    has_cred = request.user.has_credential(creds.COMMENT_PIN,
+                                           approved=[pkgbase.Maintainer])
+    if not has_cred:
+        _ = l10n.get_translator_for_request(request)
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail=_("You are not allowed to pin this comment."))
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment.PinnedTS = now
+
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/comments/{id}/unpin")
+@auth_required()
+async def pkgbase_comment_unpin(request: Request, name: str, id: int,
+                                next: str = Form(default=None)):
+    """
+    Unpin a comment.
+
+    :param request: FastAPI Request
+    :param name: PackageBase.Name
+    :param id: PackageComment.ID
+    :param next: Optional `next` parameter used in the POST request
+    :return: RedirectResponse to `next`
+    """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    has_cred = request.user.has_credential(creds.COMMENT_PIN,
+                                           approved=[pkgbase.Maintainer])
+    if not has_cred:
+        _ = l10n.get_translator_for_request(request)
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail=_("You are not allowed to unpin this comment."))
+
+    with db.begin():
+        comment.PinnedTS = 0
+
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/comments/{id}/delete")
+@auth_required()
+async def pkgbase_comment_delete(request: Request, name: str, id: int,
+                                 next: str = Form(default=None)):
+    """
+    Delete a comment.
+
+    This action does **not** delete the comment from the database, but
+    sets PackageBase.DelTS and PackageBase.DeleterUID, which is used to
+    decide who gets to view the comment and what utilities it gets.
+
+    :param request: FastAPI Request
+    :param name: PackageBase.Name
+    :param id: PackageComment.ID
+    :param next: Optional `next` parameter used in the POST request
+    :return: RedirectResposne to `next`
+    """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    authorized = request.user.has_credential(creds.COMMENT_DELETE,
+                                             [comment.User])
+    if not authorized:
+        _ = l10n.get_translator_for_request(request)
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail=_("You are not allowed to delete this comment."))
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment.Deleter = request.user
+        comment.DelTS = now
+
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/comments/{id}/undelete")
+@auth_required()
+async def pkgbase_comment_undelete(request: Request, name: str, id: int,
+                                   next: str = Form(default=None)):
+    """
+    Undelete a comment.
+
+    This action does **not** undelete any comment from the database, but
+    unsets PackageBase.DelTS and PackageBase.DeleterUID which restores
+    the comment to a standard state.
+
+    :param request: FastAPI Request
+    :param name: PackageBase.Name
+    :param id: PackageComment.ID
+    :param next: Optional `next` parameter used in the POST request
+    :return: RedirectResponse to `next`
+    """
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    comment = get_pkgbase_comment(pkgbase, id)
+
+    has_cred = request.user.has_credential(creds.COMMENT_UNDELETE,
+                                           approved=[comment.User])
+    if not has_cred:
+        _ = l10n.get_translator_for_request(request)
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail=_("You are not allowed to undelete this comment."))
+
+    with db.begin():
+        comment.Deleter = None
+        comment.DelTS = None
+
+    if not next:
+        next = f"/pkgbase/{name}"
+
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/vote")
+@auth_required()
+async def pkgbase_vote(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    vote = pkgbase.package_votes.filter(
+        PackageVote.UsersID == request.user.ID
+    ).first()
+    has_cred = request.user.has_credential(creds.PKGBASE_VOTE)
+    if has_cred and not vote:
+        now = int(datetime.utcnow().timestamp())
+        with db.begin():
+            db.create(PackageVote,
+                      User=request.user,
+                      PackageBase=pkgbase,
+                      VoteTS=now)
+
+        # Update NumVotes/Popularity.
+        popupdate.run_single(pkgbase)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/unvote")
+@auth_required()
+async def pkgbase_unvote(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    vote = pkgbase.package_votes.filter(
+        PackageVote.UsersID == request.user.ID
+    ).first()
+    has_cred = request.user.has_credential(creds.PKGBASE_VOTE)
+    if has_cred and vote:
+        with db.begin():
+            db.delete(vote)
+
+        # Update NumVotes/Popularity.
+        popupdate.run_single(pkgbase)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/notify")
+@auth_required()
+async def pkgbase_notify(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    actions.pkgbase_notify_instance(request, pkgbase)
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/unnotify")
+@auth_required()
+async def pkgbase_unnotify(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    actions.pkgbase_unnotify_instance(request, pkgbase)
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/unflag")
+@auth_required()
+async def pkgbase_unflag(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    actions.pkgbase_unflag_instance(request, pkgbase)
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.get("/pkgbase/{name}/disown")
+@auth_required()
+async def pkgbase_disown_get(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential(creds.PKGBASE_DISOWN,
+                                           approved=[pkgbase.Maintainer])
+    if not has_cred:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                HTTPStatus.SEE_OTHER)
+
+    context = templates.make_context(request, "Disown Package")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "packages/disown.html", context)
+
+
+@router.post("/pkgbase/{name}/disown")
+@auth_required()
+async def pkgbase_disown_post(request: Request, name: str,
+                              comments: str = Form(default=str()),
+                              confirm: bool = Form(default=False)):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential(creds.PKGBASE_DISOWN,
+                                           approved=[pkgbase.Maintainer])
+    if not has_cred:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                HTTPStatus.SEE_OTHER)
+
+    context = templates.make_context(request, "Disown Package")
+    context["pkgbase"] = pkgbase
+    if not confirm:
+        context["errors"] = [("The selected packages have not been disowned, "
+                              "check the confirmation checkbox.")]
+        return render_template(request, "packages/disown.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    with db.begin():
+        update_closure_comment(pkgbase, ORPHAN_ID, comments)
+
+    try:
+        actions.pkgbase_disown_instance(request, pkgbase)
+    except InvariantError as exc:
+        context["errors"] = [str(exc)]
+        return render_template(request, "packages/disown.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.post("/pkgbase/{name}/adopt")
+@auth_required()
+async def pkgbase_adopt_post(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    has_cred = request.user.has_credential(creds.PKGBASE_ADOPT)
+    if has_cred or not pkgbase.Maintainer:
+        # If the user has credentials, they'll adopt the package regardless
+        # of maintainership. Otherwise, we'll promote the user to maintainer
+        # if no maintainer currently exists.
+        actions.pkgbase_adopt_instance(request, pkgbase)
+
+    return RedirectResponse(f"/pkgbase/{name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.get("/pkgbase/{name}/delete")
+@auth_required()
+async def pkgbase_delete_get(request: Request, name: str):
+    if not request.user.has_credential(creds.PKGBASE_DELETE):
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
+    context = templates.make_context(request, "Package Deletion")
+    context["pkgbase"] = get_pkg_or_base(name, PackageBase)
+    return render_template(request, "packages/delete.html", context)
+
+
+@router.post("/pkgbase/{name}/delete")
+@auth_required()
+async def pkgbase_delete_post(request: Request, name: str,
+                              confirm: bool = Form(default=False),
+                              comments: str = Form(default=str())):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    if not request.user.has_credential(creds.PKGBASE_DELETE):
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
+    if not confirm:
+        context = templates.make_context(request, "Package Deletion")
+        context["pkgbase"] = pkgbase
+        context["errors"] = [("The selected packages have not been deleted, "
+                              "check the confirmation checkbox.")]
+        return render_template(request, "packages/delete.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    if comments:
+        # Update any existing deletion requests' ClosureComment.
+        with db.begin():
+            requests = pkgbase.requests.filter(
+                and_(PackageRequest.Status == PENDING_ID,
+                     PackageRequest.ReqTypeID == DELETION_ID)
+            )
+            for pkgreq in requests:
+                pkgreq.ClosureComment = comments
+
+    notifs = actions.pkgbase_delete_instance(
+        request, pkgbase, comments=comments)
+    util.apply_all(notifs, lambda n: n.send())
+    return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
+
+
+@router.get("/pkgbase/{name}/merge")
+@auth_required()
+async def pkgbase_merge_get(request: Request, name: str,
+                            into: str = Query(default=str()),
+                            next: str = Query(default=str())):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    if not next:
+        next = f"/pkgbase/{pkgbase.Name}"
+
+    context = templates.make_context(request, "Package Merging")
+    context.update({
+        "pkgbase": pkgbase,
+        "into": into,
+        "next": next
+    })
+
+    status_code = HTTPStatus.OK
+    # TODO: Lookup errors from credential instead of hardcoding them.
+    # Idea: Something like credential_errors(creds.PKGBASE_MERGE).
+    # Perhaps additionally: bad_credential_status_code(creds.PKGBASE_MERGE).
+    # Don't take these examples verbatim. We should find good naming.
+    if not request.user.has_credential(creds.PKGBASE_MERGE):
+        context["errors"] = [
+            "Only Trusted Users and Developers can merge packages."]
+        status_code = HTTPStatus.UNAUTHORIZED
+
+    return render_template(request, "pkgbase/merge.html", context,
+                           status_code=status_code)
+
+
+@router.post("/pkgbase/{name}/merge")
+@auth_required()
+async def pkgbase_merge_post(request: Request, name: str,
+                             into: str = Form(default=str()),
+                             comments: str = Form(default=str()),
+                             confirm: bool = Form(default=False),
+                             next: str = Form(default=str())):
+
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    context = await make_variable_context(request, "Package Merging")
+    context["pkgbase"] = pkgbase
+
+    # TODO: Lookup errors from credential instead of hardcoding them.
+    if not request.user.has_credential(creds.PKGBASE_MERGE):
+        context["errors"] = [
+            "Only Trusted Users and Developers can merge packages."]
+        return render_template(request, "pkgbase/merge.html", context,
+                               status_code=HTTPStatus.UNAUTHORIZED)
+
+    if not confirm:
+        context["errors"] = ["The selected packages have not been deleted, "
+                             "check the confirmation checkbox."]
+        return render_template(request, "pkgbase/merge.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    try:
+        target = get_pkg_or_base(into, PackageBase)
+    except HTTPException:
+        context["errors"] = [
+            "Cannot find package to merge votes and comments into."]
+        return render_template(request, "pkgbase/merge.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    if pkgbase == target:
+        context["errors"] = ["Cannot merge a package base with itself."]
+        return render_template(request, "pkgbase/merge.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    with db.begin():
+        update_closure_comment(pkgbase, MERGE_ID, comments, target=target)
+
+    # Merge pkgbase into target.
+    actions.pkgbase_merge_instance(request, pkgbase, target, comments=comments)
+
+    if not next:
+        next = f"/pkgbase/{target.Name}"
+
+    # Redirect to the newly merged into package.
+    return RedirectResponse(next, status_code=HTTPStatus.SEE_OTHER)

From a77d44e919df07096bb36dadd5cc20754831e46d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 2 Jan 2022 00:20:02 -0800
Subject: [PATCH 772/844] change(python): move comaint routes to pkgbase router

Also brings over comaint utility functions to the pkgbase
package.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py    | 153 +------------------------------------
 aurweb/pkgbase/actions.py  |   5 +-
 aurweb/pkgbase/util.py     | 153 ++++++++++++++++++++++++++++++++++++-
 aurweb/routers/packages.py |  67 ----------------
 aurweb/routers/pkgbase.py  |  71 ++++++++++++++++-
 5 files changed, 225 insertions(+), 224 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 987061c9..0224e738 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -4,17 +4,15 @@ from typing import Dict, List, Tuple, Union
 
 import orjson
 
-from fastapi import HTTPException, Request
+from fastapi import HTTPException
 from sqlalchemy import orm
 
-from aurweb import config, db, l10n, models, util
-from aurweb.models import Package, PackageBase, User
+from aurweb import config, db, models
+from aurweb.models import Package
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
-from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_relation import PackageRelation
 from aurweb.redis import redis_connection
-from aurweb.scripts import notify
 from aurweb.templates import register_filter
 
 Providers = List[Union[PackageRelation, OfficialProvider]]
@@ -222,151 +220,6 @@ def query_notified(query: List[models.Package],
     return output
 
 
-def remove_comaintainer(comaint: PackageComaintainer) \
-        -> notify.ComaintainerRemoveNotification:
-    """
-    Remove a PackageComaintainer.
-
-    This function does *not* begin any database transaction and
-    must be used **within** a database transaction, e.g.:
-
-    with db.begin():
-       remove_comaintainer(comaint)
-
-    :param comaint: Target PackageComaintainer to be deleted
-    :return: ComaintainerRemoveNotification
-    """
-    pkgbase = comaint.PackageBase
-    notif = notify.ComaintainerRemoveNotification(comaint.User.ID, pkgbase.ID)
-    db.delete(comaint)
-    rotate_comaintainers(pkgbase)
-    return notif
-
-
-def remove_comaintainers(pkgbase: PackageBase, usernames: List[str]) -> None:
-    """
-    Remove comaintainers from `pkgbase`.
-
-    :param pkgbase: PackageBase instance
-    :param usernames: Iterable of username strings
-    """
-    notifications = []
-    with db.begin():
-        comaintainers = pkgbase.comaintainers.join(User).filter(
-            User.Username.in_(usernames)
-        ).all()
-        notifications = [
-            notify.ComaintainerRemoveNotification(co.User.ID, pkgbase.ID)
-            for co in comaintainers
-        ]
-        db.delete_all(comaintainers)
-
-    # Rotate comaintainer priority values.
-    with db.begin():
-        rotate_comaintainers(pkgbase)
-
-    # Send out notifications.
-    util.apply_all(notifications, lambda n: n.send())
-
-
-def latest_priority(pkgbase: PackageBase) -> int:
-    """
-    Return the highest Priority column related to `pkgbase`.
-
-    :param pkgbase: PackageBase instance
-    :return: Highest Priority found or 0 if no records exist
-    """
-
-    # Order comaintainers related to pkgbase by Priority DESC.
-    record = pkgbase.comaintainers.order_by(
-        PackageComaintainer.Priority.desc()).first()
-
-    # Use Priority column if record exists, otherwise 0.
-    return record.Priority if record else 0
-
-
-class NoopComaintainerNotification:
-    """ A noop notification stub used as an error-state return value. """
-
-    def send(self) -> None:
-        """ noop """
-        return
-
-
-def add_comaintainer(pkgbase: PackageBase, comaintainer: User) \
-        -> notify.ComaintainerAddNotification:
-    """
-    Add a new comaintainer to `pkgbase`.
-
-    :param pkgbase: PackageBase instance
-    :param comaintainer: User instance used for new comaintainer record
-    :return: ComaintainerAddNotification
-    """
-    # Skip given `comaintainers` who are already maintainer.
-    if pkgbase.Maintainer == comaintainer:
-        return NoopComaintainerNotification()
-
-    # Priority for the new comaintainer is +1 more than the highest.
-    new_prio = latest_priority(pkgbase) + 1
-
-    with db.begin():
-        db.create(PackageComaintainer, PackageBase=pkgbase,
-                  User=comaintainer, Priority=new_prio)
-
-    return notify.ComaintainerAddNotification(comaintainer.ID, pkgbase.ID)
-
-
-def add_comaintainers(request: Request, pkgbase: models.PackageBase,
-                      usernames: List[str]) -> None:
-    """
-    Add comaintainers to `pkgbase`.
-
-    :param request: FastAPI request
-    :param pkgbase: PackageBase instance
-    :param usernames: Iterable of username strings
-    :return: Error string on failure else None
-    """
-    # For each username in usernames, perform validation of the username
-    # and append the User record to `users` if no errors occur.
-    users = []
-    for username in usernames:
-        user = db.query(User).filter(User.Username == username).first()
-        if not user:
-            _ = l10n.get_translator_for_request(request)
-            return _("Invalid user name: %s") % username
-        users.append(user)
-
-    notifications = []
-
-    def add_comaint(user: User):
-        nonlocal notifications
-        # Populate `notifications` with add_comaintainer's return value,
-        # which is a ComaintainerAddNotification.
-        notifications.append(add_comaintainer(pkgbase, user))
-
-    # Move along: add all `users` as new `pkgbase` comaintainers.
-    util.apply_all(users, add_comaint)
-
-    # Send out notifications.
-    util.apply_all(notifications, lambda n: n.send())
-
-
-def rotate_comaintainers(pkgbase: PackageBase) -> None:
-    """
-    Rotate `pkgbase` comaintainers.
-
-    This function resets the Priority column of all PackageComaintainer
-    instances related to `pkgbase` to seqential 1 .. n values with
-    persisted order.
-
-    :param pkgbase: PackageBase instance
-    """
-    comaintainers = pkgbase.comaintainers.order_by(
-        models.PackageComaintainer.Priority.asc())
-    for i, comaint in enumerate(comaintainers):
-        comaint.Priority = i + 1
-
-
 def pkg_required(pkgname: str, provides: List[str], limit: int) \
         -> List[PackageDependency]:
     """
diff --git a/aurweb/pkgbase/actions.py b/aurweb/pkgbase/actions.py
index 00098d2e..73366829 100644
--- a/aurweb/pkgbase/actions.py
+++ b/aurweb/pkgbase/actions.py
@@ -9,6 +9,7 @@ from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
 from aurweb.packages.requests import handle_request, update_closure_comment
+from aurweb.pkgbase import util as pkgbaseutil
 from aurweb.scripts import notify, popupdate
 
 logger = logging.get_logger(__name__)
@@ -47,8 +48,6 @@ def pkgbase_unflag_instance(request: Request, pkgbase: PackageBase) -> None:
 
 
 def pkgbase_disown_instance(request: Request, pkgbase: PackageBase) -> None:
-    import aurweb.packages.util as pkgutil
-
     disowner = request.user
     notifs = [notify.DisownNotification(disowner.ID, pkgbase.ID)]
 
@@ -62,7 +61,7 @@ def pkgbase_disown_instance(request: Request, pkgbase: PackageBase) -> None:
             if prio_comaint:
                 # If there is such a comaintainer, promote them to maint.
                 pkgbase.Maintainer = prio_comaint.User
-                notifs.append(pkgutil.remove_comaintainer(prio_comaint))
+                notifs.append(pkgbaseutil.remove_comaintainer(prio_comaint))
             else:
                 # Otherwise, just orphan the package completely.
                 pkgbase.Maintainer = None
diff --git a/aurweb/pkgbase/util.py b/aurweb/pkgbase/util.py
index e348d5f0..945f0ed6 100644
--- a/aurweb/pkgbase/util.py
+++ b/aurweb/pkgbase/util.py
@@ -1,12 +1,14 @@
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 from fastapi import Request
 
-from aurweb import config
-from aurweb.models import PackageBase
+from aurweb import config, db, l10n, util
+from aurweb.models import PackageBase, User
+from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_comment import PackageComment
 from aurweb.models.package_request import PackageRequest
 from aurweb.models.package_vote import PackageVote
+from aurweb.scripts import notify
 from aurweb.templates import make_context as _make_context
 
 
@@ -45,3 +47,148 @@ def make_context(request: Request, pkgbase: PackageBase) -> Dict[str, Any]:
     ).count()
 
     return context
+
+
+def remove_comaintainer(comaint: PackageComaintainer) \
+        -> notify.ComaintainerRemoveNotification:
+    """
+    Remove a PackageComaintainer.
+
+    This function does *not* begin any database transaction and
+    must be used **within** a database transaction, e.g.:
+
+    with db.begin():
+       remove_comaintainer(comaint)
+
+    :param comaint: Target PackageComaintainer to be deleted
+    :return: ComaintainerRemoveNotification
+    """
+    pkgbase = comaint.PackageBase
+    notif = notify.ComaintainerRemoveNotification(comaint.User.ID, pkgbase.ID)
+    db.delete(comaint)
+    rotate_comaintainers(pkgbase)
+    return notif
+
+
+def remove_comaintainers(pkgbase: PackageBase, usernames: List[str]) -> None:
+    """
+    Remove comaintainers from `pkgbase`.
+
+    :param pkgbase: PackageBase instance
+    :param usernames: Iterable of username strings
+    """
+    notifications = []
+    with db.begin():
+        comaintainers = pkgbase.comaintainers.join(User).filter(
+            User.Username.in_(usernames)
+        ).all()
+        notifications = [
+            notify.ComaintainerRemoveNotification(co.User.ID, pkgbase.ID)
+            for co in comaintainers
+        ]
+        db.delete_all(comaintainers)
+
+    # Rotate comaintainer priority values.
+    with db.begin():
+        rotate_comaintainers(pkgbase)
+
+    # Send out notifications.
+    util.apply_all(notifications, lambda n: n.send())
+
+
+def latest_priority(pkgbase: PackageBase) -> int:
+    """
+    Return the highest Priority column related to `pkgbase`.
+
+    :param pkgbase: PackageBase instance
+    :return: Highest Priority found or 0 if no records exist
+    """
+
+    # Order comaintainers related to pkgbase by Priority DESC.
+    record = pkgbase.comaintainers.order_by(
+        PackageComaintainer.Priority.desc()).first()
+
+    # Use Priority column if record exists, otherwise 0.
+    return record.Priority if record else 0
+
+
+class NoopComaintainerNotification:
+    """ A noop notification stub used as an error-state return value. """
+
+    def send(self) -> None:
+        """ noop """
+        return
+
+
+def add_comaintainer(pkgbase: PackageBase, comaintainer: User) \
+        -> notify.ComaintainerAddNotification:
+    """
+    Add a new comaintainer to `pkgbase`.
+
+    :param pkgbase: PackageBase instance
+    :param comaintainer: User instance used for new comaintainer record
+    :return: ComaintainerAddNotification
+    """
+    # Skip given `comaintainers` who are already maintainer.
+    if pkgbase.Maintainer == comaintainer:
+        return NoopComaintainerNotification()
+
+    # Priority for the new comaintainer is +1 more than the highest.
+    new_prio = latest_priority(pkgbase) + 1
+
+    with db.begin():
+        db.create(PackageComaintainer, PackageBase=pkgbase,
+                  User=comaintainer, Priority=new_prio)
+
+    return notify.ComaintainerAddNotification(comaintainer.ID, pkgbase.ID)
+
+
+def add_comaintainers(request: Request, pkgbase: PackageBase,
+                      usernames: List[str]) -> None:
+    """
+    Add comaintainers to `pkgbase`.
+
+    :param request: FastAPI request
+    :param pkgbase: PackageBase instance
+    :param usernames: Iterable of username strings
+    :return: Error string on failure else None
+    """
+    # For each username in usernames, perform validation of the username
+    # and append the User record to `users` if no errors occur.
+    users = []
+    for username in usernames:
+        user = db.query(User).filter(User.Username == username).first()
+        if not user:
+            _ = l10n.get_translator_for_request(request)
+            return _("Invalid user name: %s") % username
+        users.append(user)
+
+    notifications = []
+
+    def add_comaint(user: User):
+        nonlocal notifications
+        # Populate `notifications` with add_comaintainer's return value,
+        # which is a ComaintainerAddNotification.
+        notifications.append(add_comaintainer(pkgbase, user))
+
+    # Move along: add all `users` as new `pkgbase` comaintainers.
+    util.apply_all(users, add_comaint)
+
+    # Send out notifications.
+    util.apply_all(notifications, lambda n: n.send())
+
+
+def rotate_comaintainers(pkgbase: PackageBase) -> None:
+    """
+    Rotate `pkgbase` comaintainers.
+
+    This function resets the Priority column of all PackageComaintainer
+    instances related to `pkgbase` to seqential 1 .. n values with
+    persisted order.
+
+    :param pkgbase: PackageBase instance
+    """
+    comaintainers = pkgbase.comaintainers.order_by(
+        PackageComaintainer.Priority.asc())
+    for i, comaint in enumerate(comaintainers):
+        comaint.Priority = i + 1
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index eda83c3f..dbb4dc63 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -181,73 +181,6 @@ async def package(request: Request, name: str) -> Response:
     return render_template(request, "packages/show.html", context)
 
 
-@router.get("/pkgbase/{name}/comaintainers")
-@auth_required()
-async def package_base_comaintainers(request: Request, name: str) -> Response:
-    # Get the PackageBase.
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
-    # get redirected to the package base's page.
-    has_creds = request.user.has_credential(creds.PKGBASE_EDIT_COMAINTAINERS,
-                                            approved=[pkgbase.Maintainer])
-    if not has_creds:
-        return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=HTTPStatus.SEE_OTHER)
-
-    # Add our base information.
-    context = make_context(request, "Manage Co-maintainers")
-    context["pkgbase"] = pkgbase
-
-    context["comaintainers"] = [
-        c.User.Username for c in pkgbase.comaintainers
-    ]
-
-    return render_template(request, "pkgbase/comaintainers.html", context)
-
-
-@router.post("/pkgbase/{name}/comaintainers")
-@auth_required()
-async def package_base_comaintainers_post(
-        request: Request, name: str,
-        users: str = Form(default=str())) -> Response:
-    # Get the PackageBase.
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
-    # get redirected to the package base's page.
-    has_creds = request.user.has_credential(creds.PKGBASE_EDIT_COMAINTAINERS,
-                                            approved=[pkgbase.Maintainer])
-    if not has_creds:
-        return RedirectResponse(f"/pkgbase/{name}",
-                                status_code=HTTPStatus.SEE_OTHER)
-
-    users = {e.strip() for e in users.split("\n") if bool(e.strip())}
-    records = {c.User.Username for c in pkgbase.comaintainers}
-
-    users_to_rm = records.difference(users)
-    pkgutil.remove_comaintainers(pkgbase, users_to_rm)
-    logger.debug(f"{request.user} removed comaintainers from "
-                 f"{pkgbase.Name}: {users_to_rm}")
-
-    users_to_add = users.difference(records)
-    error = pkgutil.add_comaintainers(request, pkgbase, users_to_add)
-    if error:
-        context = make_context(request, "Manage Co-maintainers")
-        context["pkgbase"] = pkgbase
-        context["comaintainers"] = [
-            c.User.Username for c in pkgbase.comaintainers
-        ]
-        context["errors"] = [error]
-        return render_template(request, "pkgbase/comaintainers.html", context)
-
-    logger.debug(f"{request.user} added comaintainers to "
-                 f"{pkgbase.Name}: {users_to_add}")
-
-    return RedirectResponse(f"/pkgbase/{pkgbase.Name}",
-                            status_code=HTTPStatus.SEE_OTHER)
-
-
 @router.get("/requests")
 @auth_required()
 async def requests(request: Request,
diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index a6c02118..464d1eea 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -5,7 +5,7 @@ from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse
 from sqlalchemy import and_
 
-from aurweb import db, l10n, templates, util
+from aurweb import db, l10n, logging, templates, util
 from aurweb.auth import auth_required, creds
 from aurweb.exceptions import InvariantError
 from aurweb.models import PackageBase
@@ -23,6 +23,7 @@ from aurweb.scripts import popupdate
 from aurweb.scripts.rendercomment import update_comment_render_fastapi
 from aurweb.templates import make_variable_context, render_template
 
+logger = logging.get_logger(__name__)
 router = APIRouter()
 
 
@@ -572,6 +573,74 @@ async def pkgbase_adopt_post(request: Request, name: str):
                             status_code=HTTPStatus.SEE_OTHER)
 
 
+@router.get("/pkgbase/{name}/comaintainers")
+@auth_required()
+async def pkgbase_comaintainers(request: Request, name: str) -> Response:
+    # Get the PackageBase.
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
+    # get redirected to the package base's page.
+    has_creds = request.user.has_credential(creds.PKGBASE_EDIT_COMAINTAINERS,
+                                            approved=[pkgbase.Maintainer])
+    if not has_creds:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
+    # Add our base information.
+    context = templates.make_context(request, "Manage Co-maintainers")
+    context.update({
+        "pkgbase": pkgbase,
+        "comaintainers": [
+            c.User.Username for c in pkgbase.comaintainers
+        ]
+    })
+
+    return render_template(request, "pkgbase/comaintainers.html", context)
+
+
+@router.post("/pkgbase/{name}/comaintainers")
+@auth_required()
+async def pkgbase_comaintainers_post(request: Request, name: str,
+                                     users: str = Form(default=str())) \
+        -> Response:
+    # Get the PackageBase.
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    # Unauthorized users (Non-TU/Dev and not the pkgbase maintainer)
+    # get redirected to the package base's page.
+    has_creds = request.user.has_credential(creds.PKGBASE_EDIT_COMAINTAINERS,
+                                            approved=[pkgbase.Maintainer])
+    if not has_creds:
+        return RedirectResponse(f"/pkgbase/{name}",
+                                status_code=HTTPStatus.SEE_OTHER)
+
+    users = {e.strip() for e in users.split("\n") if bool(e.strip())}
+    records = {c.User.Username for c in pkgbase.comaintainers}
+
+    users_to_rm = records.difference(users)
+    pkgbaseutil.remove_comaintainers(pkgbase, users_to_rm)
+    logger.debug(f"{request.user} removed comaintainers from "
+                 f"{pkgbase.Name}: {users_to_rm}")
+
+    users_to_add = users.difference(records)
+    error = pkgbaseutil.add_comaintainers(request, pkgbase, users_to_add)
+    if error:
+        context = templates.make_context(request, "Manage Co-maintainers")
+        context["pkgbase"] = pkgbase
+        context["comaintainers"] = [
+            c.User.Username for c in pkgbase.comaintainers
+        ]
+        context["errors"] = [error]
+        return render_template(request, "pkgbase/comaintainers.html", context)
+
+    logger.debug(f"{request.user} added comaintainers to "
+                 f"{pkgbase.Name}: {users_to_add}")
+
+    return RedirectResponse(f"/pkgbase/{pkgbase.Name}",
+                            status_code=HTTPStatus.SEE_OTHER)
+
+
 @router.get("/pkgbase/{name}/delete")
 @auth_required()
 async def pkgbase_delete_get(request: Request, name: str):

From a1f46611e1caee19af8fc84a452ed4484ada528a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 2 Jan 2022 00:54:56 -0800
Subject: [PATCH 773/844] change(python): move request & pkgbase request routes

Move package request routes and related routes to their
respective routers. In addition, move some utility used
for requests over from `aurweb.packages`.

Introduced routers:
- `aurweb.routers.requests`

Introduced package:
- `aurweb.requests`

Introduced module:
- `aurweb.requests.util`

Changes:
- Moved `aurweb.packages.validate` to `aurweb.pkgbase.validate`
- Moved requests listing & request closure routes to
  `aurweb.routers.requests`
- Moved pkgbase request creation route to `aurweb.routers.pkgbase`
- Moved `get_pkgreq_by_id` from `aurweb.packages.util` to
  `aurweb.requests.util` and fixed its return type hint.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py                           |   3 +-
 aurweb/packages/util.py                  |   8 -
 aurweb/{packages => pkgbase}/validate.py |   9 +-
 aurweb/requests/__init__.py              |   0
 aurweb/requests/util.py                  |  13 ++
 aurweb/routers/packages.py               | 177 +----------------------
 aurweb/routers/pkgbase.py                |  98 ++++++++++++-
 aurweb/routers/requests.py               |  92 ++++++++++++
 test/test_packages_util.py               |   6 -
 test/test_requests.py                    |   7 +
 10 files changed, 218 insertions(+), 195 deletions(-)
 rename aurweb/{packages => pkgbase}/validate.py (84%)
 create mode 100644 aurweb/requests/__init__.py
 create mode 100644 aurweb/requests/util.py
 create mode 100644 aurweb/routers/requests.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 88e72052..15c2d40a 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -21,7 +21,7 @@ from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
 from aurweb.prometheus import http_api_requests_total, http_requests_total, instrumentator
-from aurweb.routers import accounts, auth, html, packages, pkgbase, rpc, rss, sso, trusted_user
+from aurweb.routers import accounts, auth, html, packages, pkgbase, requests, rpc, rss, sso, trusted_user
 from aurweb.templates import make_context, render_template
 
 # Setup the FastAPI app.
@@ -82,6 +82,7 @@ async def app_startup():
     app.include_router(rss.router)
     app.include_router(packages.router)
     app.include_router(pkgbase.router)
+    app.include_router(requests.router)
     app.include_router(rpc.router)
 
     # Initialize the database engine and ORM.
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 0224e738..4210f51e 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -115,14 +115,6 @@ def get_pkgbase_comment(pkgbase: models.PackageBase, id: int) \
     return db.refresh(comment)
 
 
-def get_pkgreq_by_id(id: int):
-    pkgreq = db.query(models.PackageRequest).filter(
-        models.PackageRequest.ID == id).first()
-    if not pkgreq:
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
-    return db.refresh(pkgreq)
-
-
 @register_filter("out_of_date")
 def out_of_date(packages: orm.Query) -> orm.Query:
     return packages.filter(models.PackageBase.OutOfDateTS.isnot(None))
diff --git a/aurweb/packages/validate.py b/aurweb/pkgbase/validate.py
similarity index 84%
rename from aurweb/packages/validate.py
rename to aurweb/pkgbase/validate.py
index e730e98b..8d05a3d7 100644
--- a/aurweb/packages/validate.py
+++ b/aurweb/pkgbase/validate.py
@@ -1,10 +1,11 @@
 from typing import Any, Dict
 
-from aurweb import db, models
+from aurweb import db
 from aurweb.exceptions import ValidationError
+from aurweb.models import PackageBase
 
 
-def request(pkgbase: models.PackageBase,
+def request(pkgbase: PackageBase,
             type: str, comments: str, merge_into: str,
             context: Dict[str, Any]) -> None:
     if not comments:
@@ -17,8 +18,8 @@ def request(pkgbase: models.PackageBase,
             raise ValidationError(
                 ['The "Merge into" field must not be empty.'])
 
-        target = db.query(models.PackageBase).filter(
-            models.PackageBase.Name == merge_into
+        target = db.query(PackageBase).filter(
+            PackageBase.Name == merge_into
         ).first()
         if not target:
             # TODO: This error needs to be translated.
diff --git a/aurweb/requests/__init__.py b/aurweb/requests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/aurweb/requests/util.py b/aurweb/requests/util.py
new file mode 100644
index 00000000..97c3447e
--- /dev/null
+++ b/aurweb/requests/util.py
@@ -0,0 +1,13 @@
+from http import HTTPStatus
+
+from fastapi import HTTPException
+
+from aurweb import db
+from aurweb.models import PackageRequest
+
+
+def get_pkgreq_by_id(id: int) -> PackageRequest:
+    pkgreq = db.query(PackageRequest).filter(PackageRequest.ID == id).first()
+    if not pkgreq:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
+    return db.refresh(pkgreq)
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index dbb4dc63..1930a7a2 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -1,28 +1,21 @@
 from collections import defaultdict
-from datetime import datetime
 from http import HTTPStatus
 from typing import Any, Dict, List
 
-from fastapi import APIRouter, Form, Query, Request, Response
-from fastapi.responses import RedirectResponse
-from sqlalchemy import case
+from fastapi import APIRouter, Form, Request, Response
 
-import aurweb.filters
-import aurweb.packages.util
+import aurweb.filters  # noqa: F401
 
 from aurweb import config, db, defaults, logging, models, util
 from aurweb.auth import auth_required, creds
-from aurweb.exceptions import InvariantError, ValidationError
-from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
+from aurweb.exceptions import InvariantError
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
 from aurweb.packages import util as pkgutil
-from aurweb.packages import validate
 from aurweb.packages.search import PackageSearch
-from aurweb.packages.util import get_pkg_or_base, get_pkgreq_by_id
+from aurweb.packages.util import get_pkg_or_base
 from aurweb.pkgbase import actions as pkgbase_actions
 from aurweb.pkgbase import util as pkgbaseutil
-from aurweb.scripts import notify
-from aurweb.templates import make_context, make_variable_context, render_template
+from aurweb.templates import make_context, render_template
 
 logger = logging.get_logger(__name__)
 router = APIRouter()
@@ -181,166 +174,6 @@ async def package(request: Request, name: str) -> Response:
     return render_template(request, "packages/show.html", context)
 
 
-@router.get("/requests")
-@auth_required()
-async def requests(request: Request,
-                   O: int = Query(default=defaults.O),
-                   PP: int = Query(default=defaults.PP)):
-    context = make_context(request, "Requests")
-
-    context["q"] = dict(request.query_params)
-
-    O, PP = util.sanitize_params(O, PP)
-    context["O"] = O
-    context["PP"] = PP
-
-    # A PackageRequest query, with left inner joined User and RequestType.
-    query = db.query(models.PackageRequest).join(
-        models.User, models.PackageRequest.UsersID == models.User.ID
-    ).join(models.RequestType)
-
-    # If the request user is not elevated (TU or Dev), then
-    # filter PackageRequests which are owned by the request user.
-    if not request.user.is_elevated():
-        query = query.filter(models.PackageRequest.UsersID == request.user.ID)
-
-    context["total"] = query.count()
-    context["results"] = query.order_by(
-        # Order primarily by the Status column being PENDING_ID,
-        # and secondarily by RequestTS; both in descending order.
-        case([(models.PackageRequest.Status == PENDING_ID, 1)], else_=0).desc(),
-        models.PackageRequest.RequestTS.desc()
-    ).limit(PP).offset(O).all()
-
-    return render_template(request, "requests.html", context)
-
-
-@router.get("/pkgbase/{name}/request")
-@auth_required()
-async def package_request(request: Request, name: str):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-    context = await make_variable_context(request, "Submit Request")
-    context["pkgbase"] = pkgbase
-    return render_template(request, "pkgbase/request.html", context)
-
-
-@router.post("/pkgbase/{name}/request")
-@auth_required()
-async def pkgbase_request_post(request: Request, name: str,
-                               type: str = Form(...),
-                               merge_into: str = Form(default=None),
-                               comments: str = Form(default=str())):
-    pkgbase = get_pkg_or_base(name, models.PackageBase)
-
-    # Create our render context.
-    context = await make_variable_context(request, "Submit Request")
-    context["pkgbase"] = pkgbase
-    if type not in {"deletion", "merge", "orphan"}:
-        # In the case that someone crafted a POST request with an invalid
-        # type, just return them to the request form with BAD_REQUEST status.
-        return render_template(request, "pkgbase/request.html", context,
-                               status_code=HTTPStatus.BAD_REQUEST)
-
-    try:
-        validate.request(pkgbase, type, comments, merge_into, context)
-    except ValidationError as exc:
-        logger.error(f"Request Validation Error: {str(exc.data)}")
-        context["errors"] = exc.data
-        return render_template(request, "pkgbase/request.html", context)
-
-    # All good. Create a new PackageRequest based on the given type.
-    now = int(datetime.utcnow().timestamp())
-    reqtype = db.query(models.RequestType).filter(
-        models.RequestType.Name == type).first()
-    with db.begin():
-        pkgreq = db.create(models.PackageRequest,
-                           RequestType=reqtype,
-                           User=request.user,
-                           RequestTS=now,
-                           PackageBase=pkgbase,
-                           PackageBaseName=pkgbase.Name,
-                           MergeBaseName=merge_into,
-                           Comments=comments,
-                           ClosureComment=str())
-
-    # Prepare notification object.
-    notif = notify.RequestOpenNotification(
-        request.user.ID, pkgreq.ID, reqtype.Name,
-        pkgreq.PackageBase.ID, merge_into=merge_into or None)
-
-    # Send the notification now that we're out of the DB scope.
-    notif.send()
-
-    auto_orphan_age = aurweb.config.getint("options", "auto_orphan_age")
-    auto_delete_age = aurweb.config.getint("options", "auto_delete_age")
-
-    ood_ts = pkgbase.OutOfDateTS or 0
-    flagged = ood_ts and (now - ood_ts) >= auto_orphan_age
-    is_maintainer = pkgbase.Maintainer == request.user
-    outdated = (now - pkgbase.SubmittedTS) <= auto_delete_age
-
-    if type == "orphan" and flagged:
-        # This request should be auto-accepted.
-        with db.begin():
-            pkgbase.Maintainer = None
-            pkgreq.Status = ACCEPTED_ID
-        notif = notify.RequestCloseNotification(
-            request.user.ID, pkgreq.ID, pkgreq.status_display())
-        notif.send()
-        logger.debug(f"New request #{pkgreq.ID} is marked for auto-orphan.")
-    elif type == "deletion" and is_maintainer and outdated:
-        # This request should be auto-accepted.
-        notifs = pkgbase_actions.pkgbase_delete_instance(
-            request, pkgbase, comments=comments)
-        util.apply_all(notifs, lambda n: n.send())
-        logger.debug(f"New request #{pkgreq.ID} is marked for auto-deletion.")
-
-    # Redirect the submitting user to /packages.
-    return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
-
-
-@router.get("/requests/{id}/close")
-@auth_required()
-async def requests_close(request: Request, id: int):
-    pkgreq = get_pkgreq_by_id(id)
-    if not request.user.is_elevated() and request.user != pkgreq.User:
-        # Request user doesn't have permission here: redirect to '/'.
-        return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
-
-    context = make_context(request, "Close Request")
-    context["pkgreq"] = pkgreq
-    return render_template(request, "requests/close.html", context)
-
-
-@router.post("/requests/{id}/close")
-@auth_required()
-async def requests_close_post(request: Request, id: int,
-                              comments: str = Form(default=str())):
-    pkgreq = get_pkgreq_by_id(id)
-
-    # `pkgreq`.User can close their own request.
-    approved = [pkgreq.User]
-    if not request.user.has_credential(creds.PKGREQ_CLOSE, approved=approved):
-        # Request user doesn't have permission here: redirect to '/'.
-        return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
-
-    context = make_context(request, "Close Request")
-    context["pkgreq"] = pkgreq
-
-    now = int(datetime.utcnow().timestamp())
-    with db.begin():
-        pkgreq.Closer = request.user
-        pkgreq.ClosureComment = comments
-        pkgreq.ClosedTS = now
-        pkgreq.Status = REJECTED_ID
-
-    notify_ = notify.RequestCloseNotification(
-        request.user.ID, pkgreq.ID, pkgreq.status_display())
-    notify_.send()
-
-    return RedirectResponse("/requests", status_code=HTTPStatus.SEE_OTHER)
-
-
 async def packages_unflag(request: Request, package_ids: List[int] = [],
                           **kwargs):
     if not package_ids:
diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index 464d1eea..e9fdd337 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -5,21 +5,22 @@ from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse
 from sqlalchemy import and_
 
-from aurweb import db, l10n, logging, templates, util
+from aurweb import config, db, l10n, logging, templates, util
 from aurweb.auth import auth_required, creds
-from aurweb.exceptions import InvariantError
+from aurweb.exceptions import InvariantError, ValidationError
 from aurweb.models import PackageBase
 from aurweb.models.package_comment import PackageComment
 from aurweb.models.package_keyword import PackageKeyword
 from aurweb.models.package_notification import PackageNotification
-from aurweb.models.package_request import PENDING_ID, PackageRequest
+from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, PackageRequest
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
 from aurweb.packages.requests import update_closure_comment
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment
 from aurweb.pkgbase import actions
 from aurweb.pkgbase import util as pkgbaseutil
-from aurweb.scripts import popupdate
+from aurweb.pkgbase import validate
+from aurweb.scripts import notify, popupdate
 from aurweb.scripts.rendercomment import update_comment_render_fastapi
 from aurweb.templates import make_variable_context, render_template
 
@@ -641,6 +642,95 @@ async def pkgbase_comaintainers_post(request: Request, name: str,
                             status_code=HTTPStatus.SEE_OTHER)
 
 
+@router.get("/pkgbase/{name}/request")
+@auth_required()
+async def pkgbase_request(request: Request, name: str):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+    context = await make_variable_context(request, "Submit Request")
+    context["pkgbase"] = pkgbase
+    return render_template(request, "pkgbase/request.html", context)
+
+
+@router.post("/pkgbase/{name}/request")
+@auth_required()
+async def pkgbase_request_post(request: Request, name: str,
+                               type: str = Form(...),
+                               merge_into: str = Form(default=None),
+                               comments: str = Form(default=str())):
+    pkgbase = get_pkg_or_base(name, PackageBase)
+
+    # Create our render context.
+    context = await make_variable_context(request, "Submit Request")
+    context["pkgbase"] = pkgbase
+
+    types = {
+        "deletion": DELETION_ID,
+        "merge": MERGE_ID,
+        "orphan": ORPHAN_ID
+    }
+
+    if type not in types:
+        # In the case that someone crafted a POST request with an invalid
+        # type, just return them to the request form with BAD_REQUEST status.
+        return render_template(request, "pkgbase/request.html", context,
+                               status_code=HTTPStatus.BAD_REQUEST)
+
+    try:
+        validate.request(pkgbase, type, comments, merge_into, context)
+    except ValidationError as exc:
+        logger.error(f"Request Validation Error: {str(exc.data)}")
+        context["errors"] = exc.data
+        return render_template(request, "pkgbase/request.html", context)
+
+    # All good. Create a new PackageRequest based on the given type.
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgreq = db.create(PackageRequest,
+                           ReqTypeID=types.get(type),
+                           User=request.user,
+                           RequestTS=now,
+                           PackageBase=pkgbase,
+                           PackageBaseName=pkgbase.Name,
+                           MergeBaseName=merge_into,
+                           Comments=comments,
+                           ClosureComment=str())
+
+    # Prepare notification object.
+    notif = notify.RequestOpenNotification(
+        request.user.ID, pkgreq.ID, type,
+        pkgreq.PackageBase.ID, merge_into=merge_into or None)
+
+    # Send the notification now that we're out of the DB scope.
+    notif.send()
+
+    auto_orphan_age = config.getint("options", "auto_orphan_age")
+    auto_delete_age = config.getint("options", "auto_delete_age")
+
+    ood_ts = pkgbase.OutOfDateTS or 0
+    flagged = ood_ts and (now - ood_ts) >= auto_orphan_age
+    is_maintainer = pkgbase.Maintainer == request.user
+    outdated = (now - pkgbase.SubmittedTS) <= auto_delete_age
+
+    if type == "orphan" and flagged:
+        # This request should be auto-accepted.
+        with db.begin():
+            pkgbase.Maintainer = None
+            pkgreq.Status = ACCEPTED_ID
+        notif = notify.RequestCloseNotification(
+            request.user.ID, pkgreq.ID, pkgreq.status_display())
+        notif.send()
+        logger.debug(f"New request #{pkgreq.ID} is marked for auto-orphan.")
+    elif type == "deletion" and is_maintainer and outdated:
+        # This request should be auto-accepted.
+        notifs = actions.pkgbase_delete_instance(
+            request, pkgbase, comments=comments)
+        util.apply_all(notifs, lambda n: n.send())
+        logger.debug(f"New request #{pkgreq.ID} is marked for auto-deletion.")
+
+    # Redirect the submitting user to /packages.
+    return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
+
+
 @router.get("/pkgbase/{name}/delete")
 @auth_required()
 async def pkgbase_delete_get(request: Request, name: str):
diff --git a/aurweb/routers/requests.py b/aurweb/routers/requests.py
new file mode 100644
index 00000000..2c18c66a
--- /dev/null
+++ b/aurweb/routers/requests.py
@@ -0,0 +1,92 @@
+from datetime import datetime
+from http import HTTPStatus
+
+from fastapi import APIRouter, Form, Query, Request
+from fastapi.responses import RedirectResponse
+from sqlalchemy import case
+
+from aurweb import db, defaults, util
+from aurweb.auth import auth_required, creds
+from aurweb.models import PackageRequest, User
+from aurweb.models.package_request import PENDING_ID, REJECTED_ID
+from aurweb.requests.util import get_pkgreq_by_id
+from aurweb.scripts import notify
+from aurweb.templates import make_context, render_template
+
+router = APIRouter()
+
+
+@router.get("/requests")
+@auth_required()
+async def requests(request: Request,
+                   O: int = Query(default=defaults.O),
+                   PP: int = Query(default=defaults.PP)):
+    context = make_context(request, "Requests")
+
+    context["q"] = dict(request.query_params)
+
+    O, PP = util.sanitize_params(O, PP)
+    context["O"] = O
+    context["PP"] = PP
+
+    # A PackageRequest query, with left inner joined User and RequestType.
+    query = db.query(PackageRequest).join(
+        User, User.ID == PackageRequest.UsersID)
+
+    # If the request user is not elevated (TU or Dev), then
+    # filter PackageRequests which are owned by the request user.
+    if not request.user.is_elevated():
+        query = query.filter(PackageRequest.UsersID == request.user.ID)
+
+    context["total"] = query.count()
+    context["results"] = query.order_by(
+        # Order primarily by the Status column being PENDING_ID,
+        # and secondarily by RequestTS; both in descending order.
+        case([(PackageRequest.Status == PENDING_ID, 1)], else_=0).desc(),
+        PackageRequest.RequestTS.desc()
+    ).limit(PP).offset(O).all()
+
+    return render_template(request, "requests.html", context)
+
+
+@router.get("/requests/{id}/close")
+@auth_required()
+async def request_close(request: Request, id: int):
+
+    pkgreq = get_pkgreq_by_id(id)
+    if not request.user.is_elevated() and request.user != pkgreq.User:
+        # Request user doesn't have permission here: redirect to '/'.
+        return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
+
+    context = make_context(request, "Close Request")
+    context["pkgreq"] = pkgreq
+    return render_template(request, "requests/close.html", context)
+
+
+@router.post("/requests/{id}/close")
+@auth_required()
+async def request_close_post(request: Request, id: int,
+                             comments: str = Form(default=str())):
+    pkgreq = get_pkgreq_by_id(id)
+
+    # `pkgreq`.User can close their own request.
+    approved = [pkgreq.User]
+    if not request.user.has_credential(creds.PKGREQ_CLOSE, approved=approved):
+        # Request user doesn't have permission here: redirect to '/'.
+        return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
+
+    context = make_context(request, "Close Request")
+    context["pkgreq"] = pkgreq
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgreq.Closer = request.user
+        pkgreq.ClosureComment = comments
+        pkgreq.ClosedTS = now
+        pkgreq.Status = REJECTED_ID
+
+    notify_ = notify.RequestCloseNotification(
+        request.user.ID, pkgreq.ID, pkgreq.status_display())
+    notify_.send()
+
+    return RedirectResponse("/requests", status_code=HTTPStatus.SEE_OTHER)
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index 3474f847..2c2ed5e9 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -2,7 +2,6 @@ from datetime import datetime
 
 import pytest
 
-from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
 from aurweb import asgi, config, db
@@ -98,11 +97,6 @@ def test_query_notified(maintainer: User, package: Package):
     assert query_notified[package.PackageBase.ID]
 
 
-def test_pkgreq_by_id_not_found():
-    with pytest.raises(HTTPException):
-        util.get_pkgreq_by_id(0)
-
-
 def test_source_uri_file(package: Package):
     FILE = "test_file"
 
diff --git a/test/test_requests.py b/test/test_requests.py
index 8228e171..8ca8f401 100644
--- a/test/test_requests.py
+++ b/test/test_requests.py
@@ -6,6 +6,7 @@ from logging import DEBUG
 
 import pytest
 
+from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
 from aurweb import asgi, config, db
@@ -15,6 +16,7 @@ from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
 from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
 from aurweb.packages.requests import ClosureFactory
+from aurweb.requests.util import get_pkgreq_by_id
 from aurweb.testing.email import Email
 from aurweb.testing.html import get_errors
 from aurweb.testing.requests import Request
@@ -583,3 +585,8 @@ def test_closure_factory_invalid_reqtype_id():
         automated.get_closure(666, None, None, None, ACCEPTED_ID)
     with pytest.raises(NotImplementedError, match=match):
         automated.get_closure(666, None, None, None, REJECTED_ID)
+
+
+def test_pkgreq_by_id_not_found():
+    with pytest.raises(HTTPException):
+        get_pkgreq_by_id(0)

From 3e048e9675199f70c1ae1fb99f30c059fd183711 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 2 Jan 2022 01:21:16 -0800
Subject: [PATCH 774/844] change(python): centralize router inclusion

Now, when we want to add, remove routes, our base routes should
be defined in aurweb.routers.__init__.APP_ROUTES.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py             | 22 ++++++++--------------
 aurweb/routers/__init__.py | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 15c2d40a..161f6f26 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -17,11 +17,12 @@ from starlette.middleware.sessions import SessionMiddleware
 import aurweb.config
 import aurweb.logging
 
+from aurweb import prometheus, util
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
-from aurweb.prometheus import http_api_requests_total, http_requests_total, instrumentator
-from aurweb.routers import accounts, auth, html, packages, pkgbase, requests, rpc, rss, sso, trusted_user
+from aurweb.prometheus import instrumentator
+from aurweb.routers import APP_ROUTES
 from aurweb.templates import make_context, render_template
 
 # Setup the FastAPI app.
@@ -29,8 +30,8 @@ app = FastAPI()
 
 # Instrument routes with the prometheus-fastapi-instrumentator
 # library with custom collectors and expose /metrics.
-instrumentator().add(http_api_requests_total())
-instrumentator().add(http_requests_total())
+instrumentator().add(prometheus.http_api_requests_total())
+instrumentator().add(prometheus.http_requests_total())
 instrumentator().instrument(app)
 
 
@@ -74,16 +75,9 @@ async def app_startup():
     app.add_middleware(SessionMiddleware, secret_key=session_secret)
 
     # Add application routes.
-    app.include_router(sso.router)
-    app.include_router(html.router)
-    app.include_router(auth.router)
-    app.include_router(accounts.router)
-    app.include_router(trusted_user.router)
-    app.include_router(rss.router)
-    app.include_router(packages.router)
-    app.include_router(pkgbase.router)
-    app.include_router(requests.router)
-    app.include_router(rpc.router)
+    def add_router(module):
+        app.include_router(module.router)
+    util.apply_all(APP_ROUTES, add_router)
 
     # Initialize the database engine and ORM.
     get_engine()
diff --git a/aurweb/routers/__init__.py b/aurweb/routers/__init__.py
index 35d43c03..da79e38f 100644
--- a/aurweb/routers/__init__.py
+++ b/aurweb/routers/__init__.py
@@ -3,3 +3,22 @@ API routers for FastAPI.
 
 See https://fastapi.tiangolo.com/tutorial/bigger-applications/
 """
+from . import accounts, auth, html, packages, pkgbase, requests, rpc, rss, sso, trusted_user
+
+"""
+aurweb application routes. This constant can be any iterable
+and each element must have a .router attribute which points
+to a fastapi.APIRouter.
+"""
+APP_ROUTES = [
+    accounts,
+    auth,
+    html,
+    packages,
+    pkgbase,
+    requests,
+    trusted_user,
+    rss,
+    rpc,
+    sso,
+]

From 51b60f4210d3f4c78b5b914e785f7d6fc9da0f38 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 2 Jan 2022 16:14:15 -0800
Subject: [PATCH 775/844] feat(auth): add requires_{auth,guest} decorators

These new decorators are meant to be used without any arguments
and provide aliases to auth_required:
- `auth_required(True) -> requires_auth`
- `auth_required(False) -> requires_guest`

These decorators should be used without arguments, e.g.:

    @router.get("/")
    @requires_guest
    async def my_route(request: Request):
        return HTMLResponse()

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth/__init__.py        | 28 ++++++++++++++++--
 aurweb/routers/accounts.py     | 24 +++++++--------
 aurweb/routers/auth.py         |  6 ++--
 aurweb/routers/packages.py     |  4 +--
 aurweb/routers/pkgbase.py      | 54 +++++++++++++++++-----------------
 aurweb/routers/requests.py     |  8 ++---
 aurweb/routers/trusted_user.py | 12 ++++----
 test/test_auth.py              |  4 +--
 8 files changed, 82 insertions(+), 58 deletions(-)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index b683b1df..3befd6ee 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -2,6 +2,7 @@ import functools
 
 from datetime import datetime
 from http import HTTPStatus
+from typing import Callable
 
 import fastapi
 
@@ -129,10 +130,15 @@ class BasicAuthBackend(AuthenticationBackend):
         return (AuthCredentials(["authenticated"]), user)
 
 
-def auth_required(auth_goal: bool = True):
-    """ Enforce a user's authentication status, bringing them to the login page
+def _auth_required(auth_goal: bool = True):
+    """
+    Enforce a user's authentication status, bringing them to the login page
     or homepage if their authentication status does not match the goal.
 
+    NOTE: This function should not need to be used in downstream code.
+    See `requires_auth` and `requires_guest` for decorators meant to be
+    used on routes (they're a bit more implicitly understandable).
+
     :param auth_goal: Whether authentication is required or entirely disallowed
                       for a user to perform this request.
     :return: Return the FastAPI function this decorator wraps.
@@ -167,6 +173,24 @@ def auth_required(auth_goal: bool = True):
     return decorator
 
 
+def requires_auth(func: Callable) -> Callable:
+    """ Require an authenticated session for a particular route. """
+
+    @functools.wraps(func)
+    async def wrapper(*args, **kwargs):
+        return await _auth_required(True)(func)(*args, **kwargs)
+    return wrapper
+
+
+def requires_guest(func: Callable) -> Callable:
+    """ Require a guest (unauthenticated) session for a particular route. """
+
+    @functools.wraps(func)
+    async def wrapper(*args, **kwargs):
+        return await _auth_required(False)(func)(*args, **kwargs)
+    return wrapper
+
+
 def account_type_required(one_of: set):
     """ A decorator that can be used on FastAPI routes to dictate
     that a user belongs to one of the types defined in one_of.
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index 6fffd79c..33ca9ed7 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -10,7 +10,7 @@ from sqlalchemy import and_, or_
 import aurweb.config
 
 from aurweb import cookies, db, l10n, logging, models, util
-from aurweb.auth import account_type_required, auth_required
+from aurweb.auth import account_type_required, requires_auth, requires_guest
 from aurweb.captcha import get_captcha_salts
 from aurweb.exceptions import ValidationError
 from aurweb.l10n import get_translator_for_request
@@ -27,14 +27,14 @@ logger = logging.get_logger(__name__)
 
 
 @router.get("/passreset", response_class=HTMLResponse)
-@auth_required(False)
+@requires_guest
 async def passreset(request: Request):
     context = await make_variable_context(request, "Password Reset")
     return render_template(request, "passreset.html", context)
 
 
 @router.post("/passreset", response_class=HTMLResponse)
-@auth_required(False)
+@requires_guest
 async def passreset_post(request: Request,
                          user: str = Form(...),
                          resetkey: str = Form(default=None),
@@ -224,7 +224,7 @@ def make_account_form_context(context: dict,
 
 
 @router.get("/register", response_class=HTMLResponse)
-@auth_required(False)
+@requires_guest
 async def account_register(request: Request,
                            U: str = Form(default=str()),    # Username
                            E: str = Form(default=str()),    # Email
@@ -250,7 +250,7 @@ async def account_register(request: Request,
 
 
 @router.post("/register", response_class=HTMLResponse)
-@auth_required(False)
+@requires_guest
 async def account_register_post(request: Request,
                                 U: str = Form(default=str()),  # Username
                                 E: str = Form(default=str()),  # Email
@@ -348,7 +348,7 @@ def cannot_edit(request: Request, user: models.User) \
 
 
 @router.get("/account/{username}/edit", response_class=HTMLResponse)
-@auth_required()
+@requires_auth
 async def account_edit(request: Request, username: str):
     user = db.query(models.User, models.User.Username == username).first()
 
@@ -364,7 +364,7 @@ async def account_edit(request: Request, username: str):
 
 
 @router.post("/account/{username}/edit", response_class=HTMLResponse)
-@auth_required()
+@requires_auth
 async def account_edit_post(request: Request,
                             username: str,
                             U: str = Form(default=str()),  # Username
@@ -461,7 +461,7 @@ async def account(request: Request, username: str):
 
 
 @router.get("/account/{username}/comments")
-@auth_required()
+@requires_auth
 async def account_comments(request: Request, username: str):
     user = get_user_by_name(username)
     context = make_context(request, "Accounts")
@@ -472,7 +472,7 @@ async def account_comments(request: Request, username: str):
 
 
 @router.get("/accounts")
-@auth_required()
+@requires_auth
 @account_type_required({at.TRUSTED_USER,
                         at.DEVELOPER,
                         at.TRUSTED_USER_AND_DEV})
@@ -482,7 +482,7 @@ async def accounts(request: Request):
 
 
 @router.post("/accounts")
-@auth_required()
+@requires_auth
 @account_type_required({at.TRUSTED_USER,
                         at.DEVELOPER,
                         at.TRUSTED_USER_AND_DEV})
@@ -567,7 +567,7 @@ def render_terms_of_service(request: Request,
 
 
 @router.get("/tos")
-@auth_required()
+@requires_auth
 async def terms_of_service(request: Request):
     # Query the database for terms that were previously accepted,
     # but now have a bumped Revision that needs to be accepted.
@@ -591,7 +591,7 @@ async def terms_of_service(request: Request):
 
 
 @router.post("/tos")
-@auth_required()
+@requires_auth
 async def terms_of_service_post(request: Request,
                                 accept: bool = Form(default=False)):
     # Query the database for terms that were previously accepted,
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 8815c896..0b68dac3 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -7,7 +7,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 import aurweb.config
 
 from aurweb import cookies, db
-from aurweb.auth import auth_required
+from aurweb.auth import requires_auth, requires_guest
 from aurweb.l10n import get_translator_for_request
 from aurweb.models import User
 from aurweb.templates import make_variable_context, render_template
@@ -29,7 +29,7 @@ async def login_get(request: Request, next: str = "/"):
 
 
 @router.post("/login", response_class=HTMLResponse)
-@auth_required(False)
+@requires_guest
 async def login_post(request: Request,
                      next: str = Form(...),
                      user: str = Form(default=str()),
@@ -81,7 +81,7 @@ async def login_post(request: Request,
 
 
 @router.post("/logout")
-@auth_required()
+@requires_auth
 async def logout(request: Request, next: str = Form(default="/")):
     if request.user.is_authenticated():
         request.user.logout(request)
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 1930a7a2..ca37ff50 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -7,7 +7,7 @@ from fastapi import APIRouter, Form, Request, Response
 import aurweb.filters  # noqa: F401
 
 from aurweb import config, db, defaults, logging, models, util
-from aurweb.auth import auth_required, creds
+from aurweb.auth import creds, requires_auth
 from aurweb.exceptions import InvariantError
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
 from aurweb.packages import util as pkgutil
@@ -406,7 +406,7 @@ PACKAGE_ACTIONS = {
 
 
 @router.post("/packages")
-@auth_required()
+@requires_auth
 async def packages_post(request: Request,
                         IDs: List[int] = Form(default=[]),
                         action: str = Form(default=str()),
diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index e9fdd337..ab7fde88 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -6,7 +6,7 @@ from fastapi.responses import JSONResponse, RedirectResponse
 from sqlalchemy import and_
 
 from aurweb import config, db, l10n, logging, templates, util
-from aurweb.auth import auth_required, creds
+from aurweb.auth import creds, requires_auth
 from aurweb.exceptions import InvariantError, ValidationError
 from aurweb.models import PackageBase
 from aurweb.models.package_comment import PackageComment
@@ -116,7 +116,7 @@ async def pkgbase_keywords(request: Request, name: str,
 
 
 @router.get("/pkgbase/{name}/flag")
-@auth_required()
+@requires_auth
 async def pkgbase_flag_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
 
@@ -131,7 +131,7 @@ async def pkgbase_flag_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/flag")
-@auth_required()
+@requires_auth
 async def pkgbase_flag_post(request: Request, name: str,
                             comments: str = Form(default=str())):
     pkgbase = get_pkg_or_base(name, PackageBase)
@@ -157,7 +157,7 @@ async def pkgbase_flag_post(request: Request, name: str,
 
 
 @router.post("/pkgbase/{name}/comments")
-@auth_required()
+@requires_auth
 async def pkgbase_comments_post(
         request: Request, name: str,
         comment: str = Form(default=str()),
@@ -189,7 +189,7 @@ async def pkgbase_comments_post(
 
 
 @router.get("/pkgbase/{name}/comments/{id}/form")
-@auth_required()
+@requires_auth
 async def pkgbase_comment_form(request: Request, name: str, id: int,
                                next: str = Query(default=None)):
     """
@@ -229,7 +229,7 @@ async def pkgbase_comment_form(request: Request, name: str, id: int,
 
 
 @router.get("/pkgbase/{name}/comments/{id}/edit")
-@auth_required()
+@requires_auth
 async def pkgbase_comment_edit(request: Request, name: str, id: int,
                                next: str = Form(default=None)):
     """
@@ -253,7 +253,7 @@ async def pkgbase_comment_edit(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}")
-@auth_required()
+@requires_auth
 async def pkgbase_comment_post(
         request: Request, name: str, id: int,
         comment: str = Form(default=str()),
@@ -293,7 +293,7 @@ async def pkgbase_comment_post(
 
 
 @router.post("/pkgbase/{name}/comments/{id}/pin")
-@auth_required()
+@requires_auth
 async def pkgbase_comment_pin(request: Request, name: str, id: int,
                               next: str = Form(default=None)):
     """
@@ -327,7 +327,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/unpin")
-@auth_required()
+@requires_auth
 async def pkgbase_comment_unpin(request: Request, name: str, id: int,
                                 next: str = Form(default=None)):
     """
@@ -360,7 +360,7 @@ async def pkgbase_comment_unpin(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/delete")
-@auth_required()
+@requires_auth
 async def pkgbase_comment_delete(request: Request, name: str, id: int,
                                  next: str = Form(default=None)):
     """
@@ -399,7 +399,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/comments/{id}/undelete")
-@auth_required()
+@requires_auth
 async def pkgbase_comment_undelete(request: Request, name: str, id: int,
                                    next: str = Form(default=None)):
     """
@@ -437,7 +437,7 @@ async def pkgbase_comment_undelete(request: Request, name: str, id: int,
 
 
 @router.post("/pkgbase/{name}/vote")
-@auth_required()
+@requires_auth
 async def pkgbase_vote(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
 
@@ -461,7 +461,7 @@ async def pkgbase_vote(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/unvote")
-@auth_required()
+@requires_auth
 async def pkgbase_unvote(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
 
@@ -481,7 +481,7 @@ async def pkgbase_unvote(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/notify")
-@auth_required()
+@requires_auth
 async def pkgbase_notify(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
     actions.pkgbase_notify_instance(request, pkgbase)
@@ -490,7 +490,7 @@ async def pkgbase_notify(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/unnotify")
-@auth_required()
+@requires_auth
 async def pkgbase_unnotify(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
     actions.pkgbase_unnotify_instance(request, pkgbase)
@@ -499,7 +499,7 @@ async def pkgbase_unnotify(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/unflag")
-@auth_required()
+@requires_auth
 async def pkgbase_unflag(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
     actions.pkgbase_unflag_instance(request, pkgbase)
@@ -508,7 +508,7 @@ async def pkgbase_unflag(request: Request, name: str):
 
 
 @router.get("/pkgbase/{name}/disown")
-@auth_required()
+@requires_auth
 async def pkgbase_disown_get(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
 
@@ -524,7 +524,7 @@ async def pkgbase_disown_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/disown")
-@auth_required()
+@requires_auth
 async def pkgbase_disown_post(request: Request, name: str,
                               comments: str = Form(default=str()),
                               confirm: bool = Form(default=False)):
@@ -559,7 +559,7 @@ async def pkgbase_disown_post(request: Request, name: str,
 
 
 @router.post("/pkgbase/{name}/adopt")
-@auth_required()
+@requires_auth
 async def pkgbase_adopt_post(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
 
@@ -575,7 +575,7 @@ async def pkgbase_adopt_post(request: Request, name: str):
 
 
 @router.get("/pkgbase/{name}/comaintainers")
-@auth_required()
+@requires_auth
 async def pkgbase_comaintainers(request: Request, name: str) -> Response:
     # Get the PackageBase.
     pkgbase = get_pkg_or_base(name, PackageBase)
@@ -601,7 +601,7 @@ async def pkgbase_comaintainers(request: Request, name: str) -> Response:
 
 
 @router.post("/pkgbase/{name}/comaintainers")
-@auth_required()
+@requires_auth
 async def pkgbase_comaintainers_post(request: Request, name: str,
                                      users: str = Form(default=str())) \
         -> Response:
@@ -643,7 +643,7 @@ async def pkgbase_comaintainers_post(request: Request, name: str,
 
 
 @router.get("/pkgbase/{name}/request")
-@auth_required()
+@requires_auth
 async def pkgbase_request(request: Request, name: str):
     pkgbase = get_pkg_or_base(name, PackageBase)
     context = await make_variable_context(request, "Submit Request")
@@ -652,7 +652,7 @@ async def pkgbase_request(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/request")
-@auth_required()
+@requires_auth
 async def pkgbase_request_post(request: Request, name: str,
                                type: str = Form(...),
                                merge_into: str = Form(default=None),
@@ -732,7 +732,7 @@ async def pkgbase_request_post(request: Request, name: str,
 
 
 @router.get("/pkgbase/{name}/delete")
-@auth_required()
+@requires_auth
 async def pkgbase_delete_get(request: Request, name: str):
     if not request.user.has_credential(creds.PKGBASE_DELETE):
         return RedirectResponse(f"/pkgbase/{name}",
@@ -744,7 +744,7 @@ async def pkgbase_delete_get(request: Request, name: str):
 
 
 @router.post("/pkgbase/{name}/delete")
-@auth_required()
+@requires_auth
 async def pkgbase_delete_post(request: Request, name: str,
                               confirm: bool = Form(default=False),
                               comments: str = Form(default=str())):
@@ -779,7 +779,7 @@ async def pkgbase_delete_post(request: Request, name: str,
 
 
 @router.get("/pkgbase/{name}/merge")
-@auth_required()
+@requires_auth
 async def pkgbase_merge_get(request: Request, name: str,
                             into: str = Query(default=str()),
                             next: str = Query(default=str())):
@@ -810,7 +810,7 @@ async def pkgbase_merge_get(request: Request, name: str,
 
 
 @router.post("/pkgbase/{name}/merge")
-@auth_required()
+@requires_auth
 async def pkgbase_merge_post(request: Request, name: str,
                              into: str = Form(default=str()),
                              comments: str = Form(default=str()),
diff --git a/aurweb/routers/requests.py b/aurweb/routers/requests.py
index 2c18c66a..4c976655 100644
--- a/aurweb/routers/requests.py
+++ b/aurweb/routers/requests.py
@@ -6,7 +6,7 @@ from fastapi.responses import RedirectResponse
 from sqlalchemy import case
 
 from aurweb import db, defaults, util
-from aurweb.auth import auth_required, creds
+from aurweb.auth import creds, requires_auth
 from aurweb.models import PackageRequest, User
 from aurweb.models.package_request import PENDING_ID, REJECTED_ID
 from aurweb.requests.util import get_pkgreq_by_id
@@ -17,7 +17,7 @@ router = APIRouter()
 
 
 @router.get("/requests")
-@auth_required()
+@requires_auth
 async def requests(request: Request,
                    O: int = Query(default=defaults.O),
                    PP: int = Query(default=defaults.PP)):
@@ -50,7 +50,7 @@ async def requests(request: Request,
 
 
 @router.get("/requests/{id}/close")
-@auth_required()
+@requires_auth
 async def request_close(request: Request, id: int):
 
     pkgreq = get_pkgreq_by_id(id)
@@ -64,7 +64,7 @@ async def request_close(request: Request, id: int):
 
 
 @router.post("/requests/{id}/close")
-@auth_required()
+@requires_auth
 async def request_close_post(request: Request, id: int,
                              comments: str = Form(default=str())):
     pkgreq = get_pkgreq_by_id(id)
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index fac68f04..bfc38bf6 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -10,7 +10,7 @@ from fastapi.responses import RedirectResponse, Response
 from sqlalchemy import and_, or_
 
 from aurweb import db, l10n, logging, models
-from aurweb.auth import account_type_required, auth_required
+from aurweb.auth import account_type_required, requires_auth
 from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND_DEV
 from aurweb.templates import make_context, make_variable_context, render_template
 
@@ -41,7 +41,7 @@ ADDVOTE_SPECIFICS = {
 
 
 @router.get("/tu")
-@auth_required()
+@requires_auth
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user(request: Request,
                        coff: int = 0,  # current offset
@@ -147,7 +147,7 @@ def render_proposal(request: Request,
 
 
 @router.get("/tu/{proposal}")
-@auth_required()
+@requires_auth
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal(request: Request, proposal: int):
     context = await make_variable_context(request, "Trusted User")
@@ -176,7 +176,7 @@ async def trusted_user_proposal(request: Request, proposal: int):
 
 
 @router.post("/tu/{proposal}")
-@auth_required()
+@requires_auth
 @account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal_post(request: Request,
                                      proposal: int,
@@ -227,7 +227,7 @@ async def trusted_user_proposal_post(request: Request,
 
 
 @router.get("/addvote")
-@auth_required()
+@requires_auth
 @account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote(request: Request,
                                user: str = str(),
@@ -247,7 +247,7 @@ async def trusted_user_addvote(request: Request,
 
 
 @router.post("/addvote")
-@auth_required()
+@requires_auth
 @account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote_post(request: Request,
                                     user: str = Form(default=str()),
diff --git a/test/test_auth.py b/test/test_auth.py
index 0094aa25..8e8b5859 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -7,7 +7,7 @@ from fastapi import HTTPException
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import config, db
-from aurweb.auth import AnonymousUser, BasicAuthBackend, account_type_required, auth_required
+from aurweb.auth import AnonymousUser, BasicAuthBackend, _auth_required, account_type_required
 from aurweb.models.account_type import USER, USER_ID
 from aurweb.models.session import Session
 from aurweb.models.user import User
@@ -105,7 +105,7 @@ async def test_auth_required_redirection_bad_referrer():
         pass
 
     # Get down to the nitty gritty internal wrapper.
-    bad_referrer_route = auth_required()(bad_referrer_route)
+    bad_referrer_route = _auth_required()(bad_referrer_route)
 
     # Execute the route with a "./blahblahblah" Referer, which does not
     # match aur_location; `./` has been used as a prefix to attempt to

From e126d431d7202c20bdcb208c3583d63cf28c5900 Mon Sep 17 00:00:00 2001
From: Steven Guikal <void@fluix.one>
Date: Mon, 13 Dec 2021 19:08:33 -0500
Subject: [PATCH 776/844] fix(FastAPI): add custom error templates for certain
 exceptions

Signed-off-by: Steven Guikal <void@fluix.one>
---
 aurweb/asgi.py            | 27 ++++++++++++++++++++++++---
 aurweb/packages/util.py   |  5 ++++-
 templates/errors/404.html | 34 ++++++++++++++++++++++++++++++++++
 templates/errors/503.html |  8 ++++++++
 4 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 templates/errors/404.html
 create mode 100644 templates/errors/503.html

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 161f6f26..b55eada1 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,6 +1,7 @@
 import asyncio
 import http
 import os
+import re
 import sys
 import typing
 
@@ -9,18 +10,22 @@ from urllib.parse import quote_plus
 from fastapi import FastAPI, HTTPException, Request, Response
 from fastapi.responses import RedirectResponse
 from fastapi.staticfiles import StaticFiles
+from jinja2 import TemplateNotFound
 from prometheus_client import multiprocess
 from sqlalchemy import and_, or_
+from starlette.exceptions import HTTPException as StarletteHTTPException
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.middleware.sessions import SessionMiddleware
 
 import aurweb.config
 import aurweb.logging
+import aurweb.pkgbase.util as pkgbaseutil
 
 from aurweb import prometheus, util
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
+from aurweb.packages.util import get_pkg_or_base
 from aurweb.prometheus import instrumentator
 from aurweb.routers import APP_ROUTES
 from aurweb.templates import make_context, render_template
@@ -89,7 +94,7 @@ def child_exit(server, worker):  # pragma: no cover
     multiprocess.mark_process_dead(worker.pid)
 
 
-@app.exception_handler(HTTPException)
+@app.exception_handler(StarletteHTTPException)
 async def http_exception_handler(request: Request, exc: HTTPException) \
         -> Response:
     """ Handle an HTTPException thrown in a route. """
@@ -97,8 +102,24 @@ async def http_exception_handler(request: Request, exc: HTTPException) \
     context = make_context(request, phrase)
     context["exc"] = exc
     context["phrase"] = phrase
-    return render_template(request, "errors/detail.html", context,
-                           exc.status_code)
+
+    # Additional context for some exceptions.
+    if exc.status_code == http.HTTPStatus.NOT_FOUND:
+        tokens = request.url.path.split("/")
+        matches = re.match("^([a-z0-9][a-z0-9.+_-]*?)(\\.git)?$", tokens[1])
+        if matches:
+            try:
+                pkgbase = get_pkg_or_base(matches.group(1))
+                context = pkgbaseutil.make_context(request, pkgbase)
+            except HTTPException:
+                pass
+
+    try:
+        return render_template(request, f"errors/{exc.status_code}.html",
+                               context, exc.status_code)
+    except TemplateNotFound:
+        return render_template(request, "errors/detail.html",
+                               context, exc.status_code)
 
 
 @app.middleware("http")
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index 4210f51e..fd8fdf85 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -87,11 +87,14 @@ def provides_markup(provides: Providers) -> str:
 
 def get_pkg_or_base(
         name: str,
-        cls: Union[models.Package, models.PackageBase] = models.PackageBase):
+        cls: Union[models.Package, models.PackageBase] = models.PackageBase) \
+        -> Union[models.Package, models.PackageBase]:
     """ Get a PackageBase instance by its name or raise a 404 if
     it can't be found in the database.
 
     :param name: {Package,PackageBase}.Name
+    :param exception: Whether to raise an HTTPException or simply return None if
+                      the package can't be found.
     :raises HTTPException: With status code 404 if record doesn't exist
     :return: {Package,PackageBase} instance
     """
diff --git a/templates/errors/404.html b/templates/errors/404.html
new file mode 100644
index 00000000..d232c656
--- /dev/null
+++ b/templates/errors/404.html
@@ -0,0 +1,34 @@
+{% extends 'partials/layout.html' %}
+
+{% block pageContent %}
+    <div id="error-page" class="box">
+        <h2>404 - {% trans %}Page Not Found{% endtrans %}</h2>
+        <p>{% trans %}Sorry, the page you've requested does not exist.{% endtrans %}</p>
+        {% if pkgbase %}
+            <ul>
+                {% set pkgname_strong="<strong>%s</strong>" | format(pkgbase.Name) %}
+                <li>
+                    <strong>{% trans %}Note{% endtrans %}:</strong>
+                    {% trans %}Git clone URLs are not meant to be opened in a browser.{% endtrans %}
+                </li>
+                <li>
+                    {% set gitcmd="<code>git clone %s</code>" | format(git_clone_uri_anon | format(pkgbase.Name)) %}
+                    {% if is_maintainer %}
+                      {% set gitcmd="<code>git clone %s</code>" | format(git_clone_uri_priv | format(pkgbase.Name)) %}
+                    {% endif %}
+                    {{
+                        "To clone the Git repository of %s, run %s."
+                        | tr | format(pkgname_strong, gitcmd) | safe
+                    }}
+                </li>
+                <li>
+                    {% set pkglink='<a href="/pkgbase/%s">' | format(pkgbase.Name) %}
+                    {{
+                        "Click %shere%s to return to the %s details page."
+                        | tr | format(pkglink, "</a>", pkgname_strong) | safe
+                    }}
+                </li>
+            </ul>
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/templates/errors/503.html b/templates/errors/503.html
new file mode 100644
index 00000000..08f737bf
--- /dev/null
+++ b/templates/errors/503.html
@@ -0,0 +1,8 @@
+{% extends 'partials/layout.html' %}
+
+{% block pageContent %}
+    <div id="error-page" class="box">
+        <h2>503 - {% trans %}Service Unavailable{% endtrans %}</h2>
+        <p>{% trans %}Don't panic! This site is down due to maintenance. We will be back soon.{% endtrans %}</p>
+    </div>
+{% endblock %}

From 6c6eb2c21b98805b6558c10f443a20e994c29119 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 3 Jan 2022 17:35:31 -0800
Subject: [PATCH 777/844] test: add tests to check various 404 paths and 503

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_html.py | 54 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/test/test_html.py b/test/test_html.py
index db47c5e5..5e9505dc 100644
--- a/test/test_html.py
+++ b/test/test_html.py
@@ -1,12 +1,15 @@
 """ A test suite used to test HTML renders in different cases. """
 from http import HTTPStatus
 
+import fastapi
 import pytest
 
+from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
 from aurweb import asgi, db
-from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID, AccountType
+from aurweb.models import PackageBase
+from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID
 from aurweb.models.user import User
 from aurweb.testing.html import get_errors, get_successes, parse_root
 from aurweb.testing.requests import Request
@@ -24,22 +27,26 @@ def client() -> TestClient:
 
 @pytest.fixture
 def user() -> User:
-    user_type = db.query(AccountType, AccountType.ID == USER_ID).first()
     with db.begin():
         user = db.create(User, Username="test", Email="test@example.org",
-                         Passwd="testPassword", AccountType=user_type)
+                         Passwd="testPassword", AccountTypeID=USER_ID)
     yield user
 
 
 @pytest.fixture
 def trusted_user(user: User) -> User:
-    tu_type = db.query(AccountType,
-                       AccountType.ID == TRUSTED_USER_ID).first()
     with db.begin():
-        user.AccountType = tu_type
+        user.AccountTypeID = TRUSTED_USER_ID
     yield user
 
 
+@pytest.fixture
+def pkgbase(user: User) -> PackageBase:
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="test-pkg", Maintainer=user)
+    yield pkgbase
+
+
 def test_archdev_navbar(client: TestClient):
     expected = [
         "AUR Home",
@@ -123,3 +130,38 @@ def test_metrics(client: TestClient):
         resp = request.get("/metrics")
     assert resp.status_code == int(HTTPStatus.OK)
     assert resp.headers.get("Content-Type").startswith("text/plain")
+
+
+def test_404_with_valid_pkgbase(client: TestClient, pkgbase: PackageBase):
+    """ Test HTTPException with status_code == 404 and valid pkgbase. """
+    endpoint = f"/{pkgbase.Name}"
+    with client as request:
+        response = request.get(endpoint)
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+
+    body = response.text
+    assert "404 - Page Not Found" in body
+    assert "To clone the Git repository" in body
+
+
+def test_404(client: TestClient):
+    """ Test HTTPException with status_code == 404 without a valid pkgbase. """
+    with client as request:
+        response = request.get("/nonexistentroute")
+    assert response.status_code == int(HTTPStatus.NOT_FOUND)
+
+    body = response.text
+    assert "404 - Page Not Found" in body
+    # No `pkgbase` is provided here; we don't see the extra info.
+    assert "To clone the Git repository" not in body
+
+
+def test_503(client: TestClient):
+    """ Test HTTPException with status_code == 503 (Service Unavailable). """
+    @asgi.app.get("/raise-503")
+    async def raise_503(request: fastapi.Request):
+        raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE)
+
+    with TestClient(app=asgi.app) as request:
+        response = request.get("/raise-503")
+    assert response.status_code == int(HTTPStatus.SERVICE_UNAVAILABLE)

From 83dc26ccdec23141e2304824e6b192befff413b8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 3 Jan 2022 21:16:54 -0800
Subject: [PATCH 778/844] fix(packages.request): fix autogenerated merge
 closure

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/requests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/packages/requests.py b/aurweb/packages/requests.py
index bb21ed9e..9ee672c7 100644
--- a/aurweb/packages/requests.py
+++ b/aurweb/packages/requests.py
@@ -30,7 +30,7 @@ class ClosureFactory:
                        pkgbase: PackageBase,
                        target: PackageBase = None):
         return (f"[Autogenerated] Accepted merge for {pkgbase.Name} "
-                "into {target.Name}.")
+                f"into {target.Name}.")
 
     def _orphan_closure(self, requester: User,
                         pkgbase: PackageBase,

From 71e73ca654ffcaa41d2a84e044cf44defe4189e4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 3 Jan 2022 22:18:06 -0800
Subject: [PATCH 779/844] fix(routers.pkgbase): fix next argument for merge
 redirection

This was redirecting us to the package which we merged, leading
us into a 404. This fixes that issue by instead redirecting us
into the target we merge into.

Closes #231

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/pkgbase.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index ab7fde88..221a9e51 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -785,9 +785,6 @@ async def pkgbase_merge_get(request: Request, name: str,
                             next: str = Query(default=str())):
     pkgbase = get_pkg_or_base(name, PackageBase)
 
-    if not next:
-        next = f"/pkgbase/{pkgbase.Name}"
-
     context = templates.make_context(request, "Package Merging")
     context.update({
         "pkgbase": pkgbase,

From b0eea001813bf3af59d419a5a9221e37fc81c818 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 3 Jan 2022 22:32:14 -0800
Subject: [PATCH 780/844] fix(pkgbase.util): filter pending requests

Closes #229

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/pkgbase/util.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aurweb/pkgbase/util.py b/aurweb/pkgbase/util.py
index 945f0ed6..76b8a8c9 100644
--- a/aurweb/pkgbase/util.py
+++ b/aurweb/pkgbase/util.py
@@ -1,12 +1,13 @@
 from typing import Any, Dict, List
 
 from fastapi import Request
+from sqlalchemy import and_
 
 from aurweb import config, db, l10n, util
 from aurweb.models import PackageBase, User
 from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_comment import PackageComment
-from aurweb.models.package_request import PackageRequest
+from aurweb.models.package_request import PENDING_ID, PackageRequest
 from aurweb.models.package_vote import PackageVote
 from aurweb.scripts import notify
 from aurweb.templates import make_context as _make_context
@@ -43,7 +44,8 @@ def make_context(request: Request, pkgbase: PackageBase) -> Dict[str, Any]:
     ).scalar()
 
     context["requests"] = pkgbase.requests.filter(
-        PackageRequest.ClosedTS.is_(None)
+        and_(PackageRequest.Status == PENDING_ID,
+             PackageRequest.ClosedTS.is_(None))
     ).count()
 
     return context

From 1af61b0c50984d018b666c68039f94bd5d164b60 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 3 Jan 2022 22:56:23 -0800
Subject: [PATCH 781/844] fix(routers.packages): fix /packages/{name} relation
 ordering

Conflicts, Provides and Replaces did not have consistent
ordering with PHP. This patch fixes that issue.

Closes #228

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index ca37ff50..bb67f2fe 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -160,15 +160,18 @@ async def package(request: Request, name: str) -> Response:
     context["licenses"] = pkg.package_licenses
 
     conflicts = pkg.package_relations.filter(
-        models.PackageRelation.RelTypeID == CONFLICTS_ID)
+        models.PackageRelation.RelTypeID == CONFLICTS_ID
+    ).order_by(models.PackageRelation.RelName.asc())
     context["conflicts"] = conflicts
 
     provides = pkg.package_relations.filter(
-        models.PackageRelation.RelTypeID == PROVIDES_ID)
+        models.PackageRelation.RelTypeID == PROVIDES_ID
+    ).order_by(models.PackageRelation.RelName.asc())
     context["provides"] = provides
 
     replaces = pkg.package_relations.filter(
-        models.PackageRelation.RelTypeID == REPLACES_ID)
+        models.PackageRelation.RelTypeID == REPLACES_ID
+    ).order_by(models.PackageRelation.RelName.asc())
     context["replaces"] = replaces
 
     return render_template(request, "packages/show.html", context)

From 2cb9de080097fc61c70c48e98a006928c4ecff76 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 4 Jan 2022 01:05:24 -0800
Subject: [PATCH 782/844] fix(models.package_group): add backref cascade

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_group.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aurweb/models/package_group.py b/aurweb/models/package_group.py
index 3b6db37d..dd212051 100644
--- a/aurweb/models/package_group.py
+++ b/aurweb/models/package_group.py
@@ -15,11 +15,13 @@ class PackageGroup(Base):
     }
 
     Package = relationship(
-        _Package, backref=backref("package_groups", lazy="dynamic"),
+        _Package, backref=backref("package_groups", lazy="dynamic",
+                                  cascade="all, delete"),
         foreign_keys=[__table__.c.PackageID])
 
     Group = relationship(
-        _Group, backref=backref("package_groups", lazy="dynamic"),
+        _Group, backref=backref("package_groups", lazy="dynamic",
+                                cascade="all, delete"),
         foreign_keys=[__table__.c.GroupID])
 
     def __init__(self, **kwargs):

From 8ffff6261b43a1d21b4871a81928eeebccc8ef19 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 4 Jan 2022 01:05:37 -0800
Subject: [PATCH 783/844] fix(models.package_dependency): add DepTypeID to PKs

This was stopping us from using numerous records for each dep type.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_dependency.py |  6 +++++-
 test/test_package_dependency.py     | 12 +-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/aurweb/models/package_dependency.py b/aurweb/models/package_dependency.py
index 44d9c839..2fd87f2a 100644
--- a/aurweb/models/package_dependency.py
+++ b/aurweb/models/package_dependency.py
@@ -16,7 +16,11 @@ class PackageDependency(Base):
     __table__ = schema.PackageDepends
     __tablename__ = __table__.name
     __mapper_args__ = {
-        "primary_key": [__table__.c.PackageID, __table__.c.DepName]
+        "primary_key": [
+            __table__.c.PackageID,
+            __table__.c.DepTypeID,
+            __table__.c.DepName,
+        ]
     }
 
     Package = relationship(
diff --git a/test/test_package_dependency.py b/test/test_package_dependency.py
index 7297abe4..2afbc1e3 100644
--- a/test/test_package_dependency.py
+++ b/test/test_package_dependency.py
@@ -4,7 +4,7 @@ from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
 from aurweb.models.account_type import USER_ID
-from aurweb.models.dependency_type import CHECKDEPENDS_ID, DEPENDS_ID, MAKEDEPENDS_ID, OPTDEPENDS_ID
+from aurweb.models.dependency_type import DEPENDS_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_dependency import PackageDependency
@@ -42,16 +42,6 @@ def test_package_dependencies(user: User, package: Package):
     assert pkgdep.DepName == "test-dep"
     assert pkgdep.Package == package
     assert pkgdep in package.package_dependencies
-
-    with db.begin():
-        pkgdep.DepTypeID = MAKEDEPENDS_ID
-
-    with db.begin():
-        pkgdep.DepTypeID = CHECKDEPENDS_ID
-
-    with db.begin():
-        pkgdep.DepTypeID = OPTDEPENDS_ID
-
     assert not pkgdep.is_package()
 
     with db.begin():

From 0988415931ed2c2537c8c43ceed21b9f93d5cb1b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 4 Jan 2022 01:06:38 -0800
Subject: [PATCH 784/844] fix(models.package_relation): add RelTypeID to PKs

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/package_relation.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aurweb/models/package_relation.py b/aurweb/models/package_relation.py
index eb6caa84..4910934d 100644
--- a/aurweb/models/package_relation.py
+++ b/aurweb/models/package_relation.py
@@ -11,7 +11,11 @@ class PackageRelation(Base):
     __table__ = schema.PackageRelations
     __tablename__ = __table__.name
     __mapper_args__ = {
-        "primary_key": [__table__.c.PackageID, __table__.c.RelName]
+        "primary_key": [
+            __table__.c.PackageID,
+            __table__.c.RelTypeID,
+            __table__.c.RelName,
+        ]
     }
 
     Package = relationship(

From ae7621fb544a459177293c3c74dc313481d19c1d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 5 Jan 2022 17:08:17 -0800
Subject: [PATCH 785/844] fix(routers.trusted_user): fix missing submitter link
 on `/tu/{id}`

Closes #235

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/tu/proposal/details.html | 7 +++++--
 test/test_trusted_user_routes.py            | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/templates/partials/tu/proposal/details.html b/templates/partials/tu/proposal/details.html
index 3f15a6eb..fd84f093 100644
--- a/templates/partials/tu/proposal/details.html
+++ b/templates/partials/tu/proposal/details.html
@@ -22,12 +22,15 @@
     </div>
 
     {% set submitted = voteinfo.Submitted | dt | as_timezone(timezone) %}
+    {% set submitter = voteinfo.Submitter.Username %}
+    {% set submitter_uri = "/account/%s" | format(submitter) %}
+    {% set submitter = '<a href="%s">%s</a>' | format(submitter_uri, submitter) %}
     {% set end = voteinfo.End | dt | as_timezone(timezone) %}
     <div class="field submitted">
         {{
             "Submitted: %s by %s" | tr
-            | format(submitted.strftime("%Y-%m-%d %H:%M"),
-                     voteinfo.Submitter.Username | e)
+            | format(submitted.strftime("%Y-%m-%d %H:%M"), submitter)
+            | safe
         }}
     </div>
 
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index ac7f82d5..96e2c704 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -3,6 +3,7 @@ import re
 from datetime import datetime
 from http import HTTPStatus
 from io import StringIO
+from typing import Tuple
 
 import lxml.etree
 import pytest
@@ -477,7 +478,8 @@ def test_tu_proposal_not_found(client, tu_user):
     assert response.status_code == int(HTTPStatus.NOT_FOUND)
 
 
-def test_tu_running_proposal(client, proposal):
+def test_tu_running_proposal(client: TestClient,
+                             proposal: Tuple[User, User, TUVoteInfo]):
     tu_user, user, voteinfo = proposal
 
     # Initiate an authenticated GET request to /tu/{proposal_id}.
@@ -502,8 +504,11 @@ def test_tu_running_proposal(client, proposal):
 
     submitted = details.xpath(
         './div[contains(@class, "submitted")]/text()')[0]
-    assert re.match(r'^Submitted: \d{4}-\d{2}-\d{2} \d{2}:\d{2} by .+$',
+    assert re.match(r'^Submitted: \d{4}-\d{2}-\d{2} \d{2}:\d{2} by$',
                     submitted.strip()) is not None
+    submitter = details.xpath('./div[contains(@class, "submitted")]/a')[0]
+    assert submitter.text.strip() == tu_user.Username
+    assert submitter.attrib["href"] == f"/account/{tu_user.Username}"
 
     end = details.xpath('./div[contains(@class, "end")]')[0]
     end_label = end.xpath("./text()")[0]

From 0df57debb8d57f975eda541c756c098bcc4b4174 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 5 Jan 2022 17:51:40 -0800
Subject: [PATCH 786/844] fix(routers.trusted_user): only display Voters on
 ended proposals

In addition, we display the Voters partial regardless of them existing
or not; with no voters, an empty Voters list is displayed.

Closes #236

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/tu/show.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/tu/show.html b/templates/tu/show.html
index ff2d4bb6..c36a3e8f 100644
--- a/templates/tu/show.html
+++ b/templates/tu/show.html
@@ -5,7 +5,7 @@
         {% include "partials/tu/proposal/details.html" %}
     </div>
     
-    {% if voters %}
+    {% if utcnow >= voteinfo.End %}
         <div class="box">
             {% include "partials/tu/proposal/voters.html" %}
         </div>
@@ -18,5 +18,4 @@
             {% include "partials/tu/proposal/form.html" %}
         {% endif %}
     </div>
-
 {% endblock %}

From 902c4d7a9cf5cb51bc5f4610f8b5fdec217afd2e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 5 Jan 2022 19:46:06 -0800
Subject: [PATCH 787/844] fix(routers.packages): fix repeatead user joins

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/search.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/aurweb/packages/search.py b/aurweb/packages/search.py
index c4ab36fe..1bca732a 100644
--- a/aurweb/packages/search.py
+++ b/aurweb/packages/search.py
@@ -59,14 +59,18 @@ class PackageSearch:
             "l": self._sort_by_last_modified
         }
 
+        self._joined = False
+
     def _join_user(self, outer: bool = True) -> orm.Query:
         """ Centralized joining of a package base's maintainer. """
-        self.query = self.query.join(
-            User,
-            User.ID == PackageBase.MaintainerUID,
-            isouter=outer
-        )
-        return self.query
+        if not self._joined:
+            self.query = self.query.join(
+                User,
+                User.ID == PackageBase.MaintainerUID,
+                isouter=outer
+            )
+            self._joined = True
+            return self.query
 
     def _search_by_namedesc(self, keywords: str) -> orm.Query:
         self._join_user()

From 9d221604b4993e4fd07bb73c9ad865c16f42aca4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 5 Jan 2022 20:16:27 -0800
Subject: [PATCH 788/844] fix(routers.trusted_user): fix proposal participation
 percentage

Closes #238

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/trusted_user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index bfc38bf6..0fa3ed28 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -125,8 +125,8 @@ def render_proposal(request: Request,
     context["voteinfo"] = voteinfo
     context["voters"] = voters.all()
 
-    participation = voteinfo.ActiveTUs / voteinfo.total_votes() \
-        if voteinfo.total_votes() else 0
+    total = voteinfo.total_votes()
+    participation = (total / voteinfo.ActiveTUs) if total else 0
     context["participation"] = participation
 
     accepted = (voteinfo.Yes > voteinfo.ActiveTUs / 2) or \

From 059733cb8cd70bff190623c1152a95335a794e28 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Wed, 5 Jan 2022 21:47:45 -0800
Subject: [PATCH 789/844] fix(routers.trusted_user): use creds to determine
 authorization

Closes #237

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/trusted_user.py       | 50 +++++++++++++---------------
 templates/partials/tu/proposals.html |  2 +-
 test/test_accounts_routes.py         |  8 +++++
 test/test_trusted_user_routes.py     | 45 +++++++++++++++++++++----
 4 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index 0fa3ed28..dee83f0c 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -10,8 +10,7 @@ from fastapi.responses import RedirectResponse, Response
 from sqlalchemy import and_, or_
 
 from aurweb import db, l10n, logging, models
-from aurweb.auth import account_type_required, requires_auth
-from aurweb.models.account_type import DEVELOPER, TRUSTED_USER, TRUSTED_USER_AND_DEV
+from aurweb.auth import creds, requires_auth
 from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
@@ -21,13 +20,6 @@ logger = logging.get_logger(__name__)
 ITEMS_PER_PAGE = 10  # Paged table size.
 MAX_AGENDA_LENGTH = 75  # Agenda table column length.
 
-# A set of account types that will approve a user for TU actions.
-REQUIRED_TYPES = {
-    TRUSTED_USER,
-    DEVELOPER,
-    TRUSTED_USER_AND_DEV
-}
-
 ADDVOTE_SPECIFICS = {
     # This dict stores a vote duration and quorum for a proposal.
     # When a proposal is added, duration is added to the current
@@ -42,12 +34,14 @@ ADDVOTE_SPECIFICS = {
 
 @router.get("/tu")
 @requires_auth
-@account_type_required(REQUIRED_TYPES)
 async def trusted_user(request: Request,
                        coff: int = 0,  # current offset
                        cby: str = "desc",  # current by
                        poff: int = 0,  # past offset
                        pby: str = "desc"):  # past by
+    if not request.user.has_credential(creds.TU_LIST_VOTES):
+        return RedirectResponse("/", status_code=HTTPStatus.SEE_OTHER)
+
     context = make_context(request, "Trusted User")
 
     current_by, past_by = cby, pby
@@ -113,9 +107,7 @@ async def trusted_user(request: Request,
     return render_template(request, "tu/index.html", context)
 
 
-def render_proposal(request: Request,
-                    context: dict,
-                    proposal: int,
+def render_proposal(request: Request, context: dict, proposal: int,
                     voteinfo: models.TUVoteInfo,
                     voters: typing.Iterable[models.User],
                     vote: models.TUVote,
@@ -148,8 +140,10 @@ def render_proposal(request: Request,
 
 @router.get("/tu/{proposal}")
 @requires_auth
-@account_type_required(REQUIRED_TYPES)
 async def trusted_user_proposal(request: Request, proposal: int):
+    if not request.user.has_credential(creds.TU_LIST_VOTES):
+        return RedirectResponse("/tu", status_code=HTTPStatus.SEE_OTHER)
+
     context = await make_variable_context(request, "Trusted User")
     proposal = int(proposal)
 
@@ -163,10 +157,9 @@ async def trusted_user_proposal(request: Request, proposal: int):
     vote = db.query(models.TUVote).filter(
         and_(models.TUVote.UserID == request.user.ID,
              models.TUVote.VoteID == voteinfo.ID)).first()
-
-    if not request.user.is_trusted_user():
+    if not request.user.has_credential(creds.TU_VOTE):
         context["error"] = "Only Trusted Users are allowed to vote."
-    elif voteinfo.User == request.user.Username:
+    if voteinfo.User == request.user.Username:
         context["error"] = "You cannot vote in an proposal about you."
     elif vote is not None:
         context["error"] = "You've already voted for this proposal."
@@ -177,10 +170,11 @@ async def trusted_user_proposal(request: Request, proposal: int):
 
 @router.post("/tu/{proposal}")
 @requires_auth
-@account_type_required(REQUIRED_TYPES)
-async def trusted_user_proposal_post(request: Request,
-                                     proposal: int,
+async def trusted_user_proposal_post(request: Request, proposal: int,
                                      decision: str = Form(...)):
+    if not request.user.has_credential(creds.TU_LIST_VOTES):
+        return RedirectResponse("/tu", status_code=HTTPStatus.SEE_OTHER)
+
     context = await make_variable_context(request, "Trusted User")
     proposal = int(proposal)  # Make sure it's an int.
 
@@ -196,7 +190,7 @@ async def trusted_user_proposal_post(request: Request,
              models.TUVote.VoteID == voteinfo.ID)).first()
 
     status_code = HTTPStatus.OK
-    if not request.user.is_trusted_user():
+    if not request.user.has_credential(creds.TU_VOTE):
         context["error"] = "Only Trusted Users are allowed to vote."
         status_code = HTTPStatus.UNAUTHORIZED
     elif voteinfo.User == request.user.Username:
@@ -228,11 +222,11 @@ async def trusted_user_proposal_post(request: Request,
 
 @router.get("/addvote")
 @requires_auth
-@account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
-async def trusted_user_addvote(request: Request,
-                               user: str = str(),
-                               type: str = "add_tu",
-                               agenda: str = str()):
+async def trusted_user_addvote(request: Request, user: str = str(),
+                               type: str = "add_tu", agenda: str = str()):
+    if not request.user.has_credential(creds.TU_ADD_VOTE):
+        return RedirectResponse("/tu", status_code=HTTPStatus.SEE_OTHER)
+
     context = await make_variable_context(request, "Add Proposal")
 
     if type not in ADDVOTE_SPECIFICS:
@@ -248,11 +242,13 @@ async def trusted_user_addvote(request: Request,
 
 @router.post("/addvote")
 @requires_auth
-@account_type_required({TRUSTED_USER, TRUSTED_USER_AND_DEV})
 async def trusted_user_addvote_post(request: Request,
                                     user: str = Form(default=str()),
                                     type: str = Form(default=str()),
                                     agenda: str = Form(default=str())):
+    if not request.user.has_credential(creds.TU_ADD_VOTE):
+        return RedirectResponse("/tu", status_code=HTTPStatus.SEE_OTHER)
+
     # Build a context.
     context = await make_variable_context(request, "Add Proposal")
 
diff --git a/templates/partials/tu/proposals.html b/templates/partials/tu/proposals.html
index 9e3c67e1..4126683a 100644
--- a/templates/partials/tu/proposals.html
+++ b/templates/partials/tu/proposals.html
@@ -1,7 +1,7 @@
 <div class="box">
     <h2>{% trans %}{{ title }}{% endtrans %}</h2>
 
-    {% if title == "Current Votes" %}
+    {% if title == "Current Votes" and request.user.has_credential(creds.TU_ADD_VOTE) %}
         <ul class="admin-actions">
             <li>
                 <a href="/addvote">
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 3b7c7161..5e5e708d 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -1857,3 +1857,11 @@ def test_account_comments_not_found(client: TestClient, user: User):
     with client as request:
         resp = request.get("/account/non-existent/comments", cookies=cookies)
     assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_accounts_unauthorized(client: TestClient, user: User):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/accounts", cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == "/"
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index 96e2c704..b050af22 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -11,7 +11,7 @@ import pytest
 from fastapi.testclient import TestClient
 
 from aurweb import config, db, util
-from aurweb.models.account_type import AccountType
+from aurweb.models.account_type import DEVELOPER_ID, AccountType
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
@@ -134,7 +134,7 @@ def test_tu_index_guest(client):
     assert response.headers.get("location") == f"/login?{params}"
 
 
-def test_tu_index_unauthorized(client, user):
+def test_tu_index_unauthorized(client: TestClient, user: User):
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
         # Login as a normal user, not a TU.
@@ -478,6 +478,24 @@ def test_tu_proposal_not_found(client, tu_user):
     assert response.status_code == int(HTTPStatus.NOT_FOUND)
 
 
+def test_tu_proposal_unauthorized(client: TestClient, user: User,
+                                  proposal: Tuple[User, User, TUVoteInfo]):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/tu/{proposal[2].ID}"
+    with client as request:
+        response = request.get(endpoint, cookies=cookies,
+                               allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/tu"
+
+    with client as request:
+        response = request.post(endpoint, cookies=cookies,
+                                data={"decision": False},
+                                allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/tu"
+
+
 def test_tu_running_proposal(client: TestClient,
                              proposal: Tuple[User, User, TUVoteInfo]):
     tu_user, user, voteinfo = proposal
@@ -641,13 +659,12 @@ def test_tu_proposal_vote(client, proposal):
     assert status == "You've already voted for this proposal."
 
 
-def test_tu_proposal_vote_unauthorized(client, proposal):
+def test_tu_proposal_vote_unauthorized(
+        client: TestClient, proposal: Tuple[User, User, TUVoteInfo]):
     tu_user, user, voteinfo = proposal
 
-    dev_type = db.query(AccountType,
-                        AccountType.AccountType == "Developer").first()
     with db.begin():
-        tu_user.AccountType = dev_type
+        tu_user.AccountTypeID = DEVELOPER_ID
 
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:
@@ -749,6 +766,22 @@ def test_tu_addvote(client: TestClient, tu_user: User):
     assert response.status_code == int(HTTPStatus.OK)
 
 
+def test_tu_addvote_unauthorized(client: TestClient, user: User,
+                                 proposal: Tuple[User, User, TUVoteInfo]):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        response = request.get("/addvote", cookies=cookies,
+                               allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/tu"
+
+    with client as request:
+        response = request.post("/addvote", cookies=cookies,
+                                allow_redirects=False)
+    assert response.status_code == int(HTTPStatus.SEE_OTHER)
+    assert response.headers.get("location") == "/tu"
+
+
 def test_tu_addvote_invalid_type(client: TestClient, tu_user: User):
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:

From d49886f44f68d96ac8c63208846ecf8b73861a2d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 6 Jan 2022 15:29:40 -0800
Subject: [PATCH 790/844] fix(web/html/addvote): convert quorum to str using
 strval

Previous conversion was causing a straight up bug when submitting
new proposals. This patch fixes that issue.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 web/html/addvote.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/html/addvote.php b/web/html/addvote.php
index 3e4def44..83b800b8 100644
--- a/web/html/addvote.php
+++ b/web/html/addvote.php
@@ -69,9 +69,8 @@ if (has_credential(CRED_TU_ADD_VOTE)) {
 
     if (!empty($_POST['addVote']) && empty($error)) {
         // Convert $quorum to a String of maximum length "12.34" (5).
-        $quorum_str = substr(strval($quorum), min(5, strlen($quorum)));
         add_tu_proposal($_POST['agenda'], $_POST['user'],
-                        $len, $quorum_str, $uid);
+                        $len, strval($quorum), $uid);
 
 		print "<p class=\"pkgoutput\">" . __("New proposal submitted.") . "</p>\n";
 	} else {

From efd61979f706d3346e611599e34ff81d061b6436 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 6 Jan 2022 20:25:30 -0800
Subject: [PATCH 791/844] fix(models.tu_voteinfo): default vote-count related
 columns to 0

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/tu_voteinfo.py | 15 ++++++---------
 test/test_tu_voteinfo.py     | 17 ++++++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/aurweb/models/tu_voteinfo.py b/aurweb/models/tu_voteinfo.py
index 35675ccc..64551998 100644
--- a/aurweb/models/tu_voteinfo.py
+++ b/aurweb/models/tu_voteinfo.py
@@ -20,6 +20,11 @@ class TUVoteInfo(Base):
         foreign_keys=[__table__.c.SubmitterID])
 
     def __init__(self, **kwargs):
+        # Default Quorum, Yes, No and Abstain columns to 0.
+        for col in ("Quorum", "Yes", "No", "Abstain"):
+            if col not in kwargs:
+                kwargs.update({col: 0})
+
         super().__init__(**kwargs)
 
         if self.Agenda is None:
@@ -46,12 +51,6 @@ class TUVoteInfo(Base):
                 orig="TU_VoteInfo.End",
                 params=("NULL"))
 
-        if self.Quorum is None:
-            raise IntegrityError(
-                statement="Column Quorum cannot be null.",
-                orig="TU_VoteInfo.Quorum",
-                params=("NULL"))
-
         if not self.Submitter:
             raise IntegrityError(
                 statement="Foreign key SubmitterID cannot be null.",
@@ -67,9 +66,7 @@ class TUVoteInfo(Base):
     def __getattribute__(self, key: str):
         """ Customize getattr to floatify any fetched Quorum values. """
         attr = super().__getattribute__(key)
-        if attr is None:
-            return attr
-        elif key == "Quorum":
+        if key == "Quorum":
             return float(attr)
         return attr
 
diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index 26fa9522..beefda36 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -140,12 +140,11 @@ def test_tu_voteinfo_null_end_raises(user: User):
     rollback()
 
 
-def test_tu_voteinfo_null_quorum_raises(user: User):
-    with pytest.raises(IntegrityError):
-        with db.begin():
-            create(TUVoteInfo,
-                   Agenda="Blah blah.",
-                   User=user.Username,
-                   Submitted=0, End=0,
-                   Submitter=user)
-    rollback()
+def test_tu_voteinfo_null_quorum_default(user: User):
+    with db.begin():
+        vi = create(TUVoteInfo,
+                    Agenda="Blah blah.",
+                    User=user.Username,
+                    Submitted=0, End=0,
+                    Submitter=user)
+    assert vi.Quorum == 0

From 6e27f62e1bcae7976e8c353e3ebdc435c2c7cb74 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 6 Jan 2022 20:26:30 -0800
Subject: [PATCH 792/844] fix(routers.trusted_user): set ActiveTUs on vote
 creation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/trusted_user.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index dee83f0c..595ee88e 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -11,6 +11,8 @@ from sqlalchemy import and_, or_
 
 from aurweb import db, l10n, logging, models
 from aurweb.auth import creds, requires_auth
+from aurweb.models import User
+from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
 from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
@@ -295,15 +297,20 @@ async def trusted_user_addvote_post(request: Request,
     agenda = re.sub(r'<[/]?script.*>', '', agenda)
     agenda = re.sub(r'<[/]?style.*>', '', agenda)
 
+    types = {TRUSTED_USER_ID, TRUSTED_USER_AND_DEV_ID}
+    active_tus = db.query(User).filter(
+        and_(User.Suspended == 0,
+             User.InactivityTS.isnot(None),
+             User.AccountTypeID.in_(types))
+    ).count()
+
     # Create a new TUVoteInfo (proposal)!
     with db.begin():
-        voteinfo = db.create(models.TUVoteInfo,
-                             User=user,
-                             Agenda=agenda,
-                             Submitted=timestamp, End=timestamp + duration,
-                             Quorum=quorum,
+        voteinfo = db.create(models.TUVoteInfo, User=user, Agenda=agenda,
+                             Submitted=timestamp, End=(timestamp + duration),
+                             Quorum=quorum, ActiveTUs=active_tus,
                              Submitter=request.user)
 
     # Redirect to the new proposal.
-    return RedirectResponse(f"/tu/{voteinfo.ID}",
-                            status_code=HTTPStatus.SEE_OTHER)
+    endpoint = f"/tu/{voteinfo.ID}"
+    return RedirectResponse(endpoint, status_code=HTTPStatus.SEE_OTHER)

From b5ff8581f31d9088ebc6aaab853bf5f7e769c377 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 6 Jan 2022 20:27:23 -0800
Subject: [PATCH 793/844] feat(migrations): add upgrade_voteinfo_integers ref

This migration modifies the Yes, No, Abstain and ActiveTUs columns
of the TUVoteInfo table from unsigned TINYINT to unsigned INTEGER.

TINYINT supports a total of 1 byte (up to 255 trusted users). This
is quite limited and we don't spend too much more by storing a
standard 4-byte INTEGER.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/schema.py                              |  8 +--
 .../be7adae47ac3_upgrade_voteinfo_integers.py | 49 +++++++++++++++++++
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 migrations/versions/be7adae47ac3_upgrade_voteinfo_integers.py

diff --git a/aurweb/schema.py b/aurweb/schema.py
index 43db920d..39550ff6 100644
--- a/aurweb/schema.py
+++ b/aurweb/schema.py
@@ -391,10 +391,10 @@ TU_VoteInfo = Table(
            if db_backend == "mysql" else String(5),
            nullable=False),
     Column('SubmitterID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
-    Column('Yes', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
-    Column('No', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
-    Column('Abstain', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
-    Column('ActiveTUs', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
+    Column('Yes', INTEGER(unsigned=True), nullable=False, server_default=text("'0'")),
+    Column('No', INTEGER(unsigned=True), nullable=False, server_default=text("'0'")),
+    Column('Abstain', INTEGER(unsigned=True), nullable=False, server_default=text("'0'")),
+    Column('ActiveTUs', INTEGER(unsigned=True), nullable=False, server_default=text("'0'")),
     mysql_engine='InnoDB',
     mysql_charset='utf8mb4',
     mysql_collate='utf8mb4_general_ci',
diff --git a/migrations/versions/be7adae47ac3_upgrade_voteinfo_integers.py b/migrations/versions/be7adae47ac3_upgrade_voteinfo_integers.py
new file mode 100644
index 00000000..d910a14b
--- /dev/null
+++ b/migrations/versions/be7adae47ac3_upgrade_voteinfo_integers.py
@@ -0,0 +1,49 @@
+"""
+upgrade voteinfo integers
+
+Within `aurweb/schema.py`, these were previously forced to use
+TINYINT(3, unsigned=True) types. When generating with dummy data,
+it is very easy to bypass 3-character TU counts; in addition,
+this is possible in the future on production, and so we should
+deal with this case regardless.
+
+All previous TINYINT(3, unsigned=True) typed columns are upgraded
+INTEGER(unsigned=True) types, supporting up to 4-bytes of active TUs
+and votes for one particular proposal.
+
+Revision ID: be7adae47ac3
+Revises: 56e2ce8e2ffa
+Create Date: 2022-01-06 14:37:07.899778
+"""
+from alembic import op
+from sqlalchemy.dialects.mysql import INTEGER, TINYINT
+
+# revision identifiers, used by Alembic.
+revision = 'be7adae47ac3'
+down_revision = '56e2ce8e2ffa'
+branch_labels = None
+depends_on = None
+
+# Upgrade to INTEGER(unsigned=True); supports 4-byte values.
+UPGRADE_T = INTEGER(unsigned=True)
+
+# Downgrade to TINYINT(3, unsigned=True); supports 1-byte values.
+DOWNGRADE_T = TINYINT(3, unsigned=True)
+
+
+def upgrade():
+    """ Upgrade 'Yes', 'No', 'Abstain' and 'ActiveTUs' to unsigned INTEGER. """
+    op.alter_column("TU_VoteInfo", "Yes", type_=UPGRADE_T)
+    op.alter_column("TU_VoteInfo", "No", type_=UPGRADE_T)
+    op.alter_column("TU_VoteInfo", "Abstain", type_=UPGRADE_T)
+    op.alter_column("TU_VoteInfo", "ActiveTUs", type_=UPGRADE_T)
+
+
+def downgrade():
+    """
+    Downgrade 'Yes', 'No', 'Abstain' and 'ActiveTUs' to unsigned TINYINT.
+    """
+    op.alter_column("TU_VoteInfo", "ActiveTUs", type_=DOWNGRADE_T)
+    op.alter_column("TU_VoteInfo", "Abstain", type_=DOWNGRADE_T)
+    op.alter_column("TU_VoteInfo", "No", type_=DOWNGRADE_T)
+    op.alter_column("TU_VoteInfo", "Yes", type_=DOWNGRADE_T)

From a6faf9bd2e3c6ebfbbd9e651f473b54be7a16dcd Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 6 Jan 2022 22:11:03 -0800
Subject: [PATCH 794/844] feat(docker): perform migrations when starting the
 fastapi service

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/run-fastapi.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index ac54aedc..4cf9dcfe 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -23,6 +23,9 @@ export FASTAPI_BACKEND="$1"
 echo "FASTAPI_BACKEND: $FASTAPI_BACKEND"
 echo "FASTAPI_WORKERS: $FASTAPI_WORKERS"
 
+# Perform migrations.
+alembic upgrade head
+
 if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
     exec uvicorn --reload \
         --ssl-certfile "$CERT" \

From bf371c447f7b5f09862e62a7dceccbe379b1a79b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 7 Jan 2022 02:18:40 -0800
Subject: [PATCH 795/844] change(poetry): move fastapi to
 tiangolo/fastapi@2b10ca1

After two months, this finally got merged by somebody else.
Still largely considering moving away from FastAPI in the
long run, but this is better than relying on kevr's fork
for starlette 0.17.1 compat.

Other packages have also been upgraded and locked to versions.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 410 ++++++++++++++++++++++++-------------------------
 pyproject.toml |   2 +-
 2 files changed, 201 insertions(+), 211 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4d6587df..097d5162 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -59,17 +59,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "attrs"
-version = "21.2.0"
+version = "21.4.0"
 description = "Classes Without Boilerplate"
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
 docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "authlib"
@@ -135,7 +135,7 @@ pycparser = "*"
 
 [[package]]
 name = "charset-normalizer"
-version = "2.0.9"
+version = "2.0.10"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
@@ -179,7 +179,7 @@ toml = ["tomli"]
 
 [[package]]
 name = "cryptography"
-version = "36.0.0"
+version = "36.0.1"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 category = "main"
 optional = false
@@ -265,7 +265,7 @@ lua = ["lupa"]
 
 [[package]]
 name = "fastapi"
-version = "0.70.0"
+version = "0.70.1"
 description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"
 category = "main"
 optional = false
@@ -274,7 +274,7 @@ develop = false
 
 [package.dependencies]
 pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0"
-starlette = "0.17.0"
+starlette = "0.17.1"
 
 [package.extras]
 all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"]
@@ -284,9 +284,9 @@ test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.91
 
 [package.source]
 type = "git"
-url = "https://github.com/kevr/fastapi.git"
-reference = "upgrade-starlette-0.17.0"
-resolved_reference = "5d2d79e6bafd86564c318b7f99153132cd6ca466"
+url = "https://github.com/tiangolo/fastapi.git"
+reference = "2b10ca1cc47146b07b6598ac9473cbe8cac50cc0"
+resolved_reference = "2b10ca1cc47146b07b6598ac9473cbe8cac50cc0"
 
 [[package]]
 name = "feedgen"
@@ -302,11 +302,11 @@ python-dateutil = "*"
 
 [[package]]
 name = "filelock"
-version = "3.4.0"
+version = "3.4.2"
 description = "A platform independent file lock."
 category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.extras]
 docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"]
@@ -453,7 +453,7 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "importlib-metadata"
-version = "4.9.0"
+version = "4.10.0"
 description = "Read metadata from Python packages"
 category = "main"
 optional = false
@@ -465,7 +465,7 @@ zipp = ">=0.5"
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
 perf = ["ipython"]
-testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
 
 [[package]]
 name = "iniconfig"
@@ -513,7 +513,7 @@ i18n = ["Babel (>=2.7)"]
 
 [[package]]
 name = "lxml"
-version = "4.6.5"
+version = "4.7.1"
 description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
 category = "main"
 optional = false
@@ -719,7 +719,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pydantic"
-version = "1.8.2"
+version = "1.9.0"
 description = "Data validation and settings management using python 3.6 type hinting"
 category = "main"
 optional = false
@@ -889,7 +889,7 @@ hiredis = ["hiredis (>=0.1.3)"]
 
 [[package]]
 name = "requests"
-version = "2.26.0"
+version = "2.27.1"
 description = "Python HTTP for Humans."
 category = "main"
 optional = false
@@ -945,7 +945,7 @@ python-versions = "*"
 
 [[package]]
 name = "sqlalchemy"
-version = "1.4.28"
+version = "1.4.29"
 description = "Database Abstraction Library"
 category = "main"
 optional = false
@@ -977,7 +977,7 @@ sqlcipher = ["sqlcipher3-binary"]
 
 [[package]]
 name = "starlette"
-version = "0.17.0"
+version = "0.17.1"
 description = "The little ASGI library that shines."
 category = "main"
 optional = false
@@ -991,7 +991,7 @@ full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"]
 
 [[package]]
 name = "tap.py"
-version = "3.0"
+version = "3.1"
 description = "Test Anything Protocol (TAP) tools"
 category = "dev"
 optional = false
@@ -1010,19 +1010,19 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "tomli"
-version = "1.2.2"
+version = "2.0.0"
 description = "A lil' TOML parser"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [[package]]
 name = "tomlkit"
-version = "0.7.2"
+version = "0.8.0"
 description = "Style preserving TOML library"
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.6,<4.0"
 
 [[package]]
 name = "typing-extensions"
@@ -1093,20 +1093,20 @@ h11 = ">=0.9.0,<1"
 
 [[package]]
 name = "zipp"
-version = "3.6.0"
+version = "3.7.0"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
 
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "e9e5ecd8b8a0453b03468a5874844048f1ca171e4252b57bf38643b9e61da005"
+content-hash = "56f52b73bfc8e30b0b63bcfa1b8960f258cfec6d5d05d5ea1eca6e10fa0dd493"
 
 [metadata.files]
 aiofiles = [
@@ -1130,21 +1130,18 @@ atomicwrites = [
     {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
 ]
 attrs = [
-    {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"},
-    {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"},
+    {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
+    {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
 ]
 authlib = [
     {file = "Authlib-0.15.5-py2.py3-none-any.whl", hash = "sha256:ecf4a7a9f2508c0bb07e93a752dd3c495cfaffc20e864ef0ffc95e3f40d2abaf"},
     {file = "Authlib-0.15.5.tar.gz", hash = "sha256:b83cf6360c8e92b0e9df0d1f32d675790bcc4e3c03977499b1eed24dcdef4252"},
 ]
 bcrypt = [
-    {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:b589229207630484aefe5899122fb938a5b017b0f4349f769b8c13e78d99a8fd"},
     {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6"},
     {file = "bcrypt-3.2.0-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:63d4e3ff96188e5898779b6057878fecf3f11cfe6ec3b313ea09955d587ec7a7"},
     {file = "bcrypt-3.2.0-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1"},
     {file = "bcrypt-3.2.0-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d"},
-    {file = "bcrypt-3.2.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a0584a92329210fcd75eb8a3250c5a941633f8bfaf2a18f81009b097732839b7"},
-    {file = "bcrypt-3.2.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:56e5da069a76470679f312a7d3d23deb3ac4519991a0361abc11da837087b61d"},
     {file = "bcrypt-3.2.0-cp36-abi3-win32.whl", hash = "sha256:a67fb841b35c28a59cebed05fbd3e80eea26e6d75851f0574a9273c80f3e9b55"},
     {file = "bcrypt-3.2.0-cp36-abi3-win_amd64.whl", hash = "sha256:81fec756feff5b6818ea7ab031205e1d323d8943d237303baca2c5f9c7846f34"},
     {file = "bcrypt-3.2.0.tar.gz", hash = "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"},
@@ -1210,8 +1207,8 @@ cffi = [
     {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"},
 ]
 charset-normalizer = [
-    {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"},
-    {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"},
+    {file = "charset-normalizer-2.0.10.tar.gz", hash = "sha256:876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd"},
+    {file = "charset_normalizer-2.0.10-py3-none-any.whl", hash = "sha256:cb957888737fc0bbcd78e3df769addb41fd1ff8cf950dc9e7ad7793f1bf44455"},
 ]
 click = [
     {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
@@ -1271,27 +1268,26 @@ coverage = [
     {file = "coverage-6.2.tar.gz", hash = "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"},
 ]
 cryptography = [
-    {file = "cryptography-36.0.0-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:9511416e85e449fe1de73f7f99b21b3aa04fba4c4d335d30c486ba3756e3a2a6"},
-    {file = "cryptography-36.0.0-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:97199a13b772e74cdcdb03760c32109c808aff7cd49c29e9cf4b7754bb725d1d"},
-    {file = "cryptography-36.0.0-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:494106e9cd945c2cadfce5374fa44c94cfadf01d4566a3b13bb487d2e6c7959e"},
-    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6fbbbb8aab4053fa018984bb0e95a16faeb051dd8cca15add2a27e267ba02b58"},
-    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:684993ff6f67000a56454b41bdc7e015429732d65a52d06385b6e9de6181c71e"},
-    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c702855cd3174666ef0d2d13dcc879090aa9c6c38f5578896407a7028f75b9f"},
-    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d91bc9f535599bed58f6d2e21a2724cb0c3895bf41c6403fe881391d29096f1d"},
-    {file = "cryptography-36.0.0-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:b17d83b3d1610e571fedac21b2eb36b816654d6f7496004d6a0d32f99d1d8120"},
-    {file = "cryptography-36.0.0-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:8982c19bb90a4fa2aad3d635c6d71814e38b643649b4000a8419f8691f20ac44"},
-    {file = "cryptography-36.0.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:24469d9d33217ffd0ce4582dfcf2a76671af115663a95328f63c99ec7ece61a4"},
-    {file = "cryptography-36.0.0-cp36-abi3-win32.whl", hash = "sha256:f6a5a85beb33e57998dc605b9dbe7deaa806385fdf5c4810fb849fcd04640c81"},
-    {file = "cryptography-36.0.0-cp36-abi3-win_amd64.whl", hash = "sha256:2deab5ec05d83ddcf9b0916319674d3dae88b0e7ee18f8962642d3cde0496568"},
-    {file = "cryptography-36.0.0-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2049f8b87f449fc6190350de443ee0c1dd631f2ce4fa99efad2984de81031681"},
-    {file = "cryptography-36.0.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a776bae1629c8d7198396fd93ec0265f8dd2341c553dc32b976168aaf0e6a636"},
-    {file = "cryptography-36.0.0-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:aa94d617a4cd4cdf4af9b5af65100c036bce22280ebb15d8b5262e8273ebc6ba"},
-    {file = "cryptography-36.0.0-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:5c49c9e8fb26a567a2b3fa0343c89f5d325447956cc2fc7231c943b29a973712"},
-    {file = "cryptography-36.0.0-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ef216d13ac8d24d9cd851776662f75f8d29c9f2d05cdcc2d34a18d32463a9b0b"},
-    {file = "cryptography-36.0.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:231c4a69b11f6af79c1495a0e5a85909686ea8db946935224b7825cfb53827ed"},
-    {file = "cryptography-36.0.0-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:f92556f94e476c1b616e6daec5f7ddded2c082efa7cee7f31c7aeda615906ed8"},
-    {file = "cryptography-36.0.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:d73e3a96c38173e0aa5646c31bf8473bc3564837977dd480f5cbeacf1d7ef3a3"},
-    {file = "cryptography-36.0.0.tar.gz", hash = "sha256:52f769ecb4ef39865719aedc67b4b7eae167bafa48dbc2a26dd36fa56460507f"},
+    {file = "cryptography-36.0.1-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:73bc2d3f2444bcfeac67dd130ff2ea598ea5f20b40e36d19821b4df8c9c5037b"},
+    {file = "cryptography-36.0.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:2d87cdcb378d3cfed944dac30596da1968f88fb96d7fc34fdae30a99054b2e31"},
+    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74d6c7e80609c0f4c2434b97b80c7f8fdfaa072ca4baab7e239a15d6d70ed73a"},
+    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:6c0c021f35b421ebf5976abf2daacc47e235f8b6082d3396a2fe3ccd537ab173"},
+    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d59a9d55027a8b88fd9fd2826c4392bd487d74bf628bb9d39beecc62a644c12"},
+    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0a817b961b46894c5ca8a66b599c745b9a3d9f822725221f0e0fe49dc043a3a3"},
+    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:94ae132f0e40fe48f310bba63f477f14a43116f05ddb69d6fa31e93f05848ae2"},
+    {file = "cryptography-36.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:7be0eec337359c155df191d6ae00a5e8bbb63933883f4f5dffc439dac5348c3f"},
+    {file = "cryptography-36.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:e0344c14c9cb89e76eb6a060e67980c9e35b3f36691e15e1b7a9e58a0a6c6dc3"},
+    {file = "cryptography-36.0.1-cp36-abi3-win32.whl", hash = "sha256:4caa4b893d8fad33cf1964d3e51842cd78ba87401ab1d2e44556826df849a8ca"},
+    {file = "cryptography-36.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:391432971a66cfaf94b21c24ab465a4cc3e8bf4a939c1ca5c3e3a6e0abebdbcf"},
+    {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bb5829d027ff82aa872d76158919045a7c1e91fbf241aec32cb07956e9ebd3c9"},
+    {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ebc15b1c22e55c4d5566e3ca4db8689470a0ca2babef8e3a9ee057a8b82ce4b1"},
+    {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:596f3cd67e1b950bc372c33f1a28a0692080625592ea6392987dba7f09f17a94"},
+    {file = "cryptography-36.0.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:30ee1eb3ebe1644d1c3f183d115a8c04e4e603ed6ce8e394ed39eea4a98469ac"},
+    {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ec63da4e7e4a5f924b90af42eddf20b698a70e58d86a72d943857c4c6045b3ee"},
+    {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca238ceb7ba0bdf6ce88c1b74a87bffcee5afbfa1e41e173b1ceb095b39add46"},
+    {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:ca28641954f767f9822c24e927ad894d45d5a1e501767599647259cbf030b903"},
+    {file = "cryptography-36.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:39bdf8e70eee6b1c7b289ec6e5d84d49a6bfa11f8b8646b5b3dfe41219153316"},
+    {file = "cryptography-36.0.1.tar.gz", hash = "sha256:53e5c1dc3d7a953de055d77bef2ff607ceef7a2aac0353b5d630ab67f7423638"},
 ]
 dnspython = [
     {file = "dnspython-2.1.0-py3-none-any.whl", hash = "sha256:95d12f6ef0317118d2a1a6fc49aac65ffec7eb8087474158f42f26a639135216"},
@@ -1318,8 +1314,8 @@ feedgen = [
     {file = "feedgen-0.9.0.tar.gz", hash = "sha256:8e811bdbbed6570034950db23a4388453628a70e689a6e8303ccec430f5a804a"},
 ]
 filelock = [
-    {file = "filelock-3.4.0-py3-none-any.whl", hash = "sha256:2e139a228bcf56dd8b2274a65174d005c4a6b68540ee0bdbb92c76f43f29f7e8"},
-    {file = "filelock-3.4.0.tar.gz", hash = "sha256:93d512b32a23baf4cac44ffd72ccf70732aeff7b8050fcaf6d3ec406d954baf4"},
+    {file = "filelock-3.4.2-py3-none-any.whl", hash = "sha256:cf0fc6a2f8d26bd900f19bf33915ca70ba4dd8c56903eeb14e1e7a2fd7590146"},
+    {file = "filelock-3.4.2.tar.gz", hash = "sha256:38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"},
 ]
 flake8 = [
     {file = "flake8-4.0.1-py2.py3-none-any.whl", hash = "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d"},
@@ -1337,7 +1333,6 @@ greenlet = [
     {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97e5306482182170ade15c4b0d8386ded995a07d7cc2ca8f27958d34d6736497"},
     {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e6a36bb9474218c7a5b27ae476035497a6990e21d04c279884eb10d9b290f1b1"},
     {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:abb7a75ed8b968f3061327c433a0fbd17b729947b400747c334a9c29a9af6c58"},
-    {file = "greenlet-1.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b336501a05e13b616ef81ce329c0e09ac5ed8c732d9ba7e3e983fcc1a9e86965"},
     {file = "greenlet-1.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:14d4f3cd4e8b524ae9b8aa567858beed70c392fdec26dbdb0a8a418392e71708"},
     {file = "greenlet-1.1.2-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:17ff94e7a83aa8671a25bf5b59326ec26da379ace2ebc4411d690d80a7fbcf23"},
     {file = "greenlet-1.1.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9f3cba480d3deb69f6ee2c1825060177a22c7826431458c697df88e6aeb3caee"},
@@ -1350,7 +1345,6 @@ greenlet = [
     {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9d29ca8a77117315101425ec7ec2a47a22ccf59f5593378fc4077ac5b754fce"},
     {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:21915eb821a6b3d9d8eefdaf57d6c345b970ad722f856cd71739493ce003ad08"},
     {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eff9d20417ff9dcb0d25e2defc2574d10b491bf2e693b4e491914738b7908168"},
-    {file = "greenlet-1.1.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:b8c008de9d0daba7b6666aa5bbfdc23dcd78cafc33997c9b7741ff6353bafb7f"},
     {file = "greenlet-1.1.2-cp36-cp36m-win32.whl", hash = "sha256:32ca72bbc673adbcfecb935bb3fb1b74e663d10a4b241aaa2f5a75fe1d1f90aa"},
     {file = "greenlet-1.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:f0214eb2a23b85528310dad848ad2ac58e735612929c8072f6093f3585fd342d"},
     {file = "greenlet-1.1.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:b92e29e58bef6d9cfd340c72b04d74c4b4e9f70c9fa7c78b674d1fec18896dc4"},
@@ -1359,7 +1353,6 @@ greenlet = [
     {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e12bdc622676ce47ae9abbf455c189e442afdde8818d9da983085df6312e7a1"},
     {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8c790abda465726cfb8bb08bd4ca9a5d0a7bd77c7ac1ca1b839ad823b948ea28"},
     {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f276df9830dba7a333544bd41070e8175762a7ac20350786b322b714b0e654f5"},
-    {file = "greenlet-1.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c5d5b35f789a030ebb95bff352f1d27a93d81069f2adb3182d99882e095cefe"},
     {file = "greenlet-1.1.2-cp37-cp37m-win32.whl", hash = "sha256:64e6175c2e53195278d7388c454e0b30997573f3f4bd63697f88d855f7a6a1fc"},
     {file = "greenlet-1.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b11548073a2213d950c3f671aa88e6f83cda6e2fb97a8b6317b1b5b33d850e06"},
     {file = "greenlet-1.1.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:9633b3034d3d901f0a46b7939f8c4d64427dfba6bbc5a36b1a67364cf148a1b0"},
@@ -1368,7 +1361,6 @@ greenlet = [
     {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e859fcb4cbe93504ea18008d1df98dee4f7766db66c435e4882ab35cf70cac43"},
     {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00e44c8afdbe5467e4f7b5851be223be68adb4272f44696ee71fe46b7036a711"},
     {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec8c433b3ab0419100bd45b47c9c8551248a5aee30ca5e9d399a0b57ac04651b"},
-    {file = "greenlet-1.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2bde6792f313f4e918caabc46532aa64aa27a0db05d75b20edfc5c6f46479de2"},
     {file = "greenlet-1.1.2-cp38-cp38-win32.whl", hash = "sha256:288c6a76705dc54fba69fbcb59904ae4ad768b4c768839b8ca5fdadec6dd8cfd"},
     {file = "greenlet-1.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:8d2f1fb53a421b410751887eb4ff21386d119ef9cde3797bf5e7ed49fb51a3b3"},
     {file = "greenlet-1.1.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:166eac03e48784a6a6e0e5f041cfebb1ab400b394db188c48b3a84737f505b67"},
@@ -1377,7 +1369,6 @@ greenlet = [
     {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1692f7d6bc45e3200844be0dba153612103db241691088626a33ff1f24a0d88"},
     {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7227b47e73dedaa513cdebb98469705ef0d66eb5a1250144468e9c3097d6b59b"},
     {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ff61ff178250f9bb3cd89752df0f1dd0e27316a8bd1465351652b1b4a4cdfd3"},
-    {file = "greenlet-1.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0051c6f1f27cb756ffc0ffbac7d2cd48cb0362ac1736871399a739b2885134d3"},
     {file = "greenlet-1.1.2-cp39-cp39-win32.whl", hash = "sha256:f70a9e237bb792c7cc7e44c531fd48f5897961701cdaa06cf22fc14965c496cf"},
     {file = "greenlet-1.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:013d61294b6cd8fe3242932c1c5e36e5d1db2c8afb58606c5a67efce62c1f5fd"},
     {file = "greenlet-1.1.2.tar.gz", hash = "sha256:e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a"},
@@ -1419,8 +1410,8 @@ idna = [
     {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
 ]
 importlib-metadata = [
-    {file = "importlib_metadata-4.9.0-py3-none-any.whl", hash = "sha256:e8b45564028bc25f8c99f546616112a6df5de6655893d7eb74c9a99680dc9751"},
-    {file = "importlib_metadata-4.9.0.tar.gz", hash = "sha256:ee50794eccb0ec340adbc838344ebb9a6ff2bcba78f752d31fc716497e2149d6"},
+    {file = "importlib_metadata-4.10.0-py3-none-any.whl", hash = "sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4"},
+    {file = "importlib_metadata-4.10.0.tar.gz", hash = "sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6"},
 ]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
@@ -1439,66 +1430,66 @@ jinja2 = [
     {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"},
 ]
 lxml = [
-    {file = "lxml-4.6.5-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:abcf7daa5ebcc89328326254f6dd6d566adb483d4d00178892afd386ab389de2"},
-    {file = "lxml-4.6.5-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3884476a90d415be79adfa4e0e393048630d0d5bcd5757c4c07d8b4b00a1096b"},
-    {file = "lxml-4.6.5-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:add017c5bd6b9ec3a5f09248396b6ee2ce61c5621f087eb2269c813cd8813808"},
-    {file = "lxml-4.6.5-cp27-cp27m-win32.whl", hash = "sha256:a702005e447d712375433ed0499cb6e1503fadd6c96a47f51d707b4d37b76d3c"},
-    {file = "lxml-4.6.5-cp27-cp27m-win_amd64.whl", hash = "sha256:da07c7e7fc9a3f40446b78c54dbba8bfd5c9100dfecb21b65bfe3f57844f5e71"},
-    {file = "lxml-4.6.5-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a708c291900c40a7ecf23f1d2384ed0bc0604e24094dd13417c7e7f8f7a50d93"},
-    {file = "lxml-4.6.5-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:f33d8efb42e4fc2b31b3b4527940b25cdebb3026fb56a80c1c1c11a4271d2352"},
-    {file = "lxml-4.6.5-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:f6befb83bca720b71d6bd6326a3b26e9496ae6649e26585de024890fe50f49b8"},
-    {file = "lxml-4.6.5-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:59d77bfa3bea13caee95bc0d3f1c518b15049b97dd61ea8b3d71ce677a67f808"},
-    {file = "lxml-4.6.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:68a851176c931e2b3de6214347b767451243eeed3bea34c172127bbb5bf6c210"},
-    {file = "lxml-4.6.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a7790a273225b0c46e5f859c1327f0f659896cc72eaa537d23aa3ad9ff2a1cc1"},
-    {file = "lxml-4.6.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6548fc551de15f310dd0564751d9dc3d405278d45ea9b2b369ed1eccf142e1f5"},
-    {file = "lxml-4.6.5-cp310-cp310-win32.whl", hash = "sha256:dc8a0dbb2a10ae8bb609584f5c504789f0f3d0d81840da4849102ec84289f952"},
-    {file = "lxml-4.6.5-cp310-cp310-win_amd64.whl", hash = "sha256:1ccbfe5d17835db906f2bab6f15b34194db1a5b07929cba3cf45a96dbfbfefc0"},
-    {file = "lxml-4.6.5-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ca9a40497f7e97a2a961c04fa8a6f23d790b0521350a8b455759d786b0bcb203"},
-    {file = "lxml-4.6.5-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e5b4b0d9440046ead3bd425eb2b852499241ee0cef1ae151038e4f87ede888c4"},
-    {file = "lxml-4.6.5-cp35-cp35m-win32.whl", hash = "sha256:87f8f7df70b90fbe7b49969f07b347e3f978f8bd1046bb8ecae659921869202b"},
-    {file = "lxml-4.6.5-cp35-cp35m-win_amd64.whl", hash = "sha256:ce52aad32ec6e46d1a91ff8b8014a91538800dd533914bfc4a82f5018d971408"},
-    {file = "lxml-4.6.5-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:8021eeff7fabde21b9858ed058a8250ad230cede91764d598c2466b0ba70db8b"},
-    {file = "lxml-4.6.5-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:cab343b265e38d4e00649cbbad9278b734c5715f9bcbb72c85a1f99b1a58e19a"},
-    {file = "lxml-4.6.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:3534d7c468c044f6aef3c0aff541db2826986a29ea73f2ca831f5d5284d9b570"},
-    {file = "lxml-4.6.5-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:bdb98f4c9e8a1735efddfaa995b0c96559792da15d56b76428bdfc29f77c4cdb"},
-    {file = "lxml-4.6.5-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:5ea121cb66d7e5cb396b4c3ca90471252b94e01809805cfe3e4e44be2db3a99c"},
-    {file = "lxml-4.6.5-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:121fc6f71c692b49af6c963b84ab7084402624ffbe605287da362f8af0668ea3"},
-    {file = "lxml-4.6.5-cp36-cp36m-win32.whl", hash = "sha256:1a2a7659b8eb93c6daee350a0d844994d49245a0f6c05c747f619386fb90ba04"},
-    {file = "lxml-4.6.5-cp36-cp36m-win_amd64.whl", hash = "sha256:2f77556266a8fe5428b8759fbfc4bd70be1d1d9c9b25d2a414f6a0c0b0f09120"},
-    {file = "lxml-4.6.5-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:558485218ee06458643b929765ac1eb04519ca3d1e2dcc288517de864c747c33"},
-    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:ba0006799f21d83c3717fe20e2707a10bbc296475155aadf4f5850f6659b96b9"},
-    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:916d457ad84e05b7db52700bad0a15c56e0c3000dcaf1263b2fb7a56fe148996"},
-    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:c580c2a61d8297a6e47f4d01f066517dbb019be98032880d19ece7f337a9401d"},
-    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a21b78af7e2e13bec6bea12fc33bc05730197674f3e5402ce214d07026ccfebd"},
-    {file = "lxml-4.6.5-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:46515773570a33eae13e451c8fcf440222ef24bd3b26f40774dd0bd8b6db15b2"},
-    {file = "lxml-4.6.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:124f09614f999551ac65e5b9875981ce4b66ac4b8e2ba9284572f741935df3d9"},
-    {file = "lxml-4.6.5-cp37-cp37m-win32.whl", hash = "sha256:b4015baed99d046c760f09a4c59d234d8f398a454380c3cf0b859aba97136090"},
-    {file = "lxml-4.6.5-cp37-cp37m-win_amd64.whl", hash = "sha256:12ae2339d32a2b15010972e1e2467345b7bf962e155671239fba74c229564b7f"},
-    {file = "lxml-4.6.5-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:76b6c296e4f7a1a8a128aec42d128646897f9ae9a700ef6839cdc9b3900db9b5"},
-    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:534032a5ceb34bba1da193b7d386ac575127cc39338379f39a164b10d97ade89"},
-    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:60aeb14ff9022d2687ef98ce55f6342944c40d00916452bb90899a191802137a"},
-    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:9801bcd52ac9c795a7d81ea67471a42cffe532e46cfb750cd5713befc5c019c0"},
-    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3b95fb7e6f9c2f53db88f4642231fc2b8907d854e614710996a96f1f32018d5c"},
-    {file = "lxml-4.6.5-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:642eb4cabd997c9b949a994f9643cd8ae00cf4ca8c5cd9c273962296fadf1c44"},
-    {file = "lxml-4.6.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:af4139172ff0263d269abdcc641e944c9de4b5d660894a3ec7e9f9db63b56ac9"},
-    {file = "lxml-4.6.5-cp38-cp38-win32.whl", hash = "sha256:57cf05466917e08f90e323f025b96f493f92c0344694f5702579ab4b7e2eb10d"},
-    {file = "lxml-4.6.5-cp38-cp38-win_amd64.whl", hash = "sha256:4f415624cf8b065796649a5e4621773dc5c9ea574a944c76a7f8a6d3d2906b41"},
-    {file = "lxml-4.6.5-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:7679bb6e4d9a3978a46ab19a3560e8d2b7265ef3c88152e7fdc130d649789887"},
-    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:c34234a1bc9e466c104372af74d11a9f98338a3f72fae22b80485171a64e0144"},
-    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4b9390bf973e3907d967b75be199cf1978ca8443183cf1e78ad80ad8be9cf242"},
-    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fcc849b28f584ed1dbf277291ded5c32bb3476a37032df4a1d523b55faa5f944"},
-    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:46f21f2600d001af10e847df9eb3b832e8a439f696c04891bcb8a8cedd859af9"},
-    {file = "lxml-4.6.5-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:99cf827f5a783038eb313beee6533dddb8bdb086d7269c5c144c1c952d142ace"},
-    {file = "lxml-4.6.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:925174cafb0f1179a7fd38da90302555d7445e34c9ece68019e53c946be7f542"},
-    {file = "lxml-4.6.5-cp39-cp39-win32.whl", hash = "sha256:12d8d6fe3ddef629ac1349fa89a638b296a34b6529573f5055d1cb4e5245f73b"},
-    {file = "lxml-4.6.5-cp39-cp39-win_amd64.whl", hash = "sha256:a52e8f317336a44836475e9c802f51c2dc38d612eaa76532cb1d17690338b63b"},
-    {file = "lxml-4.6.5-pp37-pypy37_pp73-macosx_10_14_x86_64.whl", hash = "sha256:11ae552a78612620afd15625be9f1b82e3cc2e634f90d6b11709b10a100cba59"},
-    {file = "lxml-4.6.5-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:473701599665d874919d05bb33b56180447b3a9da8d52d6d9799f381ce23f95c"},
-    {file = "lxml-4.6.5-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:7f00cc64b49d2ef19ddae898a3def9dd8fda9c3d27c8a174c2889ee757918e71"},
-    {file = "lxml-4.6.5-pp38-pypy38_pp73-macosx_10_14_x86_64.whl", hash = "sha256:73e8614258404b2689a26cb5d002512b8bc4dfa18aca86382f68f959aee9b0c8"},
-    {file = "lxml-4.6.5-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:ff44de36772b05c2eb74f2b4b6d1ae29b8f41ed5506310ce1258d44826ee38c1"},
-    {file = "lxml-4.6.5-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:5d5254c815c186744c8f922e2ce861a2bdeabc06520b4b30b2f7d9767791ce6e"},
-    {file = "lxml-4.6.5.tar.gz", hash = "sha256:6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca"},
+    {file = "lxml-4.7.1-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:d546431636edb1d6a608b348dd58cc9841b81f4116745857b6cb9f8dadb2725f"},
+    {file = "lxml-4.7.1-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6308062534323f0d3edb4e702a0e26a76ca9e0e23ff99be5d82750772df32a9e"},
+    {file = "lxml-4.7.1-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:f76dbe44e31abf516114f6347a46fa4e7c2e8bceaa4b6f7ee3a0a03c8eba3c17"},
+    {file = "lxml-4.7.1-cp27-cp27m-win32.whl", hash = "sha256:d5618d49de6ba63fe4510bdada62d06a8acfca0b4b5c904956c777d28382b419"},
+    {file = "lxml-4.7.1-cp27-cp27m-win_amd64.whl", hash = "sha256:9393a05b126a7e187f3e38758255e0edf948a65b22c377414002d488221fdaa2"},
+    {file = "lxml-4.7.1-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:50d3dba341f1e583265c1a808e897b4159208d814ab07530202b6036a4d86da5"},
+    {file = "lxml-4.7.1-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:44f552e0da3c8ee3c28e2eb82b0b784200631687fc6a71277ea8ab0828780e7d"},
+    {file = "lxml-4.7.1-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:e662c6266e3a275bdcb6bb049edc7cd77d0b0f7e119a53101d367c841afc66dc"},
+    {file = "lxml-4.7.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4c093c571bc3da9ebcd484e001ba18b8452903cd428c0bc926d9b0141bcb710e"},
+    {file = "lxml-4.7.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:3e26ad9bc48d610bf6cc76c506b9e5ad9360ed7a945d9be3b5b2c8535a0145e3"},
+    {file = "lxml-4.7.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a5f623aeaa24f71fce3177d7fee875371345eb9102b355b882243e33e04b7175"},
+    {file = "lxml-4.7.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7b5e2acefd33c259c4a2e157119c4373c8773cf6793e225006a1649672ab47a6"},
+    {file = "lxml-4.7.1-cp310-cp310-win32.whl", hash = "sha256:67fa5f028e8a01e1d7944a9fb616d1d0510d5d38b0c41708310bd1bc45ae89f6"},
+    {file = "lxml-4.7.1-cp310-cp310-win_amd64.whl", hash = "sha256:b1d381f58fcc3e63fcc0ea4f0a38335163883267f77e4c6e22d7a30877218a0e"},
+    {file = "lxml-4.7.1-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:38d9759733aa04fb1697d717bfabbedb21398046bd07734be7cccc3d19ea8675"},
+    {file = "lxml-4.7.1-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:dfd0d464f3d86a1460683cd742306d1138b4e99b79094f4e07e1ca85ee267fe7"},
+    {file = "lxml-4.7.1-cp35-cp35m-win32.whl", hash = "sha256:534e946bce61fd162af02bad7bfd2daec1521b71d27238869c23a672146c34a5"},
+    {file = "lxml-4.7.1-cp35-cp35m-win_amd64.whl", hash = "sha256:6ec829058785d028f467be70cd195cd0aaf1a763e4d09822584ede8c9eaa4b03"},
+    {file = "lxml-4.7.1-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:ade74f5e3a0fd17df5782896ddca7ddb998845a5f7cd4b0be771e1ffc3b9aa5b"},
+    {file = "lxml-4.7.1-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:41358bfd24425c1673f184d7c26c6ae91943fe51dfecc3603b5e08187b4bcc55"},
+    {file = "lxml-4.7.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:6e56521538f19c4a6690f439fefed551f0b296bd785adc67c1777c348beb943d"},
+    {file = "lxml-4.7.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5b0f782f0e03555c55e37d93d7a57454efe7495dab33ba0ccd2dbe25fc50f05d"},
+    {file = "lxml-4.7.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:490712b91c65988012e866c411a40cc65b595929ececf75eeb4c79fcc3bc80a6"},
+    {file = "lxml-4.7.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:34c22eb8c819d59cec4444d9eebe2e38b95d3dcdafe08965853f8799fd71161d"},
+    {file = "lxml-4.7.1-cp36-cp36m-win32.whl", hash = "sha256:2a906c3890da6a63224d551c2967413b8790a6357a80bf6b257c9a7978c2c42d"},
+    {file = "lxml-4.7.1-cp36-cp36m-win_amd64.whl", hash = "sha256:36b16fecb10246e599f178dd74f313cbdc9f41c56e77d52100d1361eed24f51a"},
+    {file = "lxml-4.7.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:a5edc58d631170de90e50adc2cc0248083541affef82f8cd93bea458e4d96db8"},
+    {file = "lxml-4.7.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:87c1b0496e8c87ec9db5383e30042357b4839b46c2d556abd49ec770ce2ad868"},
+    {file = "lxml-4.7.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:0a5f0e4747f31cff87d1eb32a6000bde1e603107f632ef4666be0dc065889c7a"},
+    {file = "lxml-4.7.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:bf6005708fc2e2c89a083f258b97709559a95f9a7a03e59f805dd23c93bc3986"},
+    {file = "lxml-4.7.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc15874816b9320581133ddc2096b644582ab870cf6a6ed63684433e7af4b0d3"},
+    {file = "lxml-4.7.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:0b5e96e25e70917b28a5391c2ed3ffc6156513d3db0e1476c5253fcd50f7a944"},
+    {file = "lxml-4.7.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:ec9027d0beb785a35aa9951d14e06d48cfbf876d8ff67519403a2522b181943b"},
+    {file = "lxml-4.7.1-cp37-cp37m-win32.whl", hash = "sha256:9fbc0dee7ff5f15c4428775e6fa3ed20003140560ffa22b88326669d53b3c0f4"},
+    {file = "lxml-4.7.1-cp37-cp37m-win_amd64.whl", hash = "sha256:1104a8d47967a414a436007c52f533e933e5d52574cab407b1e49a4e9b5ddbd1"},
+    {file = "lxml-4.7.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:fc9fb11b65e7bc49f7f75aaba1b700f7181d95d4e151cf2f24d51bfd14410b77"},
+    {file = "lxml-4.7.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:317bd63870b4d875af3c1be1b19202de34c32623609ec803b81c99193a788c1e"},
+    {file = "lxml-4.7.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:610807cea990fd545b1559466971649e69302c8a9472cefe1d6d48a1dee97440"},
+    {file = "lxml-4.7.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:09b738360af8cb2da275998a8bf79517a71225b0de41ab47339c2beebfff025f"},
+    {file = "lxml-4.7.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6a2ab9d089324d77bb81745b01f4aeffe4094306d939e92ba5e71e9a6b99b71e"},
+    {file = "lxml-4.7.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:eed394099a7792834f0cb4a8f615319152b9d801444c1c9e1b1a2c36d2239f9e"},
+    {file = "lxml-4.7.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:735e3b4ce9c0616e85f302f109bdc6e425ba1670a73f962c9f6b98a6d51b77c9"},
+    {file = "lxml-4.7.1-cp38-cp38-win32.whl", hash = "sha256:772057fba283c095db8c8ecde4634717a35c47061d24f889468dc67190327bcd"},
+    {file = "lxml-4.7.1-cp38-cp38-win_amd64.whl", hash = "sha256:13dbb5c7e8f3b6a2cf6e10b0948cacb2f4c9eb05029fe31c60592d08ac63180d"},
+    {file = "lxml-4.7.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:718d7208b9c2d86aaf0294d9381a6acb0158b5ff0f3515902751404e318e02c9"},
+    {file = "lxml-4.7.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:5bee1b0cbfdb87686a7fb0e46f1d8bd34d52d6932c0723a86de1cc532b1aa489"},
+    {file = "lxml-4.7.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:e410cf3a2272d0a85526d700782a2fa92c1e304fdcc519ba74ac80b8297adf36"},
+    {file = "lxml-4.7.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:585ea241ee4961dc18a95e2f5581dbc26285fcf330e007459688096f76be8c42"},
+    {file = "lxml-4.7.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a555e06566c6dc167fbcd0ad507ff05fd9328502aefc963cb0a0547cfe7f00db"},
+    {file = "lxml-4.7.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:adaab25be351fff0d8a691c4f09153647804d09a87a4e4ea2c3f9fe9e8651851"},
+    {file = "lxml-4.7.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:82d16a64236970cb93c8d63ad18c5b9f138a704331e4b916b2737ddfad14e0c4"},
+    {file = "lxml-4.7.1-cp39-cp39-win32.whl", hash = "sha256:59e7da839a1238807226f7143c68a479dee09244d1b3cf8c134f2fce777d12d0"},
+    {file = "lxml-4.7.1-cp39-cp39-win_amd64.whl", hash = "sha256:a1bbc4efa99ed1310b5009ce7f3a1784698082ed2c1ef3895332f5df9b3b92c2"},
+    {file = "lxml-4.7.1-pp37-pypy37_pp73-macosx_10_14_x86_64.whl", hash = "sha256:0607ff0988ad7e173e5ddf7bf55ee65534bd18a5461183c33e8e41a59e89edf4"},
+    {file = "lxml-4.7.1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:6c198bfc169419c09b85ab10cb0f572744e686f40d1e7f4ed09061284fc1303f"},
+    {file = "lxml-4.7.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a58d78653ae422df6837dd4ca0036610b8cb4962b5cfdbd337b7b24de9e5f98a"},
+    {file = "lxml-4.7.1-pp38-pypy38_pp73-macosx_10_14_x86_64.whl", hash = "sha256:e18281a7d80d76b66a9f9e68a98cf7e1d153182772400d9a9ce855264d7d0ce7"},
+    {file = "lxml-4.7.1-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8e54945dd2eeb50925500957c7c579df3cd07c29db7810b83cf30495d79af267"},
+    {file = "lxml-4.7.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:447d5009d6b5447b2f237395d0018901dcc673f7d9f82ba26c1b9f9c3b444b60"},
+    {file = "lxml-4.7.1.tar.gz", hash = "sha256:a1613838aa6b89af4ba10a0f3a972836128801ed008078f8c1244e65958f1b24"},
 ]
 mako = [
     {file = "Mako-1.1.6-py2.py3-none-any.whl", hash = "sha256:afaf8e515d075b22fad7d7b8b30e4a1c90624ff2f3733a06ec125f5a5f043a57"},
@@ -1514,9 +1505,6 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
     {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
     {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"},
     {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
     {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
@@ -1528,9 +1516,6 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
@@ -1542,9 +1527,6 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
@@ -1557,9 +1539,6 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
@@ -1572,9 +1551,6 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
     {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
@@ -1696,28 +1672,41 @@ pycparser = [
     {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
 ]
 pydantic = [
-    {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"},
-    {file = "pydantic-1.8.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7c6002203fe2c5a1b5cbb141bb85060cbff88c2d78eccbc72d97eb7022c43e4"},
-    {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:589eb6cd6361e8ac341db97602eb7f354551482368a37f4fd086c0733548308e"},
-    {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:10e5622224245941efc193ad1d159887872776df7a8fd592ed746aa25d071840"},
-    {file = "pydantic-1.8.2-cp36-cp36m-win_amd64.whl", hash = "sha256:99a9fc39470010c45c161a1dc584997f1feb13f689ecf645f59bb4ba623e586b"},
-    {file = "pydantic-1.8.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a83db7205f60c6a86f2c44a61791d993dff4b73135df1973ecd9eed5ea0bda20"},
-    {file = "pydantic-1.8.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:41b542c0b3c42dc17da70554bc6f38cbc30d7066d2c2815a94499b5684582ecb"},
-    {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:ea5cb40a3b23b3265f6325727ddfc45141b08ed665458be8c6285e7b85bd73a1"},
-    {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:18b5ea242dd3e62dbf89b2b0ec9ba6c7b5abaf6af85b95a97b00279f65845a23"},
-    {file = "pydantic-1.8.2-cp37-cp37m-win_amd64.whl", hash = "sha256:234a6c19f1c14e25e362cb05c68afb7f183eb931dd3cd4605eafff055ebbf287"},
-    {file = "pydantic-1.8.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:021ea0e4133e8c824775a0cfe098677acf6fa5a3cbf9206a376eed3fc09302cd"},
-    {file = "pydantic-1.8.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e710876437bc07bd414ff453ac8ec63d219e7690128d925c6e82889d674bb505"},
-    {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:ac8eed4ca3bd3aadc58a13c2aa93cd8a884bcf21cb019f8cfecaae3b6ce3746e"},
-    {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:4a03cbbe743e9c7247ceae6f0d8898f7a64bb65800a45cbdc52d65e370570820"},
-    {file = "pydantic-1.8.2-cp38-cp38-win_amd64.whl", hash = "sha256:8621559dcf5afacf0069ed194278f35c255dc1a1385c28b32dd6c110fd6531b3"},
-    {file = "pydantic-1.8.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8b223557f9510cf0bfd8b01316bf6dd281cf41826607eada99662f5e4963f316"},
-    {file = "pydantic-1.8.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:244ad78eeb388a43b0c927e74d3af78008e944074b7d0f4f696ddd5b2af43c62"},
-    {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:05ef5246a7ffd2ce12a619cbb29f3307b7c4509307b1b49f456657b43529dc6f"},
-    {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:54cd5121383f4a461ff7644c7ca20c0419d58052db70d8791eacbbe31528916b"},
-    {file = "pydantic-1.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:4be75bebf676a5f0f87937c6ddb061fa39cbea067240d98e298508c1bda6f3f3"},
-    {file = "pydantic-1.8.2-py3-none-any.whl", hash = "sha256:fec866a0b59f372b7e776f2d7308511784dace622e0992a0b59ea3ccee0ae833"},
-    {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"},
+    {file = "pydantic-1.9.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cb23bcc093697cdea2708baae4f9ba0e972960a835af22560f6ae4e7e47d33f5"},
+    {file = "pydantic-1.9.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1d5278bd9f0eee04a44c712982343103bba63507480bfd2fc2790fa70cd64cf4"},
+    {file = "pydantic-1.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ab624700dc145aa809e6f3ec93fb8e7d0f99d9023b713f6a953637429b437d37"},
+    {file = "pydantic-1.9.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c8d7da6f1c1049eefb718d43d99ad73100c958a5367d30b9321b092771e96c25"},
+    {file = "pydantic-1.9.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3c3b035103bd4e2e4a28da9da7ef2fa47b00ee4a9cf4f1a735214c1bcd05e0f6"},
+    {file = "pydantic-1.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3011b975c973819883842c5ab925a4e4298dffccf7782c55ec3580ed17dc464c"},
+    {file = "pydantic-1.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:086254884d10d3ba16da0588604ffdc5aab3f7f09557b998373e885c690dd398"},
+    {file = "pydantic-1.9.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:0fe476769acaa7fcddd17cadd172b156b53546ec3614a4d880e5d29ea5fbce65"},
+    {file = "pydantic-1.9.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8e9dcf1ac499679aceedac7e7ca6d8641f0193c591a2d090282aaf8e9445a46"},
+    {file = "pydantic-1.9.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d1e4c28f30e767fd07f2ddc6f74f41f034d1dd6bc526cd59e63a82fe8bb9ef4c"},
+    {file = "pydantic-1.9.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:c86229333cabaaa8c51cf971496f10318c4734cf7b641f08af0a6fbf17ca3054"},
+    {file = "pydantic-1.9.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c0727bda6e38144d464daec31dff936a82917f431d9c39c39c60a26567eae3ed"},
+    {file = "pydantic-1.9.0-cp36-cp36m-win_amd64.whl", hash = "sha256:dee5ef83a76ac31ab0c78c10bd7d5437bfdb6358c95b91f1ba7ff7b76f9996a1"},
+    {file = "pydantic-1.9.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d9c9bdb3af48e242838f9f6e6127de9be7063aad17b32215ccc36a09c5cf1070"},
+    {file = "pydantic-1.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2ee7e3209db1e468341ef41fe263eb655f67f5c5a76c924044314e139a1103a2"},
+    {file = "pydantic-1.9.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0b6037175234850ffd094ca77bf60fb54b08b5b22bc85865331dd3bda7a02fa1"},
+    {file = "pydantic-1.9.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b2571db88c636d862b35090ccf92bf24004393f85c8870a37f42d9f23d13e032"},
+    {file = "pydantic-1.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8b5ac0f1c83d31b324e57a273da59197c83d1bb18171e512908fe5dc7278a1d6"},
+    {file = "pydantic-1.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:bbbc94d0c94dd80b3340fc4f04fd4d701f4b038ebad72c39693c794fd3bc2d9d"},
+    {file = "pydantic-1.9.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e0896200b6a40197405af18828da49f067c2fa1f821491bc8f5bde241ef3f7d7"},
+    {file = "pydantic-1.9.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7bdfdadb5994b44bd5579cfa7c9b0e1b0e540c952d56f627eb227851cda9db77"},
+    {file = "pydantic-1.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:574936363cd4b9eed8acdd6b80d0143162f2eb654d96cb3a8ee91d3e64bf4cf9"},
+    {file = "pydantic-1.9.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c556695b699f648c58373b542534308922c46a1cda06ea47bc9ca45ef5b39ae6"},
+    {file = "pydantic-1.9.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f947352c3434e8b937e3aa8f96f47bdfe6d92779e44bb3f41e4c213ba6a32145"},
+    {file = "pydantic-1.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5e48ef4a8b8c066c4a31409d91d7ca372a774d0212da2787c0d32f8045b1e034"},
+    {file = "pydantic-1.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:96f240bce182ca7fe045c76bcebfa0b0534a1bf402ed05914a6f1dadff91877f"},
+    {file = "pydantic-1.9.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:815ddebb2792efd4bba5488bc8fde09c29e8ca3227d27cf1c6990fc830fd292b"},
+    {file = "pydantic-1.9.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6c5b77947b9e85a54848343928b597b4f74fc364b70926b3c4441ff52620640c"},
+    {file = "pydantic-1.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c68c3bc88dbda2a6805e9a142ce84782d3930f8fdd9655430d8576315ad97ce"},
+    {file = "pydantic-1.9.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5a79330f8571faf71bf93667d3ee054609816f10a259a109a0738dac983b23c3"},
+    {file = "pydantic-1.9.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f5a64b64ddf4c99fe201ac2724daada8595ada0d102ab96d019c1555c2d6441d"},
+    {file = "pydantic-1.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a733965f1a2b4090a5238d40d983dcd78f3ecea221c7af1497b845a9709c1721"},
+    {file = "pydantic-1.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:2cc6a4cb8a118ffec2ca5fcb47afbacb4f16d0ab8b7350ddea5e8ef7bcc53a16"},
+    {file = "pydantic-1.9.0-py3-none-any.whl", hash = "sha256:085ca1de245782e9b46cefcf99deecc67d418737a1fd3f6a4f511344b613a5b3"},
+    {file = "pydantic-1.9.0.tar.gz", hash = "sha256:742645059757a56ecd886faf4ed2441b9c0cd406079c2b4bee51bcc3fbcd510a"},
 ]
 pyflakes = [
     {file = "pyflakes-2.4.0-py2.py3-none-any.whl", hash = "sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e"},
@@ -1795,8 +1784,8 @@ redis = [
     {file = "redis-3.5.3.tar.gz", hash = "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2"},
 ]
 requests = [
-    {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"},
-    {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"},
+    {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"},
+    {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"},
 ]
 rfc3986 = [
     {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"},
@@ -1815,61 +1804,62 @@ sortedcontainers = [
     {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"},
 ]
 sqlalchemy = [
-    {file = "SQLAlchemy-1.4.28-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:e659f256b7d402338563913bdeba53bf1eadd4c09e6f6dc93cc47938f7962a8f"},
-    {file = "SQLAlchemy-1.4.28-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:38df997ffa9007e953ad574f2263f61b9b683fd63ae397480ea4960be9bda0fd"},
-    {file = "SQLAlchemy-1.4.28-cp27-cp27m-win_amd64.whl", hash = "sha256:6dd6fa51cf08d9433d28802228d2204e175324f1a284c4492e4af2dd36a2d485"},
-    {file = "SQLAlchemy-1.4.28-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:bb2d8530b7cc94b7fd9341843c3e49b6db48ea22313a8db9df21c41615b5e7b1"},
-    {file = "SQLAlchemy-1.4.28-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:3b64f5d1c1d0e5f2ed4aa66f2b65ff6bdcdf4c5cc83b71c4bbf69695b09e9e19"},
-    {file = "SQLAlchemy-1.4.28-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c02991e22ddce134ef1093ef5a9d5de448fc87b91432e4f879826e93cd1c7"},
-    {file = "SQLAlchemy-1.4.28-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:387365c157e96eceacdd6c5468815ad05a523ba778680de4c8139a029e1fe044"},
-    {file = "SQLAlchemy-1.4.28-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5639800f1cfe751569af2242041b30a08a6c0b9e5d95ed674ec8082d381eff13"},
-    {file = "SQLAlchemy-1.4.28-cp310-cp310-win32.whl", hash = "sha256:261fcb3ff8c59e17ec44f9e61713a44ceaa97ae816da978d5cd1dc2c36f32478"},
-    {file = "SQLAlchemy-1.4.28-cp310-cp310-win_amd64.whl", hash = "sha256:29d10796e5604ab7bc067eda7231a2d2411a51eda43082673641245a49d1c4bb"},
-    {file = "SQLAlchemy-1.4.28-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:4490b10f83cd56ca2cdcd94b140d89911ac331e42a727b79157963b1b04fdd0c"},
-    {file = "SQLAlchemy-1.4.28-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83ee7f6fa5faed23996c67044376d46815f65183ad6d744d94d68b18cdef060b"},
-    {file = "SQLAlchemy-1.4.28-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f667a947378bcb12a371ab38bed1b708f3a682d1ba30176422652082919285a2"},
-    {file = "SQLAlchemy-1.4.28-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61965abc63c8b54038574698888e91a126753a4bdc0ec001397acb14501834e0"},
-    {file = "SQLAlchemy-1.4.28-cp36-cp36m-win32.whl", hash = "sha256:41a02030f8934b0de843341e7014192a0c16ee2726a06da154c81153fbe56b33"},
-    {file = "SQLAlchemy-1.4.28-cp36-cp36m-win_amd64.whl", hash = "sha256:c3497cd63c5f90112b8882ea4dd694052166f779ce9055cd5c4305e0b76d72d9"},
-    {file = "SQLAlchemy-1.4.28-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:5d91dce14ac3347bce301062ca825e7fb7e15c133f3909f15989e94878b1082f"},
-    {file = "SQLAlchemy-1.4.28-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08e39d65b38d4c3f77c4c9bf090b0ba4ec5721a6e0a74b63d2a9781cdcacf142"},
-    {file = "SQLAlchemy-1.4.28-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c85ead1d17acc5e8b282c578394dba253728bcbcbeb66e4ef0e25f4bab53935a"},
-    {file = "SQLAlchemy-1.4.28-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:daddcd6ba1706cc5fcc9cfaa913aa4bf331172dc7efd385fe3ee1feae3b513bc"},
-    {file = "SQLAlchemy-1.4.28-cp37-cp37m-win32.whl", hash = "sha256:ce4f2b34378561bc2e42635888fe86efe13d104ba1d95b5ca67b4d60d8e53e67"},
-    {file = "SQLAlchemy-1.4.28-cp37-cp37m-win_amd64.whl", hash = "sha256:4999b03daa6c9afb9a0bf9e3b8769128ef1880557dacfca86fa7562920c49f6b"},
-    {file = "SQLAlchemy-1.4.28-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:dd041324328cece3ccdf70cfbd71b5ab968e564a22318ffd88b054f5eadeb9be"},
-    {file = "SQLAlchemy-1.4.28-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf2c1d64c4ee0f30e08e1844ff0acf3c1b6c4277c0e89ec3e8bf1722d245b108"},
-    {file = "SQLAlchemy-1.4.28-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:525e962af8f25fc24ce019e6f237d49f8720d757a8a56c9b4caa2d91e2c66111"},
-    {file = "SQLAlchemy-1.4.28-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b72744fed32ecf2bf786d2e2f6756c04126c323ba939f47177b9722775626889"},
-    {file = "SQLAlchemy-1.4.28-cp38-cp38-win32.whl", hash = "sha256:b5541355b8d4970753d4f7292f73a320704b20406e06cd29b469d156f0a484d8"},
-    {file = "SQLAlchemy-1.4.28-cp38-cp38-win_amd64.whl", hash = "sha256:cf3a3c2f32d53a4166b2eb8de35f93bcb640e51c32033024af500017d8e8a8c9"},
-    {file = "SQLAlchemy-1.4.28-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:dfa093bd8ecfceafff62078910178567323005e44fbe4d7933e6cbce4512cea2"},
-    {file = "SQLAlchemy-1.4.28-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:555d56b71f61b4c9fa55fe203fe6e1e561c9385fa97c5849783ae050a89113af"},
-    {file = "SQLAlchemy-1.4.28-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c90b21360cf14d33c8a004f991aa336c7906a8db825d4ec38722c5ff1c47dada"},
-    {file = "SQLAlchemy-1.4.28-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2019b332cf4f9a513133fdf056dc4cecec7fbae7016ebc574d0f310103eed7ee"},
-    {file = "SQLAlchemy-1.4.28-cp39-cp39-win32.whl", hash = "sha256:ca500f30619daf863ab1c66d57d53a0987361a8f3266454290198aabd18f2599"},
-    {file = "SQLAlchemy-1.4.28-cp39-cp39-win_amd64.whl", hash = "sha256:853de08e881dae0305647dd61b4429758f11d1bf02a9faf02793cad44bb2e0d5"},
-    {file = "SQLAlchemy-1.4.28.tar.gz", hash = "sha256:7fdb7b775fb0739d3e71461509f978beb788935bc0aa9e47df14837cb33e5226"},
+    {file = "SQLAlchemy-1.4.29-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:da64423c05256f4ab8c0058b90202053b201cbe3a081f3a43eb590cd554395ab"},
+    {file = "SQLAlchemy-1.4.29-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:0fc4eec2f46b40bdd42112b3be3fbbf88e194bcf02950fbb88bcdc1b32f07dc7"},
+    {file = "SQLAlchemy-1.4.29-cp27-cp27m-win32.whl", hash = "sha256:101d2e100ba9182c9039699588e0b2d833c54b3bad46c67c192159876c9f27ea"},
+    {file = "SQLAlchemy-1.4.29-cp27-cp27m-win_amd64.whl", hash = "sha256:ceac84dd9abbbe115e8be0c817bed85d9fa639b4d294e7817f9e61162d5f766c"},
+    {file = "SQLAlchemy-1.4.29-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:15b65887b6c324cad638c7671cb95985817b733242a7eb69edd7cdf6953be1e0"},
+    {file = "SQLAlchemy-1.4.29-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:78abc507d17753ed434b6cc0c0693126279723d5656d9775bfcac966a99a899b"},
+    {file = "SQLAlchemy-1.4.29-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb8c993706e86178ce15a6b86a335a2064f52254b640e7f53365e716423d33f4"},
+    {file = "SQLAlchemy-1.4.29-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:804e22d5b6165a4f3f019dd9c94bec5687de985a9c54286b93ded9f7846b8c82"},
+    {file = "SQLAlchemy-1.4.29-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56d9d62021946263d4478c9ca012fbd1805f10994cb615c88e7bfd1ae14604d8"},
+    {file = "SQLAlchemy-1.4.29-cp310-cp310-win32.whl", hash = "sha256:027f356c727db24f3c75828c7feb426f87ce1241242d08958e454bd025810660"},
+    {file = "SQLAlchemy-1.4.29-cp310-cp310-win_amd64.whl", hash = "sha256:debaf09a823061f88a8dee04949814cf7e82fb394c5bca22c780cb03172ca23b"},
+    {file = "SQLAlchemy-1.4.29-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:dc27dcc6c72eb38be7f144e9c2c4372d35a3684d3a6dd43bd98c1238358ee17c"},
+    {file = "SQLAlchemy-1.4.29-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4ddd4f2e247128c58bb3dd4489922874afce157d2cff0b2295d67fcd0f22494"},
+    {file = "SQLAlchemy-1.4.29-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9ce960a1dc60524136cf6f75621588e2508a117e04a6e3eedb0968bd13b8c824"},
+    {file = "SQLAlchemy-1.4.29-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5919e647e1d4805867ea556ed4967c68b4d8b266059fa35020dbaed8ffdd60f3"},
+    {file = "SQLAlchemy-1.4.29-cp36-cp36m-win32.whl", hash = "sha256:886359f734b95ad1ef443b13bb4518bcade4db4f9553c9ce33d6d04ebda8d44e"},
+    {file = "SQLAlchemy-1.4.29-cp36-cp36m-win_amd64.whl", hash = "sha256:e9cc6d844e24c307c3272677982a9b33816aeb45e4977791c3bdd47637a8d810"},
+    {file = "SQLAlchemy-1.4.29-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:5e9cd33459afa69c88fa648e803d1f1245e3caa60bfe8b80a9595e5edd3bda9c"},
+    {file = "SQLAlchemy-1.4.29-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eeaebceb24b46e884c4ad3c04f37feb178b81f6ce720af19bfa2592ca32fdef7"},
+    {file = "SQLAlchemy-1.4.29-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e89347d3bd2ef873832b47e85f4bbd810a5e626c5e749d90a07638da100eb1c8"},
+    {file = "SQLAlchemy-1.4.29-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a717c2e70fd1bb477161c4cc85258e41d978584fbe5522613618195f7e87d9b"},
+    {file = "SQLAlchemy-1.4.29-cp37-cp37m-win32.whl", hash = "sha256:f74d6c05d2d163464adbdfbc1ab85048cc15462ff7d134b8aed22bd521e1faa5"},
+    {file = "SQLAlchemy-1.4.29-cp37-cp37m-win_amd64.whl", hash = "sha256:621854dbb4d2413c759a5571564170de45ef37299df52e78e62b42e2880192e1"},
+    {file = "SQLAlchemy-1.4.29-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:f3909194751bb6cb7c5511dd18bcf77e6e3f0b31604ed4004dffa9461f71e737"},
+    {file = "SQLAlchemy-1.4.29-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dd49d21d1f03c81fbec9080ecdc4486d5ddda67e7fbb75ebf48294465c022cdc"},
+    {file = "SQLAlchemy-1.4.29-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e5f6959466a42b6569774c257e55f9cd85200d5b0ba09f0f5d8b5845349c5822"},
+    {file = "SQLAlchemy-1.4.29-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0072f9887aabe66db23f818bbe950cfa1b6127c5cb769b00bcc07935b3adb0ad"},
+    {file = "SQLAlchemy-1.4.29-cp38-cp38-win32.whl", hash = "sha256:ad618d687d26d4cbfa9c6fa6141d59e05bcdfc60cb6e1f1d3baa18d8c62fef5f"},
+    {file = "SQLAlchemy-1.4.29-cp38-cp38-win_amd64.whl", hash = "sha256:878daecb6405e786b07f97e1c77a9cfbbbec17432e8a90c487967e32cfdecb33"},
+    {file = "SQLAlchemy-1.4.29-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:e027bdf0a4cf6bd0a3ad3b998643ea374d7991bd117b90bf9982e41ceb742941"},
+    {file = "SQLAlchemy-1.4.29-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5de7adfb91d351f44062b8dedf29f49d4af7cb765be65816e79223a4e31062b"},
+    {file = "SQLAlchemy-1.4.29-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fbc6e63e481fa323036f305ada96a3362e1d60dd2bfa026cac10c3553e6880e9"},
+    {file = "SQLAlchemy-1.4.29-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7dd0502cb091660ad0d89c5e95a29825f37cde2a5249957838e975871fbffaad"},
+    {file = "SQLAlchemy-1.4.29-cp39-cp39-win32.whl", hash = "sha256:37b46bfc4af3dc226acb6fa28ecd2e1fd223433dc5e15a2bad62bf0a0cbb4e8b"},
+    {file = "SQLAlchemy-1.4.29-cp39-cp39-win_amd64.whl", hash = "sha256:08cfd35eecaba79be930c9bfd2e1f0c67a7e1314355d83a378f9a512b1cf7587"},
+    {file = "SQLAlchemy-1.4.29.tar.gz", hash = "sha256:fa2bad14e1474ba649cfc969c1d2ec915dd3e79677f346bbfe08e93ef9020b39"},
 ]
 starlette = [
-    {file = "starlette-0.17.0-py3-none-any.whl", hash = "sha256:64ffd950183d474df2cf7a4018c8bbb31a481367691c70f5ace4b2d376235f72"},
-    {file = "starlette-0.17.0.tar.gz", hash = "sha256:31a889e7d7bf487f70d9d197ed7efadb47fa938c58626ed93e381480833c5b84"},
+    {file = "starlette-0.17.1-py3-none-any.whl", hash = "sha256:26a18cbda5e6b651c964c12c88b36d9898481cd428ed6e063f5f29c418f73050"},
+    {file = "starlette-0.17.1.tar.gz", hash = "sha256:57eab3cc975a28af62f6faec94d355a410634940f10b30d68d31cb5ec1b44ae8"},
 ]
 "tap.py" = [
-    {file = "tap.py-3.0-py2.py3-none-any.whl", hash = "sha256:a598bfaa2e224d71f2e86147c2ef822c18ff2e1b8ef006397e5056b08f92f699"},
-    {file = "tap.py-3.0.tar.gz", hash = "sha256:f5eeeeebfd64e53d32661752bb4c288589a3babbb96db3f391a4ec29f1359c70"},
+    {file = "tap.py-3.1-py3-none-any.whl", hash = "sha256:928c852f3361707b796c93730cc5402c6378660b161114461066acf53d65bf5d"},
+    {file = "tap.py-3.1.tar.gz", hash = "sha256:3c0cd45212ad5a25b35445964e2517efa000a118a1bfc3437dae828892eaf1e1"},
 ]
 toml = [
     {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
 tomli = [
-    {file = "tomli-1.2.2-py3-none-any.whl", hash = "sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade"},
-    {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
+    {file = "tomli-2.0.0-py3-none-any.whl", hash = "sha256:b5bde28da1fed24b9bd1d4d2b8cba62300bfb4ec9a6187a957e8ddb9434c5224"},
+    {file = "tomli-2.0.0.tar.gz", hash = "sha256:c292c34f58502a1eb2bbb9f5bbc9a5ebc37bee10ffb8c2d6bbdfa8eb13cc14e1"},
 ]
 tomlkit = [
-    {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"},
-    {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"},
+    {file = "tomlkit-0.8.0-py3-none-any.whl", hash = "sha256:b824e3466f1d475b2b5f1c392954c6cb7ea04d64354ff7300dc7c14257dc85db"},
+    {file = "tomlkit-0.8.0.tar.gz", hash = "sha256:29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1"},
 ]
 typing-extensions = [
     {file = "typing_extensions-4.0.1-py3-none-any.whl", hash = "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"},
@@ -1896,6 +1886,6 @@ wsproto = [
     {file = "wsproto-1.0.0.tar.gz", hash = "sha256:868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38"},
 ]
 zipp = [
-    {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"},
-    {file = "zipp-3.6.0.tar.gz", hash = "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"},
+    {file = "zipp-3.7.0-py3-none-any.whl", hash = "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375"},
+    {file = "zipp-3.7.0.tar.gz", hash = "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"},
 ]
diff --git a/pyproject.toml b/pyproject.toml
index 708a5939..e14fad1e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,7 +56,7 @@ bcrypt = "^3.2.0"
 bleach = "^4.1.0"
 email-validator = "^1.1.3"
 fakeredis = "^1.6.1"
-fastapi = { git = "https://github.com/kevr/fastapi.git", branch = "upgrade-starlette-0.17.0" }
+fastapi = { git = "https://github.com/tiangolo/fastapi.git", rev = "2b10ca1cc47146b07b6598ac9473cbe8cac50cc0" }
 feedgen = "^0.9.0"
 httpx = "^0.20.0"
 itsdangerous = "^2.0.1"

From 9e7ae5904f45fd22bed6d871256080458fde966c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 7 Jan 2022 18:21:23 -0800
Subject: [PATCH 796/844] feat(python): handle RuntimeErrors raised through
 routes

This gets raised when a client closes a connection before receiving
a valid response; this is not controllable from our side.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py    | 17 ++++++-----------
 aurweb/util.py    | 24 ++++++++++++++++++++++++
 test/test_util.py | 28 ++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index b55eada1..cbb84f8a 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,4 +1,3 @@
-import asyncio
 import http
 import os
 import re
@@ -21,7 +20,7 @@ import aurweb.config
 import aurweb.logging
 import aurweb.pkgbase.util as pkgbaseutil
 
-from aurweb import prometheus, util
+from aurweb import logging, prometheus, util
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
@@ -30,6 +29,8 @@ from aurweb.prometheus import instrumentator
 from aurweb.routers import APP_ROUTES
 from aurweb.templates import make_context, render_template
 
+logger = logging.get_logger(__name__)
+
 # Setup the FastAPI app.
 app = FastAPI()
 
@@ -132,9 +133,7 @@ async def add_security_headers(request: Request, call_next: typing.Callable):
     RP: Referrer-Policy
     XFO: X-Frame-Options
     """
-    response = asyncio.create_task(call_next(request))
-    await asyncio.wait({response}, return_when=asyncio.FIRST_COMPLETED)
-    response = response.result()
+    response = await util.error_or_result(call_next, request)
 
     # Add CSP header.
     nonce = request.user.nonce
@@ -174,9 +173,7 @@ async def check_terms_of_service(request: Request, call_next: typing.Callable):
             return RedirectResponse(
                 "/tos", status_code=int(http.HTTPStatus.SEE_OTHER))
 
-    task = asyncio.create_task(call_next(request))
-    await asyncio.wait({task}, return_when=asyncio.FIRST_COMPLETED)
-    return task.result()
+    return await util.error_or_result(call_next, request)
 
 
 @app.middleware("http")
@@ -194,6 +191,4 @@ async def id_redirect_middleware(request: Request, call_next: typing.Callable):
         path = request.url.path.rstrip('/')
         return RedirectResponse(f"{path}/{id}{qs}")
 
-    task = asyncio.create_task(call_next(request))
-    await asyncio.wait({task}, return_when=asyncio.FIRST_COMPLETED)
-    return task.result()
+    return await util.error_or_result(call_next, request)
diff --git a/aurweb/util.py b/aurweb/util.py
index 10a7953b..0eb2671e 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -7,6 +7,7 @@ import string
 
 from datetime import datetime
 from distutils.util import strtobool as _strtobool
+from http import HTTPStatus
 from typing import Any, Callable, Dict, Iterable, Tuple
 from urllib.parse import urlencode, urlparse
 from zoneinfo import ZoneInfo
@@ -15,6 +16,7 @@ import fastapi
 import pygit2
 
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
+from fastapi.responses import JSONResponse
 from jinja2 import pass_context
 
 import aurweb.config
@@ -207,3 +209,25 @@ def git_search(repo: pygit2.Repository, commit_hash: str) -> int:
             break
         prefixlen += 1
     return prefixlen
+
+
+async def error_or_result(next: Callable, *args, **kwargs) \
+        -> fastapi.Response:
+    """
+    Try to return a response from `next`.
+
+    If RuntimeError is raised during next(...) execution, return a
+    500 with the exception's error as a JSONResponse.
+
+    :param next: Callable of the next fastapi route callback
+    :param *args: Variable number of arguments passed to the endpoint
+    :param **kwargs: Optional kwargs to pass to the endpoint
+    :return: next(...) retval; if an exc is raised: a 500 response
+    """
+    try:
+        response = await next(*args, **kwargs)
+    except RuntimeError as exc:
+        logger.error(f"RuntimeError: {exc}")
+        status_code = HTTPStatus.INTERNAL_SERVER_ERROR
+        return JSONResponse({"error": str(exc)}, status_code=status_code)
+    return response
diff --git a/test/test_util.py b/test/test_util.py
index 2529ed1f..41876fbf 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,7 +1,16 @@
+import json
+
 from datetime import datetime
+from http import HTTPStatus
 from zoneinfo import ZoneInfo
 
+import fastapi
+import pytest
+
+from fastapi.responses import JSONResponse
+
 from aurweb import filters, util
+from aurweb.testing.requests import Request
 
 
 def test_timestamp_to_datetime():
@@ -57,3 +66,22 @@ def test_git_search_double_commit():
     # Locate the shortest prefix length that matches commit_hash.
     prefixlen = util.git_search(repo, commit_hash)
     assert prefixlen == 13
+
+
+@pytest.mark.asyncio
+async def test_error_or_result():
+
+    async def route(request: fastapi.Request):
+        raise RuntimeError("No response returned.")
+
+    response = await util.error_or_result(route, Request())
+    assert response.status_code == HTTPStatus.INTERNAL_SERVER_ERROR
+
+    data = json.loads(response.body)
+    assert data.get("error") == "No response returned."
+
+    async def good_route(request: fastapi.Request):
+        return JSONResponse()
+
+    response = await util.error_or_result(good_route, Request())
+    assert response.status_code == HTTPStatus.OK

From 6f6f0675972d5d0fe48b0ebdebf85592ab3ce5b4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 8 Jan 2022 13:40:38 -0800
Subject: [PATCH 797/844] feat: add aurweb-adduser console script

Originally left at util/adduser.py, this script allows administrators
to simply add a user to the configured aurweb database.

See --help for options.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 {util => aurweb/scripts}/adduser.py | 18 ++++++----
 pyproject.toml                      |  1 +
 test/test_adduser.py                | 56 +++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 6 deletions(-)
 rename {util => aurweb/scripts}/adduser.py (85%)
 create mode 100644 test/test_adduser.py

diff --git a/util/adduser.py b/aurweb/scripts/adduser.py
similarity index 85%
rename from util/adduser.py
rename to aurweb/scripts/adduser.py
index 1853869a..4cc059d1 100644
--- a/util/adduser.py
+++ b/aurweb/scripts/adduser.py
@@ -1,7 +1,17 @@
+"""
+Add a user to the configured aurweb database.
+
+See `aurweb-adduser --help` for documentation.
+
+Copyright (C) 2022 aurweb Development Team
+All Rights Reserved
+"""
 import argparse
 import sys
 import traceback
 
+import aurweb.models.account_type as at
+
 from aurweb import db
 from aurweb.models.account_type import AccountType
 from aurweb.models.ssh_pub_key import SSHPubKey, get_fingerprint
@@ -19,13 +29,9 @@ def parse_args():
     parser.add_argument("--pgp-key", help="PGP Key Fingerprint")
     parser.add_argument("--ssh-pubkey", help="SSH PubKey")
 
+    choices = at.ACCOUNT_TYPE_NAME.values()
     parser.add_argument("-t", "--type", help="Account Type",
-                        choices=[
-                            "User",
-                            "Trusted User",
-                            "Developer",
-                            "Trusted User & Developer"
-                        ], default="User")
+                        choices=choices, default=at.USER)
 
     return parser.parse_args()
 
diff --git a/pyproject.toml b/pyproject.toml
index e14fad1e..b64ba64b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -111,3 +111,4 @@ aurweb-rendercomment = "aurweb.scripts.rendercomment:main"
 aurweb-tuvotereminder = "aurweb.scripts.tuvotereminder:main"
 aurweb-usermaint = "aurweb.scripts.usermaint:main"
 aurweb-config = "aurweb.scripts.config:main"
+aurweb-adduser = "aurweb.scripts.adduser:main"
diff --git a/test/test_adduser.py b/test/test_adduser.py
new file mode 100644
index 00000000..6c71a519
--- /dev/null
+++ b/test/test_adduser.py
@@ -0,0 +1,56 @@
+from typing import List
+from unittest import mock
+
+import pytest
+
+import aurweb.models.account_type as at
+
+from aurweb import db
+from aurweb.models import User
+from aurweb.scripts import adduser
+from aurweb.testing.requests import Request
+
+TEST_SSH_PUBKEY = ("ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAI"
+                   "bmlzdHAyNTYAAABBBEURnkiY6JoLyqDE8Li1XuAW+LHmkmLDMW/GL5wY"
+                   "7k4/A+Ta7bjA3MOKrF9j4EuUTvCuNXULxvpfSqheTFWZc+g= "
+                   "kevr@volcano")
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    return
+
+
+def run_main(args: List[str] = []):
+    with mock.patch("sys.argv", ["aurweb-adduser"] + args):
+        adduser.main()
+
+
+def test_adduser_no_args():
+    with pytest.raises(SystemExit):
+        run_main()
+
+
+def test_adduser():
+    run_main(["-u", "test", "-e", "test@example.org", "-p", "abcd1234"])
+    test = db.query(User).filter(User.Username == "test").first()
+    assert test is not None
+    assert test.login(Request(), "abcd1234")
+
+
+def test_adduser_tu():
+    run_main([
+        "-u", "test", "-e", "test@example.org", "-p", "abcd1234",
+        "-t", at.TRUSTED_USER
+    ])
+    test = db.query(User).filter(User.Username == "test").first()
+    assert test is not None
+    assert test.AccountTypeID == at.TRUSTED_USER_ID
+
+
+def test_adduser_ssh_pk():
+    run_main(["-u", "test", "-e", "test@example.org", "-p", "abcd1234",
+              "--ssh-pubkey", TEST_SSH_PUBKEY])
+    test = db.query(User).filter(User.Username == "test").first()
+    assert test is not None
+    assert TEST_SSH_PUBKEY.startswith(test.ssh_pub_key.PubKey)

From e6679e4c4e62ea17c4d635971ecdb96b76cc74d4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 8 Jan 2022 13:54:54 -0800
Subject: [PATCH 798/844] change(poetry): update fastapi to 0.71.0 release

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 18 +++++++-----------
 pyproject.toml |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 097d5162..5f2c219e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -265,12 +265,11 @@ lua = ["lupa"]
 
 [[package]]
 name = "fastapi"
-version = "0.70.1"
+version = "0.71.0"
 description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"
 category = "main"
 optional = false
 python-versions = ">=3.6.1"
-develop = false
 
 [package.dependencies]
 pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0"
@@ -279,15 +278,9 @@ starlette = "0.17.1"
 [package.extras]
 all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"]
 dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"]
-doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"]
+doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=8.1.4,<9.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"]
 test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"]
 
-[package.source]
-type = "git"
-url = "https://github.com/tiangolo/fastapi.git"
-reference = "2b10ca1cc47146b07b6598ac9473cbe8cac50cc0"
-resolved_reference = "2b10ca1cc47146b07b6598ac9473cbe8cac50cc0"
-
 [[package]]
 name = "feedgen"
 version = "0.9.0"
@@ -1106,7 +1099,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "56f52b73bfc8e30b0b63bcfa1b8960f258cfec6d5d05d5ea1eca6e10fa0dd493"
+content-hash = "b7a578260b8836df2ed014b43c6228463b3f52db3d832ede7e9c946de974ba7e"
 
 [metadata.files]
 aiofiles = [
@@ -1309,7 +1302,10 @@ fakeredis = [
     {file = "fakeredis-1.7.0-py3-none-any.whl", hash = "sha256:6f1e04f64557ad3b6835bdc6e5a8d022cbace4bdc24a47ad58f6a72e0fbff760"},
     {file = "fakeredis-1.7.0.tar.gz", hash = "sha256:c9bd12e430336cbd3e189fae0e91eb99997b93e76dbfdd6ed67fa352dc684c71"},
 ]
-fastapi = []
+fastapi = [
+    {file = "fastapi-0.71.0-py3-none-any.whl", hash = "sha256:a78eca6b084de9667f2d5f37e2ae297270e5a119cd01c2f04815795da92fc87f"},
+    {file = "fastapi-0.71.0.tar.gz", hash = "sha256:2b5ac0ae89c80b40d1dd4b2ea0bb1f78d7c4affd3644d080bf050f084759fff2"},
+]
 feedgen = [
     {file = "feedgen-0.9.0.tar.gz", hash = "sha256:8e811bdbbed6570034950db23a4388453628a70e689a6e8303ccec430f5a804a"},
 ]
diff --git a/pyproject.toml b/pyproject.toml
index b64ba64b..79fe3a8f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,7 +56,6 @@ bcrypt = "^3.2.0"
 bleach = "^4.1.0"
 email-validator = "^1.1.3"
 fakeredis = "^1.6.1"
-fastapi = { git = "https://github.com/tiangolo/fastapi.git", rev = "2b10ca1cc47146b07b6598ac9473cbe8cac50cc0" }
 feedgen = "^0.9.0"
 httpx = "^0.20.0"
 itsdangerous = "^2.0.1"
@@ -88,6 +87,7 @@ pytest-xdist = "^2.4.0"
 filelock = "^3.3.2"
 posix-ipc = "^1.0.5"
 pyalpm = "^0.10.6"
+fastapi = "^0.71.0"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^4.0.1"

From c775e8a69252245b4eaf8a26ac5213776354e9b1 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 9 Jan 2022 22:38:08 -0800
Subject: [PATCH 799/844] feat(templates): add version to make_context

Prioritizes COMMIT_HASH environment variable and uses
`aurweb.config.AURWEB_VERSION` as a fallback.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/templates.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aurweb/templates.py b/aurweb/templates.py
index 5eea1d3e..74c993f8 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -109,7 +109,8 @@ def make_context(request: Request, title: str, next: str = None):
         "utcnow": int(datetime.utcnow().timestamp()),
         "config": aurweb.config,
         "creds": aurweb.auth.creds,
-        "next": next if next else request.url.path
+        "next": next if next else request.url.path,
+        "version": os.environ.get("COMMIT_HASH", aurweb.config.AURWEB_VERSION)
     }
 
 

From d675c0dc2666be4f3c006e0b96f7d1891572a777 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 9 Jan 2022 22:32:49 -0800
Subject: [PATCH 800/844] feat(python): catch all exceptions thrown through
 fastapi route paths

This commit does quite a bit:
- Catches unhandled exceptions raised in the route handler and
  produces a 500 Internal Server Error Arch-themed response.
- Each unhandled exception causes a notification to be sent to new
  `notifications.postmaster` email with a "Traceback ID."
- Traceback ID is logged to the server along with the traceback which
  caused the 500: `docker-compose logs fastapi | grep '<traceback_id>'`
- If `options.traceback` is set to `1`, traceback is displayed in
  the new 500.html template.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py            | 65 ++++++++++++++++++++++++++++++++++++++-
 aurweb/models/user.py     |  9 ++----
 aurweb/scripts/notify.py  | 55 +++++++++++++++++++++++++++++++--
 conf/config.defaults      |  5 +++
 conf/config.dev           |  1 +
 po/aurweb.pot             | 17 ++++++++++
 templates/errors/500.html | 20 ++++++++++++
 test/test_asgi.py         | 51 ++++++++++++++++++++++++++++++
 test/test_auth_routes.py  | 12 ++++++--
 web/html/css/aurweb.css   |  9 ++++++
 10 files changed, 230 insertions(+), 14 deletions(-)
 create mode 100644 templates/errors/500.html

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index cbb84f8a..95bd5e77 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -1,7 +1,10 @@
+import hashlib
 import http
+import io
 import os
 import re
 import sys
+import traceback
 import typing
 
 from urllib.parse import quote_plus
@@ -26,7 +29,9 @@ from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
 from aurweb.packages.util import get_pkg_or_base
 from aurweb.prometheus import instrumentator
+from aurweb.redis import redis_connection
 from aurweb.routers import APP_ROUTES
+from aurweb.scripts import notify
 from aurweb.templates import make_context, render_template
 
 logger = logging.get_logger(__name__)
@@ -95,6 +100,61 @@ def child_exit(server, worker):  # pragma: no cover
     multiprocess.mark_process_dead(worker.pid)
 
 
+async def internal_server_error(request: Request, exc: Exception) -> Response:
+    """
+    Catch all uncaught Exceptions thrown in a route.
+
+    :param request: FastAPI Request
+    :return: Rendered 500.html template with status_code 500
+    """
+    context = make_context(request, "Internal Server Error")
+
+    # Print out the exception via `traceback` and store the value
+    # into the `traceback` context variable.
+    tb_io = io.StringIO()
+    traceback.print_exc(file=tb_io)
+    tb = tb_io.getvalue()
+    context["traceback"] = tb
+
+    # Produce a SHA1 hash of the traceback string.
+    tb_hash = hashlib.sha1(tb.encode()).hexdigest()
+
+    # Use the first 7 characters of the sha1 for the traceback id.
+    # We will use this to log and include in the notification.
+    tb_id = tb_hash[:7]
+
+    redis = redis_connection()
+    pipe = redis.pipeline()
+    key = f"tb:{tb_hash}"
+    pipe.get(key)
+    retval, = pipe.execute()
+    if not retval:
+        # Expire in one hour; this is just done to make sure we
+        # don't infinitely store these values, but reduce the number
+        # of automated reports (notification below). At this time of
+        # writing, unexpected exceptions are not common, thus this
+        # will not produce a large memory footprint in redis.
+        pipe.set(key, tb)
+        pipe.expire(key, 3600)
+        pipe.execute()
+
+        # Send out notification about it.
+        notif = notify.ServerErrorNotification(
+            tb_id, context.get("version"), context.get("utcnow"))
+        notif.send()
+
+        retval = tb
+    else:
+        retval = retval.decode()
+
+    # Log details about the exception traceback.
+    logger.error(f"FATAL[{tb_id}]: An unexpected exception has occurred.")
+    logger.error(retval)
+
+    return render_template(request, "errors/500.html", context,
+                           status_code=http.HTTPStatus.INTERNAL_SERVER_ERROR)
+
+
 @app.exception_handler(StarletteHTTPException)
 async def http_exception_handler(request: Request, exc: HTTPException) \
         -> Response:
@@ -133,7 +193,10 @@ async def add_security_headers(request: Request, call_next: typing.Callable):
     RP: Referrer-Policy
     XFO: X-Frame-Options
     """
-    response = await util.error_or_result(call_next, request)
+    try:
+        response = await util.error_or_result(call_next, request)
+    except Exception as exc:
+        return await internal_server_error(request, exc)
 
     # Add CSP header.
     nonce = request.user.nonce
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index fe342eac..fcf4a9b3 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -1,12 +1,11 @@
 import hashlib
 
 from datetime import datetime
-from http import HTTPStatus
 from typing import List, Set
 
 import bcrypt
 
-from fastapi import HTTPException, Request
+from fastapi import Request
 from sqlalchemy import or_
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
@@ -142,11 +141,7 @@ class User(Base):
                 exc = exc_
 
         if exc:
-            detail = ("Unable to generate a unique session ID in "
-                      f"{tries} iterations.")
-            logger.error(str(exc))
-            raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-                                detail=detail)
+            raise exc
 
         return self.session.SessionID
 
diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index 20e8a5d5..1f875a9c 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -7,15 +7,22 @@ import subprocess
 import sys
 import textwrap
 
+from typing import List, Tuple
+
 from sqlalchemy import and_, or_
 
 import aurweb.config
 import aurweb.db
 import aurweb.l10n
 
-from aurweb import db, logging
-from aurweb.models import (PackageBase, PackageComaintainer, PackageComment, PackageNotification, PackageRequest, RequestType,
-                           TUVote, User)
+from aurweb import db, l10n, logging
+from aurweb.models import PackageBase, User
+from aurweb.models.package_comaintainer import PackageComaintainer
+from aurweb.models.package_comment import PackageComment
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_request import PackageRequest
+from aurweb.models.request_type import RequestType
+from aurweb.models.tu_vote import TUVote
 
 logger = logging.get_logger(__name__)
 
@@ -122,6 +129,48 @@ class Notification:
             logger.error(str(exc))
 
 
+class ServerErrorNotification(Notification):
+    """ A notification used to represent an internal server error. """
+
+    def __init__(self, traceback_id: int, version: str, utc: int):
+        """
+        Construct a ServerErrorNotification.
+
+        :param traceback_id: Traceback ID
+        :param version: aurweb version
+        :param utc: UTC timestamp
+        """
+        self._tb_id = traceback_id
+        self._version = version
+        self._utc = utc
+
+        postmaster = aurweb.config.get("notifications", "postmaster")
+        self._to = postmaster
+
+        super().__init__()
+
+    def get_recipients(self) -> List[Tuple[str, str]]:
+        from aurweb.auth import AnonymousUser
+        user = (db.query(User).filter(User.Email == self._to).first()
+                or AnonymousUser())
+        return [(self._to, user.LangPreference)]
+
+    def get_subject(self, lang: str) -> str:
+        return l10n.translator.translate("AUR Server Error", lang)
+
+    def get_body(self, lang: str) -> str:
+        """ A forcibly English email body. """
+        dt = aurweb.util.timestamp_to_datetime(self._utc)
+        dts = dt.strftime("%Y-%m-%d %H:%M")
+        return (f"Traceback ID: {self._tb_id}\n"
+                f"Location: {aur_location}\n"
+                f"Version: {self._version}\n"
+                f"Datetime: {dts} UTC\n")
+
+    def get_refs(self):
+        return (aur_location,)
+
+
 class ResetKeyNotification(Notification):
     def __init__(self, uid):
 
diff --git a/conf/config.defaults b/conf/config.defaults
index 082d51a5..cb96bad2 100644
--- a/conf/config.defaults
+++ b/conf/config.defaults
@@ -44,6 +44,8 @@ cache_pkginfo_ttl = 86400
 memcache_servers = 127.0.0.1:11211
 salt_rounds = 12
 redis_address = redis://localhost
+; Toggles traceback display in templates/errors/500.html.
+traceback = 0
 
 [ratelimit]
 request_limit = 4000
@@ -65,6 +67,9 @@ smtp-user =
 smtp-password =
 sender = notify@aur.archlinux.org
 reply-to = noreply@aur.archlinux.org
+; Administration email which will receive notifications about
+; various server details like uncaught exceptions.
+postmaster = admin@example.org
 
 [fingerprints]
 Ed25519 = SHA256:HQ03dn6EasJHNDlt51KpQpFkT3yBX83x7BoIkA1iv2k
diff --git a/conf/config.dev b/conf/config.dev
index e97f6f12..923c34ff 100644
--- a/conf/config.dev
+++ b/conf/config.dev
@@ -37,6 +37,7 @@ memcache_servers = memcached:11211
 ; If cache = 'redis' this address is used to connect to Redis.
 redis_address = redis://127.0.0.1
 aur_request_ml = aur-requests@localhost
+traceback = 1
 
 [notifications]
 ; For development/testing, use /usr/bin/sendmail
diff --git a/po/aurweb.pot b/po/aurweb.pot
index f6d1377b..adc1fc3a 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -2304,3 +2304,20 @@ msgstr ""
 #: aurweb/packages/requests.py
 msgid "No due existing orphan requests to accept for %s."
 msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid "Details have been logged and will be reviewed by the postmaster "
+"posthaste. We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
diff --git a/templates/errors/500.html b/templates/errors/500.html
new file mode 100644
index 00000000..1a9bfa6b
--- /dev/null
+++ b/templates/errors/500.html
@@ -0,0 +1,20 @@
+{% extends "partials/layout.html" %}
+
+{% block pageContent %}
+    <div class="box">
+        <h2>500 - {{ "Internal Server Error" | tr }}</h2>
+
+        <p>
+            {{ "A fatal error has occurred." | tr }}
+            {{
+                "Details have been logged and will be reviewed by the "
+                "postmaster posthaste. We apologize for any inconvenience "
+                "this may have caused." | tr
+            }}
+        </p>
+
+        {% if config.getboolean("options", "traceback") %}
+            <pre class="traceback">{{ traceback }}</pre>
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/test/test_asgi.py b/test/test_asgi.py
index 16b07c31..af13266f 100644
--- a/test/test_asgi.py
+++ b/test/test_asgi.py
@@ -1,19 +1,28 @@
 import http
 import os
+import re
 
 from unittest import mock
 
+import fastapi
 import pytest
 
 from fastapi import HTTPException
+from fastapi.testclient import TestClient
 
 import aurweb.asgi
 import aurweb.config
 import aurweb.redis
 
+from aurweb.testing.email import Email
 from aurweb.testing.requests import Request
 
 
+@pytest.fixture
+def setup(db_test, email_test):
+    return
+
+
 @pytest.mark.asyncio
 async def test_asgi_startup_session_secret_exception(monkeypatch):
     """ Test that we get an IOError on app_startup when we cannot
@@ -66,3 +75,45 @@ async def test_asgi_app_unsupported_backends():
         expr = r"^.*\(sqlite\) is unsupported.*$"
         with pytest.raises(ValueError, match=expr):
             await aurweb.asgi.app_startup()
+
+
+def test_internal_server_error(setup: None,
+                               caplog: pytest.LogCaptureFixture):
+    config_getboolean = aurweb.config.getboolean
+
+    def mock_getboolean(section: str, key: str) -> bool:
+        if section == "options" and key == "traceback":
+            return True
+        return config_getboolean(section, key)
+
+    @aurweb.asgi.app.get("/internal_server_error")
+    async def internal_server_error(request: fastapi.Request):
+        raise ValueError("test exception")
+
+    with mock.patch("aurweb.config.getboolean", side_effect=mock_getboolean):
+        with TestClient(app=aurweb.asgi.app) as request:
+            resp = request.get("/internal_server_error")
+    assert resp.status_code == int(http.HTTPStatus.INTERNAL_SERVER_ERROR)
+
+    # Let's assert that a notification was sent out to the postmaster.
+    assert Email.count() == 1
+
+    aur_location = aurweb.config.get("options", "aur_location")
+    email = Email(1)
+    assert f"Location: {aur_location}" in email.body
+    assert "Traceback ID:" in email.body
+    assert "Version:" in email.body
+    assert "Datetime:" in email.body
+    assert f"[1] {aur_location}" in email.body
+
+    # Assert that the exception got logged with with its traceback id.
+    expr = r"FATAL\[.{7}\]"
+    assert re.search(expr, caplog.text)
+
+    # Let's do it again; no email should be sent the next time,
+    # since the hash is stored in redis.
+    with mock.patch("aurweb.config.getboolean", side_effect=mock_getboolean):
+        with TestClient(app=aurweb.asgi.app) as request:
+            resp = request.get("/internal_server_error")
+    assert resp.status_code == int(http.HTTPStatus.INTERNAL_SERVER_ERROR)
+    assert Email.count() == 1
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index f3e2a011..be24d582 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -1,3 +1,5 @@
+import re
+
 from datetime import datetime
 from http import HTTPStatus
 from unittest import mock
@@ -322,9 +324,13 @@ def test_generate_unique_sid_exhausted(client: TestClient, user: User,
             response = request.post("/login", data=post_data, cookies={})
     assert response.status_code == int(HTTPStatus.INTERNAL_SERVER_ERROR)
 
-    expected = "Unable to generate a unique session ID"
-    assert expected in response.text
     assert "500 - Internal Server Error" in response.text
 
-    # Make sure an IntegrityError from the DB got logged out.
+    # Make sure an IntegrityError from the DB got logged out
+    # with a FATAL traceback ID.
+    expr = r"FATAL\[.{7}\]"
+    assert re.search(expr, caplog.text)
     assert "IntegrityError" in caplog.text
+
+    expr = r"Duplicate entry .+ for key .+SessionID.+"
+    assert re.search(expr, response.text)
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index 739ac7b7..ac20aac5 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -255,3 +255,12 @@ div.box form.link p {
 div.box form.link button {
     padding: 0;
 }
+
+pre.traceback {
+    /* https://css-tricks.com/snippets/css/make-pre-text-wrap/ */
+    white-space: pre-wrap;
+    white-space: -moz-pre-wrap;
+    white-space: -pre-wrap;
+    white-space: -o-pre-wrap;
+    word-wrap: break-all;
+}

From 9f9b1c173234e1842f81ae8fa064223af673e559 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 27 Nov 2021 17:07:52 -0800
Subject: [PATCH 801/844] change(docker): host fastapi over plain http

We don't need the https certificates being dealt with in the fastapi
service; we will define our certificates in any frontend nginx
running on top.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf      |  4 ++--
 docker/scripts/run-fastapi.sh | 19 -------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index e51bd64f..c60bb3d9 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -23,7 +23,7 @@ http {
 
     gzip on;
 
-    upstream hypercorn {
+    upstream asgi_backend {
         server fastapi:8000;
     }
 
@@ -142,7 +142,7 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_redirect off;
             proxy_buffering off;
-            proxy_pass https://hypercorn;
+            proxy_pass http://asgi_backend;
         }
     }
 
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index 4cf9dcfe..d3d75359 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -1,17 +1,4 @@
 #!/bin/bash
-
-CERT=/data/localhost.cert.pem
-KEY=/data/localhost.key.pem
-
-# If production.{cert,key}.pem exists, prefer them. This allows
-# user customization of the certificates that FastAPI uses.
-if [ -f /data/production.cert.pem ]; then
-    CERT=/data/production.cert.pem
-fi
-if [ -f /data/production.key.pem ]; then
-    KEY=/data/production.key.pem
-fi
-
 # By default, set FASTAPI_WORKERS to 2. In production, this should
 # be configured by the deployer.
 if [ -z ${FASTAPI_WORKERS+x} ]; then
@@ -28,16 +15,12 @@ alembic upgrade head
 
 if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
     exec uvicorn --reload \
-        --ssl-certfile "$CERT" \
-        --ssl-keyfile "$KEY" \
         --log-config /docker/logging.conf \
         --host "0.0.0.0" \
         --port 8000 \
         aurweb.asgi:app
 elif [ "$1" == "gunicorn" ]; then
     exec gunicorn \
-        --keyfile="$KEY" \
-        --certfile="$CERT" \
         --log-config /docker/logging.conf \
         --bind "0.0.0.0:8000" \
         -w $FASTAPI_WORKERS \
@@ -45,8 +28,6 @@ elif [ "$1" == "gunicorn" ]; then
         aurweb.asgi:app
 elif [ "$1" == "hypercorn" ]; then
     exec hypercorn --reload \
-        --certfile "$CERT" \
-        --keyfile "$KEY" \
         --log-config /docker/logging.conf \
         -b "0.0.0.0:8000" \
         aurweb.asgi:app

From 4edae5015a2ebef8f3460584bce5b46f981ab03c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 28 Nov 2021 19:53:34 -0800
Subject: [PATCH 802/844] change(docker): remove ca dependencies on
 php-fpm/fastapi

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5347569a..ebc760d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -200,8 +200,6 @@ services:
       test: "bash /docker/health/php.sh"
       interval: 2s
     depends_on:
-      ca:
-        condition: service_started
       git:
         condition: service_healthy
       memcached:
@@ -231,8 +229,6 @@ services:
       test: "bash /docker/health/fastapi.sh ${FASTAPI_BACKEND}"
       interval: 2s
     depends_on:
-      ca:
-        condition: service_started
       git:
         condition: service_healthy
       redis:
@@ -258,6 +254,8 @@ services:
       test: "bash /docker/health/nginx.sh"
       interval: 2s
     depends_on:
+      ca:
+        condition: service_started
       cgit-php:
         condition: service_healthy
       cgit-fastapi:

From 6d4e8028ebbf4aeb3e4ad82c79e0b4df70317330 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 10 Jan 2022 00:26:11 -0800
Subject: [PATCH 803/844] change(gitlab-ci): explicitly down containers before
 upping

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0166db2c..2bf4dd1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,6 +72,7 @@ deploy:
     # Set secure login config for aurweb.
     - sed -ri "s/^(disable_http_login).*$/\1 = 1/" conf/config.dev
     - docker-compose build
+    - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml down --remove-orphans
     - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d
     - docker image prune -f
     - docker container prune -f

From 1ee8d177b40a3b7d3e11975437948bb614b2bc55 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 10 Jan 2022 14:49:53 -0800
Subject: [PATCH 804/844] fix(docker): rewrite trailing slashes to non-trailing
 in nginx config

Without this rewriting, we've been running into conversing with
HTTP over HTTPS (400 Bad Request).

TODO: Refactor this entire nginx config to something a bit more
simple and clean.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index c60bb3d9..b5c09d08 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -94,6 +94,8 @@ http {
         ssl_certificate /etc/ssl/certs/web.cert.pem;
         ssl_certificate_key /etc/ssl/private/web.key.pem;
 
+        rewrite ^/(.*)/$ /$1 permanent;
+
         location ~ ^/[^\/]+\.gz$ {
             # Override mime type to text/plain.
             types { text/plain gz; }
@@ -113,10 +115,6 @@ http {
             add_header ETag "";
         }
 
-        location / {
-            try_files $uri @proxy_to_app;
-        }
-
         location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" {
             include      uwsgi_params;
             uwsgi_pass   smartgit;
@@ -136,13 +134,12 @@ http {
             uwsgi_pass uwsgi://cgit-fastapi;
         }
 
-        location @proxy_to_app {
+        location / {
+            proxy_pass http://asgi_backend;
             proxy_set_header Host $http_host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_redirect off;
-            proxy_buffering off;
-            proxy_pass http://asgi_backend;
+            proxy_set_header X-Forwarded-Ssl on;
         }
     }
 

From 60ae676075f862d27a402d5b2c70fdebc6fe1190 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 13 Jan 2022 19:19:06 -0800
Subject: [PATCH 805/844] fix(util): catch homepage validation exceptions

We were allowing erroneous URLs through, raising exceptions,
from e.g. `http://[localhost:8444/blah`. This patch catches
any ValueErrors raised during the parse process and returns
False, indicating that the validation failed.

This patch also adds testing specifically for `util.valid_homepage`.
We didn't have specific testing for this before; this will allow us
to catch regressions in this area.

Closes #250

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/util.py    | 5 ++++-
 test/test_util.py | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/aurweb/util.py b/aurweb/util.py
index 0eb2671e..bda743fd 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -63,7 +63,10 @@ def valid_email(email):
 
 
 def valid_homepage(homepage):
-    parts = urlparse(homepage)
+    try:
+        parts = urlparse(homepage)
+    except ValueError:
+        return False
     return parts.scheme in ("http", "https") and bool(parts.netloc)
 
 
diff --git a/test/test_util.py b/test/test_util.py
index 41876fbf..91a0f475 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -85,3 +85,12 @@ async def test_error_or_result():
 
     response = await util.error_or_result(good_route, Request())
     assert response.status_code == HTTPStatus.OK
+
+
+def test_valid_homepage():
+    assert util.valid_homepage("http://google.com")
+    assert util.valid_homepage("https://google.com")
+    assert not util.valid_homepage("http://[google.com/broken-ipv6")
+    assert not util.valid_homepage("https://[google.com/broken-ipv6")
+
+    assert not util.valid_homepage("gopher://gopher.hprc.utoronto.ca/")

From 43b7fdb61d2924f3e4910a600f4b040537cb0ac9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 13 Jan 2022 21:32:13 -0800
Subject: [PATCH 806/844] fix(rpc): display rpc doc when no query string is
 provided

Closes #255

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/rpc.py |  5 ++++-
 aurweb/rpc.py         | 15 +++++++++++++++
 test/test_rpc.py      | 25 ++++++++++++++++++++++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/aurweb/routers/rpc.py b/aurweb/routers/rpc.py
index 66376067..942f4e9d 100644
--- a/aurweb/routers/rpc.py
+++ b/aurweb/routers/rpc.py
@@ -12,7 +12,7 @@ from fastapi.responses import JSONResponse
 
 from aurweb import defaults
 from aurweb.ratelimit import check_ratelimit
-from aurweb.rpc import RPC
+from aurweb.rpc import RPC, documentation
 
 router = APIRouter()
 
@@ -74,6 +74,9 @@ async def rpc(request: Request,
               args: Optional[List[str]] = Query(default=[], alias="arg[]"),
               callback: Optional[str] = Query(default=None)):
 
+    if not request.url.query:
+        return documentation()
+
     # Create a handle to our RPC class.
     rpc = RPC(version=v, type=type)
 
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 7bdae638..30fd2fbd 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -1,6 +1,9 @@
+import os
+
 from collections import defaultdict
 from typing import Any, Callable, Dict, List, NewType, Union
 
+from fastapi.responses import HTMLResponse
 from sqlalchemy import and_, literal
 
 import aurweb.config as config
@@ -23,6 +26,18 @@ DataGenerator = NewType("DataGenerator",
                         Callable[[models.Package], Dict[str, Any]])
 
 
+def documentation():
+    aurwebdir = config.get("options", "aurwebdir")
+    rpc_doc = os.path.join(aurwebdir, "doc", "rpc.html")
+
+    if not os.path.exists(rpc_doc):
+        raise OSError("doc/rpc.html could not be read")
+
+    with open(rpc_doc) as f:
+        data = f.read()
+    return HTMLResponse(data)
+
+
 class RPC:
     """ RPC API handler class.
 
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 6540b4a5..4e81a7cb 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -14,7 +14,7 @@ from redis.client import Pipeline
 import aurweb.models.dependency_type as dt
 import aurweb.models.relation_type as rt
 
-from aurweb import asgi, config, db, scripts
+from aurweb import asgi, config, db, rpc, scripts
 from aurweb.models.account_type import USER_ID
 from aurweb.models.license import License
 from aurweb.models.package import Package
@@ -215,6 +215,29 @@ def pipeline():
     yield pipeline
 
 
+def test_rpc_documentation(client: TestClient):
+    with client as request:
+        resp = request.get("/rpc")
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert "aurweb RPC Interface" in resp.text
+
+
+def test_rpc_documentation_missing():
+    config_get = config.get
+
+    def mock_get(section: str, key: str) -> str:
+        if section == "options" and key == "aurwebdir":
+            return "/missing"
+        return config_get(section, key)
+
+    with mock.patch("aurweb.config.get", side_effect=mock_get):
+        config.rehash()
+        expr = r"^doc/rpc\.html could not be read$"
+        with pytest.raises(OSError, match=expr):
+            rpc.documentation()
+    config.rehash()
+
+
 def test_rpc_singular_info(client: TestClient,
                            user: User,
                            packages: List[Package],

From c4ea1171cde9073b95e82aaa5959eff5ead8e499 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 13 Jan 2022 21:41:52 -0800
Subject: [PATCH 807/844] fix(docker): compile doc during image build

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile                     | 3 +++
 docker/scripts/install-deps.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 38d3ca0e..16e6514e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,6 +29,9 @@ RUN sed -i "s;YOUR_AUR_ROOT;/aurweb;g" conf/config
 # Install Python dependencies.
 RUN /docker/scripts/install-python-deps.sh
 
+# Compile asciidocs.
+RUN make -C doc
+
 # Add our aur user.
 RUN useradd -U -d /aurweb -c 'AUR User' aur
 
diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index 372b6e0c..f55cfa3b 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -9,6 +9,6 @@ pacman -Syu --noconfirm --noprogressbar \
       mariadb mariadb-libs cgit-aurweb uwsgi uwsgi-plugin-cgi \
       php php-fpm memcached php-memcached python-pip pyalpm \
       python-srcinfo curl libeatmydata cronie python-poetry \
-      python-poetry-core step-cli step-ca
+      python-poetry-core step-cli step-ca asciidoc
 
 exec "$@"

From d31a51742b4dac3972fb53f15ed98cb072724e9e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 13 Jan 2022 21:55:18 -0800
Subject: [PATCH 808/844] fix(gitlab-ci): compile asciidoc

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bf4dd1b..e738dd1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,7 @@ test:
     - sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
     - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
     - make -C po all install
+    - make -C doc
     - make -C test clean
   script:
     # Run sharness.

From b4495a49bf2cd75adeb02746217cd7b92df7a834 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 13 Jan 2022 23:27:10 -0800
Subject: [PATCH 809/844] fix(rpc): improve type=search performance

This patch brings in the use of .with_entities on our
RPC search query. This primarily fixes performance issues
we were seeing with large queries.

That being said, we do see a bit of a slowdown on
large record count rpc queries, but it's quite negligible
at this point.

We still do aim to perform better than the older PHP
implementation, so this is not a finishing patch by
any means.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/search.py | 11 +++++--
 aurweb/rpc.py             | 62 +++++++++++++++++++++++----------------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/aurweb/packages/search.py b/aurweb/packages/search.py
index 1bca732a..b4af5aab 100644
--- a/aurweb/packages/search.py
+++ b/aurweb/packages/search.py
@@ -1,6 +1,6 @@
 from sqlalchemy import and_, case, or_, orm
 
-from aurweb import db, models, util
+from aurweb import db, models
 from aurweb.models import Package, PackageBase, User
 from aurweb.models.dependency_type import CHECKDEPENDS_ID, DEPENDS_ID, MAKEDEPENDS_ID, OPTDEPENDS_ID
 from aurweb.models.package_comaintainer import PackageComaintainer
@@ -257,8 +257,10 @@ class RPCSearch(PackageSearch):
         # Fix-up inherited search_by_cb to reflect RPC-specific by params.
         # We keep: "nd", "n" and "m". We also overlay four new by params
         # on top: "depends", "makedepends", "optdepends" and "checkdepends".
-        util.apply_all(RPCSearch.keys_removed,
-                       lambda k: self.search_by_cb.pop(k))
+        self.search_by_cb = {
+            k: v for k, v in self.search_by_cb.items()
+            if k not in RPCSearch.keys_removed
+        }
         self.search_by_cb.update({
             "depends": self._search_by_depends,
             "makedepends": self._search_by_makedepends,
@@ -266,6 +268,9 @@ class RPCSearch(PackageSearch):
             "checkdepends": self._search_by_checkdepends
         })
 
+        # We always want an optional Maintainer in the RPC.
+        self._join_user()
+
     def _join_depends(self, dep_type_id: int) -> orm.Query:
         """ Join Package with PackageDependency and filter results
         based on `dep_type_id`.
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 30fd2fbd..8757d9f9 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -4,7 +4,7 @@ from collections import defaultdict
 from typing import Any, Callable, Dict, List, NewType, Union
 
 from fastapi.responses import HTMLResponse
-from sqlalchemy import and_, literal
+from sqlalchemy import and_, literal, orm
 
 import aurweb.config as config
 
@@ -123,34 +123,27 @@ class RPC:
 
         # Produce RPC API compatible Popularity: If zero, it's an integer
         # 0, otherwise, it's formatted to the 6th decimal place.
-        pop = package.PackageBase.Popularity
+        pop = package.Popularity
         pop = 0 if not pop else float(util.number_format(pop, 6))
 
         snapshot_uri = config.get("options", "snapshot_uri")
-        data = defaultdict(list)
-        data.update({
+        return {
             "ID": package.ID,
             "Name": package.Name,
             "PackageBaseID": package.PackageBaseID,
-            "PackageBase": package.PackageBase.Name,
+            "PackageBase": package.PackageBaseName,
             # Maintainer should be set following this update if one exists.
-            "Maintainer": None,
+            "Maintainer": package.Maintainer,
             "Version": package.Version,
             "Description": package.Description,
             "URL": package.URL,
             "URLPath": snapshot_uri % package.Name,
-            "NumVotes": package.PackageBase.NumVotes,
+            "NumVotes": package.NumVotes,
             "Popularity": pop,
-            "OutOfDate": package.PackageBase.OutOfDateTS,
-            "FirstSubmitted": package.PackageBase.SubmittedTS,
-            "LastModified": package.PackageBase.ModifiedTS
-        })
-
-        if package.PackageBase.Maintainer is not None:
-            # We do have a maintainer: set the Maintainer key.
-            data["Maintainer"] = package.PackageBase.Maintainer.Username
-
-        return data
+            "OutOfDate": package.OutOfDateTS,
+            "FirstSubmitted": package.SubmittedTS,
+            "LastModified": package.ModifiedTS
+        }
 
     def _get_info_json_data(self, package: models.Package) -> Dict[str, Any]:
         data = self._get_json_data(package)
@@ -178,19 +171,38 @@ class RPC:
         :param packages: A list of Package instances or a Package ORM query
         :param data_generator: Generator callable of single-Package JSON data
         """
-        output = []
-        for pkg in packages:
-            db.refresh(pkg)
-            output.append(data_generator(pkg))
-        return output
+        return [data_generator(pkg) for pkg in packages]
+
+    def _entities(self, query: orm.Query) -> orm.Query:
+        """ Select specific RPC columns on `query`. """
+        return query.with_entities(
+            models.Package.ID,
+            models.Package.Name,
+            models.Package.Version,
+            models.Package.Description,
+            models.Package.URL,
+            models.Package.PackageBaseID,
+            models.PackageBase.Name.label("PackageBaseName"),
+            models.PackageBase.NumVotes,
+            models.PackageBase.Popularity,
+            models.PackageBase.OutOfDateTS,
+            models.PackageBase.SubmittedTS,
+            models.PackageBase.ModifiedTS,
+            models.User.Username.label("Maintainer"),
+        ).group_by(models.Package.ID)
 
     def _handle_multiinfo_type(self, args: List[str] = [], **kwargs) \
             -> List[Dict[str, Any]]:
         self._enforce_args(args)
         args = set(args)
 
-        packages = db.query(models.Package).join(models.PackageBase).filter(
-            models.Package.Name.in_(args))
+        packages = db.query(models.Package).join(models.PackageBase).join(
+            models.User,
+            models.User.ID == models.PackageBase.MaintainerUID,
+            isouter=True
+        ).filter(models.Package.Name.in_(args))
+        packages = self._entities(packages)
+
         ids = {pkg.ID for pkg in packages}
 
         # Aliases for 80-width.
@@ -293,7 +305,7 @@ class RPC:
         search.search_by(by, arg)
 
         max_results = config.getint("options", "max_rpc_results")
-        results = search.results().limit(max_results)
+        results = self._entities(search.results()).limit(max_results)
         return self._assemble_json_data(results, self._get_json_data)
 
     def _handle_msearch_type(self, args: List[str] = [], **kwargs)\

From 88cb1096c000f2bcaa454161812e30d5d6b02691 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 14 Jan 2022 01:02:00 -0800
Subject: [PATCH 810/844] feat(docker): add more cron scripts

Added the rest:
- aurweb-pkgmaint
- aurweb-usermaint
- aurweb-tuvotereminder
- aurweb-popupdate

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/aurweb-cron | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/config/aurweb-cron b/docker/config/aurweb-cron
index 2fe72ba1..8b502149 100644
--- a/docker/config/aurweb-cron
+++ b/docker/config/aurweb-cron
@@ -1,3 +1,7 @@
 AUR_CONFIG='/aurweb/conf/config'
 */5 * * * * bash -c 'aurweb-aurblup'
 */5 * * * * bash -c 'aurweb-mkpkglists --extended'
+*/5 * * * * bash -c 'aurweb-pkgmaint'
+*/5 * * * * bash -c 'aurweb-usermaint'
+*/5 * * * * bash -c 'aurweb-tuvotereminder'
+*/5 * * * * bash -c 'aurweb-popupdate'

From ec3295ffd4fcc9961604bf366f3c8d3f14b40d6d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 15 Jan 2022 15:16:39 -0800
Subject: [PATCH 811/844] fix(docker): update archlinux-keyring prior to -Syu

When the Docker image is outdated, we need to fetch updated
archlinux-keyring keys to perform an -Syu without problems.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/install-deps.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index f55cfa3b..1d8815b1 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -4,11 +4,17 @@
 # robust development ecosystem.
 set -eou pipefail
 
+# Update and rollout archlinux-keyring keys.
+pacman-key --init
+pacman-key --updatedb
+pacman-key --populate
+
+# Install other OS dependencies.
 pacman -Syu --noconfirm --noprogressbar \
     --cachedir .pkg-cache git gpgme nginx redis openssh \
-      mariadb mariadb-libs cgit-aurweb uwsgi uwsgi-plugin-cgi \
-      php php-fpm memcached php-memcached python-pip pyalpm \
-      python-srcinfo curl libeatmydata cronie python-poetry \
-      python-poetry-core step-cli step-ca asciidoc
+    mariadb mariadb-libs cgit-aurweb uwsgi uwsgi-plugin-cgi \
+    php php-fpm memcached php-memcached python-pip pyalpm \
+    python-srcinfo curl libeatmydata cronie python-poetry \
+    python-poetry-core step-cli step-ca asciidoc
 
 exec "$@"

From 0f4ead759c8d6c7d020599338334e7a5a1ff6d49 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 15 Jan 2022 20:11:51 -0800
Subject: [PATCH 812/844] fix(docker): correct proxy configuration

- On non-localhost communication, this whitelists forwarded headers
  on all remote ips
- Add more headers
- Force https X-Forwarded-Proto
- Unset Forwarded header and rely on X-Forwarded-*

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf      | 3 ++-
 docker/scripts/run-fastapi.sh | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index b5c09d08..5d983695 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -137,8 +137,9 @@ http {
         location / {
             proxy_pass http://asgi_backend;
             proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-Protocol ssl;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Proto https;
             proxy_set_header X-Forwarded-Ssl on;
         }
     }
diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index d3d75359..ed1e07ec 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -23,6 +23,8 @@ elif [ "$1" == "gunicorn" ]; then
     exec gunicorn \
         --log-config /docker/logging.conf \
         --bind "0.0.0.0:8000" \
+        --proxy-protocol \
+        --forwarded-allow-ips "*" \
         -w $FASTAPI_WORKERS \
         -k uvicorn.workers.UvicornWorker \
         aurweb.asgi:app

From 34a29df1a893c7f40de3890c54379a3e3f34d42a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 15 Jan 2022 20:19:58 -0800
Subject: [PATCH 813/844] fix(docker): remove fastapi rewrite rule

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/config/nginx.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index 5d983695..9fdf6015 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -94,8 +94,6 @@ http {
         ssl_certificate /etc/ssl/certs/web.cert.pem;
         ssl_certificate_key /etc/ssl/private/web.key.pem;
 
-        rewrite ^/(.*)/$ /$1 permanent;
-
         location ~ ^/[^\/]+\.gz$ {
             # Override mime type to text/plain.
             types { text/plain gz; }

From b092e247fc1af8f4fefaccd28cffdf1c0b069d1d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 15 Jan 2022 20:21:40 -0800
Subject: [PATCH 814/844] fix(docker): update keyring before installing deps

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/install-deps.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/scripts/install-deps.sh b/docker/scripts/install-deps.sh
index 1d8815b1..ced18c81 100755
--- a/docker/scripts/install-deps.sh
+++ b/docker/scripts/install-deps.sh
@@ -9,6 +9,8 @@ pacman-key --init
 pacman-key --updatedb
 pacman-key --populate
 
+pacman -Sy --noconfirm --noprogressbar archlinux-keyring
+
 # Install other OS dependencies.
 pacman -Syu --noconfirm --noprogressbar \
     --cachedir .pkg-cache git gpgme nginx redis openssh \

From 42aa12d07599c80c34f7e25ed3737488dc59a9f8 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 15 Jan 2022 21:04:47 -0800
Subject: [PATCH 815/844] fix(docker): unrestrict --forwarded-allow-ips on
 (uvi|hyper)corn

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/run-fastapi.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh
index ed1e07ec..fe037542 100755
--- a/docker/scripts/run-fastapi.sh
+++ b/docker/scripts/run-fastapi.sh
@@ -18,6 +18,7 @@ if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
         --log-config /docker/logging.conf \
         --host "0.0.0.0" \
         --port 8000 \
+        --forwarded-allow-ips "*" \
         aurweb.asgi:app
 elif [ "$1" == "gunicorn" ]; then
     exec gunicorn \
@@ -32,6 +33,7 @@ elif [ "$1" == "hypercorn" ]; then
     exec hypercorn --reload \
         --log-config /docker/logging.conf \
         -b "0.0.0.0:8000" \
+        --forwarded-allow-ips "*" \
         aurweb.asgi:app
 else
     echo "Error: Invalid \$FASTAPI_BACKEND supplied."

From 3e3706911cb015b74af50188c09f93d9a4497b78 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 15 Jan 2022 21:43:23 -0800
Subject: [PATCH 816/844] change(python): move test_pkgbase tests to their own
 suite

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_packages_routes.py | 1076 +--------------------------
 test/test_pkgbase_routes.py  | 1334 ++++++++++++++++++++++++++++++++++
 2 files changed, 1335 insertions(+), 1075 deletions(-)
 create mode 100644 test/test_pkgbase_routes.py

diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index ba724f19..5de38b30 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -8,7 +8,6 @@ from unittest import mock
 import pytest
 
 from fastapi.testclient import TestClient
-from sqlalchemy import and_
 
 from aurweb import asgi, db, defaults
 from aurweb.models import License, PackageLicense
@@ -26,9 +25,8 @@ from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_request import ACCEPTED_ID, REJECTED_ID, PackageRequest
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID, RelationType
-from aurweb.models.request_type import DELETION_ID, MERGE_ID, RequestType
+from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
-from aurweb.testing.email import Email
 from aurweb.testing.html import get_errors, get_successes, parse_root
 from aurweb.testing.requests import Request
 
@@ -513,44 +511,6 @@ def test_package_dependencies(client: TestClient, maintainer: User,
     assert broken_node.text.strip() == broken_dep.DepName
 
 
-def test_pkgbase_not_found(client: TestClient):
-    with client as request:
-        resp = request.get("/pkgbase/not_found")
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_redirect(client: TestClient, package: Package):
-    with client as request:
-        resp = request.get(f"/pkgbase/{package.Name}",
-                           allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/packages/{package.Name}"
-
-
-def test_pkgbase(client: TestClient, package: Package):
-    with db.begin():
-        second = db.create(Package, Name="second-pkg",
-                           PackageBase=package.PackageBase)
-
-    expected = [package.Name, second.Name]
-    with client as request:
-        resp = request.get(f"/pkgbase/{package.Name}",
-                           allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-
-    # Check the details box title.
-    title = root.find('.//div[@id="pkgdetails"]/h2')
-    title, pkgname = title.text.split(": ")
-    assert title == "Package Base Details"
-    assert pkgname == package.Name
-
-    pkgs = root.findall('.//div[@id="pkgs"]/ul/li/a')
-    for i, name in enumerate(expected):
-        assert pkgs[i].text.strip() == name
-
-
 def test_packages(client: TestClient, packages: List[Package]):
     with client as request:
         response = request.get("/packages", params={
@@ -1110,414 +1070,6 @@ def test_packages_per_page(client: TestClient, maintainer: User):
     assert len(rows) == 250
 
 
-def test_pkgbase_voters(client: TestClient, tu_user: User, package: Package):
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/voters"
-
-    now = int(datetime.utcnow().timestamp())
-    with db.begin():
-        db.create(PackageVote, User=tu_user, PackageBase=pkgbase, VoteTS=now)
-
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    # We should've gotten one link to the voter, tu_user.
-    root = parse_root(resp.text)
-    rows = root.xpath('//div[@class="box"]//ul/li/a')
-    assert len(rows) == 1
-    assert rows[0].text.strip() == tu_user.Username
-
-
-def test_pkgbase_voters_unauthorized(client: TestClient, user: User,
-                                     package: Package):
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/voters"
-
-    now = int(datetime.utcnow().timestamp())
-    with db.begin():
-        db.create(PackageVote, User=user, PackageBase=pkgbase, VoteTS=now)
-
-    with client as request:
-        resp = request.get(endpoint, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-
-def test_pkgbase_comment_not_found(client: TestClient, maintainer: User,
-                                   package: Package):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    comment_id = 12345  # A non-existing comment.
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments/{comment_id}"
-    with client as request:
-        resp = request.post(endpoint, data={
-            "comment": "Failure"
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_comment_form_unauthorized(client: TestClient, user: User,
-                                           maintainer: User, package: Package):
-    now = int(datetime.utcnow().timestamp())
-    with db.begin():
-        comment = db.create(PackageComment, PackageBase=package.PackageBase,
-                            User=maintainer, Comments="Test",
-                            RenderedComment=str(), CommentTS=now)
-
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/form"
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
-
-
-def test_pkgbase_comment_form_not_found(client: TestClient, maintainer: User,
-                                        package: Package):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    comment_id = 12345  # A non-existing comment.
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/form"
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_comments_missing_comment(client: TestClient, maintainer: User,
-                                          package: Package):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-
-
-def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
-                          package: Package):
-    """ This test includes tests against the following routes:
-    - POST /pkgbase/{name}/comments
-    - GET /pkgbase/{name} (to check comments)
-        - Tested against a comment created with the POST route
-    - GET /pkgbase/{name}/comments/{id}/form
-        - Tested against a comment created with the POST route
-    """
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments"
-    with client as request:
-        resp = request.post(endpoint, data={
-            "comment": "Test comment.",
-            "enable_notifications": True
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    expected_prefix = f"/pkgbase/{pkgbasename}"
-    prefix_len = len(expected_prefix)
-    assert resp.headers.get("location")[:prefix_len] == expected_prefix
-
-    with client as request:
-        resp = request.get(resp.headers.get("location"))
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    headers = root.xpath('//h4[@class="comment-header"]')
-    bodies = root.xpath('//div[@class="article-content"]/div/p')
-
-    assert len(headers) == 1
-    assert len(bodies) == 1
-
-    assert bodies[0].text.strip() == "Test comment."
-    comment_id = headers[0].attrib["id"].split("-")[-1]
-
-    # Test the non-javascript version of comment editing by
-    # visiting the /pkgbase/{name}/comments/{id}/edit route.
-    with client as request:
-        resp = request.get(f"{endpoint}/{comment_id}/edit", cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    # Clear up the PackageNotification. This doubles as testing
-    # that the notification was created and clears it up so we can
-    # test enabling it during edit.
-    pkgbase = package.PackageBase
-    db_notif = pkgbase.notifications.filter(
-        PackageNotification.UserID == maintainer.ID
-    ).first()
-    with db.begin():
-        db.delete(db_notif)
-
-    # Now, let's edit the comment we just created.
-    comment_id = int(headers[0].attrib["id"].split("-")[-1])
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}"
-    with client as request:
-        resp = request.post(endpoint, data={
-            "comment": "Edited comment.",
-            "enable_notifications": True
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    with client as request:
-        resp = request.get(resp.headers.get("location"))
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    headers = root.xpath('//h4[@class="comment-header"]')
-    bodies = root.xpath('//div[@class="article-content"]/div/p')
-
-    assert len(headers) == 1
-    assert len(bodies) == 1
-
-    assert bodies[0].text.strip() == "Edited comment."
-
-    # Ensure that a notification was created.
-    db_notif = pkgbase.notifications.filter(
-        PackageNotification.UserID == maintainer.ID
-    ).first()
-    assert db_notif is not None
-
-    # Don't supply a comment; should return BAD_REQUEST.
-    with client as request:
-        fail_resp = request.post(endpoint, cookies=cookies)
-    assert fail_resp.status_code == int(HTTPStatus.BAD_REQUEST)
-
-    # Now, test the form route, which should return form markup
-    # via JSON.
-    endpoint = f"{endpoint}/form"
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    data = resp.json()
-    assert "form" in data
-
-
-def test_pkgbase_comment_delete(client: TestClient,
-                                maintainer: User,
-                                user: User,
-                                package: Package,
-                                comment: PackageComment):
-    # Test the unauthorized case of comment deletion.
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/delete"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    expected = f"/pkgbase/{pkgbasename}"
-    assert resp.headers.get("location") == expected
-
-    # Test the unauthorized case of comment undeletion.
-    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/undelete"
-    with client as request:
-        resp = request.post(endpoint, cookies=maint_cookies)
-    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
-
-    # And move on to undeleting it.
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-
-def test_pkgbase_comment_delete_unauthorized(client: TestClient,
-                                             maintainer: User,
-                                             package: Package,
-                                             comment: PackageComment):
-    # Test the unauthorized case of comment deletion.
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/delete"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
-
-
-def test_pkgbase_comment_delete_not_found(client: TestClient,
-                                          maintainer: User,
-                                          package: Package):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    comment_id = 12345  # Non-existing comment.
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/delete"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_comment_undelete_not_found(client: TestClient,
-                                            maintainer: User,
-                                            package: Package):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    comment_id = 12345  # Non-existing comment.
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/undelete"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_comment_pin(client: TestClient,
-                             maintainer: User,
-                             package: Package,
-                             comment: PackageComment):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    comment_id = comment.ID
-    pkgbasename = package.PackageBase.Name
-
-    # Pin the comment.
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/pin"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # Assert that PinnedTS got set.
-    assert comment.PinnedTS > 0
-
-    # Unpin the comment we just pinned.
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/unpin"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # Let's assert that PinnedTS was unset.
-    assert comment.PinnedTS == 0
-
-
-def test_pkgbase_comment_pin_unauthorized(client: TestClient,
-                                          user: User,
-                                          package: Package,
-                                          comment: PackageComment):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    comment_id = comment.ID
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/pin"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
-
-
-def test_pkgbase_comment_unpin_unauthorized(client: TestClient,
-                                            user: User,
-                                            package: Package,
-                                            comment: PackageComment):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    comment_id = comment.ID
-    pkgbasename = package.PackageBase.Name
-    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/unpin"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
-
-
-def test_pkgbase_comaintainers_not_found(client: TestClient, maintainer: User):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    endpoint = "/pkgbase/fake/comaintainers"
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_comaintainers_post_not_found(client: TestClient,
-                                              maintainer: User):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    endpoint = "/pkgbase/fake/comaintainers"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_comaintainers_unauthorized(client: TestClient, user: User,
-                                            package: Package):
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-
-def test_pkgbase_comaintainers_post_unauthorized(client: TestClient,
-                                                 user: User,
-                                                 package: Package):
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-
-def test_pkgbase_comaintainers_post_invalid_user(client: TestClient,
-                                                 maintainer: User,
-                                                 package: Package):
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "users": "\nfake\n"
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    error = root.xpath('//ul[@class="errorlist"]/li')[0]
-    assert error.text.strip() == "Invalid user name: fake"
-
-
-def test_pkgbase_comaintainers(client: TestClient, user: User,
-                               maintainer: User, package: Package):
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-
-    # Start off by adding user as a comaintainer to package.
-    # The maintainer username given should be ignored.
-    with client as request:
-        resp = request.post(endpoint, data={
-            "users": f"\n{user.Username}\n{maintainer.Username}\n"
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-    # Do it again to exercise the last_priority bump path.
-    with client as request:
-        resp = request.post(endpoint, data={
-            "users": f"\n{user.Username}\n{maintainer.Username}\n"
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-    # Now that we've added a comaintainer to the pkgbase,
-    # let's perform a GET request to make sure that the backend produces
-    # the user we added in the users textarea.
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    users = root.xpath('//textarea[@id="id_users"]')[0]
-    assert users.text.strip() == user.Username
-
-    # Finish off by removing all the comaintainers.
-    with client as request:
-        resp = request.post(endpoint, data={
-            "users": str()
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    users = root.xpath('//textarea[@id="id_users"]')[0]
-    assert users is not None and users.text is None
-
-
 def test_requests_unauthorized(client: TestClient):
     with client as request:
         resp = request.get("/requests", allow_redirects=False)
@@ -1582,119 +1134,6 @@ def test_requests_selfmade(client: TestClient, user: User,
         assert last_row.text.strip() == "Close"
 
 
-def test_pkgbase_request_not_found(client: TestClient, user: User):
-    pkgbase_name = "fake"
-    endpoint = f"/pkgbase/{pkgbase_name}/request"
-
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_request(client: TestClient, user: User, package: Package):
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/request"
-
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-
-def test_pkgbase_request_post_not_found(client: TestClient, user: User):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post("/pkgbase/fake/request", data={
-            "type": "fake"
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
-
-
-def test_pkgbase_request_post_invalid_type(client: TestClient,
-                                           user: User,
-                                           package: Package):
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={"type": "fake"}, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-
-
-def test_pkgbase_request_post_no_comment_error(client: TestClient,
-                                               user: User,
-                                               package: Package):
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "deletion",
-            "comments": ""  # An empty comment field causes an error.
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    error = root.xpath('//ul[@class="errorlist"]/li')[0]
-    expected = "The comment field must not be empty."
-    assert error.text.strip() == expected
-
-
-def test_pkgbase_request_post_merge_not_found_error(client: TestClient,
-                                                    user: User,
-                                                    package: Package):
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "merge",
-            "merge_into": "fake",  # There is no PackageBase.Name "fake"
-            "comments": "We want to merge this."
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    error = root.xpath('//ul[@class="errorlist"]/li')[0]
-    expected = "The package base you want to merge into does not exist."
-    assert error.text.strip() == expected
-
-
-def test_pkgbase_request_post_merge_no_merge_into_error(client: TestClient,
-                                                        user: User,
-                                                        package: Package):
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "merge",
-            "merge_into": "",  # There is no PackageBase.Name "fake"
-            "comments": "We want to merge this."
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    error = root.xpath('//ul[@class="errorlist"]/li')[0]
-    expected = 'The "Merge into" field must not be empty.'
-    assert error.text.strip() == expected
-
-
-def test_pkgbase_request_post_merge_self_error(client: TestClient, user: User,
-                                               package: Package):
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, data={
-            "type": "merge",
-            "merge_into": package.PackageBase.Name,
-            "comments": "We want to merge this."
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    error = root.xpath('//ul[@class="errorlist"]/li')[0]
-    expected = "You cannot merge a package base into itself."
-    assert error.text.strip() == expected
-
-
 def test_requests_close(client: TestClient, user: User,
                         pkgreq: PackageRequest):
     cookies = {"AURSID": user.login(Request(), "testPassword")}
@@ -1751,339 +1190,6 @@ def test_requests_close_post_rejected(client: TestClient, user: User,
     assert pkgreq.ClosureComment == str()
 
 
-def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
-                      package: Package):
-    pkgbase = package.PackageBase
-
-    # We shouldn't have flagged the package yet; assert so.
-    assert pkgbase.Flagger is None
-
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbase.Name}/flag"
-
-    # Get the flag page.
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    # Now, let's check the /pkgbase/{name}/flag-comment route.
-    flag_comment_endpoint = f"/pkgbase/{pkgbase.Name}/flag-comment"
-    with client as request:
-        resp = request.get(flag_comment_endpoint, cookies=cookies,
-                           allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-    # Try to flag it without a comment.
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-
-    # Flag it with a valid comment.
-    with client as request:
-        resp = request.post(endpoint, data={
-            "comments": "Test"
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert pkgbase.Flagger == user
-    assert pkgbase.FlaggerComment == "Test"
-
-    # Now, let's check the /pkgbase/{name}/flag-comment route.
-    flag_comment_endpoint = f"/pkgbase/{pkgbase.Name}/flag-comment"
-    with client as request:
-        resp = request.get(flag_comment_endpoint, cookies=cookies,
-                           allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    # Now try to perform a get; we should be redirected because
-    # it's already flagged.
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    with db.begin():
-        user2 = db.create(User, Username="test2",
-                          Email="test2@example.org",
-                          Passwd="testPassword",
-                          AccountType=user.AccountType)
-
-    # Now, test that the 'user2' user can't unflag it, because they
-    # didn't flag it to begin with.
-    user2_cookies = {"AURSID": user2.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbase.Name}/unflag"
-    with client as request:
-        resp = request.post(endpoint, cookies=user2_cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert pkgbase.Flagger == user
-
-    # Now, test that the 'maintainer' user can.
-    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, cookies=maint_cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert pkgbase.Flagger is None
-
-    # Flag it again.
-    with client as request:
-        resp = request.post(f"/pkgbase/{pkgbase.Name}/flag", data={
-            "comments": "Test"
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # Now, unflag it for real.
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert pkgbase.Flagger is None
-
-
-def test_pkgbase_flag_vcs(client: TestClient, user: User, package: Package):
-    # Morph our package fixture into a VCS package (-git).
-    with db.begin():
-        package.PackageBase.Name += "-git"
-        package.Name += "-git"
-
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get(f"/pkgbase/{package.PackageBase.Name}/flag",
-                           cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    expected = ("This seems to be a VCS package. Please do "
-                "<strong>not</strong> flag it out-of-date if the package "
-                "version in the AUR does not match the most recent commit. "
-                "Flagging this package should only be done if the sources "
-                "moved or changes in the PKGBUILD are required because of "
-                "recent upstream changes.")
-    assert expected in resp.text
-
-
-def test_pkgbase_notify(client: TestClient, user: User, package: Package):
-    pkgbase = package.PackageBase
-
-    # We have no notif record yet; assert that.
-    notif = pkgbase.notifications.filter(
-        PackageNotification.UserID == user.ID
-    ).first()
-    assert notif is None
-
-    # Enable notifications.
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbase.Name}/notify"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    notif = pkgbase.notifications.filter(
-        PackageNotification.UserID == user.ID
-    ).first()
-    assert notif is not None
-
-    # Disable notifications.
-    endpoint = f"/pkgbase/{pkgbase.Name}/unnotify"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    notif = pkgbase.notifications.filter(
-        PackageNotification.UserID == user.ID
-    ).first()
-    assert notif is None
-
-
-def test_pkgbase_vote(client: TestClient, user: User, package: Package):
-    pkgbase = package.PackageBase
-
-    # We haven't voted yet.
-    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
-    assert vote is None
-
-    # Vote for the package.
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbase.Name}/vote"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
-    assert vote is not None
-    assert pkgbase.NumVotes == 1
-
-    # Remove vote.
-    endpoint = f"/pkgbase/{pkgbase.Name}/unvote"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
-    assert vote is None
-    assert pkgbase.NumVotes == 0
-
-
-def test_pkgbase_disown_as_sole_maintainer(client: TestClient,
-                                           maintainer: User,
-                                           package: Package):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
-
-    # But we do here.
-    with client as request:
-        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-
-def test_pkgbase_disown(client: TestClient, user: User, maintainer: User,
-                        package: Package):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    user_cookies = {"AURSID": user.login(Request(), "testPassword")}
-    pkgbase = package.PackageBase
-    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
-
-    with db.begin():
-        db.create(PackageComaintainer,
-                  User=user,
-                  PackageBase=pkgbase,
-                  Priority=1)
-
-    # GET as a normal user, which is rejected for lack of credentials.
-    with client as request:
-        resp = request.get(endpoint, cookies=user_cookies,
-                           allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # GET as the maintainer.
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    # POST as a normal user, which is rejected for lack of credentials.
-    with client as request:
-        resp = request.post(endpoint, cookies=user_cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # POST as the maintainer without "confirm".
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-
-    # POST as the maintainer with "confirm".
-    with client as request:
-        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-
-def test_pkgbase_adopt(client: TestClient, user: User, tu_user: User,
-                       maintainer: User, package: Package):
-    # Unset the maintainer as if package is orphaned.
-    with db.begin():
-        package.PackageBase.Maintainer = None
-
-    pkgbasename = package.PackageBase.Name
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbasename}/adopt"
-
-    # Adopt the package base.
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert package.PackageBase.Maintainer == maintainer
-
-    # Try to adopt it when it already has a maintainer; nothing changes.
-    user_cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, cookies=user_cookies,
-                            allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert package.PackageBase.Maintainer == maintainer
-
-    # Steal the package as a TU.
-    tu_cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(endpoint, cookies=tu_cookies,
-                            allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert package.PackageBase.Maintainer == tu_user
-
-
-def test_pkgbase_delete_unauthorized(client: TestClient, user: User,
-                                     package: Package):
-    pkgbase = package.PackageBase
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
-
-    # Test GET.
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-    # Test POST.
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
-
-
-def test_pkgbase_delete(client: TestClient, tu_user: User, package: Package):
-    pkgbase = package.PackageBase
-
-    # Test that the GET request works.
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    # Test that POST works and denies us because we haven't confirmed.
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-
-    # Test that we can actually delete the pkgbase.
-    with client as request:
-        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # Let's assert that the package base record got removed.
-    record = db.query(PackageBase).filter(
-        PackageBase.Name == pkgbase.Name
-    ).first()
-    assert record is None
-
-    # Two emails should've been sent out; an autogenerated
-    # request's accepted notification and a deletion notification.
-    assert Email.count() == 1
-
-    req_close = Email(1).parse()
-    expr = r"^\[PRQ#\d+\] Deletion Request for [^ ]+ Accepted$"
-    subject = req_close.headers.get("Subject")
-    assert re.match(expr, subject)
-
-
-def test_pkgbase_delete_with_request(client: TestClient, tu_user: User,
-                                     pkgbase: PackageBase,
-                                     pkgreq: PackageRequest):
-    # TODO: Test that a previously existing request gets Accepted when
-    # a TU deleted the package.
-
-    # Delete the package as `tu_user` via POST request.
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
-    with client as request:
-        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == "/packages"
-
-    # We should've just sent one closure email since `pkgreq` exists.
-    assert Email.count() == 1
-
-    # Make sure it was a closure for the deletion request.
-    email = Email(1).parse()
-    expr = r"^\[PRQ#\d+\] Deletion Request for [^ ]+ Accepted$"
-    assert re.match(expr, email.headers.get("Subject"))
-
-
 def test_packages_post_unknown_action(client: TestClient, user: User,
                                       package: Package):
 
@@ -2130,24 +1236,6 @@ def test_packages_post(client: TestClient, user: User, package: Package):
         assert errors[0].text.strip() == expected
 
 
-def test_pkgbase_merge_unauthorized(client: TestClient, user: User,
-                                    package: Package):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
-
-
-def test_pkgbase_merge(client: TestClient, tu_user: User, package: Package):
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
-    with client as request:
-        resp = request.get(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-    assert not get_errors(resp.text)
-
-
 def test_packages_post_unflag(client: TestClient, user: User,
                               maintainer: User, package: Package):
     # Flag `package` as `user`.
@@ -2489,138 +1577,6 @@ def test_packages_post_delete(caplog: pytest.fixture, client: TestClient,
     assert expected in caplog.text
 
 
-def test_pkgbase_merge_post_unauthorized(client: TestClient, user: User,
-                                         package: Package):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
-
-
-def test_pkgbase_merge_post_unconfirmed(client: TestClient, tu_user: User,
-                                        package: Package):
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-    errors = get_errors(resp.text)
-    expected = ("The selected packages have not been deleted, "
-                "check the confirmation checkbox.")
-    assert errors[0].text.strip() == expected
-
-
-def test_pkgbase_merge_post_invalid_into(client: TestClient, tu_user: User,
-                                         package: Package):
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
-    with client as request:
-        resp = request.post(endpoint, data={
-            "into": "not_real",
-            "confirm": True
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-    errors = get_errors(resp.text)
-    expected = "Cannot find package to merge votes and comments into."
-    assert errors[0].text.strip() == expected
-
-
-def test_pkgbase_merge_post_self_invalid(client: TestClient, tu_user: User,
-                                         package: Package):
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
-    with client as request:
-        resp = request.post(endpoint, data={
-            "into": package.PackageBase.Name,
-            "confirm": True
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
-    errors = get_errors(resp.text)
-    expected = "Cannot merge a package base with itself."
-    assert errors[0].text.strip() == expected
-
-
-def test_pkgbase_merge_post(client: TestClient, tu_user: User,
-                            package: Package,
-                            pkgbase: PackageBase,
-                            target: PackageBase,
-                            pkgreq: PackageRequest):
-    pkgname = package.Name
-    pkgbasename = pkgbase.Name
-
-    # Create a merge request destined for another target.
-    # This will allow our test code to exercise closing
-    # such a request after merging the pkgbase in question.
-    with db.begin():
-        pkgreq.ReqTypeID = MERGE_ID
-        pkgreq.MergeBaseName = target.Name
-
-    # Vote for the package.
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/vote"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # Enable notifications.
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/notify"
-    with client as request:
-        resp = request.post(endpoint, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # Comment on the package.
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments"
-    with client as request:
-        resp = request.post(endpoint, data={
-            "comment": "Test comment."
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    # Save these relationships for later comparison.
-    comments = package.PackageBase.comments.all()
-    notifs = package.PackageBase.notifications.all()
-    votes = package.PackageBase.package_votes.all()
-
-    # Merge the package into target.
-    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
-    with client as request:
-        resp = request.post(endpoint, data={
-            "into": target.Name,
-            "confirm": True
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    loc = resp.headers.get("location")
-    assert loc == f"/pkgbase/{target.Name}"
-
-    # Two emails should've been sent out.
-    assert Email.count() == 1
-    email_body = Email(1).parse().glue()
-    assert f"Merge Request for {pkgbasename} Accepted" in email_body
-
-    # Assert that the original comments, notifs and votes we setup
-    # got migrated to target as intended.
-    assert comments == target.comments.all()
-    assert notifs == target.notifications.all()
-    assert votes == target.package_votes.all()
-
-    # ...and that the package got deleted.
-    package = db.query(Package).filter(Package.Name == pkgname).first()
-    assert package is None
-
-    # Our previously-made request should have gotten accepted.
-    assert pkgreq.Status == ACCEPTED_ID
-    assert pkgreq.Closer is not None
-
-    # A PackageRequest is always created when merging this way.
-    pkgreq = db.query(PackageRequest).filter(
-        and_(PackageRequest.ReqTypeID == MERGE_ID,
-             PackageRequest.PackageBaseName == pkgbasename,
-             PackageRequest.MergeBaseName == target.Name)
-    ).first()
-    assert pkgreq is not None
-
-
 def test_account_comments_unauthorized(client: TestClient, user: User):
     """ This test may seem out of place, but it requires packages,
     so its being included in the packages routes test suite to
@@ -2667,33 +1623,3 @@ def test_account_comments(client: TestClient, user: User, package: Package):
     expected = rendered_comment.RenderedComment.replace(
         "<p>", "").replace("</p>", "")
     assert rendered[0].text.strip() == expected
-
-
-def test_pkgbase_keywords(client: TestClient, user: User, package: Package):
-    endpoint = f"/pkgbase/{package.PackageBase.Name}"
-    with client as request:
-        resp = request.get(endpoint)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    keywords = root.xpath('//a[@class="keyword"]')
-    assert len(keywords) == 0
-
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    post_endpoint = f"{endpoint}/keywords"
-    with client as request:
-        resp = request.post(post_endpoint, data={
-            "keywords": "abc test"
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    with client as request:
-        resp = request.get(resp.headers.get("location"))
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    root = parse_root(resp.text)
-    keywords = root.xpath('//a[@class="keyword"]')
-    assert len(keywords) == 2
-    expected = ["abc", "test"]
-    for i, keyword in enumerate(keywords):
-        assert keyword.text.strip() == expected[i]
diff --git a/test/test_pkgbase_routes.py b/test/test_pkgbase_routes.py
new file mode 100644
index 00000000..cafd61f6
--- /dev/null
+++ b/test/test_pkgbase_routes.py
@@ -0,0 +1,1334 @@
+import re
+
+from datetime import datetime
+from http import HTTPStatus
+from typing import List
+from unittest import mock
+
+import pytest
+
+from fastapi.testclient import TestClient
+from sqlalchemy import and_
+
+from aurweb import asgi, db
+from aurweb.models.account_type import USER_ID, AccountType
+from aurweb.models.dependency_type import DependencyType
+from aurweb.models.package import Package
+from aurweb.models.package_base import PackageBase
+from aurweb.models.package_comaintainer import PackageComaintainer
+from aurweb.models.package_comment import PackageComment
+from aurweb.models.package_dependency import PackageDependency
+from aurweb.models.package_notification import PackageNotification
+from aurweb.models.package_relation import PackageRelation
+from aurweb.models.package_request import ACCEPTED_ID, PackageRequest
+from aurweb.models.package_vote import PackageVote
+from aurweb.models.relation_type import PROVIDES_ID, RelationType
+from aurweb.models.request_type import DELETION_ID, MERGE_ID, RequestType
+from aurweb.models.user import User
+from aurweb.testing.email import Email
+from aurweb.testing.html import get_errors, get_successes, parse_root
+from aurweb.testing.requests import Request
+
+
+def package_endpoint(package: Package) -> str:
+    return f"/packages/{package.Name}"
+
+
+def create_package(pkgname: str, maintainer: User) -> Package:
+    pkgbase = db.create(PackageBase,
+                        Name=pkgname,
+                        Maintainer=maintainer)
+    return db.create(Package, Name=pkgbase.Name, PackageBase=pkgbase)
+
+
+def create_package_dep(package: Package, depname: str,
+                       dep_type_name: str = "depends") -> PackageDependency:
+    dep_type = db.query(DependencyType,
+                        DependencyType.Name == dep_type_name).first()
+    return db.create(PackageDependency,
+                     DependencyType=dep_type,
+                     Package=package,
+                     DepName=depname)
+
+
+def create_package_rel(package: Package,
+                       relname: str) -> PackageRelation:
+    rel_type = db.query(RelationType,
+                        RelationType.ID == PROVIDES_ID).first()
+    return db.create(PackageRelation,
+                     RelationType=rel_type,
+                     Package=package,
+                     RelName=relname)
+
+
+@pytest.fixture(autouse=True)
+def setup(db_test):
+    return
+
+
+@pytest.fixture
+def client() -> TestClient:
+    """ Yield a FastAPI TestClient. """
+    yield TestClient(app=asgi.app)
+
+
+def create_user(username: str) -> User:
+    with db.begin():
+        user = db.create(User, Username=username,
+                         Email=f"{username}@example.org",
+                         Passwd="testPassword",
+                         AccountTypeID=USER_ID)
+    return user
+
+
+@pytest.fixture
+def user() -> User:
+    """ Yield a user. """
+    user = create_user("test")
+    yield user
+
+
+@pytest.fixture
+def maintainer() -> User:
+    """ Yield a specific User used to maintain packages. """
+    account_type = db.query(AccountType, AccountType.ID == USER_ID).first()
+    with db.begin():
+        maintainer = db.create(User, Username="test_maintainer",
+                               Email="test_maintainer@example.org",
+                               Passwd="testPassword",
+                               AccountType=account_type)
+    yield maintainer
+
+
+@pytest.fixture
+def tu_user():
+    tu_type = db.query(AccountType,
+                       AccountType.AccountType == "Trusted User").first()
+    with db.begin():
+        tu_user = db.create(User, Username="test_tu",
+                            Email="test_tu@example.org",
+                            RealName="Test TU", Passwd="testPassword",
+                            AccountType=tu_type)
+    yield tu_user
+
+
+@pytest.fixture
+def package(maintainer: User) -> Package:
+    """ Yield a Package created by user. """
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgbase = db.create(PackageBase,
+                            Name="test-package",
+                            Maintainer=maintainer,
+                            Packager=maintainer,
+                            Submitter=maintainer,
+                            ModifiedTS=now)
+        package = db.create(Package,
+                            PackageBase=pkgbase,
+                            Name=pkgbase.Name)
+    yield package
+
+
+@pytest.fixture
+def pkgbase(package: Package) -> PackageBase:
+    yield package.PackageBase
+
+
+@pytest.fixture
+def target(maintainer: User) -> PackageBase:
+    """ Merge target. """
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        pkgbase = db.create(PackageBase, Name="target-package",
+                            Maintainer=maintainer,
+                            Packager=maintainer,
+                            Submitter=maintainer,
+                            ModifiedTS=now)
+        db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+    yield pkgbase
+
+
+@pytest.fixture
+def pkgreq(user: User, pkgbase: PackageBase) -> PackageRequest:
+    """ Yield a PackageRequest related to `pkgbase`. """
+    with db.begin():
+        pkgreq = db.create(PackageRequest,
+                           ReqTypeID=DELETION_ID,
+                           User=user,
+                           PackageBase=pkgbase,
+                           PackageBaseName=pkgbase.Name,
+                           Comments=f"Deletion request for {pkgbase.Name}",
+                           ClosureComment=str())
+    yield pkgreq
+
+
+@pytest.fixture
+def comment(user: User, package: Package) -> PackageComment:
+    pkgbase = package.PackageBase
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment = db.create(PackageComment,
+                            User=user,
+                            PackageBase=pkgbase,
+                            Comments="Test comment.",
+                            RenderedComment=str(),
+                            CommentTS=now)
+    yield comment
+
+
+@pytest.fixture
+def packages(maintainer: User) -> List[Package]:
+    """ Yield 55 packages named pkg_0 .. pkg_54. """
+    packages_ = []
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        for i in range(55):
+            pkgbase = db.create(PackageBase,
+                                Name=f"pkg_{i}",
+                                Maintainer=maintainer,
+                                Packager=maintainer,
+                                Submitter=maintainer,
+                                ModifiedTS=now)
+            package = db.create(Package,
+                                PackageBase=pkgbase,
+                                Name=f"pkg_{i}")
+            packages_.append(package)
+
+    yield packages_
+
+
+@pytest.fixture
+def requests(user: User, packages: List[Package]) -> List[PackageRequest]:
+    pkgreqs = []
+    deletion_type = db.query(RequestType).filter(
+        RequestType.ID == DELETION_ID
+    ).first()
+    with db.begin():
+        for i in range(55):
+            pkgreq = db.create(PackageRequest,
+                               RequestType=deletion_type,
+                               User=user,
+                               PackageBase=packages[i].PackageBase,
+                               PackageBaseName=packages[i].Name,
+                               Comments=f"Deletion request for pkg_{i}",
+                               ClosureComment=str())
+            pkgreqs.append(pkgreq)
+    yield pkgreqs
+
+
+def test_pkgbase_not_found(client: TestClient):
+    with client as request:
+        resp = request.get("/pkgbase/not_found")
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_redirect(client: TestClient, package: Package):
+    with client as request:
+        resp = request.get(f"/pkgbase/{package.Name}",
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/packages/{package.Name}"
+
+
+def test_pkgbase(client: TestClient, package: Package):
+    with db.begin():
+        second = db.create(Package, Name="second-pkg",
+                           PackageBase=package.PackageBase)
+
+    expected = [package.Name, second.Name]
+    with client as request:
+        resp = request.get(f"/pkgbase/{package.Name}",
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+
+    # Check the details box title.
+    title = root.find('.//div[@id="pkgdetails"]/h2')
+    title, pkgname = title.text.split(": ")
+    assert title == "Package Base Details"
+    assert pkgname == package.Name
+
+    pkgs = root.findall('.//div[@id="pkgs"]/ul/li/a')
+    for i, name in enumerate(expected):
+        assert pkgs[i].text.strip() == name
+
+
+def test_pkgbase_voters(client: TestClient, tu_user: User, package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/voters"
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        db.create(PackageVote, User=tu_user, PackageBase=pkgbase, VoteTS=now)
+
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # We should've gotten one link to the voter, tu_user.
+    root = parse_root(resp.text)
+    rows = root.xpath('//div[@class="box"]//ul/li/a')
+    assert len(rows) == 1
+    assert rows[0].text.strip() == tu_user.Username
+
+
+def test_pkgbase_voters_unauthorized(client: TestClient, user: User,
+                                     package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/voters"
+
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        db.create(PackageVote, User=user, PackageBase=pkgbase, VoteTS=now)
+
+    with client as request:
+        resp = request.get(endpoint, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+
+def test_pkgbase_comment_not_found(client: TestClient, maintainer: User,
+                                   package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = 12345  # A non-existing comment.
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments/{comment_id}"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comment": "Failure"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comment_form_unauthorized(client: TestClient, user: User,
+                                           maintainer: User, package: Package):
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        comment = db.create(PackageComment, PackageBase=package.PackageBase,
+                            User=maintainer, Comments="Test",
+                            RenderedComment=str(), CommentTS=now)
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/form"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comment_form_not_found(client: TestClient, maintainer: User,
+                                        package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = 12345  # A non-existing comment.
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/form"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comments_missing_comment(client: TestClient, maintainer: User,
+                                          package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_pkgbase_comments(client: TestClient, maintainer: User, user: User,
+                          package: Package):
+    """ This test includes tests against the following routes:
+    - POST /pkgbase/{name}/comments
+    - GET /pkgbase/{name} (to check comments)
+        - Tested against a comment created with the POST route
+    - GET /pkgbase/{name}/comments/{id}/form
+        - Tested against a comment created with the POST route
+    """
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comment": "Test comment.",
+            "enable_notifications": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    expected_prefix = f"/pkgbase/{pkgbasename}"
+    prefix_len = len(expected_prefix)
+    assert resp.headers.get("location")[:prefix_len] == expected_prefix
+
+    with client as request:
+        resp = request.get(resp.headers.get("location"))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    headers = root.xpath('//h4[@class="comment-header"]')
+    bodies = root.xpath('//div[@class="article-content"]/div/p')
+
+    assert len(headers) == 1
+    assert len(bodies) == 1
+
+    assert bodies[0].text.strip() == "Test comment."
+    comment_id = headers[0].attrib["id"].split("-")[-1]
+
+    # Test the non-javascript version of comment editing by
+    # visiting the /pkgbase/{name}/comments/{id}/edit route.
+    with client as request:
+        resp = request.get(f"{endpoint}/{comment_id}/edit", cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Clear up the PackageNotification. This doubles as testing
+    # that the notification was created and clears it up so we can
+    # test enabling it during edit.
+    pkgbase = package.PackageBase
+    db_notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == maintainer.ID
+    ).first()
+    with db.begin():
+        db.delete(db_notif)
+
+    # Now, let's edit the comment we just created.
+    comment_id = int(headers[0].attrib["id"].split("-")[-1])
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comment": "Edited comment.",
+            "enable_notifications": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    with client as request:
+        resp = request.get(resp.headers.get("location"))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    headers = root.xpath('//h4[@class="comment-header"]')
+    bodies = root.xpath('//div[@class="article-content"]/div/p')
+
+    assert len(headers) == 1
+    assert len(bodies) == 1
+
+    assert bodies[0].text.strip() == "Edited comment."
+
+    # Ensure that a notification was created.
+    db_notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == maintainer.ID
+    ).first()
+    assert db_notif is not None
+
+    # Don't supply a comment; should return BAD_REQUEST.
+    with client as request:
+        fail_resp = request.post(endpoint, cookies=cookies)
+    assert fail_resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    # Now, test the form route, which should return form markup
+    # via JSON.
+    endpoint = f"{endpoint}/form"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    data = resp.json()
+    assert "form" in data
+
+
+def test_pkgbase_comment_delete(client: TestClient,
+                                maintainer: User,
+                                user: User,
+                                package: Package,
+                                comment: PackageComment):
+    # Test the unauthorized case of comment deletion.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/delete"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    expected = f"/pkgbase/{pkgbasename}"
+    assert resp.headers.get("location") == expected
+
+    # Test the unauthorized case of comment undeletion.
+    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/undelete"
+    with client as request:
+        resp = request.post(endpoint, cookies=maint_cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+    # And move on to undeleting it.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_pkgbase_comment_delete_unauthorized(client: TestClient,
+                                             maintainer: User,
+                                             package: Package,
+                                             comment: PackageComment):
+    # Test the unauthorized case of comment deletion.
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/delete"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comment_delete_not_found(client: TestClient,
+                                          maintainer: User,
+                                          package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = 12345  # Non-existing comment.
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/delete"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comment_undelete_not_found(client: TestClient,
+                                            maintainer: User,
+                                            package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = 12345  # Non-existing comment.
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/undelete"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comment_pin(client: TestClient,
+                             maintainer: User,
+                             package: Package,
+                             comment: PackageComment):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    comment_id = comment.ID
+    pkgbasename = package.PackageBase.Name
+
+    # Pin the comment.
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/pin"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Assert that PinnedTS got set.
+    assert comment.PinnedTS > 0
+
+    # Unpin the comment we just pinned.
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/unpin"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Let's assert that PinnedTS was unset.
+    assert comment.PinnedTS == 0
+
+
+def test_pkgbase_comment_pin_unauthorized(client: TestClient,
+                                          user: User,
+                                          package: Package,
+                                          comment: PackageComment):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    comment_id = comment.ID
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/pin"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comment_unpin_unauthorized(client: TestClient,
+                                            user: User,
+                                            package: Package,
+                                            comment: PackageComment):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    comment_id = comment.ID
+    pkgbasename = package.PackageBase.Name
+    endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/unpin"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comaintainers_not_found(client: TestClient, maintainer: User):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = "/pkgbase/fake/comaintainers"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comaintainers_post_not_found(client: TestClient,
+                                              maintainer: User):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = "/pkgbase/fake/comaintainers"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comaintainers_unauthorized(client: TestClient, user: User,
+                                            package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+
+def test_pkgbase_comaintainers_post_unauthorized(client: TestClient,
+                                                 user: User,
+                                                 package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+
+def test_pkgbase_comaintainers_post_invalid_user(client: TestClient,
+                                                 maintainer: User,
+                                                 package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "users": "\nfake\n"
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    assert error.text.strip() == "Invalid user name: fake"
+
+
+def test_pkgbase_comaintainers(client: TestClient, user: User,
+                               maintainer: User, package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/comaintainers"
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+
+    # Start off by adding user as a comaintainer to package.
+    # The maintainer username given should be ignored.
+    with client as request:
+        resp = request.post(endpoint, data={
+            "users": f"\n{user.Username}\n{maintainer.Username}\n"
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    # Do it again to exercise the last_priority bump path.
+    with client as request:
+        resp = request.post(endpoint, data={
+            "users": f"\n{user.Username}\n{maintainer.Username}\n"
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    # Now that we've added a comaintainer to the pkgbase,
+    # let's perform a GET request to make sure that the backend produces
+    # the user we added in the users textarea.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    users = root.xpath('//textarea[@id="id_users"]')[0]
+    assert users.text.strip() == user.Username
+
+    # Finish off by removing all the comaintainers.
+    with client as request:
+        resp = request.post(endpoint, data={
+            "users": str()
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    users = root.xpath('//textarea[@id="id_users"]')[0]
+    assert users is not None and users.text is None
+
+
+def test_pkgbase_request_not_found(client: TestClient, user: User):
+    pkgbase_name = "fake"
+    endpoint = f"/pkgbase/{pkgbase_name}/request"
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_request(client: TestClient, user: User, package: Package):
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/request"
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+
+def test_pkgbase_request_post_not_found(client: TestClient, user: User):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/pkgbase/fake/request", data={
+            "type": "fake"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_request_post_invalid_type(client: TestClient,
+                                           user: User,
+                                           package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={"type": "fake"}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_pkgbase_request_post_no_comment_error(client: TestClient,
+                                               user: User,
+                                               package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "deletion",
+            "comments": ""  # An empty comment field causes an error.
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    expected = "The comment field must not be empty."
+    assert error.text.strip() == expected
+
+
+def test_pkgbase_request_post_merge_not_found_error(client: TestClient,
+                                                    user: User,
+                                                    package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "merge",
+            "merge_into": "fake",  # There is no PackageBase.Name "fake"
+            "comments": "We want to merge this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    expected = "The package base you want to merge into does not exist."
+    assert error.text.strip() == expected
+
+
+def test_pkgbase_request_post_merge_no_merge_into_error(client: TestClient,
+                                                        user: User,
+                                                        package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "merge",
+            "merge_into": "",  # There is no PackageBase.Name "fake"
+            "comments": "We want to merge this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    expected = 'The "Merge into" field must not be empty.'
+    assert error.text.strip() == expected
+
+
+def test_pkgbase_request_post_merge_self_error(client: TestClient, user: User,
+                                               package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/request"
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, data={
+            "type": "merge",
+            "merge_into": package.PackageBase.Name,
+            "comments": "We want to merge this."
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    error = root.xpath('//ul[@class="errorlist"]/li')[0]
+    expected = "You cannot merge a package base into itself."
+    assert error.text.strip() == expected
+
+
+def test_pkgbase_flag(client: TestClient, user: User, maintainer: User,
+                      package: Package):
+    pkgbase = package.PackageBase
+
+    # We shouldn't have flagged the package yet; assert so.
+    assert pkgbase.Flagger is None
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/flag"
+
+    # Get the flag page.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Now, let's check the /pkgbase/{name}/flag-comment route.
+    flag_comment_endpoint = f"/pkgbase/{pkgbase.Name}/flag-comment"
+    with client as request:
+        resp = request.get(flag_comment_endpoint, cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    # Try to flag it without a comment.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    # Flag it with a valid comment.
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comments": "Test"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert pkgbase.Flagger == user
+    assert pkgbase.FlaggerComment == "Test"
+
+    # Now, let's check the /pkgbase/{name}/flag-comment route.
+    flag_comment_endpoint = f"/pkgbase/{pkgbase.Name}/flag-comment"
+    with client as request:
+        resp = request.get(flag_comment_endpoint, cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Now try to perform a get; we should be redirected because
+    # it's already flagged.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    with db.begin():
+        user2 = db.create(User, Username="test2",
+                          Email="test2@example.org",
+                          Passwd="testPassword",
+                          AccountType=user.AccountType)
+
+    # Now, test that the 'user2' user can't unflag it, because they
+    # didn't flag it to begin with.
+    user2_cookies = {"AURSID": user2.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/unflag"
+    with client as request:
+        resp = request.post(endpoint, cookies=user2_cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert pkgbase.Flagger == user
+
+    # Now, test that the 'maintainer' user can.
+    maint_cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, cookies=maint_cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert pkgbase.Flagger is None
+
+    # Flag it again.
+    with client as request:
+        resp = request.post(f"/pkgbase/{pkgbase.Name}/flag", data={
+            "comments": "Test"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Now, unflag it for real.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert pkgbase.Flagger is None
+
+
+def test_pkgbase_flag_vcs(client: TestClient, user: User, package: Package):
+    # Morph our package fixture into a VCS package (-git).
+    with db.begin():
+        package.PackageBase.Name += "-git"
+        package.Name += "-git"
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(f"/pkgbase/{package.PackageBase.Name}/flag",
+                           cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    expected = ("This seems to be a VCS package. Please do "
+                "<strong>not</strong> flag it out-of-date if the package "
+                "version in the AUR does not match the most recent commit. "
+                "Flagging this package should only be done if the sources "
+                "moved or changes in the PKGBUILD are required because of "
+                "recent upstream changes.")
+    assert expected in resp.text
+
+
+def test_pkgbase_notify(client: TestClient, user: User, package: Package):
+    pkgbase = package.PackageBase
+
+    # We have no notif record yet; assert that.
+    notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == user.ID
+    ).first()
+    assert notif is None
+
+    # Enable notifications.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/notify"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == user.ID
+    ).first()
+    assert notif is not None
+
+    # Disable notifications.
+    endpoint = f"/pkgbase/{pkgbase.Name}/unnotify"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    notif = pkgbase.notifications.filter(
+        PackageNotification.UserID == user.ID
+    ).first()
+    assert notif is None
+
+
+def test_pkgbase_vote(client: TestClient, user: User, package: Package):
+    pkgbase = package.PackageBase
+
+    # We haven't voted yet.
+    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
+    assert vote is None
+
+    # Vote for the package.
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/vote"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
+    assert vote is not None
+    assert pkgbase.NumVotes == 1
+
+    # Remove vote.
+    endpoint = f"/pkgbase/{pkgbase.Name}/unvote"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    vote = pkgbase.package_votes.filter(PackageVote.UsersID == user.ID).first()
+    assert vote is None
+    assert pkgbase.NumVotes == 0
+
+
+def test_pkgbase_disown_as_sole_maintainer(client: TestClient,
+                                           maintainer: User,
+                                           package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+
+    # But we do here.
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_pkgbase_disown(client: TestClient, user: User, maintainer: User,
+                        package: Package):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    user_cookies = {"AURSID": user.login(Request(), "testPassword")}
+    pkgbase = package.PackageBase
+    endpoint = f"/pkgbase/{pkgbase.Name}/disown"
+
+    with db.begin():
+        db.create(PackageComaintainer,
+                  User=user,
+                  PackageBase=pkgbase,
+                  Priority=1)
+
+    # GET as a normal user, which is rejected for lack of credentials.
+    with client as request:
+        resp = request.get(endpoint, cookies=user_cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # GET as the maintainer.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # POST as a normal user, which is rejected for lack of credentials.
+    with client as request:
+        resp = request.post(endpoint, cookies=user_cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # POST as the maintainer without "confirm".
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    # POST as the maintainer with "confirm".
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_pkgbase_adopt(client: TestClient, user: User, tu_user: User,
+                       maintainer: User, package: Package):
+    # Unset the maintainer as if package is orphaned.
+    with db.begin():
+        package.PackageBase.Maintainer = None
+
+    pkgbasename = package.PackageBase.Name
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbasename}/adopt"
+
+    # Adopt the package base.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert package.PackageBase.Maintainer == maintainer
+
+    # Try to adopt it when it already has a maintainer; nothing changes.
+    user_cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, cookies=user_cookies,
+                            allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert package.PackageBase.Maintainer == maintainer
+
+    # Steal the package as a TU.
+    tu_cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(endpoint, cookies=tu_cookies,
+                            allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert package.PackageBase.Maintainer == tu_user
+
+
+def test_pkgbase_delete_unauthorized(client: TestClient, user: User,
+                                     package: Package):
+    pkgbase = package.PackageBase
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
+
+    # Test GET.
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+    # Test POST.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
+
+
+def test_pkgbase_delete(client: TestClient, tu_user: User, package: Package):
+    pkgbase = package.PackageBase
+
+    # Test that the GET request works.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # Test that POST works and denies us because we haven't confirmed.
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+    # Test that we can actually delete the pkgbase.
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Let's assert that the package base record got removed.
+    record = db.query(PackageBase).filter(
+        PackageBase.Name == pkgbase.Name
+    ).first()
+    assert record is None
+
+    # Two emails should've been sent out; an autogenerated
+    # request's accepted notification and a deletion notification.
+    assert Email.count() == 1
+
+    req_close = Email(1).parse()
+    expr = r"^\[PRQ#\d+\] Deletion Request for [^ ]+ Accepted$"
+    subject = req_close.headers.get("Subject")
+    assert re.match(expr, subject)
+
+
+def test_pkgbase_delete_with_request(client: TestClient, tu_user: User,
+                                     pkgbase: PackageBase,
+                                     pkgreq: PackageRequest):
+    # TODO: Test that a previously existing request gets Accepted when
+    # a TU deleted the package.
+
+    # Delete the package as `tu_user` via POST request.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{pkgbase.Name}/delete"
+    with client as request:
+        resp = request.post(endpoint, data={"confirm": True}, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == "/packages"
+
+    # We should've just sent one closure email since `pkgreq` exists.
+    assert Email.count() == 1
+
+    # Make sure it was a closure for the deletion request.
+    email = Email(1).parse()
+    expr = r"^\[PRQ#\d+\] Deletion Request for [^ ]+ Accepted$"
+    assert re.match(expr, email.headers.get("Subject"))
+
+
+def test_packages_post_unknown_action(client: TestClient, user: User,
+                                      package: Package):
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post("/packages", data={"action": "unknown"},
+                            cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+
+def test_packages_post_error(client: TestClient, user: User, package: Package):
+
+    async def stub_action(request: Request, **kwargs):
+        return (False, ["Some error."])
+
+    actions = {"stub": stub_action}
+    with mock.patch.dict("aurweb.routers.packages.PACKAGE_ACTIONS", actions):
+        cookies = {"AURSID": user.login(Request(), "testPassword")}
+        with client as request:
+            resp = request.post("/packages", data={"action": "stub"},
+                                cookies=cookies, allow_redirects=False)
+        assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+
+        errors = get_errors(resp.text)
+        expected = "Some error."
+        assert errors[0].text.strip() == expected
+
+
+def test_packages_post(client: TestClient, user: User, package: Package):
+
+    async def stub_action(request: Request, **kwargs):
+        return (True, ["Some success."])
+
+    actions = {"stub": stub_action}
+    with mock.patch.dict("aurweb.routers.packages.PACKAGE_ACTIONS", actions):
+        cookies = {"AURSID": user.login(Request(), "testPassword")}
+        with client as request:
+            resp = request.post("/packages", data={"action": "stub"},
+                                cookies=cookies, allow_redirects=False)
+        assert resp.status_code == int(HTTPStatus.OK)
+
+        errors = get_successes(resp.text)
+        expected = "Some success."
+        assert errors[0].text.strip() == expected
+
+
+def test_pkgbase_merge_unauthorized(client: TestClient, user: User,
+                                    package: Package):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_merge(client: TestClient, tu_user: User, package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.get(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+    assert not get_errors(resp.text)
+
+
+def test_pkgbase_merge_post_unauthorized(client: TestClient, user: User,
+                                         package: Package):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_merge_post_unconfirmed(client: TestClient, tu_user: User,
+                                        package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = ("The selected packages have not been deleted, "
+                "check the confirmation checkbox.")
+    assert errors[0].text.strip() == expected
+
+
+def test_pkgbase_merge_post_invalid_into(client: TestClient, tu_user: User,
+                                         package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "into": "not_real",
+            "confirm": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "Cannot find package to merge votes and comments into."
+    assert errors[0].text.strip() == expected
+
+
+def test_pkgbase_merge_post_self_invalid(client: TestClient, tu_user: User,
+                                         package: Package):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "into": package.PackageBase.Name,
+            "confirm": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
+    errors = get_errors(resp.text)
+    expected = "Cannot merge a package base with itself."
+    assert errors[0].text.strip() == expected
+
+
+def test_pkgbase_merge_post(client: TestClient, tu_user: User,
+                            package: Package,
+                            pkgbase: PackageBase,
+                            target: PackageBase,
+                            pkgreq: PackageRequest):
+    pkgname = package.Name
+    pkgbasename = pkgbase.Name
+
+    # Create a merge request destined for another target.
+    # This will allow our test code to exercise closing
+    # such a request after merging the pkgbase in question.
+    with db.begin():
+        pkgreq.ReqTypeID = MERGE_ID
+        pkgreq.MergeBaseName = target.Name
+
+    # Vote for the package.
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/vote"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Enable notifications.
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/notify"
+    with client as request:
+        resp = request.post(endpoint, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Comment on the package.
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/comments"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "comment": "Test comment."
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    # Save these relationships for later comparison.
+    comments = package.PackageBase.comments.all()
+    notifs = package.PackageBase.notifications.all()
+    votes = package.PackageBase.package_votes.all()
+
+    # Merge the package into target.
+    endpoint = f"/pkgbase/{package.PackageBase.Name}/merge"
+    with client as request:
+        resp = request.post(endpoint, data={
+            "into": target.Name,
+            "confirm": True
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    loc = resp.headers.get("location")
+    assert loc == f"/pkgbase/{target.Name}"
+
+    # Two emails should've been sent out.
+    assert Email.count() == 1
+    email_body = Email(1).parse().glue()
+    assert f"Merge Request for {pkgbasename} Accepted" in email_body
+
+    # Assert that the original comments, notifs and votes we setup
+    # got migrated to target as intended.
+    assert comments == target.comments.all()
+    assert notifs == target.notifications.all()
+    assert votes == target.package_votes.all()
+
+    # ...and that the package got deleted.
+    package = db.query(Package).filter(Package.Name == pkgname).first()
+    assert package is None
+
+    # Our previously-made request should have gotten accepted.
+    assert pkgreq.Status == ACCEPTED_ID
+    assert pkgreq.Closer is not None
+
+    # A PackageRequest is always created when merging this way.
+    pkgreq = db.query(PackageRequest).filter(
+        and_(PackageRequest.ReqTypeID == MERGE_ID,
+             PackageRequest.PackageBaseName == pkgbasename,
+             PackageRequest.MergeBaseName == target.Name)
+    ).first()
+    assert pkgreq is not None
+
+
+def test_pkgbase_keywords(client: TestClient, user: User, package: Package):
+    endpoint = f"/pkgbase/{package.PackageBase.Name}"
+    with client as request:
+        resp = request.get(endpoint)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    keywords = root.xpath('//a[@class="keyword"]')
+    assert len(keywords) == 0
+
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    post_endpoint = f"{endpoint}/keywords"
+    with client as request:
+        resp = request.post(post_endpoint, data={
+            "keywords": "abc test"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    with client as request:
+        resp = request.get(resp.headers.get("location"))
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    root = parse_root(resp.text)
+    keywords = root.xpath('//a[@class="keyword"]')
+    assert len(keywords) == 2
+    expected = ["abc", "test"]
+    for i, keyword in enumerate(keywords):
+        assert keyword.text.strip() == expected[i]

From 9441f4f904a6b5dd0fb968daa4f3d50b6598516f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 15 Jan 2022 21:52:53 -0800
Subject: [PATCH 817/844] change(python): move test_requests tests to their own
 suite

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_packages_routes.py | 143 +----------------------------
 test/test_requests.py        | 172 ++++++++++++++++++++++++++++++++++-
 2 files changed, 172 insertions(+), 143 deletions(-)

diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 5de38b30..30c0a48a 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -9,7 +9,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import asgi, db, defaults
+from aurweb import asgi, db
 from aurweb.models import License, PackageLicense
 from aurweb.models.account_type import USER_ID, AccountType
 from aurweb.models.dependency_type import DependencyType
@@ -22,7 +22,7 @@ from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_keyword import PackageKeyword
 from aurweb.models.package_notification import PackageNotification
 from aurweb.models.package_relation import PackageRelation
-from aurweb.models.package_request import ACCEPTED_ID, REJECTED_ID, PackageRequest
+from aurweb.models.package_request import PackageRequest
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID, RelationType
 from aurweb.models.request_type import DELETION_ID, RequestType
@@ -198,25 +198,6 @@ def packages(maintainer: User) -> List[Package]:
     yield packages_
 
 
-@pytest.fixture
-def requests(user: User, packages: List[Package]) -> List[PackageRequest]:
-    pkgreqs = []
-    deletion_type = db.query(RequestType).filter(
-        RequestType.ID == DELETION_ID
-    ).first()
-    with db.begin():
-        for i in range(55):
-            pkgreq = db.create(PackageRequest,
-                               RequestType=deletion_type,
-                               User=user,
-                               PackageBase=packages[i].PackageBase,
-                               PackageBaseName=packages[i].Name,
-                               Comments=f"Deletion request for pkg_{i}",
-                               ClosureComment=str())
-            pkgreqs.append(pkgreq)
-    yield pkgreqs
-
-
 def test_package_not_found(client: TestClient):
     with client as request:
         resp = request.get("/packages/not_found")
@@ -1070,126 +1051,6 @@ def test_packages_per_page(client: TestClient, maintainer: User):
     assert len(rows) == 250
 
 
-def test_requests_unauthorized(client: TestClient):
-    with client as request:
-        resp = request.get("/requests", allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-
-def test_requests(client: TestClient,
-                  maintainer: User,
-                  tu_user: User,
-                  packages: List[Package],
-                  requests: List[PackageRequest]):
-    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get("/requests", params={
-            # Pass in url query parameters O, SeB and SB to exercise
-            # their paths inside of the pager_nav used in this request.
-            "O": 0,  # Page 1
-            "SeB": "nd",
-            "SB": "n"
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    assert "Next ›" in resp.text
-    assert "Last »" in resp.text
-
-    root = parse_root(resp.text)
-    # We have 55 requests, our defaults.PP is 50, so expect we have 50 rows.
-    rows = root.xpath('//table[@class="results"]/tbody/tr')
-    assert len(rows) == defaults.PP
-
-    # Request page 2 of the requests page.
-    with client as request:
-        resp = request.get("/requests", params={
-            "O": 50  # Page 2
-        }, cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    assert "‹ Previous" in resp.text
-    assert "« First" in resp.text
-
-    root = parse_root(resp.text)
-    rows = root.xpath('//table[@class="results"]/tbody/tr')
-    assert len(rows) == 5  # There are five records left on the second page.
-
-
-def test_requests_selfmade(client: TestClient, user: User,
-                           requests: List[PackageRequest]):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get("/requests", cookies=cookies)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-    # As the user who creates all of the requests, we should see all of them.
-    # However, we are not allowed to accept any of them ourselves.
-    root = parse_root(resp.text)
-    rows = root.xpath('//table[@class="results"]/tbody/tr')
-    assert len(rows) == defaults.PP
-
-    # Our first and only link in the last row should be "Close".
-    for row in rows:
-        last_row = row.xpath('./td')[-1].xpath('./a')[0]
-        assert last_row.text.strip() == "Close"
-
-
-def test_requests_close(client: TestClient, user: User,
-                        pkgreq: PackageRequest):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get(f"/requests/{pkgreq.ID}/close", cookies=cookies,
-                           allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.OK)
-
-
-def test_requests_close_unauthorized(client: TestClient, maintainer: User,
-                                     pkgreq: PackageRequest):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.get(f"/requests/{pkgreq.ID}/close", cookies=cookies,
-                           allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == "/"
-
-
-def test_requests_close_post_unauthorized(client: TestClient, maintainer: User,
-                                          pkgreq: PackageRequest):
-    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
-            "reason": ACCEPTED_ID
-        }, cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-    assert resp.headers.get("location") == "/"
-
-
-def test_requests_close_post(client: TestClient, user: User,
-                             pkgreq: PackageRequest):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(f"/requests/{pkgreq.ID}/close",
-                            cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    assert pkgreq.Status == REJECTED_ID
-    assert pkgreq.Closer == user
-    assert pkgreq.ClosureComment == str()
-
-
-def test_requests_close_post_rejected(client: TestClient, user: User,
-                                      pkgreq: PackageRequest):
-    cookies = {"AURSID": user.login(Request(), "testPassword")}
-    with client as request:
-        resp = request.post(f"/requests/{pkgreq.ID}/close",
-                            cookies=cookies, allow_redirects=False)
-    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
-
-    assert pkgreq.Status == REJECTED_ID
-    assert pkgreq.Closer == user
-    assert pkgreq.ClosureComment == str()
-
-
 def test_packages_post_unknown_action(client: TestClient, user: User,
                                       package: Package):
 
diff --git a/test/test_requests.py b/test/test_requests.py
index 8ca8f401..e8813a69 100644
--- a/test/test_requests.py
+++ b/test/test_requests.py
@@ -3,13 +3,14 @@ import re
 from datetime import datetime
 from http import HTTPStatus
 from logging import DEBUG
+from typing import List
 
 import pytest
 
 from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
-from aurweb import asgi, config, db
+from aurweb import asgi, config, db, defaults
 from aurweb.models import Package, PackageBase, PackageRequest, User
 from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID
 from aurweb.models.package_notification import PackageNotification
@@ -18,7 +19,7 @@ from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID
 from aurweb.packages.requests import ClosureFactory
 from aurweb.requests.util import get_pkgreq_by_id
 from aurweb.testing.email import Email
-from aurweb.testing.html import get_errors
+from aurweb.testing.html import get_errors, parse_root
 from aurweb.testing.requests import Request
 
 
@@ -78,6 +79,54 @@ def auser2(user2: User) -> User:
     yield user2
 
 
+@pytest.fixture
+def maintainer() -> User:
+    """ Yield a specific User used to maintain packages. """
+    with db.begin():
+        maintainer = db.create(User, Username="test_maintainer",
+                               Email="test_maintainer@example.org",
+                               Passwd="testPassword",
+                               AccountTypeID=USER_ID)
+    yield maintainer
+
+
+@pytest.fixture
+def packages(maintainer: User) -> List[Package]:
+    """ Yield 55 packages named pkg_0 .. pkg_54. """
+    packages_ = []
+    now = int(datetime.utcnow().timestamp())
+    with db.begin():
+        for i in range(55):
+            pkgbase = db.create(PackageBase,
+                                Name=f"pkg_{i}",
+                                Maintainer=maintainer,
+                                Packager=maintainer,
+                                Submitter=maintainer,
+                                ModifiedTS=now)
+            package = db.create(Package,
+                                PackageBase=pkgbase,
+                                Name=f"pkg_{i}")
+            packages_.append(package)
+
+    yield packages_
+
+
+@pytest.fixture
+def requests(user: User, packages: List[Package]) -> List[PackageRequest]:
+    pkgreqs = []
+    with db.begin():
+        for i in range(55):
+            pkgreq = db.create(PackageRequest,
+                               ReqTypeID=DELETION_ID,
+                               User=user,
+                               PackageBase=packages[i].PackageBase,
+                               PackageBaseName=packages[i].Name,
+                               Comments=f"Deletion request for pkg_{i}",
+                               ClosureComment=str())
+            pkgreqs.append(pkgreq)
+    yield pkgreqs
+
+
 @pytest.fixture
 def tu_user() -> User:
     """ Yield an authenticated Trusted User instance. """
@@ -590,3 +639,122 @@ def test_closure_factory_invalid_reqtype_id():
 def test_pkgreq_by_id_not_found():
     with pytest.raises(HTTPException):
         get_pkgreq_by_id(0)
+
+
+def test_requests_unauthorized(client: TestClient):
+    with client as request:
+        resp = request.get("/requests", allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+
+def test_requests(client: TestClient,
+                  tu_user: User,
+                  packages: List[Package],
+                  requests: List[PackageRequest]):
+    cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/requests", params={
+            # Pass in url query parameters O, SeB and SB to exercise
+            # their paths inside of the pager_nav used in this request.
+            "O": 0,  # Page 1
+            "SeB": "nd",
+            "SB": "n"
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    assert "Next ›" in resp.text
+    assert "Last »" in resp.text
+
+    root = parse_root(resp.text)
+    # We have 55 requests, our defaults.PP is 50, so expect we have 50 rows.
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == defaults.PP
+
+    # Request page 2 of the requests page.
+    with client as request:
+        resp = request.get("/requests", params={
+            "O": 50  # Page 2
+        }, cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    assert "‹ Previous" in resp.text
+    assert "« First" in resp.text
+
+    root = parse_root(resp.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == 5  # There are five records left on the second page.
+
+
+def test_requests_selfmade(client: TestClient, user: User,
+                           requests: List[PackageRequest]):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get("/requests", cookies=cookies)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+    # As the user who creates all of the requests, we should see all of them.
+    # However, we are not allowed to accept any of them ourselves.
+    root = parse_root(resp.text)
+    rows = root.xpath('//table[@class="results"]/tbody/tr')
+    assert len(rows) == defaults.PP
+
+    # Our first and only link in the last row should be "Close".
+    for row in rows:
+        last_row = row.xpath('./td')[-1].xpath('./a')[0]
+        assert last_row.text.strip() == "Close"
+
+
+def test_requests_close(client: TestClient, user: User,
+                        pkgreq: PackageRequest):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(f"/requests/{pkgreq.ID}/close", cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.OK)
+
+
+def test_requests_close_unauthorized(client: TestClient, maintainer: User,
+                                     pkgreq: PackageRequest):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.get(f"/requests/{pkgreq.ID}/close", cookies=cookies,
+                           allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == "/"
+
+
+def test_requests_close_post_unauthorized(client: TestClient, maintainer: User,
+                                          pkgreq: PackageRequest):
+    cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(f"/requests/{pkgreq.ID}/close", data={
+            "reason": ACCEPTED_ID
+        }, cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+    assert resp.headers.get("location") == "/"
+
+
+def test_requests_close_post(client: TestClient, user: User,
+                             pkgreq: PackageRequest):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(f"/requests/{pkgreq.ID}/close",
+                            cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    assert pkgreq.Status == REJECTED_ID
+    assert pkgreq.Closer == user
+    assert pkgreq.ClosureComment == str()
+
+
+def test_requests_close_post_rejected(client: TestClient, user: User,
+                                      pkgreq: PackageRequest):
+    cookies = {"AURSID": user.login(Request(), "testPassword")}
+    with client as request:
+        resp = request.post(f"/requests/{pkgreq.ID}/close",
+                            cookies=cookies, allow_redirects=False)
+    assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+    assert pkgreq.Status == REJECTED_ID
+    assert pkgreq.Closer == user
+    assert pkgreq.ClosureComment == str()

From 64069b9b5d374894b4f6040befe69f15420d7cca Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 16 Jan 2022 02:00:41 -0800
Subject: [PATCH 818/844] change(python): use a transaction query in
 get_pkg_or_base

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/packages/util.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index fd8fdf85..21b5fab8 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -103,11 +103,13 @@ def get_pkg_or_base(
     if provider:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
-    instance = db.query(cls).filter(cls.Name == name).first()
+    with db.begin():
+        instance = db.query(cls).filter(cls.Name == name).first()
+
     if not instance:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
-    return db.refresh(instance)
+    return instance
 
 
 def get_pkgbase_comment(pkgbase: models.PackageBase, id: int) \

From eb59cbaa3988219685f2359939d4ddd398f6b36d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 16 Jan 2022 02:01:52 -0800
Subject: [PATCH 819/844] change(python): use transaction query in
 BasicAuthBackend

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index 3befd6ee..841110fa 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -122,8 +122,8 @@ class BasicAuthBackend(AuthenticationBackend):
         # At this point, we cannot have an invalid user if the record
         # exists, due to ForeignKey constraints in the schema upheld
         # by mysqlclient.
-        user = db.query(User).filter(User.ID == record.UsersID).first()
-        db.refresh(user)
+        with db.begin():
+            user = db.query(User).filter(User.ID == record.UsersID).first()
         user.nonce = util.make_nonce()
         user.authenticated = True
 

From d94e2dc9d77ad736d0c545e4ce78e6832b6aa02c Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 16 Jan 2022 18:16:42 -0800
Subject: [PATCH 820/844] feat(poetry): add srcinfo

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 poetry.lock    | 28 +++++++++++++++++++++++++++-
 pyproject.toml |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index 5f2c219e..db16fedf 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -606,6 +606,14 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "parse"
+version = "1.19.0"
+description = "parse() is the opposite of format()"
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "pluggy"
 version = "1.0.0"
@@ -968,6 +976,17 @@ postgresql_psycopg2cffi = ["psycopg2cffi"]
 pymysql = ["pymysql (<1)", "pymysql"]
 sqlcipher = ["sqlcipher3-binary"]
 
+[[package]]
+name = "srcinfo"
+version = "0.0.8"
+description = "A small library to parse .SRCINFO files"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+parse = "*"
+
 [[package]]
 name = "starlette"
 version = "0.17.1"
@@ -1099,7 +1118,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "b7a578260b8836df2ed014b43c6228463b3f52db3d832ede7e9c946de974ba7e"
+content-hash = "492c523ad53b760b6132ba644471f9424e5cf7a7bcdd47ba648aa80d1494038f"
 
 [metadata.files]
 aiofiles = [
@@ -1598,6 +1617,9 @@ packaging = [
 paginate = [
     {file = "paginate-0.5.6.tar.gz", hash = "sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d"},
 ]
+parse = [
+    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
+]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
@@ -1837,6 +1859,10 @@ sqlalchemy = [
     {file = "SQLAlchemy-1.4.29-cp39-cp39-win_amd64.whl", hash = "sha256:08cfd35eecaba79be930c9bfd2e1f0c67a7e1314355d83a378f9a512b1cf7587"},
     {file = "SQLAlchemy-1.4.29.tar.gz", hash = "sha256:fa2bad14e1474ba649cfc969c1d2ec915dd3e79677f346bbfe08e93ef9020b39"},
 ]
+srcinfo = [
+    {file = "srcinfo-0.0.8-py3-none-any.whl", hash = "sha256:0922ee4302b927d7ddea74c47e539b226a0a7738dc89f95b66404a28d07f3f6b"},
+    {file = "srcinfo-0.0.8.tar.gz", hash = "sha256:5ac610cf8b15d4b0a0374bd1f7ad301675c2938f0414addf3ef7d7e3fcaf5c65"},
+]
 starlette = [
     {file = "starlette-0.17.1-py3-none-any.whl", hash = "sha256:26a18cbda5e6b651c964c12c88b36d9898481cd428ed6e063f5f29c418f73050"},
     {file = "starlette-0.17.1.tar.gz", hash = "sha256:57eab3cc975a28af62f6faec94d355a410634940f10b30d68d31cb5ec1b44ae8"},
diff --git a/pyproject.toml b/pyproject.toml
index 79fe3a8f..c6076829 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,6 +88,7 @@ filelock = "^3.3.2"
 posix-ipc = "^1.0.5"
 pyalpm = "^0.10.6"
 fastapi = "^0.71.0"
+srcinfo = "^0.0.8"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^4.0.1"

From c07c40bcb64c595576d3799091e591f00c32ff41 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 17 Jan 2022 11:53:05 -0800
Subject: [PATCH 821/844] fix: clean up package action templates (merge,
 delete, disown)

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 po/aurweb.pot                  | 13 +++++++++++++
 templates/packages/delete.html | 24 ++++++++++++++++++------
 templates/packages/disown.html | 16 ++++++++++++++--
 templates/pkgbase/merge.html   | 25 +++++++++++++++++++------
 web/html/css/aurweb.css        |  3 +--
 5 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/po/aurweb.pot b/po/aurweb.pot
index adc1fc3a..afad9e12 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -2321,3 +2321,16 @@ msgstr ""
 #: aurweb/scripts/notify.py
 msgid "AUR Server Error"
 msgstr ""
+
+#: templates/pkgbase/merge.html
+#: templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html
+#: templates/packages/delete.html
+msgid "This action will close any pending package requests "
+"related to it. If %sComments%s are omitted, a closure "
+"comment will be autogenerated."
+msgstr ""
diff --git a/templates/packages/delete.html b/templates/packages/delete.html
index 8910cce9..55eaeba2 100644
--- a/templates/packages/delete.html
+++ b/templates/packages/delete.html
@@ -27,6 +27,15 @@
             {% endfor %}
         </ul>
 
+        <p>
+            {{
+                "This action will close any pending package requests "
+                "related to it. If %sComments%s are omitted, a closure "
+                "comment will be autogenerated."
+                | tr | format("<em>", "</em>") | safe
+            }}
+        </p>
+
         <p>
             {{
                 "Deletion of a package is permanent. "
@@ -36,6 +45,15 @@
 
         <form action="/pkgbase/{{ pkgbase.Name }}/delete" method="post">
             <fieldset>
+
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments" name="comments"
+                              rows="5" cols="50"
+                              placeholder="Related package request closure comments..."
+                    ></textarea>
+                </p>
+
                 <p>
                     <label class="confirmation">
                         <input type="checkbox" name="confirm" value="1" />
@@ -43,12 +61,6 @@
                     </label>
                 </p>
 
-                <p>
-                    <label for="id_comments">{{ "Comments" | tr }}:</label>
-                    <textarea id="id_comments" name="comments"
-                              rows="5" cols="50"></textarea>
-                </p>
-
                 <p>
                     <input class="button"
                            type="submit"
diff --git a/templates/packages/disown.html b/templates/packages/disown.html
index 1442053f..0ceecfa1 100644
--- a/templates/packages/disown.html
+++ b/templates/packages/disown.html
@@ -27,6 +27,15 @@
             {% endfor %}
         </ul>
 
+        <p>
+            {{
+                "This action will close any pending package requests "
+                "related to it. If %sComments%s are omitted, a closure "
+                "comment will be autogenerated."
+                | tr | format("<em>", "</em>") | safe
+            }}
+        </p>
+
         <p>
             {{
                 "By selecting the checkbox, you confirm that you want to "
@@ -38,8 +47,11 @@
             <fieldset>
                 <p>
                     <label for="id_comments">{{ "Comments" | tr }}:</label>
-                    <textarea id="id_comments" name="comments"
-                              rows="5" cols="50"></textarea>
+                    <textarea id="id_comments"
+                              name="comments"
+                              rows="5" cols="50"
+                              placeholder="Related package request closure comments..."
+                    ></textarea>
                 </p>
 
                 <p>
diff --git a/templates/pkgbase/merge.html b/templates/pkgbase/merge.html
index b5129801..981bd649 100644
--- a/templates/pkgbase/merge.html
+++ b/templates/pkgbase/merge.html
@@ -28,6 +28,15 @@
             {% endfor %}
         </ul>
 
+        <p>
+            {{
+                "This action will close any pending package requests "
+                "related to it. If %sComments%s are omitted, a closure "
+                "comment will be autogenerated."
+                | tr | format("<em>", "</em>") | safe
+            }}
+        </p>
+
         <p>
             {{ "Once the package has been merged it cannot be reversed. " | tr }}
             {{ "Enter the package name you wish to merge the package into. " | tr }}
@@ -37,6 +46,16 @@
         <form id="merge-form" action="/pkgbase/{{ pkgbase.Name }}/merge" method="post">
             <fieldset>
                 <input type="hidden" name="next" value="{{ next }}" />
+
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments"
+                              name="comments"
+                              rows="5" cols="50"
+                              placeholder="Related package request closure comments..."
+                    ></textarea>
+                </p>
+
                 <p>
                     <label id="merge-into" for="merge_into">
                         {{ "Merge into:" | tr }}
@@ -49,12 +68,6 @@
                     />
                 </p>
 
-                <p>
-                    <label for="id_comments">{{ "Comments" | tr }}:</label>
-                    <textarea id="id_comments" name="comments"
-                              rows="5" cols="50"></textarea>
-                </p>
-
                 <p>
                     <label class="confirmation">
                         <input type="checkbox" name="confirm" />
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index ac20aac5..d5752c07 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -144,8 +144,7 @@ span.hover-help {
 	cursor:help;
 }
 
-label.confirmation,
-#merge-into {
+label.confirmation {
 	width: auto;
 }
 

From cce9385fb1e593a0e8ed3ea2b749832a533039e9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 17 Jan 2022 11:57:03 -0800
Subject: [PATCH 822/844] fix(db): remove debug logging of dbname

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/db.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/aurweb/db.py b/aurweb/db.py
index 70ad58d1..4c53730a 100644
--- a/aurweb/db.py
+++ b/aurweb/db.py
@@ -16,10 +16,6 @@ from sqlalchemy.orm import Query, Session, SessionTransaction, scoped_session, s
 import aurweb.config
 import aurweb.util
 
-from aurweb import logging
-
-logger = logging.get_logger(__name__)
-
 DRIVERS = {
     "mysql": "mysql+mysqldb"
 }
@@ -96,11 +92,6 @@ def get_session(engine: Engine = None) -> Session:
             sessionmaker(autocommit=True, autoflush=False, bind=engine))
         _sessions[dbname] = Session()
 
-        # If this is the first grab of this session, log out the
-        # database name used.
-        raw_dbname = test_name()
-        logger.debug(f"DBName({raw_dbname}): {dbname}")
-
     return _sessions.get(dbname)
 
 

From bf4662e26f73891ab05a1f9d4f4273a566e0bc83 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 17 Jan 2022 12:02:32 -0800
Subject: [PATCH 823/844] change(logging): restrict logging.conf & add
 logging.test.conf

We'll override logging.conf with logging.test.conf for debug logging
needed for tests now, so we can rely on the default logging.conf
for production use.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml                         | 10 ++++------
 docker/test-mysql-entrypoint.sh        |  3 +++
 logging.conf                           |  4 +---
 logging.prod.conf => logging.test.conf |  7 +++----
 4 files changed, 11 insertions(+), 13 deletions(-)
 rename logging.prod.conf => logging.test.conf (85%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e738dd1c..77271d6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,15 +26,13 @@ test:
     - cp -v conf/config.dev conf/config
     - sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
     - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
-    - make -C po all install
-    - make -C doc
-    - make -C test clean
+    - cp -vf logging.test.conf logging.conf # Put test logging config in place.
+    - make -C po all install # Compile translations.
+    - make -C doc # Compile asciidoc.
+    - make -C test clean # Cleanup coverage.
   script:
     # Run sharness.
-    - cp logging.conf logging.conf.bak # Copy devel logging.conf to backup
-    - cp logging.prod.conf logging.conf # Copy in logging.prod.conf
     - make -C test sh # sharness tests use sqlite.
-    - cp logging.conf.bak logging.conf # Restore devel logging.conf
     # Run pytest.
     - pytest # Run pytest suites.
     - make -C test coverage # Produce coverage reports.
diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
index b3464256..5c3f1a1d 100755
--- a/docker/test-mysql-entrypoint.sh
+++ b/docker/test-mysql-entrypoint.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -eou pipefail
 
+# Set test logging.
+cp -vf "logging.test.conf" "logging.conf"
+
 # We use the root user for testing in Docker.
 # The test user must be able to create databases and drop them.
 aurweb-config set database user 'root'
diff --git a/logging.conf b/logging.conf
index 6c44f5dc..7dfd30f0 100644
--- a/logging.conf
+++ b/logging.conf
@@ -14,9 +14,7 @@ handlers=
 propogate=0
 
 [logger_aurweb]
-; This loglevel is set to DEBUG for tests where we expect specific
-; debug logging to occur. In production, this should be set to INFO.
-level=DEBUG
+level=INFO
 handlers=simpleHandler
 qualname=aurweb
 propagate=1
diff --git a/logging.prod.conf b/logging.test.conf
similarity index 85%
rename from logging.prod.conf
rename to logging.test.conf
index 016e7949..6c44f5dc 100644
--- a/logging.prod.conf
+++ b/logging.test.conf
@@ -1,6 +1,3 @@
-; This logger should be used in production, as it limits the logging
-; done to INFO. The main logger uses DEBUG and is purely meant for
-; debugging and unit tests.
 [loggers]
 keys=root,aurweb,uvicorn,hypercorn,alembic
 
@@ -17,7 +14,9 @@ handlers=
 propogate=0
 
 [logger_aurweb]
-level=INFO
+; This loglevel is set to DEBUG for tests where we expect specific
+; debug logging to occur. In production, this should be set to INFO.
+level=DEBUG
 handlers=simpleHandler
 qualname=aurweb
 propagate=1

From 290ef1a2edbaba6878b58f7b2a2de2bc7bd014a4 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 17 Jan 2022 12:27:06 -0800
Subject: [PATCH 824/844] fix(gitlab-ci): remove logging.prod.conf copy

No longer needed; logging.conf, which is the default config
used, is now setup for production INFO logging.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77271d6f..1e4795ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,6 @@ deploy:
     COMMIT_HASH: $CI_COMMIT_SHA
     GIT_DATA_DIR: git_data
   script:
-    - cp -vf logging.prod.conf logging.conf # Use production logging.conf
     - pacman -Syu --noconfirm docker docker-compose socat openssh
     - chmod 600 ${SSH_KEY}
     - socat "UNIX-LISTEN:/tmp/docker.sock,reuseaddr,fork" EXEC:"ssh -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -Ti ${SSH_KEY} ${SSH_USER}@${SSH_HOST}" &

From e5dfd53b9a3fa3befc5ab57d081c210450e44ce7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 17 Jan 2022 13:53:43 -0800
Subject: [PATCH 825/844] examples: poetry-driven git scripts & aurweb service

This introduces examples of a gunicorn systemd service in
addition to git script wrappers that can be used for poetry
virtualenv-driven installations.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 examples/aurweb-git-auth.sh   |  6 ++++++
 examples/aurweb-git-serve.sh  |  6 ++++++
 examples/aurweb-git-update.sh |  6 ++++++
 examples/aurweb.service       | 16 ++++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 examples/aurweb-git-auth.sh
 create mode 100644 examples/aurweb-git-serve.sh
 create mode 100644 examples/aurweb-git-update.sh
 create mode 100644 examples/aurweb.service

diff --git a/examples/aurweb-git-auth.sh b/examples/aurweb-git-auth.sh
new file mode 100644
index 00000000..3e4defd4
--- /dev/null
+++ b/examples/aurweb-git-auth.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Wrapper script used to call aurweb-git-update externally when
+# utilizing an app-based virtualenv.
+aurweb_dir="$HOME"
+cd $aurweb_dir
+exec poetry run aurweb-git-auth "$@"
diff --git a/examples/aurweb-git-serve.sh b/examples/aurweb-git-serve.sh
new file mode 100644
index 00000000..3a64dcbd
--- /dev/null
+++ b/examples/aurweb-git-serve.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Wrapper script used to call aurweb-git-update externally when
+# utilizing an app-based virtualenv.
+aurweb_dir="$HOME"
+cd $aurweb_dir
+exec poetry run aurweb-git-serve "$@"
diff --git a/examples/aurweb-git-update.sh b/examples/aurweb-git-update.sh
new file mode 100644
index 00000000..808dbccd
--- /dev/null
+++ b/examples/aurweb-git-update.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Wrapper script used to call aurweb-git-update externally when
+# utilizing an app-based virtualenv.
+aurweb_dir="$HOME"
+cd $aurweb_dir
+exec poetry run aurweb-git-update "$@"
diff --git a/examples/aurweb.service b/examples/aurweb.service
new file mode 100644
index 00000000..9c482030
--- /dev/null
+++ b/examples/aurweb.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=aurweb asgi server
+
+[Description]
+User=aur
+WorkingDirectory=/srv/http/aurweb
+ExecStart=/usr/bin/poetry run gunicorn \
+    --log-config /srv/http/aurweb/logging.conf \
+    --bind '0.0.0.0:8000' \
+    --forwarded-allow-ips '*' \
+    --workers 4 \
+    -k uvicorn.workers.UvicornWorker \
+    aurweb.asgi:app
+
+[Install]
+WantedBy=multi-user.target

From ebb333565e92b29aba309e0392c2f9df8a688d2f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 17 Jan 2022 14:00:51 -0800
Subject: [PATCH 826/844] update INSTALL: asgi-driven aurweb direction

We heavily attempt to provide easy use of poetry virtualenvs
with aurweb in this revision of the INSTALL file. Added a
section about cron jobs and updated the nginx config example
with a lot more detail and locations for other parts of
the AUR infrastructure.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL | 186 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 113 insertions(+), 73 deletions(-)

diff --git a/INSTALL b/INSTALL
index e14b9f31..1779b1dc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,98 +9,131 @@ In particular, the cgit interface will be unusable as well as the ssh+git
 interface. For a detailed description on how to setup a full aurweb server,
 read the instructions below.
 
-1) Clone the aurweb project:
+1) Clone the aurweb project and install it (via `python-poetry`):
 
-   $ cd /srv/http/
-   $ git clone git://git.archlinux.org/aurweb.git
+    $ cd /srv/http/
+    $ git clone git://git.archlinux.org/aurweb.git
+    $ poetry install
 
 2) Setup a web server with PHP and MySQL. Configure the web server to redirect
    all URLs to /index.php/foo/bar/. The following block can be used with nginx:
 
     server {
-        listen       80;
+        # https is preferred and can be done easily with LetsEncrypt
+        # or self-CA signing. Users can still listen over 80 for plain
+        # http, for which the [options] disable_http_login used to toggle
+        # the authentication feature.
+        listen       443 ssl http2;
         server_name  aur.local aur;
 
-        root   /srv/http/aurweb/web/html;
-        index  index.php;
+        # To enable SSL proxy properly, make sure gunicorn and friends
+        # are supporting forwarded headers over 127.0.0.1 or any if
+        # the asgi server is contacted by non-localhost hosts.
+        ssl_certificate /etc/ssl/certs/aur.cert.pem;
+        ssl_certificate_key /etc/ssl/private/aur.key.pem;
 
-        location ~ ^/[^/]+\.php($|/) {
-            fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
-            fastcgi_index  index.php;
-            fastcgi_split_path_info ^(/[^/]+\.php)(/.*)$;
-            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            fastcgi_param  PATH_INFO        $fastcgi_path_info;
-            include        fastcgi_params;
+        # Asset root. This is used to match against gzip archives.
+        root   /srv/http/aurweb/web/html;
+
+        # TU Bylaws redirect.
+        location = /trusted-user/TUbylaws.html {
+            return 301 https://tu-bylaws.aur.archlinux.org;
         }
 
-        location ~ .* {
-            rewrite ^/(.*)$ /index.php/$1 last;
+        # smartgit location.
+        location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" {
+            include      uwsgi_params;
+            uwsgi_pass   smartgit;
+            uwsgi_modifier1 9;
+            uwsgi_param  SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
+            uwsgi_param  PATH_INFO /aur.git/$3;
+            uwsgi_param  GIT_HTTP_EXPORT_ALL "";
+            uwsgi_param  GIT_NAMESPACE $1;
+            uwsgi_param  GIT_PROJECT_ROOT /srv/http/aurweb;
+        }
+
+        # cgitrc.proto should be configured and located somewhere
+        # of your choosing.
+        location ~ ^/cgit {
+            include uwsgi_params;
+            rewrite ^/cgit/([^?/]+/[^?]*)?(?:\?(.*))?$ /cgit.cgi?url=$1&$2 last;
+            uwsgi_modifier1 9;
+            uwsgi_param CGIT_CONFIG /srv/http/aurweb/conf/cgitrc.proto;
+            uwsgi_pass cgit;
+        }
+
+        # Static archive assets.
+        location ~ \.gz$ {
+            types { application/gzip text/plain }
+            default_type text/plain;
+            add_header Content-Encoding gzip;
+            expires 5m;
+        }
+
+        # For everything else, proxy the http request to (guni|uvi|hyper)corn.
+        # The ASGI server application should allow this request's IP to be
+        # forwarded via the headers used below.
+        # https://docs.gunicorn.org/en/stable/settings.html#forwarded-allow-ips
+        location / {
+            proxy_pass http://127.0.0.1:8000;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Protocol ssl;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Ssl on;
         }
     }
 
-    Ensure to enable the pdo_mysql extension in php.ini.
-
 3) Optionally copy conf/config.defaults to /etc/aurweb/. Create or copy
    /etc/aurweb/config (this is expected to contain all configuration settings
    if the defaults file does not exist) and adjust the configuration (pay
    attention to disable_http_login, enable_maintenance and aur_location).
 
-4) Install dependencies.
+4) Install system-wide dependencies:
 
-4a) Install system-wide dependencies:
+    # pacman -S git gpgme cgit curl openssh uwsgi uwsgi-plugin-cgi \
+        python-poetry
 
-    # pacman -S git gpgme cgit pyalpm python-srcinfo curl openssh \
-                uwsgi uwsgi-plugin-cgi php php-fpm
-
-4b) Install Python dependencies via poetry (required):
-
-**NOTE** Users do not need to install pip or poetry dependencies system-wide.
-You may take advantage of Poetry's virtualenv integration to manage
-dependencies. This is merely a demonstration to show users how to without
-a virtualenv. In Docker and CI, we don't yet use a virtualenv.
-
-    ## Install Poetry dependencies system-wide, if not using a virtualenv.
-    # pacman -S python-pip
-
-    ## Ensure pip is upgraded. Poetry depends on it being up to date.
-    # pip install --upgrade pip
-
-    ## Install Poetry.
-    # curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-    # export PATH="$HOME/.poetry/bin:${PATH}"
-
-    ## Use Poetry to install dependencies and the aurweb package.
-    # poetry lock     # Resolve dependencies
-    # poetry update   # Install/update dependencies
-    # poetry build    # Build the aurweb package
-    # poetry install  # Install the aurweb package and scripts
-
-When installing in a virtualenv, config.defaults must contain the correct
-absolute paths to aurweb scripts, which requires modification.
-
-4c) Setup FastAPI Redis cache (optional).
-
-First, install Redis and start its service.
-
-    # pacman -S redis
-    # systemctl enable --now redis
-
-Now that Redis is running, ensure that you configure aurweb to use
-the Redis cache by setting `cache = redis` in your AUR config.
-
-In `conf/config.defaults`, the `redis_address` configuration is set
-to `redis://localhost`. This can be set to point to any Redis server
-and will be used as long as `cache = redis`.
-
-5) Create a new database and a user and import the aurweb SQL schema:
-
-    $ python -m aurweb.initdb
-
-6) Create a new user:
+5) Create a new user:
 
     # useradd -U -d /srv/http/aurweb -c 'AUR user' aur
+    # su - aur
 
-7) Initialize the Git repository:
+6a) Install Python dependencies via poetry:
+
+    # Install the package and scripts as the aur user.
+    $ poetry install
+
+6b) Setup Services
+
+aurweb utilizes the following systemd services:
+- mariadb
+- redis (optional, requires [options] cache 'redis')
+- `examples/aurweb.service`
+
+6c) Setup Cron
+
+Using [cronie](https://archlinux.org/packages/core/x86_64/cronie/):
+
+    # su - aur
+    $ crontab -e
+
+The following crontab file uses every script meant to be run on an
+interval:
+
+    AUR_CONFIG='/etc/aurweb/config'
+    */5 * * * * bash -c 'poetry run aurweb-aurblup'
+    */5 * * * * bash -c 'poetry run aurweb-mkpkglists --extended'
+    */5 * * * * bash -c 'poetry run aurweb-pkgmaint'
+    */5 * * * * bash -c 'poetry run aurweb-usermaint'
+    */5 * * * * bash -c 'poetry run aurweb-tuvotereminder'
+    */5 * * * * bash -c 'poetry run aurweb-popupdate'
+
+7) Create a new database and a user and import the aurweb SQL schema:
+
+    $ poetry run python -m aurweb.initdb
+
+8) Initialize the Git repository:
 
     # mkdir /srv/http/aurweb/aur.git/
     # cd /srv/http/aurweb/aur.git/
@@ -108,19 +141,26 @@ and will be used as long as `cache = redis`.
     # git config --local transfer.hideRefs '^refs/'
     # git config --local --add transfer.hideRefs '!refs/'
     # git config --local --add transfer.hideRefs '!HEAD'
-    # ln -s /usr/local/bin/aurweb-git-update hooks/update
     # chown -R aur .
 
+Link to `aurweb-git-update` poetry wrapper provided at
+`examples/aurweb-git-update.sh` which should be installed
+somewhere as executable.
+
+    # ln -s /path/to/aurweb-git-update.sh hooks/update
+
    It is recommended to read doc/git-interface.txt for more information on the
    administration of the package Git repository.
 
-8) Configure sshd(8) for the AUR. Add the following lines at the end of your
-   sshd_config(5) and restart the sshd. Note that OpenSSH 6.9 or newer is
-   needed!
+9) Configure sshd(8) for the AUR. Add the following lines at the end of your
+   sshd_config(5) and restart the sshd.
+
+If using a virtualenv, copy `examples/aurweb-git-auth.sh` to a location
+and call it below:
 
     Match User aur
         PasswordAuthentication no
-        AuthorizedKeysCommand /usr/local/bin/aurweb-git-auth "%t" "%k"
+        AuthorizedKeysCommand /path/to/aurweb-git-auth.sh "%t" "%k"
         AuthorizedKeysCommandUser aur
         AcceptEnv AUR_OVERWRITE
 

From 8a81eae8f4037300366d529abcef4249470f2c26 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 00:35:04 -0800
Subject: [PATCH 827/844] update test/README.md

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/README.md | 133 ++++++++++++++++++++-----------------------------
 1 file changed, 54 insertions(+), 79 deletions(-)

diff --git a/test/README.md b/test/README.md
index 0d86a879..b4ad8dfc 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,39 +1,35 @@
 aurweb Test Collection
 ======================
 
-To run all tests, you may run `make check` under `test/` (alternative targets:
-`make pytest`, `make sh`).
+To run all tests, you may run `make -C test sh` and `pytest` within
+the project root:
+
+    $ make -C test sh    # Run Sharness tests.
+    $ poetry run pytest  # Run Pytest suites.
 
 For more control, you may use the `prove` or `pytest` command, which receives a
 directory or a list of files to run, and produces a report.
 
 Each test script is standalone, so you may run them individually. Some tests
-may receive command-line options to help debugging. See for example sharness's
-documentation for shell test scripts:
-https://github.com/chriscool/sharness/blob/master/README.git
+may receive command-line options to help debugging.
 
 Dependencies
 ------------
 
-For all the test to run, the following Arch packages should be installed:
+For all tests to run dependencies provided via `poetry` are required:
 
-- pyalpm
-- python-alembic
-- python-bleach
-- python-markdown
-- python-pygit2
-- python-sqlalchemy
-- python-srcinfo
-- python-coverage
-- python-pytest
-- python-pytest-cov
-- python-pytest-asyncio
-- postfix
-- openssh
+    $ poetry install
 
-Optional (faster testing)
+Logging
+-------
 
-- libeatmydata
+Tests also require the `logging.test.conf` logging configuration
+file to be used. To prepare, you can override `logging.conf`:
+
+    $ cp -vf logging.test.conf logging.conf
+
+`logging.test.conf` enables debug logging for the aurweb package,
+for which we run tests against.
 
 Test Configuration
 ------------------
@@ -52,56 +48,38 @@ repository.
 
     $ sed -i "s;YOUR_AUR_ROOT;/path/to/aurweb;g" conf/config
 
-Now, one must decide a database backend to use; see
-[Test Database](#test-database) for details on configuring
-the different supported backends.
+Test Databases
+--------------
 
-Test Database
--------------
+Python tests create and drop hashed database names based on
+`PYTEST_CURRENT_TEST`. To run tests with a database, the database
+user must have privileges to create and drop their own databases.
+Typically, this is the root user, but can be configured for any
+other user:
 
-Users may choose to configure one of several backends, including:
-`mysql` and `sqlite`. By default, `conf/config.dev` is configured
-for a the `mysql` backend using a test database named `aurweb_test`.
+    GRANT ALL ON *.* TO 'user'@'localhost' WITH GRANT OPTION
 
-Users can initialize an empty MySQL database by performing the following:
+The aurweb platform is intended to use the `mysql` backend, but
+the `sqlite` backend is still used for sharness tests. These tests
+will soon be replaced with pytest suites and `sqlite` removed.
 
-    $ cat conf/config
-    [database]
-    backend = mysql
-    name = aurweb_test
-    user = aur
-    password = aur
-    socket = /var/run/mysqld/mysqld.sock
-    ...
-
-    # mysql -u root -e "CREATE USER 'aur'@'localhost' IDENTIFIED BY 'aur'"
-    # mysql -u root -e "CREATE DATABASE aurweb_test"
-    # mysql -u root -e "GRANT ALL ON aurweb_test.* TO 'aur'@'localhost'"
-    # mysql -u root -e "FLUSH ALL PRIVILEGES"
-
-    $ export AUR_CONFIG=conf/config
-    $ python3 -m aurweb.initdb
-
-Or more lightweight with `sqlite`:
-
-    $ cat $AUR_CONFIG
-    [database]
-    backend = sqlite
-    name = aurweb.sqlite3
-    ...
-
-    $ export AUR_CONFIG=conf/config
-    $ python3 -m aurweb.initdb
-
-After initializing a fresh test database, users can continue on to
-[Running Tests](#running-tests).
+After ensuring you've configured a test database, users can continue
+on to [Running Tests](#running-tests).
 
 Running tests
 -------------
 
-Recommended method of running tests: `make check`.
+Makefile test targets: `sh`, `clean`.
 
-Makefile test targets: `sh`, `pytest`.
+Recommended method of running tests: `pytest`.
+
+Legacy sharness tests: `make -C test sh`.
+
+aurweb is currently going through a refactor where  the majority of
+`sharness` tests have been replaced with `pytest` units. There are
+still a few `sharness` tests around, and they are required to gain
+as much coverage as possible over an entire test run. Users should
+be writing `pytest` units for any new features.
 
 Run tests from the project root.
 
@@ -117,20 +95,12 @@ To run `sharness` shell test suites (requires Arch Linux):
 
 To run `pytest` Python test suites:
 
+    # With poetry-installed aurweb
+    $ poetry run pytest
+
+    # With globally-installed aurweb
     $ pytest
 
-**Note:** For SQLite tests, users may want to use `eatmydata`
-to improve speed:
-
-    $ eatmydata -- make -C test sh
-
-To produce coverage reports related to Python when running tests manually,
-use the following method:
-
-    $ coverage run --append /path/to/python/file.py
-
-**Note:** Sharness test suites (shell) internally run coverage run.
-
 After tests are run, one can produce coverage reports.
 
     # Print out a CLI coverage report.
@@ -159,19 +129,24 @@ Example code:
     import pytest
 
     from aurweb import db
+    from aurweb.models.account_type import USER_ID
     from aurweb.models.user import User
-    from aurweb.testing import setup_test_db
     from aurweb.testing.requests import Request
 
-
+    # We need to use the `db_test` fixture at some point
+    # during our test functions.
     @pytest.fixture(autouse=True)
-    def setup(db_test):
+    def setup(db_test: None) -> None:
         return
 
+    # Or... specify it in a dependency fixture.
     @pytest.fixture
-    def user():
+    def user(db_test: None) -> User:
         with db.begin():
-            user = db.create(User, Passwd="testPassword", ...)
+            user = db.create(User, Username="test",
+                             Email="test@example.org",
+                             Passwd="testPassword",
+                             AccountTypeID=USER_ID)
         yield user
 
     def test_user_login(user: User):

From ce7c44758e28d82a62eddb0f3f57c38da2fd55d7 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 01:25:46 -0800
Subject: [PATCH 828/844] update INSTALL with Redis caching

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index 1779b1dc..f30714cf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -179,8 +179,10 @@ and call it below:
 
    Sample systemd unit files for fcgiwrap can be found under conf/.
 
-10) If you want memcache to cache MySQL data.
+10) If you want Redis to cache data.
 
-    # pacman -S php-memcached
+    # pacman -S redis
+    # systemctl enable --now redis
 
-    And edit the configuration file to enabled memcache caching.
+    And edit the configuration file to enabled redis caching
+    (`[options] cache = redis`).

From 3102736b13572f4a0f69b9f5269230371c03858a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 01:40:47 -0800
Subject: [PATCH 829/844] update documentation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL               |  7 +++++++
 doc/git-interface.txt | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/INSTALL b/INSTALL
index f30714cf..763da3b7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -186,3 +186,10 @@ and call it below:
 
     And edit the configuration file to enabled redis caching
     (`[options] cache = redis`).
+
+11) Start `aurweb.service`.
+
+An example systemd unit has been included at `examples/aurweb.service`.
+This unit can be used to manage the aurweb asgi backend. By default,
+it is configured to use `poetry` as the `aur` user; this should be
+configured as needed.
diff --git a/doc/git-interface.txt b/doc/git-interface.txt
index f9409612..8c6806f7 100644
--- a/doc/git-interface.txt
+++ b/doc/git-interface.txt
@@ -111,3 +111,21 @@ receive.autogc to false. Remember to periodically run `git gc` manually or
 setup a maintenance script which initiates the garbage collection if you follow
 this advice. For gc.pruneExpire, we recommend "3.months.ago", such that commits
 that became unreachable by TU intervention are kept for a while.
+
+Script Wrappers (poetry)
+------------------------
+
+When aurweb is installed within a poetry virtualenv, commands need
+to be prefixed with `poetry run`. A few wrapper scripts are provided
+which automate this, as long as the executing user's `$HOME` is
+aurweb's project root.
+
+- `examples/aurweb-git-auth.sh`
+- `examples/aurweb-git-serve.sh`
+- `examples/aurweb-git-update.sh`
+
+These scripts should be installed somewhere on the aurweb host. The
+following options need to be updated to the installed wrappers:
+
+- `[auth] git-serve-cmd`
+- `[serve] git-update-cmd`

From fca175ed84a37397e95ba8a44f03e71e4166e755 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 01:55:41 -0800
Subject: [PATCH 830/844] update more documentation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL             |  4 +---
 TESTING             | 58 ++++++++++++++++++++++++++++++++++++---------
 doc/maintenance.txt | 14 +++++------
 3 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/INSTALL b/INSTALL
index 763da3b7..4b904e25 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,9 +4,7 @@ Setup on Arch Linux
 For testing aurweb patches before submission, you can use the instructions in
 TESTING for testing the web interface only.
 
-Note that you can only do limited testing using the PHP built-in web server.
-In particular, the cgit interface will be unusable as well as the ssh+git
-interface. For a detailed description on how to setup a full aurweb server,
+For a detailed description on how to setup a full aurweb server,
 read the instructions below.
 
 1) Clone the aurweb project and install it (via `python-poetry`):
diff --git a/TESTING b/TESTING
index 972bce2c..75271596 100644
--- a/TESTING
+++ b/TESTING
@@ -5,19 +5,47 @@ Note that this setup is only to test the web interface. If you need to have a
 full aurweb instance with cgit, ssh interface, etc, follow the directions in
 INSTALL.
 
+docker-compose
+--------------
+
 1) Clone the aurweb project:
 
     $ git clone git://git.archlinux.org/aurweb.git
 
 2) Install the necessary packages:
 
-    # pacman -S --needed php php-sqlite sqlite words fortune-mod \
-                         python python-sqlalchemy python-alembic \
-                         python-fastapi uvicorn nginx \
-                         python-authlib python-itsdangerous python-httpx \
-                         words fortune-mod
+    # pacman -S docker-compose
 
-   Ensure to enable the pdo_sqlite extension in php.ini.
+2) Build the aurweb:latest image:
+
+    $ cd /path/to/aurweb/
+    $ docker-compose build
+
+3) Run local Docker development instance:
+
+    $ cd /path/to/aurweb/
+    $ docker-compose up -d nginx
+
+4) Browse to local aurweb development server.
+
+   Python: https://localhost:8444/
+   PHP: https://localhost:8443/
+
+Bare Metal
+----------
+
+1) Clone the aurweb project:
+
+    $ git clone git://git.archlinux.org/aurweb.git
+
+2) Install the necessary packages:
+
+    # pacman -S python-poetry
+
+4) Install the package/dependencies via `poetry`:
+
+    $ cd /path/to/aurweb/
+    $ poetry install
 
 3) Copy conf/config.dev to conf/config and replace YOUR_AUR_ROOT by the absolute
    path to the root of your aurweb clone. sed can do both tasks for you:
@@ -27,15 +55,23 @@ INSTALL.
    Note that when the upstream config.dev is updated, you should compare it to
    your conf/config, or regenerate your configuration with the command above.
 
-4) Prepare the testing database:
+4) Prepare a database:
 
     $ cd /path/to/aurweb/
 
-    $ AUR_CONFIG=conf/config python -m aurweb.initdb
+    $ AUR_CONFIG=conf/config poetry run python -m aurweb.initdb
 
-    $ schema/gendummydata.py data.sql
-    $ sqlite3 aurweb.sqlite3 < data.sql
+    $ poetry run schema/gendummydata.py dummy_data.sql
+    $ mysql -uaur -paur aurweb < dummy_data.sql
 
 5) Run the test server:
 
-   $ AUR_CONFIG=conf/config python -m aurweb.spawn
+   ## set AUR_CONFIG to our locally created config
+   $ export AUR_CONFIG=conf/config
+
+   ## with aurweb.spawn
+   $ poetry run python -m aurweb.spawn
+
+   ## with systemd service
+   $ sudo install -m644 examples/aurweb.service /etc/systemd/system/
+   $ systemctl enable --now aurweb.service
diff --git a/doc/maintenance.txt b/doc/maintenance.txt
index 2c5c9faf..fbde1fff 100644
--- a/doc/maintenance.txt
+++ b/doc/maintenance.txt
@@ -76,16 +76,16 @@ computations and clean up the database:
 * aurweb-usermaint removes the last login IP address of all users that did not
   login within the past seven days.
 
-These scripts can be installed by running `python3 setup.py install` and are
+These scripts can be installed by running `poetry install` and are
 usually scheduled using Cron. The current setup is:
 
 ----
-*/5 * * * * aurweb-mkpkglists [--extended]
-1 */2 * * * aurweb-popupdate
-2 */2 * * * aurweb-aurblup
-3 */2 * * * aurweb-pkgmaint
-4 */2 * * * aurweb-usermaint
-5 */12 * * * aurweb-tuvotereminder
+*/5 * * * * poetry run aurweb-mkpkglists [--extended]
+1 */2 * * * poetry run aurweb-popupdate
+2 */2 * * * poetry run aurweb-aurblup
+3 */2 * * * poetry run aurweb-pkgmaint
+4 */2 * * * poetry run aurweb-usermaint
+5 */12 * * * poetry run aurweb-tuvotereminder
 ----
 
 Advanced Administrative Features

From 211ca5e49c610640ba2fc08f5d37175cbcf40b72 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 03:06:17 -0800
Subject: [PATCH 831/844] housekeep: define filters in their own modules

This patch cleans up aurweb.templates and removes direct
module-level initialization of the environment.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/asgi.py                   |  2 +
 aurweb/auth/__init__.py          |  4 +-
 aurweb/captcha.py                |  3 +
 aurweb/filters.py                | 96 +++++++++++++++++++++++++++++++-
 aurweb/l10n.py                   | 27 ---------
 aurweb/routers/rss.py            |  6 +-
 aurweb/rpc.py                    |  5 +-
 aurweb/scripts/mkpkglists.py     |  4 +-
 aurweb/scripts/notify.py         |  3 +-
 aurweb/templates.py              | 29 +---------
 aurweb/util.py                   | 44 +--------------
 test/test_filters.py             | 36 ++++++++++++
 test/test_l10n.py                |  8 ++-
 test/test_templates.py           | 13 +----
 test/test_trusted_user_routes.py |  4 +-
 test/test_util.py                | 34 -----------
 16 files changed, 159 insertions(+), 159 deletions(-)
 create mode 100644 test/test_filters.py

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index 95bd5e77..2dd546aa 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -19,7 +19,9 @@ from starlette.exceptions import HTTPException as StarletteHTTPException
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.middleware.sessions import SessionMiddleware
 
+import aurweb.captcha  # noqa: F401
 import aurweb.config
+import aurweb.filters  # noqa: F401
 import aurweb.logging
 import aurweb.pkgbase.util as pkgbaseutil
 
diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index 841110fa..8e7faed1 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -13,7 +13,7 @@ from starlette.requests import HTTPConnection
 
 import aurweb.config
 
-from aurweb import db, l10n, util
+from aurweb import db, filters, l10n, util
 from aurweb.models import Session, User
 from aurweb.models.account_type import ACCOUNT_TYPE_ID
 
@@ -166,7 +166,7 @@ def _auth_required(auth_goal: bool = True):
                     raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
                                         detail=_("Bad Referer header."))
                 url = referer[len(aur) - 1:]
-            url = "/login?" + util.urlencode({"next": url})
+            url = "/login?" + filters.urlencode({"next": url})
             return RedirectResponse(url, status_code=int(HTTPStatus.SEE_OTHER))
         return wrapper
 
diff --git a/aurweb/captcha.py b/aurweb/captcha.py
index 529b09e1..34d99e53 100644
--- a/aurweb/captcha.py
+++ b/aurweb/captcha.py
@@ -5,6 +5,7 @@ from jinja2 import pass_context
 
 from aurweb.db import query
 from aurweb.models import User
+from aurweb.templates import register_filter
 
 
 def get_captcha_salts():
@@ -41,6 +42,7 @@ def get_captcha_answer(token):
     return hashlib.md5((text + "\n").encode()).hexdigest()[:6]
 
 
+@register_filter("captcha_salt")
 @pass_context
 def captcha_salt_filter(context):
     """ Returns the most recent CAPTCHA salt in the list of salts. """
@@ -48,6 +50,7 @@ def captcha_salt_filter(context):
     return salts[0]
 
 
+@register_filter("captcha_cmdline")
 @pass_context
 def captcha_cmdline_filter(context, salt):
     """ Returns a CAPTCHA challenge for a given salt. """
diff --git a/aurweb/filters.py b/aurweb/filters.py
index f9f56b5d..9b731501 100644
--- a/aurweb/filters.py
+++ b/aurweb/filters.py
@@ -1,10 +1,19 @@
-from typing import Any, Dict
+import copy
+import math
 
+from datetime import datetime
+from typing import Any, Dict
+from urllib.parse import quote_plus, urlencode
+from zoneinfo import ZoneInfo
+
+import fastapi
 import paginate
 
 from jinja2 import pass_context
 
-from aurweb import config, util
+import aurweb.models
+
+from aurweb import config, l10n
 from aurweb.templates import register_filter, register_function
 
 
@@ -30,7 +39,7 @@ def pager_nav(context: Dict[str, Any],
     def create_url(page: int):
         nonlocal q
         offset = max(page * pp - pp, 0)
-        qs = util.to_qs(util.extend_query(q, ["O", offset]))
+        qs = to_qs(extend_query(q, ["O", offset]))
         return f"{prefix}?{qs}"
 
     # Use the paginate module to produce our linkage.
@@ -58,3 +67,84 @@ def config_getint(section: str, key: str) -> int:
 @register_function("round")
 def do_round(f: float) -> int:
     return round(f)
+
+
+@register_filter("tr")
+@pass_context
+def tr(context: Dict[str, Any], value: str):
+    """ A translation filter; example: {{ "Hello" | tr("de") }}. """
+    _ = l10n.get_translator_for_request(context.get("request"))
+    return _(value)
+
+
+@register_filter("tn")
+@pass_context
+def tn(context: Dict[str, Any], count: int,
+       singular: str, plural: str) -> str:
+    """ A singular and plural translation filter.
+
+    Example:
+        {{ some_integer | tn("singular %d", "plural %d") }}
+
+    :param context: Response context
+    :param count: The number used to decide singular or plural state
+    :param singular: The singular translation
+    :param plural: The plural translation
+    :return: Translated string
+    """
+    gettext = l10n.get_raw_translator_for_request(context.get("request"))
+    return gettext.ngettext(singular, plural, count)
+
+
+@register_filter("dt")
+def timestamp_to_datetime(timestamp: int):
+    return datetime.utcfromtimestamp(int(timestamp))
+
+
+@register_filter("as_timezone")
+def as_timezone(dt: datetime, timezone: str):
+    return dt.astimezone(tz=ZoneInfo(timezone))
+
+
+@register_filter("extend_query")
+def extend_query(query: Dict[str, Any], *additions) -> Dict[str, Any]:
+    """ Add additional key value pairs to query. """
+    q = copy.copy(query)
+    for k, v in list(additions):
+        q[k] = v
+    return q
+
+
+@register_filter("urlencode")
+def to_qs(query: Dict[str, Any]) -> str:
+    return urlencode(query, doseq=True)
+
+
+@register_filter("get_vote")
+def get_vote(voteinfo, request: fastapi.Request):
+    from aurweb.models import TUVote
+    return voteinfo.tu_votes.filter(TUVote.User == request.user).first()
+
+
+@register_filter("number_format")
+def number_format(value: float, places: int):
+    """ A converter function similar to PHP's number_format. """
+    return f"{value:.{places}f}"
+
+
+@register_filter("account_url")
+@pass_context
+def account_url(context: Dict[str, Any],
+                user: "aurweb.models.user.User") -> str:
+    base = aurweb.config.get("options", "aur_location")
+    return f"{base}/account/{user.Username}"
+
+
+@register_filter("quote_plus")
+def _quote_plus(*args, **kwargs) -> str:
+    return quote_plus(*args, **kwargs)
+
+
+@register_filter("ceil")
+def ceil(*args, **kwargs) -> int:
+    return math.ceil(*args, **kwargs)
diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index c4938d64..f3bbc1da 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -1,10 +1,8 @@
 import gettext
-import typing
 
 from collections import OrderedDict
 
 from fastapi import Request
-from jinja2 import pass_context
 
 import aurweb.config
 
@@ -86,28 +84,3 @@ def get_translator_for_request(request: Request):
         return translator.translate(message, lang)
 
     return translate
-
-
-@pass_context
-def tr(context: typing.Any, value: str):
-    """ A translation filter; example: {{ "Hello" | tr("de") }}. """
-    _ = get_translator_for_request(context.get("request"))
-    return _(value)
-
-
-@pass_context
-def tn(context: typing.Dict[str, typing.Any], count: int,
-       singular: str, plural: str) -> str:
-    """ A singular and plural translation filter.
-
-    Example:
-        {{ some_integer | tn("singular %d", "plural %d") }}
-
-    :param context: Response context
-    :param count: The number used to decide singular or plural state
-    :param singular: The singular translation
-    :param plural: The plural translation
-    :return: Translated string
-    """
-    gettext = get_raw_translator_for_request(context.get("request"))
-    return gettext.ngettext(singular, plural, count)
diff --git a/aurweb/routers/rss.py b/aurweb/routers/rss.py
index 672a47d6..454ff497 100644
--- a/aurweb/routers/rss.py
+++ b/aurweb/routers/rss.py
@@ -4,7 +4,7 @@ from fastapi import APIRouter, Request
 from fastapi.responses import Response
 from feedgen.feed import FeedGenerator
 
-from aurweb import db, util
+from aurweb import db, filters
 from aurweb.models import Package, PackageBase
 
 router = APIRouter()
@@ -39,8 +39,8 @@ def make_rss_feed(request: Request, packages: list,
         entry.description(pkg.Description or str())
 
         attr = getattr(pkg.PackageBase, date_attr)
-        dt = util.timestamp_to_datetime(attr)
-        dt = util.as_timezone(dt, request.user.Timezone)
+        dt = filters.timestamp_to_datetime(attr)
+        dt = filters.as_timezone(dt, request.user.Timezone)
         entry.pubDate(dt.strftime("%Y-%m-%d %H:%M:%S%z"))
 
         entry.source(f"{base}")
diff --git a/aurweb/rpc.py b/aurweb/rpc.py
index 8757d9f9..90e03a41 100644
--- a/aurweb/rpc.py
+++ b/aurweb/rpc.py
@@ -8,8 +8,9 @@ from sqlalchemy import and_, literal, orm
 
 import aurweb.config as config
 
-from aurweb import db, defaults, models, util
+from aurweb import db, defaults, models
 from aurweb.exceptions import RPCError
+from aurweb.filters import number_format
 from aurweb.packages.search import RPCSearch
 
 TYPE_MAPPING = {
@@ -124,7 +125,7 @@ class RPC:
         # Produce RPC API compatible Popularity: If zero, it's an integer
         # 0, otherwise, it's formatted to the 6th decimal place.
         pop = package.Popularity
-        pop = 0 if not pop else float(util.number_format(pop, 6))
+        pop = 0 if not pop else float(number_format(pop, 6))
 
         snapshot_uri = config.get("options", "snapshot_uri")
         return {
diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 92de7931..d97bc01c 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -31,7 +31,7 @@ from sqlalchemy import literal, orm
 
 import aurweb.config
 
-from aurweb import db, logging, models, util
+from aurweb import db, filters, logging, models, util
 from aurweb.benchmark import Benchmark
 from aurweb.models import Package, PackageBase, User
 
@@ -264,7 +264,7 @@ def _main():
     with gzip.open(USERS, "wt") as f:
         f.writelines([f"{user.Username}\n" for i, user in enumerate(query)])
 
-    seconds = util.number_format(bench.end(), 4)
+    seconds = filters.number_format(bench.end(), 4)
     logger.info(f"Completed in {seconds} seconds.")
 
 
diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index 1f875a9c..91593e7f 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -13,6 +13,7 @@ from sqlalchemy import and_, or_
 
 import aurweb.config
 import aurweb.db
+import aurweb.filters
 import aurweb.l10n
 
 from aurweb import db, l10n, logging
@@ -160,7 +161,7 @@ class ServerErrorNotification(Notification):
 
     def get_body(self, lang: str) -> str:
         """ A forcibly English email body. """
-        dt = aurweb.util.timestamp_to_datetime(self._utc)
+        dt = aurweb.filters.timestamp_to_datetime(self._utc)
         dts = dt.strftime("%Y-%m-%d %H:%M")
         return (f"Traceback ID: {self._tb_id}\n"
                 f"Location: {aur_location}\n"
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 74c993f8..82f115d1 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -1,23 +1,20 @@
 import copy
 import functools
-import math
 import os
 import zoneinfo
 
 from datetime import datetime
 from http import HTTPStatus
 from typing import Callable
-from urllib.parse import quote_plus
 
 import jinja2
 
 from fastapi import Request
 from fastapi.responses import HTMLResponse
 
-import aurweb.auth.creds
 import aurweb.config
 
-from aurweb import captcha, cookies, l10n, time, util
+from aurweb import cookies, l10n, time
 
 # Prepare jinja2 objects.
 _loader = jinja2.FileSystemLoader(os.path.join(
@@ -25,27 +22,6 @@ _loader = jinja2.FileSystemLoader(os.path.join(
 _env = jinja2.Environment(loader=_loader, autoescape=True,
                           extensions=["jinja2.ext.i18n"])
 
-# Add t{r,n} translation filters.
-_env.filters["tr"] = l10n.tr
-_env.filters["tn"] = l10n.tn
-
-# Utility filters.
-_env.filters["dt"] = util.timestamp_to_datetime
-_env.filters["as_timezone"] = util.as_timezone
-_env.filters["extend_query"] = util.extend_query
-_env.filters["urlencode"] = util.to_qs
-_env.filters["quote_plus"] = quote_plus
-_env.filters["get_vote"] = util.get_vote
-_env.filters["number_format"] = util.number_format
-_env.filters["ceil"] = math.ceil
-
-# Add captcha filters.
-_env.filters["captcha_salt"] = captcha.captcha_salt_filter
-_env.filters["captcha_cmdline"] = captcha.captcha_cmdline_filter
-
-# Add account utility filters.
-_env.filters["account_url"] = util.account_url
-
 
 def register_filter(name: str) -> Callable:
     """ A decorator that can be used to register a filter.
@@ -65,8 +41,6 @@ def register_filter(name: str) -> Callable:
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
             return func(*args, **kwargs)
-        if name in _env.filters:
-            raise KeyError(f"Jinja already has a filter named '{name}'")
         _env.filters[name] = wrapper
         return wrapper
     return decorator
@@ -88,6 +62,7 @@ def register_function(name: str) -> Callable:
 
 def make_context(request: Request, title: str, next: str = None):
     """ Create a context for a jinja2 TemplateResponse. """
+    import aurweb.auth.creds
 
     commit_url = aurweb.config.get_with_fallback("devel", "commit_url", None)
     commit_hash = aurweb.config.get_with_fallback("devel", "commit_hash", None)
diff --git a/aurweb/util.py b/aurweb/util.py
index bda743fd..776cf516 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -1,5 +1,4 @@
 import base64
-import copy
 import math
 import re
 import secrets
@@ -8,16 +7,14 @@ import string
 from datetime import datetime
 from distutils.util import strtobool as _strtobool
 from http import HTTPStatus
-from typing import Any, Callable, Dict, Iterable, Tuple
-from urllib.parse import urlencode, urlparse
-from zoneinfo import ZoneInfo
+from typing import Callable, Iterable, Tuple
+from urllib.parse import urlparse
 
 import fastapi
 import pygit2
 
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
 from fastapi.responses import JSONResponse
-from jinja2 import pass_context
 
 import aurweb.config
 
@@ -107,43 +104,6 @@ def valid_ssh_pubkey(pk):
     return base64.b64encode(base64.b64decode(tokens[1])).decode() == tokens[1]
 
 
-@pass_context
-def account_url(context: Dict[str, Any],
-                user: "aurweb.models.user.User") -> str:
-    base = aurweb.config.get("options", "aur_location")
-    return f"{base}/account/{user.Username}"
-
-
-def timestamp_to_datetime(timestamp: int):
-    return datetime.utcfromtimestamp(int(timestamp))
-
-
-def as_timezone(dt: datetime, timezone: str):
-    return dt.astimezone(tz=ZoneInfo(timezone))
-
-
-def extend_query(query: Dict[str, Any], *additions) -> Dict[str, Any]:
-    """ Add additional key value pairs to query. """
-    q = copy.copy(query)
-    for k, v in list(additions):
-        q[k] = v
-    return q
-
-
-def to_qs(query: Dict[str, Any]) -> str:
-    return urlencode(query, doseq=True)
-
-
-def get_vote(voteinfo, request: fastapi.Request):
-    from aurweb.models import TUVote
-    return voteinfo.tu_votes.filter(TUVote.User == request.user).first()
-
-
-def number_format(value: float, places: int):
-    """ A converter function similar to PHP's number_format. """
-    return f"{value:.{places}f}"
-
-
 def jsonify(obj):
     """ Perform a conversion on obj if it's needed. """
     if isinstance(obj, datetime):
diff --git a/test/test_filters.py b/test/test_filters.py
new file mode 100644
index 00000000..53d95cdf
--- /dev/null
+++ b/test/test_filters.py
@@ -0,0 +1,36 @@
+from datetime import datetime
+from zoneinfo import ZoneInfo
+
+from aurweb import filters
+
+
+def test_timestamp_to_datetime():
+    ts = datetime.utcnow().timestamp()
+    dt = datetime.utcfromtimestamp(int(ts))
+    assert filters.timestamp_to_datetime(ts) == dt
+
+
+def test_as_timezone():
+    ts = datetime.utcnow().timestamp()
+    dt = filters.timestamp_to_datetime(ts)
+    assert filters.as_timezone(dt, "UTC") == dt.astimezone(tz=ZoneInfo("UTC"))
+
+
+def test_number_format():
+    assert filters.number_format(0.222, 2) == "0.22"
+    assert filters.number_format(0.226, 2) == "0.23"
+
+
+def test_extend_query():
+    """ Test extension of a query via extend_query. """
+    query = {"a": "b"}
+    extended = filters.extend_query(query, ("a", "c"), ("b", "d"))
+    assert extended.get("a") == "c"
+    assert extended.get("b") == "d"
+
+
+def test_to_qs():
+    """ Test conversion from a query dictionary to a query string. """
+    query = {"a": "b", "c": [1, 2, 3]}
+    qs = filters.to_qs(query)
+    assert qs == "a=b&c=1&c=2&c=3"
diff --git a/test/test_l10n.py b/test/test_l10n.py
index 1c2ae95a..c24c5f55 100644
--- a/test/test_l10n.py
+++ b/test/test_l10n.py
@@ -1,5 +1,5 @@
 """ Test our l10n module. """
-from aurweb import l10n
+from aurweb import filters, l10n
 from aurweb.testing.requests import Request
 
 
@@ -43,8 +43,10 @@ def test_tn_filter():
     request.cookies["AURLANG"] = "en"
     context = {"language": "en", "request": request}
 
-    translated = l10n.tn(context, 1, "%d package found.", "%d packages found.")
+    translated = filters.tn(context, 1, "%d package found.",
+                            "%d packages found.")
     assert translated == "%d package found."
 
-    translated = l10n.tn(context, 2, "%d package found.", "%d packages found.")
+    translated = filters.tn(context, 2, "%d package found.",
+                            "%d packages found.")
     assert translated == "%d packages found."
diff --git a/test/test_templates.py b/test/test_templates.py
index 6104c126..7d393b61 100644
--- a/test/test_templates.py
+++ b/test/test_templates.py
@@ -8,6 +8,8 @@ import pytest
 import aurweb.filters  # noqa: F401
 
 from aurweb import config, db, templates
+from aurweb.filters import as_timezone, number_format
+from aurweb.filters import timestamp_to_datetime as to_dt
 from aurweb.models import Package, PackageBase, User
 from aurweb.models.account_type import USER_ID
 from aurweb.models.license import License
@@ -17,8 +19,6 @@ from aurweb.models.relation_type import PROVIDES_ID, REPLACES_ID
 from aurweb.templates import base_template, make_context, register_filter, register_function
 from aurweb.testing.html import parse_root
 from aurweb.testing.requests import Request
-from aurweb.util import as_timezone, number_format
-from aurweb.util import timestamp_to_datetime as to_dt
 
 GIT_CLONE_URI_ANON = "anon_%s"
 GIT_CLONE_URI_PRIV = "priv_%s"
@@ -79,15 +79,6 @@ def create_license(pkg: Package, license_name: str) -> PackageLicense:
     return pkglic
 
 
-def test_register_filter_exists_key_error():
-    """ Most instances of register_filter are tested through module
-    imports or template renders, so we only test failures here. """
-    with pytest.raises(KeyError):
-        @register_filter("func")
-        def some_func():
-            pass
-
-
 def test_register_function_exists_key_error():
     """ Most instances of register_filter are tested through module
     imports or template renders, so we only test failures here. """
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index b050af22..ae5ad418 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -10,7 +10,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import config, db, util
+from aurweb import config, db, filters
 from aurweb.models.account_type import DEVELOPER_ID, AccountType
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
@@ -130,7 +130,7 @@ def test_tu_index_guest(client):
         response = request.get("/tu", allow_redirects=False, headers=headers)
     assert response.status_code == int(HTTPStatus.SEE_OTHER)
 
-    params = util.urlencode({"next": "/tu"})
+    params = filters.urlencode({"next": "/tu"})
     assert response.headers.get("location") == f"/login?{params}"
 
 
diff --git a/test/test_util.py b/test/test_util.py
index 91a0f475..51d978fb 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,8 +1,6 @@
 import json
 
-from datetime import datetime
 from http import HTTPStatus
-from zoneinfo import ZoneInfo
 
 import fastapi
 import pytest
@@ -13,38 +11,6 @@ from aurweb import filters, util
 from aurweb.testing.requests import Request
 
 
-def test_timestamp_to_datetime():
-    ts = datetime.utcnow().timestamp()
-    dt = datetime.utcfromtimestamp(int(ts))
-    assert util.timestamp_to_datetime(ts) == dt
-
-
-def test_as_timezone():
-    ts = datetime.utcnow().timestamp()
-    dt = util.timestamp_to_datetime(ts)
-    assert util.as_timezone(dt, "UTC") == dt.astimezone(tz=ZoneInfo("UTC"))
-
-
-def test_number_format():
-    assert util.number_format(0.222, 2) == "0.22"
-    assert util.number_format(0.226, 2) == "0.23"
-
-
-def test_extend_query():
-    """ Test extension of a query via extend_query. """
-    query = {"a": "b"}
-    extended = util.extend_query(query, ("a", "c"), ("b", "d"))
-    assert extended.get("a") == "c"
-    assert extended.get("b") == "d"
-
-
-def test_to_qs():
-    """ Test conversion from a query dictionary to a query string. """
-    query = {"a": "b", "c": [1, 2, 3]}
-    qs = util.to_qs(query)
-    assert qs == "a=b&c=1&c=2&c=3"
-
-
 def test_round():
     assert filters.do_round(1.3) == 1
     assert filters.do_round(1.5) == 2

From 7f1de72e08a06a9af6ac6dabc0aad5f5be985f26 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 05:22:00 -0800
Subject: [PATCH 832/844] fix(docker): remove logging setup in run-tests.sh

This was left in when we removed logging.prod.conf in a
previous patch. `test-mysql-entrypoint.sh` takes care of
test logging for us now, so this section is unnecessary.

Closes #261

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker/scripts/run-tests.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docker/scripts/run-tests.sh b/docker/scripts/run-tests.sh
index 07e84822..a726c957 100755
--- a/docker/scripts/run-tests.sh
+++ b/docker/scripts/run-tests.sh
@@ -6,10 +6,7 @@ dir=$(dirname $0)
 make -C test clean
 
 # Run sharness tests.
-cp -vf logging.conf logging.conf.bak
-cp -vf logging.prod.conf logging.conf
 bash $dir/run-sharness.sh
-cp -vf logging.conf.bak logging.conf
 
 # Run Python tests with MariaDB database.
 # Pass --silence to avoid reporting coverage. We will do that below.

From 7bcc8d7ce7432fe85a6505d7e773cc76a17d044a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 06:39:42 -0800
Subject: [PATCH 833/844] feat: support LOG_CONFIG environment variable

This variable allows users to override the logging.conf used
for Python logging configuration. By default, this is set
to logging.conf, which is a production config. LOG_CONFIG
is treated relative to [options] aurwebdir.

This patch allows us to specify the logging config as opposed
to copying over logging.conf in our test docker and gitlab
test scripts, as well as ease-of-testing as a developer.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 .gitlab-ci.yml                  | 6 +++---
 aurweb/logging.py               | 6 +++++-
 docker-compose.yml              | 3 +++
 docker/sharness-entrypoint.sh   | 2 --
 docker/test-mysql-entrypoint.sh | 3 ---
 test/README.md                  | 8 +++++---
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e4795ce..d682a9f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ variables:
   DB_HOST: localhost
   TEST_RECURSION_LIMIT: 10000
   CURRENT_DIR: "$(pwd)"
+  LOG_CONFIG: logging.test.conf
 
 test:
   stage: test
@@ -26,15 +27,14 @@ test:
     - cp -v conf/config.dev conf/config
     - sed -i "s;YOUR_AUR_ROOT;$(pwd);g" conf/config
     - ./docker/test-mysql-entrypoint.sh # Create mysql AUR_CONFIG.
-    - cp -vf logging.test.conf logging.conf # Put test logging config in place.
     - make -C po all install # Compile translations.
     - make -C doc # Compile asciidoc.
     - make -C test clean # Cleanup coverage.
   script:
     # Run sharness.
-    - make -C test sh # sharness tests use sqlite.
+    - make -C test sh
     # Run pytest.
-    - pytest # Run pytest suites.
+    - pytest
     - make -C test coverage # Produce coverage reports.
     - flake8 --count aurweb # Assert no flake8 violations in aurweb.
     - flake8 --count test # Assert no flake8 violations in test.
diff --git a/aurweb/logging.py b/aurweb/logging.py
index b205a296..116421e4 100644
--- a/aurweb/logging.py
+++ b/aurweb/logging.py
@@ -4,8 +4,11 @@ import os
 
 import aurweb.config
 
+# For testing, users should set LOG_CONFIG=logging.test.conf
+# We test against various debug log output.
 aurwebdir = aurweb.config.get("options", "aurwebdir")
-config_path = os.path.join(aurwebdir, "logging.conf")
+log_config = os.environ.get("LOG_CONFIG", "logging.conf")
+config_path = os.path.join(aurwebdir, log_config)
 
 logging.config.fileConfig(config_path, disable_existing_loggers=False)
 logging.getLogger("root").addHandler(logging.NullHandler())
@@ -19,4 +22,5 @@ def get_logger(name: str) -> logging.Logger:
     :param name: Logger name; typically `__name__`
     :returns: name's logging.Logger
     """
+
     return logging.getLogger(name)
diff --git a/docker-compose.yml b/docker-compose.yml
index ebc760d4..ecfe964f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -273,6 +273,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config.sqlite
+      - LOG_CONFIG=logging.test.conf
     entrypoint: /docker/sharness-entrypoint.sh
     command: /docker/scripts/run-sharness.sh
     stdin_open: true
@@ -298,6 +299,7 @@ services:
       - AUR_CONFIG=conf/config
       - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
       - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
+      - LOG_CONFIG=logging.test.conf
     entrypoint: /docker/test-mysql-entrypoint.sh
     command: /docker/scripts/run-pytests.sh clean
     stdin_open: true
@@ -326,6 +328,7 @@ services:
       - AUR_CONFIG=conf/config
       - TEST_RECURSION_LIMIT=${TEST_RECURSION_LIMIT}
       - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus
+      - LOG_CONFIG=logging.test.conf
     entrypoint: /docker/test-mysql-entrypoint.sh
     command: /docker/scripts/run-tests.sh
     stdin_open: true
diff --git a/docker/sharness-entrypoint.sh b/docker/sharness-entrypoint.sh
index 3a1b244c..daa9edeb 100755
--- a/docker/sharness-entrypoint.sh
+++ b/docker/sharness-entrypoint.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 set -eou pipefail
 
-cp -vf logging.prod.conf logging.conf
-
 exec "$@"
diff --git a/docker/test-mysql-entrypoint.sh b/docker/test-mysql-entrypoint.sh
index 5c3f1a1d..b3464256 100755
--- a/docker/test-mysql-entrypoint.sh
+++ b/docker/test-mysql-entrypoint.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 set -eou pipefail
 
-# Set test logging.
-cp -vf "logging.test.conf" "logging.conf"
-
 # We use the root user for testing in Docker.
 # The test user must be able to create databases and drop them.
 aurweb-config set database user 'root'
diff --git a/test/README.md b/test/README.md
index b4ad8dfc..0d7a85e2 100644
--- a/test/README.md
+++ b/test/README.md
@@ -24,9 +24,10 @@ Logging
 -------
 
 Tests also require the `logging.test.conf` logging configuration
-file to be used. To prepare, you can override `logging.conf`:
+file to be used. You can specify the `LOG_CONFIG` environment
+variable to override:
 
-    $ cp -vf logging.test.conf logging.conf
+    $ export LOG_CONFIG=logging.test.conf
 
 `logging.test.conf` enables debug logging for the aurweb package,
 for which we run tests against.
@@ -85,9 +86,10 @@ Run tests from the project root.
 
     $ cd /path/to/aurweb
 
-Ensure you have the proper `AUR_CONFIG` exported:
+Ensure you have the proper `AUR_CONFIG` and `LOG_CONFIG` exported:
 
     $ export AUR_CONFIG=conf/config
+    $ export LOG_CONFIG=logging.test.conf
 
 To run `sharness` shell test suites (requires Arch Linux):
 

From 7f6c23d4cbbec2812264fa8a50cb09885db0db8e Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 05:59:52 -0800
Subject: [PATCH 834/844] housekeep: centralize datetime generation

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/auth/__init__.py          |  5 ++---
 aurweb/models/package_base.py    |  6 ++----
 aurweb/models/tu_voteinfo.py     |  6 ++----
 aurweb/models/user.py            |  5 ++---
 aurweb/packages/requests.py      |  7 +++----
 aurweb/ratelimit.py              |  8 +++-----
 aurweb/routers/auth.py           |  6 ++----
 aurweb/routers/html.py           |  5 ++---
 aurweb/routers/pkgbase.py        | 17 ++++++++---------
 aurweb/routers/requests.py       |  5 ++---
 aurweb/routers/trusted_user.py   |  7 +++----
 aurweb/scripts/pkgmaint.py       |  6 ++----
 aurweb/scripts/popupdate.py      |  5 ++---
 aurweb/scripts/tuvotereminder.py |  6 ++----
 aurweb/scripts/usermaint.py      |  6 ++----
 aurweb/templates.py              |  6 ++----
 aurweb/time.py                   | 20 ++++++++++++++++++++
 aurweb/users/update.py           |  5 ++---
 test/test_accounts_routes.py     |  4 ++--
 test/test_auth.py                | 10 ++++------
 test/test_auth_routes.py         |  7 +++----
 test/test_filters.py             |  6 +++---
 test/test_homepage.py            |  9 ++++-----
 test/test_notify.py              |  5 ++---
 test/test_package_request.py     |  6 ++----
 test/test_package_vote.py        |  6 ++----
 test/test_packages_routes.py     | 25 ++++++++++++-------------
 test/test_packages_util.py       |  6 ++----
 test/test_pkgbase_routes.py      | 17 ++++++++---------
 test/test_pkgmaint.py            |  5 ++---
 test/test_rendercomment.py       |  5 ++---
 test/test_requests.py            | 17 ++++++++---------
 test/test_rpc.py                 |  5 ++---
 test/test_rss.py                 |  5 ++---
 test/test_session.py             |  7 +++----
 test/test_templates.py           |  5 ++---
 test/test_trusted_user_routes.py | 15 +++++++--------
 test/test_tu_vote.py             |  6 ++----
 test/test_tu_voteinfo.py         | 10 ++++------
 test/test_tuvotereminder.py      |  5 ++---
 test/test_usermaint.py           |  8 +++-----
 41 files changed, 146 insertions(+), 179 deletions(-)

diff --git a/aurweb/auth/__init__.py b/aurweb/auth/__init__.py
index 8e7faed1..c4f433c0 100644
--- a/aurweb/auth/__init__.py
+++ b/aurweb/auth/__init__.py
@@ -1,6 +1,5 @@
 import functools
 
-from datetime import datetime
 from http import HTTPStatus
 from typing import Callable
 
@@ -13,7 +12,7 @@ from starlette.requests import HTTPConnection
 
 import aurweb.config
 
-from aurweb import db, filters, l10n, util
+from aurweb import db, filters, l10n, time, util
 from aurweb.models import Session, User
 from aurweb.models.account_type import ACCOUNT_TYPE_ID
 
@@ -110,7 +109,7 @@ class BasicAuthBackend(AuthenticationBackend):
                                            "persistent_cookie_timeout")
 
         # If no session with sid and a LastUpdateTS now or later exists.
-        now_ts = int(datetime.utcnow().timestamp())
+        now_ts = time.utcnow()
         record = db.query(Session).filter(Session.SessionID == sid).first()
         if not record:
             return unauthenticated
diff --git a/aurweb/models/package_base.py b/aurweb/models/package_base.py
index 8c88b7b5..37ad63ce 100644
--- a/aurweb/models/package_base.py
+++ b/aurweb/models/package_base.py
@@ -1,9 +1,7 @@
-from datetime import datetime
-
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-from aurweb import schema
+from aurweb import schema, time
 from aurweb.models.declarative import Base
 from aurweb.models.user import User as _User
 
@@ -43,7 +41,7 @@ class PackageBase(Base):
 
         # If no SubmittedTS/ModifiedTS is provided on creation, set them
         # here to the current utc timestamp.
-        now = datetime.utcnow().timestamp()
+        now = time.utcnow()
         if not self.SubmittedTS:
             self.SubmittedTS = now
         if not self.ModifiedTS:
diff --git a/aurweb/models/tu_voteinfo.py b/aurweb/models/tu_voteinfo.py
index 64551998..7934a772 100644
--- a/aurweb/models/tu_voteinfo.py
+++ b/aurweb/models/tu_voteinfo.py
@@ -1,11 +1,9 @@
 import typing
 
-from datetime import datetime
-
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import backref, relationship
 
-from aurweb import schema
+from aurweb import schema, time
 from aurweb.models.declarative import Base
 from aurweb.models.user import User as _User
 
@@ -71,7 +69,7 @@ class TUVoteInfo(Base):
         return attr
 
     def is_running(self):
-        return self.End > int(datetime.utcnow().timestamp())
+        return self.End > time.utcnow()
 
     def total_votes(self):
         return self.Yes + self.No + self.Abstain
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index fcf4a9b3..871ff209 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -1,6 +1,5 @@
 import hashlib
 
-from datetime import datetime
 from typing import List, Set
 
 import bcrypt
@@ -14,7 +13,7 @@ import aurweb.config
 import aurweb.models.account_type
 import aurweb.schema
 
-from aurweb import db, logging, schema, util
+from aurweb import db, logging, schema, time, util
 from aurweb.models.account_type import AccountType as _AccountType
 from aurweb.models.ban import is_banned
 from aurweb.models.declarative import Base
@@ -121,7 +120,7 @@ class User(Base):
         exc = None
         for i in range(tries):
             exc = None
-            now_ts = datetime.utcnow().timestamp()
+            now_ts = time.utcnow()
             try:
                 with db.begin():
                     self.LastLogin = now_ts
diff --git a/aurweb/packages/requests.py b/aurweb/packages/requests.py
index 9ee672c7..724249d4 100644
--- a/aurweb/packages/requests.py
+++ b/aurweb/packages/requests.py
@@ -1,10 +1,9 @@
-from datetime import datetime
 from typing import List, Optional, Set
 
 from fastapi import Request
 from sqlalchemy import and_, orm
 
-from aurweb import config, db, l10n, util
+from aurweb import config, db, l10n, time, util
 from aurweb.exceptions import InvariantError
 from aurweb.models import PackageBase, PackageRequest, User
 from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID
@@ -106,7 +105,7 @@ def verify_orphan_request(user: User, pkgbase: PackageBase):
         PackageRequest.ReqTypeID == ORPHAN_ID)
     for pkgreq in requests:
         idle_time = config.getint("options", "request_idle_time")
-        time_delta = int(datetime.utcnow().timestamp()) - pkgreq.RequestTS
+        time_delta = time.utcnow() - pkgreq.RequestTS
         is_due = pkgreq.Status == PENDING_ID and time_delta > idle_time
         if is_due:
             # If the requester is the pkgbase maintainer or the
@@ -128,7 +127,7 @@ def close_pkgreq(pkgreq: PackageRequest, closer: User,
     :param target: Optional PackageBase instance to merge into
     :param status: `pkgreq`.Status value to update to
     """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     pkgreq.Status = status
     pkgreq.Closer = closer
     pkgreq.ClosureComment = (
diff --git a/aurweb/ratelimit.py b/aurweb/ratelimit.py
index a71cb1cc..659ab6b8 100644
--- a/aurweb/ratelimit.py
+++ b/aurweb/ratelimit.py
@@ -1,9 +1,7 @@
-from datetime import datetime
-
 from fastapi import Request
 from redis.client import Pipeline
 
-from aurweb import config, db, logging
+from aurweb import config, db, logging, time
 from aurweb.models import ApiRateLimit
 from aurweb.redis import redis_connection
 
@@ -12,7 +10,7 @@ logger = logging.get_logger(__name__)
 
 def _update_ratelimit_redis(request: Request, pipeline: Pipeline):
     window_length = config.getint("ratelimit", "window_length")
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     time_to_delete = now - window_length
 
     host = request.client.host
@@ -37,7 +35,7 @@ def _update_ratelimit_redis(request: Request, pipeline: Pipeline):
 
 def _update_ratelimit_db(request: Request):
     window_length = config.getint("ratelimit", "window_length")
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     time_to_delete = now - window_length
 
     records = db.query(ApiRateLimit).filter(
diff --git a/aurweb/routers/auth.py b/aurweb/routers/auth.py
index 0b68dac3..bae9a599 100644
--- a/aurweb/routers/auth.py
+++ b/aurweb/routers/auth.py
@@ -1,4 +1,3 @@
-from datetime import datetime
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, HTTPException, Request
@@ -6,7 +5,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 
 import aurweb.config
 
-from aurweb import cookies, db
+from aurweb import cookies, db, time
 from aurweb.auth import requires_auth, requires_guest
 from aurweb.l10n import get_translator_for_request
 from aurweb.models import User
@@ -57,8 +56,7 @@ async def login_post(request: Request,
 
     login_timeout = aurweb.config.getint("options", "login_timeout")
 
-    expires_at = int(datetime.utcnow().timestamp()
-                     + max(cookie_timeout, login_timeout))
+    expires_at = int(time.utcnow() + max(cookie_timeout, login_timeout))
 
     response = RedirectResponse(url=next,
                                 status_code=HTTPStatus.SEE_OTHER)
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index 337acce6..74901762 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -3,7 +3,6 @@ decorators in some way; more complex routes should be defined in their
 own modules and imported here. """
 import os
 
-from datetime import datetime
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, HTTPException, Request, Response
@@ -14,7 +13,7 @@ from sqlalchemy import and_, case, or_
 import aurweb.config
 import aurweb.models.package_request
 
-from aurweb import cookies, db, models, util
+from aurweb import cookies, db, models, time, util
 from aurweb.cache import db_count_cache
 from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
 from aurweb.models.package_request import PENDING_ID
@@ -97,7 +96,7 @@ async def index(request: Request):
         redis, "trusted_user_count", query, expire=cache_expire)
 
     # Current timestamp.
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
 
     seven_days = 86400 * 7  # Seven days worth of seconds.
     seven_days_ago = now - seven_days
diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index 221a9e51..510ca467 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -1,11 +1,10 @@
-from datetime import datetime
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse
 from sqlalchemy import and_
 
-from aurweb import config, db, l10n, logging, templates, util
+from aurweb import config, db, l10n, logging, templates, time, util
 from aurweb.auth import creds, requires_auth
 from aurweb.exceptions import InvariantError, ValidationError
 from aurweb.models import PackageBase
@@ -146,7 +145,7 @@ async def pkgbase_flag_post(request: Request, name: str,
 
     has_cred = request.user.has_credential(creds.PKGBASE_FLAG)
     if has_cred and not pkgbase.Flagger:
-        now = int(datetime.utcnow().timestamp())
+        now = time.utcnow()
         with db.begin():
             pkgbase.OutOfDateTS = now
             pkgbase.Flagger = request.user
@@ -170,7 +169,7 @@ async def pkgbase_comments_post(
 
     # If the provided comment is different than the record's version,
     # update the db record.
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         comment = db.create(PackageComment, User=request.user,
                             PackageBase=pkgbase,
@@ -268,7 +267,7 @@ async def pkgbase_comment_post(
 
     # If the provided comment is different than the record's version,
     # update the db record.
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     if db_comment.Comments != comment:
         with db.begin():
             db_comment.Comments = comment
@@ -316,7 +315,7 @@ async def pkgbase_comment_pin(request: Request, name: str, id: int,
             status_code=HTTPStatus.UNAUTHORIZED,
             detail=_("You are not allowed to pin this comment."))
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         comment.PinnedTS = now
 
@@ -387,7 +386,7 @@ async def pkgbase_comment_delete(request: Request, name: str, id: int,
             status_code=HTTPStatus.UNAUTHORIZED,
             detail=_("You are not allowed to delete this comment."))
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         comment.Deleter = request.user
         comment.DelTS = now
@@ -446,7 +445,7 @@ async def pkgbase_vote(request: Request, name: str):
     ).first()
     has_cred = request.user.has_credential(creds.PKGBASE_VOTE)
     if has_cred and not vote:
-        now = int(datetime.utcnow().timestamp())
+        now = time.utcnow()
         with db.begin():
             db.create(PackageVote,
                       User=request.user,
@@ -683,7 +682,7 @@ async def pkgbase_request_post(request: Request, name: str,
         return render_template(request, "pkgbase/request.html", context)
 
     # All good. Create a new PackageRequest based on the given type.
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgreq = db.create(PackageRequest,
                            ReqTypeID=types.get(type),
diff --git a/aurweb/routers/requests.py b/aurweb/routers/requests.py
index 4c976655..ac69f079 100644
--- a/aurweb/routers/requests.py
+++ b/aurweb/routers/requests.py
@@ -1,11 +1,10 @@
-from datetime import datetime
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, Query, Request
 from fastapi.responses import RedirectResponse
 from sqlalchemy import case
 
-from aurweb import db, defaults, util
+from aurweb import db, defaults, time, util
 from aurweb.auth import creds, requires_auth
 from aurweb.models import PackageRequest, User
 from aurweb.models.package_request import PENDING_ID, REJECTED_ID
@@ -78,7 +77,7 @@ async def request_close_post(request: Request, id: int,
     context = make_context(request, "Close Request")
     context["pkgreq"] = pkgreq
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgreq.Closer = request.user
         pkgreq.ClosureComment = comments
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index 595ee88e..ff1ebfa1 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -2,14 +2,13 @@ import html
 import re
 import typing
 
-from datetime import datetime
 from http import HTTPStatus
 
 from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import RedirectResponse, Response
 from sqlalchemy import and_, or_
 
-from aurweb import db, l10n, logging, models
+from aurweb import db, l10n, logging, models, time
 from aurweb.auth import creds, requires_auth
 from aurweb.models import User
 from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
@@ -52,7 +51,7 @@ async def trusted_user(request: Request,
     context["pp"] = pp = ITEMS_PER_PAGE
     context["prev_len"] = MAX_AGENDA_LENGTH
 
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
 
     if current_by not in {"asc", "desc"}:
         # If a malicious by was given, default to desc.
@@ -290,7 +289,7 @@ async def trusted_user_addvote_post(request: Request,
 
     # Gather some mapped constants and the current timestamp.
     duration, quorum = ADDVOTE_SPECIFICS.get(type)
-    timestamp = int(datetime.utcnow().timestamp())
+    timestamp = time.utcnow()
 
     # TODO: Review this. Is this even necessary?
     # Remove <script> and <style> tags.
diff --git a/aurweb/scripts/pkgmaint.py b/aurweb/scripts/pkgmaint.py
index b3992e5c..2a2c638a 100755
--- a/aurweb/scripts/pkgmaint.py
+++ b/aurweb/scripts/pkgmaint.py
@@ -1,16 +1,14 @@
 #!/usr/bin/env python3
 
-from datetime import datetime
-
 from sqlalchemy import and_
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models import PackageBase
 
 
 def _main():
     # One day behind.
-    limit_to = int(datetime.utcnow().timestamp()) - 86400
+    limit_to = time.utcnow() - 86400
 
     query = db.query(PackageBase).filter(
         and_(PackageBase.SubmittedTS < limit_to,
diff --git a/aurweb/scripts/popupdate.py b/aurweb/scripts/popupdate.py
index e2d008f2..a2a796fd 100755
--- a/aurweb/scripts/popupdate.py
+++ b/aurweb/scripts/popupdate.py
@@ -1,13 +1,12 @@
 #!/usr/bin/env python3
 
-from datetime import datetime
 from typing import List
 
 from sqlalchemy import and_, func
 from sqlalchemy.sql.functions import coalesce
 from sqlalchemy.sql.functions import sum as _sum
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models import PackageBase, PackageVote
 
 
@@ -20,7 +19,7 @@ def run_variable(pkgbases: List[PackageBase] = []) -> None:
 
     :param pkgbases: List of PackageBase instances
     """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
 
     # NumVotes subquery.
     votes_subq = db.get_session().query(
diff --git a/aurweb/scripts/tuvotereminder.py b/aurweb/scripts/tuvotereminder.py
index 5e860725..742fa6d4 100755
--- a/aurweb/scripts/tuvotereminder.py
+++ b/aurweb/scripts/tuvotereminder.py
@@ -1,12 +1,10 @@
 #!/usr/bin/env python3
 
-from datetime import datetime
-
 from sqlalchemy import and_
 
 import aurweb.config
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models import TUVoteInfo
 from aurweb.scripts import notify
 
@@ -16,7 +14,7 @@ notify_cmd = aurweb.config.get('notifications', 'notify-cmd')
 def main():
     db.get_engine()
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
 
     start = aurweb.config.getint("tuvotereminder", "range_start")
     filter_from = now + start
diff --git a/aurweb/scripts/usermaint.py b/aurweb/scripts/usermaint.py
index aad3e8de..69f9db04 100755
--- a/aurweb/scripts/usermaint.py
+++ b/aurweb/scripts/usermaint.py
@@ -1,15 +1,13 @@
 #!/usr/bin/env python3
 
-from datetime import datetime
-
 from sqlalchemy import update
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models import User
 
 
 def _main():
-    limit_to = int(datetime.utcnow().timestamp()) - 86400 * 7
+    limit_to = time.utcnow() - 86400 * 7
 
     update_ = update(User).where(
         User.LastLogin < limit_to
diff --git a/aurweb/templates.py b/aurweb/templates.py
index 82f115d1..d1830d91 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -1,9 +1,7 @@
 import copy
 import functools
 import os
-import zoneinfo
 
-from datetime import datetime
 from http import HTTPStatus
 from typing import Callable
 
@@ -80,8 +78,8 @@ def make_context(request: Request, title: str, next: str = None):
         "timezone": timezone,
         "timezones": time.SUPPORTED_TIMEZONES,
         "title": title,
-        "now": datetime.now(tz=zoneinfo.ZoneInfo(timezone)),
-        "utcnow": int(datetime.utcnow().timestamp()),
+        "now": time.now(timezone),
+        "utcnow": time.utcnow(),
         "config": aurweb.config,
         "creds": aurweb.auth.creds,
         "next": next if next else request.url.path,
diff --git a/aurweb/time.py b/aurweb/time.py
index bf13ca23..a97ca986 100644
--- a/aurweb/time.py
+++ b/aurweb/time.py
@@ -3,6 +3,7 @@ import zoneinfo
 from collections import OrderedDict
 from datetime import datetime
 from urllib.parse import unquote
+from zoneinfo import ZoneInfo
 
 from fastapi import Request
 
@@ -62,3 +63,22 @@ def get_request_timezone(request: Request):
     if request.user.is_authenticated():
         default_tz = request.user.Timezone
     return unquote(request.cookies.get("AURTZ", default_tz))
+
+
+def now(timezone: str) -> datetime:
+    """
+    Get the current timezone-localized timestamp.
+
+    :param timezone: Valid timezone supported by ZoneInfo
+    :return: Current localized datetime
+    """
+    return datetime.now(tz=ZoneInfo(timezone))
+
+
+def utcnow() -> int:
+    """
+    Get the current UTC timestamp.
+
+    :return: Current UTC timestamp
+    """
+    return int(datetime.utcnow().timestamp())
diff --git a/aurweb/users/update.py b/aurweb/users/update.py
index fd42a194..685dfd80 100644
--- a/aurweb/users/update.py
+++ b/aurweb/users/update.py
@@ -1,9 +1,8 @@
-from datetime import datetime
 from typing import Any, Dict
 
 from fastapi import Request
 
-from aurweb import cookies, db, models
+from aurweb import cookies, db, models, time
 from aurweb.models.ssh_pub_key import get_fingerprint
 from aurweb.util import strtobool
 
@@ -14,7 +13,7 @@ def simple(U: str = str(), E: str = str(), H: bool = False,
            CN: bool = False, UN: bool = False, ON: bool = False,
            S: bool = False, user: models.User = None,
            **kwargs) -> None:
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         user.Username = U or user.Username
         user.Email = E or user.Email
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 5e5e708d..01e61101 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -13,7 +13,7 @@ from fastapi.testclient import TestClient
 
 import aurweb.models.account_type as at
 
-from aurweb import captcha, db, logging
+from aurweb import captcha, db, logging, time
 from aurweb.asgi import app
 from aurweb.db import create, query
 from aurweb.models.accepted_term import AcceptedTerm
@@ -155,7 +155,7 @@ def test_post_passreset_user(client: TestClient, user: User):
 def test_post_passreset_resetkey(client: TestClient, user: User):
     with db.begin():
         user.session = Session(UsersID=user.ID, SessionID="blah",
-                               LastUpdateTS=datetime.utcnow().timestamp())
+                               LastUpdateTS=time.utcnow())
 
     # Prepare a password reset.
     with client as request:
diff --git a/test/test_auth.py b/test/test_auth.py
index 8e8b5859..b8221c19 100644
--- a/test/test_auth.py
+++ b/test/test_auth.py
@@ -1,12 +1,10 @@
-from datetime import datetime
-
 import fastapi
 import pytest
 
 from fastapi import HTTPException
 from sqlalchemy.exc import IntegrityError
 
-from aurweb import config, db
+from aurweb import config, db, time
 from aurweb.auth import AnonymousUser, BasicAuthBackend, _auth_required, account_type_required
 from aurweb.models.account_type import USER, USER_ID
 from aurweb.models.session import Session
@@ -55,7 +53,7 @@ async def test_auth_backend_invalid_sid(backend: BasicAuthBackend):
 @pytest.mark.asyncio
 async def test_auth_backend_invalid_user_id():
     # Create a new session with a fake user id.
-    now_ts = datetime.utcnow().timestamp()
+    now_ts = time.utcnow()
     with pytest.raises(IntegrityError):
         Session(UsersID=666, SessionID="realSession",
                 LastUpdateTS=now_ts + 5)
@@ -65,7 +63,7 @@ async def test_auth_backend_invalid_user_id():
 async def test_basic_auth_backend(user: User, backend: BasicAuthBackend):
     # This time, everything matches up. We expect the user to
     # equal the real_user.
-    now_ts = datetime.utcnow().timestamp()
+    now_ts = time.utcnow()
     with db.begin():
         db.create(Session, UsersID=user.ID, SessionID="realSession",
                   LastUpdateTS=now_ts + 5)
@@ -87,7 +85,7 @@ async def test_expired_session(backend: BasicAuthBackend, user: User):
 
     # Set Session.LastUpdateTS to 20 seconds expired.
     timeout = config.getint("options", "login_timeout")
-    now_ts = int(datetime.utcnow().timestamp())
+    now_ts = time.utcnow()
     with db.begin():
         request.user.session.LastUpdateTS = now_ts - timeout - 20
 
diff --git a/test/test_auth_routes.py b/test/test_auth_routes.py
index be24d582..4136a18e 100644
--- a/test/test_auth_routes.py
+++ b/test/test_auth_routes.py
@@ -1,6 +1,5 @@
 import re
 
-from datetime import datetime
 from http import HTTPStatus
 from unittest import mock
 
@@ -10,7 +9,7 @@ from fastapi.testclient import TestClient
 
 import aurweb.config
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.asgi import app
 from aurweb.models.account_type import USER_ID
 from aurweb.models.session import Session
@@ -200,7 +199,7 @@ def test_login_remember_me(client: TestClient, user: User):
 
     cookie_timeout = aurweb.config.getint(
         "options", "persistent_cookie_timeout")
-    now_ts = int(datetime.utcnow().timestamp())
+    now_ts = time.utcnow()
     session = db.query(Session).filter(Session.UsersID == user.ID).first()
 
     # Expect that LastUpdateTS is not past the cookie timeout
@@ -294,7 +293,7 @@ def test_generate_unique_sid_exhausted(client: TestClient, user: User,
     This exercises the bad path of /login, where we can't find a unique
     SID to assign the user.
     """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         # Create a second user; we'll login with this one.
         user2 = db.create(User, Username="test2", Email="test2@example.org",
diff --git a/test/test_filters.py b/test/test_filters.py
index 53d95cdf..558911f5 100644
--- a/test/test_filters.py
+++ b/test/test_filters.py
@@ -1,17 +1,17 @@
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
-from aurweb import filters
+from aurweb import filters, time
 
 
 def test_timestamp_to_datetime():
-    ts = datetime.utcnow().timestamp()
+    ts = time.utcnow()
     dt = datetime.utcfromtimestamp(int(ts))
     assert filters.timestamp_to_datetime(ts) == dt
 
 
 def test_as_timezone():
-    ts = datetime.utcnow().timestamp()
+    ts = time.utcnow()
     dt = filters.timestamp_to_datetime(ts)
     assert filters.as_timezone(dt, "UTC") == dt.astimezone(tz=ZoneInfo("UTC"))
 
diff --git a/test/test_homepage.py b/test/test_homepage.py
index 2e6d53c9..5d3bc711 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -1,6 +1,5 @@
 import re
 
-from datetime import datetime
 from http import HTTPStatus
 from unittest.mock import patch
 
@@ -8,7 +7,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.asgi import app
 from aurweb.models.account_type import USER_ID
 from aurweb.models.package import Package
@@ -62,7 +61,7 @@ def packages(user):
 
     # For i..num_packages, create a package named pkg_{i}.
     pkgs = []
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         for i in range(num_packages):
             pkgbase = db.create(PackageBase, Name=f"pkg_{i}",
@@ -184,7 +183,7 @@ def test_homepage_dashboard(redis, packages, user):
 
 
 def test_homepage_dashboard_requests(redis, packages, user):
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
 
     pkg = packages[0]
     reqtype = db.query(RequestType, RequestType.ID == DELETION_ID).first()
@@ -210,7 +209,7 @@ def test_homepage_dashboard_flagged_packages(redis, packages, user):
     # Set the first Package flagged by setting its OutOfDateTS column.
     pkg = packages[0]
     with db.begin():
-        pkg.PackageBase.OutOfDateTS = int(datetime.utcnow().timestamp())
+        pkg.PackageBase.OutOfDateTS = time.utcnow()
 
     cookies = {"AURSID": user.login(Request(), "testPassword")}
     with client as request:
diff --git a/test/test_notify.py b/test/test_notify.py
index e0035976..a8e994c5 100644
--- a/test/test_notify.py
+++ b/test/test_notify.py
@@ -1,11 +1,10 @@
-from datetime import datetime
 from logging import ERROR
 from typing import List
 from unittest import mock
 
 import pytest
 
-from aurweb import config, db, models
+from aurweb import config, db, models, time
 from aurweb.models import Package, PackageBase, PackageRequest, User
 from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID
 from aurweb.models.request_type import ORPHAN_ID
@@ -48,7 +47,7 @@ def user2() -> User:
 
 @pytest.fixture
 def pkgbases(user: User) -> List[PackageBase]:
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
 
     output = []
     with db.begin():
diff --git a/test/test_package_request.py b/test/test_package_request.py
index 1ba48e09..3474c565 100644
--- a/test/test_package_request.py
+++ b/test/test_package_request.py
@@ -1,10 +1,8 @@
-from datetime import datetime
-
 import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models.account_type import USER_ID
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_request import (ACCEPTED, ACCEPTED_ID, CLOSED, CLOSED_ID, PENDING, PENDING_ID, REJECTED,
@@ -54,7 +52,7 @@ def test_package_request_creation(user: User, pkgbase: PackageBase):
 
 
 def test_package_request_closed(user: User, pkgbase: PackageBase):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
     with db.begin():
         package_request = db.create(PackageRequest, ReqTypeID=MERGE_ID,
                                     User=user, PackageBase=pkgbase,
diff --git a/test/test_package_vote.py b/test/test_package_vote.py
index 08edb92d..24d2fdd2 100644
--- a/test/test_package_vote.py
+++ b/test/test_package_vote.py
@@ -1,10 +1,8 @@
-from datetime import datetime
-
 import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models.account_type import USER_ID
 from aurweb.models.package_base import PackageBase
 from aurweb.models.package_vote import PackageVote
@@ -33,7 +31,7 @@ def pkgbase(user: User) -> PackageBase:
 
 
 def test_package_vote_creation(user: User, pkgbase: PackageBase):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
 
     with db.begin():
         package_vote = db.create(PackageVote, User=user,
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 30c0a48a..adafe1ae 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1,6 +1,5 @@
 import re
 
-from datetime import datetime
 from http import HTTPStatus
 from typing import List
 from unittest import mock
@@ -9,7 +8,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import asgi, db
+from aurweb import asgi, db, time
 from aurweb.models import License, PackageLicense
 from aurweb.models.account_type import USER_ID, AccountType
 from aurweb.models.dependency_type import DependencyType
@@ -116,7 +115,7 @@ def tu_user():
 @pytest.fixture
 def package(maintainer: User) -> Package:
     """ Yield a Package created by user. """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgbase = db.create(PackageBase,
                             Name="test-package",
@@ -138,7 +137,7 @@ def pkgbase(package: Package) -> PackageBase:
 @pytest.fixture
 def target(maintainer: User) -> PackageBase:
     """ Merge target. """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgbase = db.create(PackageBase, Name="target-package",
                             Maintainer=maintainer,
@@ -166,7 +165,7 @@ def pkgreq(user: User, pkgbase: PackageBase) -> PackageRequest:
 @pytest.fixture
 def comment(user: User, package: Package) -> PackageComment:
     pkgbase = package.PackageBase
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         comment = db.create(PackageComment,
                             User=user,
@@ -181,7 +180,7 @@ def comment(user: User, package: Package) -> PackageComment:
 def packages(maintainer: User) -> List[Package]:
     """ Yield 55 packages named pkg_0 .. pkg_54. """
     packages_ = []
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         for i in range(55):
             pkgbase = db.create(PackageBase,
@@ -293,7 +292,7 @@ def test_package(client: TestClient, package: Package):
 
 
 def test_package_comments(client: TestClient, user: User, package: Package):
-    now = (datetime.utcnow().timestamp())
+    now = (time.utcnow())
     with db.begin():
         comment = db.create(PackageComment, PackageBase=package.PackageBase,
                             User=user, Comments="Test comment", CommentTS=now)
@@ -847,7 +846,7 @@ def test_packages_sort_by_popularity(client: TestClient,
 def test_packages_sort_by_voted(client: TestClient,
                                 maintainer: User,
                                 packages: List[Package]):
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         db.create(PackageVote, PackageBase=packages[0].PackageBase,
                   User=maintainer, VoteTS=now)
@@ -942,7 +941,7 @@ def test_packages_sort_by_maintainer(client: TestClient,
 
 def test_packages_sort_by_last_modified(client: TestClient,
                                         packages: List[Package]):
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     # Set the first package's ModifiedTS to be 1000 seconds before now.
     package = packages[0]
     with db.begin():
@@ -970,7 +969,7 @@ def test_packages_flagged(client: TestClient, maintainer: User,
                           packages: List[Package]):
     package = packages[0]
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
 
     with db.begin():
         package.PackageBase.OutOfDateTS = now
@@ -1100,7 +1099,7 @@ def test_packages_post(client: TestClient, user: User, package: Package):
 def test_packages_post_unflag(client: TestClient, user: User,
                               maintainer: User, package: Package):
     # Flag `package` as `user`.
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         package.PackageBase.Flagger = user
         package.PackageBase.OutOfDateTS = now
@@ -1127,7 +1126,7 @@ def test_packages_post_unflag(client: TestClient, user: User,
     assert successes[0].text.strip() == expected
 
     # Re-flag `package` as `user`.
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         package.PackageBase.Flagger = user
         package.PackageBase.OutOfDateTS = now
@@ -1453,7 +1452,7 @@ def test_account_comments(client: TestClient, user: User, package: Package):
     """ This test may seem out of place, but it requires packages,
     so its being included in the packages routes test suite to
     leverage existing fixtures. """
-    now = (datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         # This comment's CommentTS is `now + 1`, so it is found in rendered
         # HTML before the rendered_comment, which has a CommentTS of `now`.
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index 2c2ed5e9..02f84601 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -1,10 +1,8 @@
-from datetime import datetime
-
 import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import asgi, config, db
+from aurweb import asgi, config, db, time
 from aurweb.models.account_type import USER_ID
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package import Package
@@ -77,7 +75,7 @@ def test_updated_packages(maintainer: User, package: Package):
 
 
 def test_query_voted(maintainer: User, package: Package):
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         db.create(PackageVote, User=maintainer, VoteTS=now,
                   PackageBase=package.PackageBase)
diff --git a/test/test_pkgbase_routes.py b/test/test_pkgbase_routes.py
index cafd61f6..17f69811 100644
--- a/test/test_pkgbase_routes.py
+++ b/test/test_pkgbase_routes.py
@@ -1,6 +1,5 @@
 import re
 
-from datetime import datetime
 from http import HTTPStatus
 from typing import List
 from unittest import mock
@@ -10,7 +9,7 @@ import pytest
 from fastapi.testclient import TestClient
 from sqlalchemy import and_
 
-from aurweb import asgi, db
+from aurweb import asgi, db, time
 from aurweb.models.account_type import USER_ID, AccountType
 from aurweb.models.dependency_type import DependencyType
 from aurweb.models.package import Package
@@ -115,7 +114,7 @@ def tu_user():
 @pytest.fixture
 def package(maintainer: User) -> Package:
     """ Yield a Package created by user. """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgbase = db.create(PackageBase,
                             Name="test-package",
@@ -137,7 +136,7 @@ def pkgbase(package: Package) -> PackageBase:
 @pytest.fixture
 def target(maintainer: User) -> PackageBase:
     """ Merge target. """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgbase = db.create(PackageBase, Name="target-package",
                             Maintainer=maintainer,
@@ -165,7 +164,7 @@ def pkgreq(user: User, pkgbase: PackageBase) -> PackageRequest:
 @pytest.fixture
 def comment(user: User, package: Package) -> PackageComment:
     pkgbase = package.PackageBase
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         comment = db.create(PackageComment,
                             User=user,
@@ -180,7 +179,7 @@ def comment(user: User, package: Package) -> PackageComment:
 def packages(maintainer: User) -> List[Package]:
     """ Yield 55 packages named pkg_0 .. pkg_54. """
     packages_ = []
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         for i in range(55):
             pkgbase = db.create(PackageBase,
@@ -258,7 +257,7 @@ def test_pkgbase_voters(client: TestClient, tu_user: User, package: Package):
     pkgbase = package.PackageBase
     endpoint = f"/pkgbase/{pkgbase.Name}/voters"
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         db.create(PackageVote, User=tu_user, PackageBase=pkgbase, VoteTS=now)
 
@@ -279,7 +278,7 @@ def test_pkgbase_voters_unauthorized(client: TestClient, user: User,
     pkgbase = package.PackageBase
     endpoint = f"/pkgbase/{pkgbase.Name}/voters"
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         db.create(PackageVote, User=user, PackageBase=pkgbase, VoteTS=now)
 
@@ -303,7 +302,7 @@ def test_pkgbase_comment_not_found(client: TestClient, maintainer: User,
 
 def test_pkgbase_comment_form_unauthorized(client: TestClient, user: User,
                                            maintainer: User, package: Package):
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         comment = db.create(PackageComment, PackageBase=package.PackageBase,
                             User=maintainer, Comments="Test",
diff --git a/test/test_pkgmaint.py b/test/test_pkgmaint.py
index 921a6330..5d6a56de 100644
--- a/test/test_pkgmaint.py
+++ b/test/test_pkgmaint.py
@@ -1,9 +1,8 @@
-from datetime import datetime
 from typing import List
 
 import pytest
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models import Package, PackageBase, User
 from aurweb.models.account_type import USER_ID
 from aurweb.scripts import pkgmaint
@@ -26,7 +25,7 @@ def user() -> User:
 def packages(user: User) -> List[Package]:
     output = []
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         for i in range(5):
             pkgbase = db.create(PackageBase, Name=f"pkg_{i}",
diff --git a/test/test_rendercomment.py b/test/test_rendercomment.py
index c45d4235..bf4009fd 100644
--- a/test/test_rendercomment.py
+++ b/test/test_rendercomment.py
@@ -1,9 +1,8 @@
-from datetime import datetime
 from unittest import mock
 
 import pytest
 
-from aurweb import config, db, logging
+from aurweb import config, db, logging, time
 from aurweb.models import Package, PackageBase, PackageComment, User
 from aurweb.models.account_type import USER_ID
 from aurweb.scripts import rendercomment
@@ -39,7 +38,7 @@ def user() -> User:
 
 @pytest.fixture
 def pkgbase(user: User) -> PackageBase:
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgbase = db.create(PackageBase, Packager=user, Name="pkgbase_0",
                             SubmittedTS=now, ModifiedTS=now)
diff --git a/test/test_requests.py b/test/test_requests.py
index e8813a69..113368f0 100644
--- a/test/test_requests.py
+++ b/test/test_requests.py
@@ -1,6 +1,5 @@
 import re
 
-from datetime import datetime
 from http import HTTPStatus
 from logging import DEBUG
 from typing import List
@@ -10,7 +9,7 @@ import pytest
 from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
-from aurweb import asgi, config, db, defaults
+from aurweb import asgi, config, db, defaults, time
 from aurweb.models import Package, PackageBase, PackageRequest, User
 from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID
 from aurweb.models.package_notification import PackageNotification
@@ -94,7 +93,7 @@ def maintainer() -> User:
 def packages(maintainer: User) -> List[Package]:
     """ Yield 55 packages named pkg_0 .. pkg_54. """
     packages_ = []
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         for i in range(55):
             pkgbase = db.create(PackageBase,
@@ -148,7 +147,7 @@ def create_pkgbase(user: User, name: str) -> PackageBase:
     :param name: PackageBase.Name
     :return: PackageBase instance
     """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgbase = db.create(PackageBase, Name=name,
                             Maintainer=user, Packager=user,
@@ -185,7 +184,7 @@ def create_request(reqtype_id: int, user: User, pkgbase: PackageBase,
     :param comments: PackageRequest.Comments
     :return: PackageRequest instance
     """
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgreq = db.create(PackageRequest, ReqTypeID=reqtype_id,
                            User=user, PackageBase=pkgbase,
@@ -274,7 +273,7 @@ def test_request_post_deletion_autoaccept(client: TestClient, auser: User,
     """ Test the request route for deletion as maintainer. """
     caplog.set_level(DEBUG)
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     auto_delete_age = config.getint("options", "auto_delete_age")
     with db.begin():
         pkgbase.ModifiedTS = now - auto_delete_age + 100
@@ -503,7 +502,7 @@ def test_orphan_request(client: TestClient, user: User, tu_user: User,
                         pkgbase: PackageBase, pkgreq: PackageRequest):
     """ Test the standard orphan request route. """
     idle_time = config.getint("options", "request_idle_time")
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgreq.ReqTypeID = ORPHAN_ID
         # Set the request time so it's seen as due (idle_time has passed).
@@ -532,7 +531,7 @@ def test_request_post_orphan_autogenerated_closure(client: TestClient,
                                                    pkgbase: PackageBase,
                                                    pkgreq: PackageRequest):
     idle_time = config.getint("options", "request_idle_time")
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgreq.ReqTypeID = ORPHAN_ID
         # Set the request time so it's seen as due (idle_time has passed).
@@ -559,7 +558,7 @@ def test_request_post_orphan_autoaccept(client: TestClient, auser: User,
                                         caplog: pytest.LogCaptureFixture):
     """ Test the standard pkgbase request route GET method. """
     caplog.set_level(DEBUG)
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     auto_orphan_age = config.getint("options", "auto_orphan_age")
     with db.begin():
         pkgbase.OutOfDateTS = now - auto_orphan_age - 100
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 4e81a7cb..6063a26f 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -1,6 +1,5 @@
 import re
 
-from datetime import datetime
 from http import HTTPStatus
 from typing import List
 from unittest import mock
@@ -14,7 +13,7 @@ from redis.client import Pipeline
 import aurweb.models.dependency_type as dt
 import aurweb.models.relation_type as rt
 
-from aurweb import asgi, config, db, rpc, scripts
+from aurweb import asgi, config, db, rpc, scripts, time
 from aurweb.models.account_type import USER_ID
 from aurweb.models.license import License
 from aurweb.models.package import Package
@@ -112,7 +111,7 @@ def packages(user: User, user2: User, user3: User) -> List[Package]:
                       PackageBase=output[0].PackageBase,
                       Keyword=keyword)
 
-        now = int(datetime.utcnow().timestamp())
+        now = time.utcnow()
         for user_ in [user, user2, user3]:
             db.create(PackageVote, User=user_,
                       PackageBase=output[0].PackageBase, VoteTS=now)
diff --git a/test/test_rss.py b/test/test_rss.py
index 7123fbf1..cef6a46f 100644
--- a/test/test_rss.py
+++ b/test/test_rss.py
@@ -1,4 +1,3 @@
-from datetime import datetime
 from http import HTTPStatus
 
 import lxml.etree
@@ -6,7 +5,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import db, logging
+from aurweb import db, logging, time
 from aurweb.asgi import app
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
@@ -40,7 +39,7 @@ def user():
 @pytest.fixture
 def packages(user):
     pkgs = []
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
 
     # Create 101 packages; we limit 100 on RSS feeds.
     with db.begin():
diff --git a/test/test_session.py b/test/test_session.py
index 67b1ada0..edae57f9 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -1,12 +1,11 @@
 """ Test our Session model. """
-from datetime import datetime
 from unittest import mock
 
 import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models.account_type import USER_ID
 from aurweb.models.session import Session, generate_unique_sid
 from aurweb.models.user import User
@@ -30,7 +29,7 @@ def user() -> User:
 def session(user: User) -> Session:
     with db.begin():
         session = db.create(Session, User=user, SessionID="testSession",
-                            LastUpdateTS=datetime.utcnow().timestamp())
+                            LastUpdateTS=time.utcnow())
     yield session
 
 
@@ -48,7 +47,7 @@ def test_session_cs():
 
     with db.begin():
         session_cs = db.create(Session, User=user2, SessionID="TESTSESSION",
-                               LastUpdateTS=datetime.utcnow().timestamp())
+                               LastUpdateTS=time.utcnow())
 
     assert session_cs.SessionID == "TESTSESSION"
     assert session_cs.SessionID != "testSession"
diff --git a/test/test_templates.py b/test/test_templates.py
index 7d393b61..96380fbe 100644
--- a/test/test_templates.py
+++ b/test/test_templates.py
@@ -1,13 +1,12 @@
 import re
 
-from datetime import datetime
 from typing import Any, Dict
 
 import pytest
 
 import aurweb.filters  # noqa: F401
 
-from aurweb import config, db, templates
+from aurweb import config, db, templates, time
 from aurweb.filters import as_timezone, number_format
 from aurweb.filters import timestamp_to_datetime as to_dt
 from aurweb.models import Package, PackageBase, User
@@ -59,7 +58,7 @@ def user(db_test) -> User:
 
 @pytest.fixture
 def pkgbase(user: User) -> PackageBase:
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         pkgbase = db.create(PackageBase, Name="test-pkg", Maintainer=user,
                             SubmittedTS=now, ModifiedTS=now)
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index ae5ad418..0e6ca9ce 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -1,6 +1,5 @@
 import re
 
-from datetime import datetime
 from http import HTTPStatus
 from io import StringIO
 from typing import Tuple
@@ -10,7 +9,7 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import config, db, filters
+from aurweb import config, db, filters, time
 from aurweb.models.account_type import DEVELOPER_ID, AccountType
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
@@ -111,7 +110,7 @@ def user():
 
 @pytest.fixture
 def proposal(user, tu_user):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
     agenda = "Test proposal."
     start = ts - 5
     end = ts + 1000
@@ -165,7 +164,7 @@ def test_tu_empty_index(client, tu_user):
 
 
 def test_tu_index(client, tu_user):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
 
     # Create some test votes: (Agenda, Start, End).
     votes = [
@@ -258,7 +257,7 @@ def test_tu_index(client, tu_user):
 
 
 def test_tu_index_table_paging(client, tu_user):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
 
     with db.begin():
         for i in range(25):
@@ -366,7 +365,7 @@ def test_tu_index_table_paging(client, tu_user):
 
 
 def test_tu_index_sorting(client, tu_user):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
 
     with db.begin():
         for i in range(2):
@@ -436,7 +435,7 @@ def test_tu_index_sorting(client, tu_user):
 
 
 def test_tu_index_last_votes(client, tu_user, user):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
 
     with db.begin():
         # Create a proposal which has ended.
@@ -584,7 +583,7 @@ def test_tu_running_proposal(client: TestClient,
 def test_tu_ended_proposal(client, proposal):
     tu_user, user, voteinfo = proposal
 
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
     with db.begin():
         voteinfo.End = ts - 5  # 5 seconds ago.
 
diff --git a/test/test_tu_vote.py b/test/test_tu_vote.py
index 9bb344b1..91d73ecb 100644
--- a/test/test_tu_vote.py
+++ b/test/test_tu_vote.py
@@ -1,10 +1,8 @@
-from datetime import datetime
-
 import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models.account_type import TRUSTED_USER_ID
 from aurweb.models.tu_vote import TUVote
 from aurweb.models.tu_voteinfo import TUVoteInfo
@@ -27,7 +25,7 @@ def user() -> User:
 
 @pytest.fixture
 def tu_voteinfo(user: User) -> TUVoteInfo:
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
     with db.begin():
         tu_voteinfo = db.create(TUVoteInfo, Agenda="Blah blah.",
                                 User=user.Username,
diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index beefda36..17226048 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -1,10 +1,8 @@
-from datetime import datetime
-
 import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.db import create, rollback
 from aurweb.models.account_type import TRUSTED_USER_ID
 from aurweb.models.tu_voteinfo import TUVoteInfo
@@ -26,7 +24,7 @@ def user() -> User:
 
 
 def test_tu_voteinfo_creation(user: User):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
                              Agenda="Blah blah.",
@@ -50,7 +48,7 @@ def test_tu_voteinfo_creation(user: User):
 
 
 def test_tu_voteinfo_is_running(user: User):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
                              Agenda="Blah blah.",
@@ -66,7 +64,7 @@ def test_tu_voteinfo_is_running(user: User):
 
 
 def test_tu_voteinfo_total_votes(user: User):
-    ts = int(datetime.utcnow().timestamp())
+    ts = time.utcnow()
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
                              Agenda="Blah blah.",
diff --git a/test/test_tuvotereminder.py b/test/test_tuvotereminder.py
index bb898e3a..a54c52a4 100644
--- a/test/test_tuvotereminder.py
+++ b/test/test_tuvotereminder.py
@@ -1,9 +1,8 @@
-from datetime import datetime
 from typing import Tuple
 
 import pytest
 
-from aurweb import config, db
+from aurweb import config, db, time
 from aurweb.models import TUVote, TUVoteInfo, User
 from aurweb.models.account_type import TRUSTED_USER_ID
 from aurweb.scripts import tuvotereminder as reminder
@@ -56,7 +55,7 @@ def user3() -> User:
 
 @pytest.fixture
 def voteinfo(user: User) -> TUVoteInfo:
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     start = config.getint("tuvotereminder", "range_start")
     with db.begin():
         voteinfo = db.create(TUVoteInfo, Agenda="Lorem ipsum.",
diff --git a/test/test_usermaint.py b/test/test_usermaint.py
index f1af59e1..e572569a 100644
--- a/test/test_usermaint.py
+++ b/test/test_usermaint.py
@@ -1,8 +1,6 @@
-from datetime import datetime
-
 import pytest
 
-from aurweb import db
+from aurweb import db, time
 from aurweb.models import User
 from aurweb.models.account_type import USER_ID
 from aurweb.scripts import usermaint
@@ -24,7 +22,7 @@ def user() -> User:
 def test_usermaint_noop(user: User):
     """ Last[SSH]Login isn't expired in this test: usermaint is noop. """
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     with db.begin():
         user.LastLoginIPAddress = "127.0.0.1"
         user.LastLogin = now - 10
@@ -45,7 +43,7 @@ def test_usermaint(user: User):
     its code path.
     """
 
-    now = int(datetime.utcnow().timestamp())
+    now = time.utcnow()
     limit_to = now - 86400 * 7
     with db.begin():
         user.LastLoginIPAddress = "127.0.0.1"

From e1a87c34077f5e960cf5d577a851802f8759547a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 17 Jan 2022 13:10:59 -0800
Subject: [PATCH 835/844] housekeep: move pkgbase templates to their own dir

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py                    |  2 +-
 aurweb/routers/pkgbase.py                     | 20 +++++++++----------
 .../{packages.html => packages/index.html}    |  0
 .../{packages => pkgbase}/comments/edit.html  |  0
 templates/{packages => pkgbase}/delete.html   |  0
 templates/{packages => pkgbase}/disown.html   |  0
 .../{packages => pkgbase}/flag-comment.html   |  0
 templates/{packages => pkgbase}/flag.html     |  0
 .../{pkgbase.html => pkgbase/index.html}      |  0
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename templates/{packages.html => packages/index.html} (100%)
 rename templates/{packages => pkgbase}/comments/edit.html (100%)
 rename templates/{packages => pkgbase}/delete.html (100%)
 rename templates/{packages => pkgbase}/disown.html (100%)
 rename templates/{packages => pkgbase}/flag-comment.html (100%)
 rename templates/{packages => pkgbase}/flag.html (100%)
 rename templates/{pkgbase.html => pkgbase/index.html} (100%)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index bb67f2fe..79c6a404 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -112,7 +112,7 @@ async def packages_get(request: Request, context: Dict[str, Any],
     context["packages"] = packages
     context["packages_count"] = num_packages
 
-    return render_template(request, "packages.html", context,
+    return render_template(request, "packages/index.html", context,
                            status_code=status_code)
 
 
diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index 510ca467..3aa73a02 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -48,7 +48,7 @@ async def pkgbase(request: Request, name: str) -> Response:
     context = pkgbaseutil.make_context(request, pkgbase)
     context["packages"] = pkgbase.packages.all()
 
-    return render_template(request, "pkgbase.html", context)
+    return render_template(request, "pkgbase/index.html", context)
 
 
 @router.get("/pkgbase/{name}/voters")
@@ -84,7 +84,7 @@ async def pkgbase_flag_comment(request: Request, name: str):
 
     context = templates.make_context(request, "Flag Comment")
     context["pkgbase"] = pkgbase
-    return render_template(request, "packages/flag-comment.html", context)
+    return render_template(request, "pkgbase/flag-comment.html", context)
 
 
 @router.post("/pkgbase/{name}/keywords")
@@ -126,7 +126,7 @@ async def pkgbase_flag_get(request: Request, name: str):
 
     context = templates.make_context(request, "Flag Package Out-Of-Date")
     context["pkgbase"] = pkgbase
-    return render_template(request, "packages/flag.html", context)
+    return render_template(request, "pkgbase/flag.html", context)
 
 
 @router.post("/pkgbase/{name}/flag")
@@ -140,7 +140,7 @@ async def pkgbase_flag_post(request: Request, name: str,
         context["pkgbase"] = pkgbase
         context["errors"] = ["The selected packages have not been flagged, "
                              "please enter a comment."]
-        return render_template(request, "packages/flag.html", context,
+        return render_template(request, "pkgbase/flag.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
     has_cred = request.user.has_credential(creds.PKGBASE_FLAG)
@@ -248,7 +248,7 @@ async def pkgbase_comment_edit(request: Request, name: str, id: int,
 
     context = await make_variable_context(request, "Edit comment", next=next)
     context["comment"] = comment
-    return render_template(request, "packages/comments/edit.html", context)
+    return render_template(request, "pkgbase/comments/edit.html", context)
 
 
 @router.post("/pkgbase/{name}/comments/{id}")
@@ -519,7 +519,7 @@ async def pkgbase_disown_get(request: Request, name: str):
 
     context = templates.make_context(request, "Disown Package")
     context["pkgbase"] = pkgbase
-    return render_template(request, "packages/disown.html", context)
+    return render_template(request, "pkgbase/disown.html", context)
 
 
 @router.post("/pkgbase/{name}/disown")
@@ -540,7 +540,7 @@ async def pkgbase_disown_post(request: Request, name: str,
     if not confirm:
         context["errors"] = [("The selected packages have not been disowned, "
                               "check the confirmation checkbox.")]
-        return render_template(request, "packages/disown.html", context,
+        return render_template(request, "pkgbase/disown.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
     with db.begin():
@@ -550,7 +550,7 @@ async def pkgbase_disown_post(request: Request, name: str,
         actions.pkgbase_disown_instance(request, pkgbase)
     except InvariantError as exc:
         context["errors"] = [str(exc)]
-        return render_template(request, "packages/disown.html", context,
+        return render_template(request, "pkgbase/disown.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
     return RedirectResponse(f"/pkgbase/{name}",
@@ -739,7 +739,7 @@ async def pkgbase_delete_get(request: Request, name: str):
 
     context = templates.make_context(request, "Package Deletion")
     context["pkgbase"] = get_pkg_or_base(name, PackageBase)
-    return render_template(request, "packages/delete.html", context)
+    return render_template(request, "pkgbase/delete.html", context)
 
 
 @router.post("/pkgbase/{name}/delete")
@@ -758,7 +758,7 @@ async def pkgbase_delete_post(request: Request, name: str,
         context["pkgbase"] = pkgbase
         context["errors"] = [("The selected packages have not been deleted, "
                               "check the confirmation checkbox.")]
-        return render_template(request, "packages/delete.html", context,
+        return render_template(request, "pkgbase/delete.html", context,
                                status_code=HTTPStatus.BAD_REQUEST)
 
     if comments:
diff --git a/templates/packages.html b/templates/packages/index.html
similarity index 100%
rename from templates/packages.html
rename to templates/packages/index.html
diff --git a/templates/packages/comments/edit.html b/templates/pkgbase/comments/edit.html
similarity index 100%
rename from templates/packages/comments/edit.html
rename to templates/pkgbase/comments/edit.html
diff --git a/templates/packages/delete.html b/templates/pkgbase/delete.html
similarity index 100%
rename from templates/packages/delete.html
rename to templates/pkgbase/delete.html
diff --git a/templates/packages/disown.html b/templates/pkgbase/disown.html
similarity index 100%
rename from templates/packages/disown.html
rename to templates/pkgbase/disown.html
diff --git a/templates/packages/flag-comment.html b/templates/pkgbase/flag-comment.html
similarity index 100%
rename from templates/packages/flag-comment.html
rename to templates/pkgbase/flag-comment.html
diff --git a/templates/packages/flag.html b/templates/pkgbase/flag.html
similarity index 100%
rename from templates/packages/flag.html
rename to templates/pkgbase/flag.html
diff --git a/templates/pkgbase.html b/templates/pkgbase/index.html
similarity index 100%
rename from templates/pkgbase.html
rename to templates/pkgbase/index.html

From dbbae9703859858d746494043ab0637f380ffcc5 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 08:21:09 -0800
Subject: [PATCH 836/844] housekeep: move templates/packages/widgets/* to
 templates/packages/

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/index.html                                        | 6 +++---
 .../packages/{widgets/search.html => search_widget.html}    | 0
 templates/partials/packages/{widgets => }/statistics.html   | 0
 templates/partials/packages/{widgets => }/updates.html      | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename templates/partials/packages/{widgets/search.html => search_widget.html} (100%)
 rename templates/partials/packages/{widgets => }/statistics.html (100%)
 rename templates/partials/packages/{widgets => }/updates.html (100%)

diff --git a/templates/index.html b/templates/index.html
index 0b6eda50..8b7ad7c2 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -11,9 +11,9 @@
         </div>
     </div>
     <div id="content-right">
-        {% include 'partials/packages/widgets/search.html' %}
-        {% include 'partials/packages/widgets/updates.html' %}
-        {% include 'partials/packages/widgets/statistics.html' %}
+        {% include 'partials/packages/search_widget.html' %}
+        {% include 'partials/packages/updates.html' %}
+        {% include 'partials/packages/statistics.html' %}
     </div>
 
 {% endblock %}
diff --git a/templates/partials/packages/widgets/search.html b/templates/partials/packages/search_widget.html
similarity index 100%
rename from templates/partials/packages/widgets/search.html
rename to templates/partials/packages/search_widget.html
diff --git a/templates/partials/packages/widgets/statistics.html b/templates/partials/packages/statistics.html
similarity index 100%
rename from templates/partials/packages/widgets/statistics.html
rename to templates/partials/packages/statistics.html
diff --git a/templates/partials/packages/widgets/updates.html b/templates/partials/packages/updates.html
similarity index 100%
rename from templates/partials/packages/widgets/updates.html
rename to templates/partials/packages/updates.html

From 2feb9b90b26bbc6a2296fbb1359012fc06b25f39 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 08:24:46 -0800
Subject: [PATCH 837/844] housekeep: move templates/partials/widgets/* to
 templates/partials/

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/packages/index.html                    | 4 ++--
 templates/partials/packages/statistics.html      | 2 +-
 templates/partials/{widgets => }/pager.html      | 0
 templates/partials/{widgets => }/statistics.html | 0
 templates/requests.html                          | 4 ++--
 test/test_templates.py                           | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename templates/partials/{widgets => }/pager.html (100%)
 rename templates/partials/{widgets => }/statistics.html (100%)

diff --git a/templates/packages/index.html b/templates/packages/index.html
index 61533524..6034d2f6 100644
--- a/templates/packages/index.html
+++ b/templates/packages/index.html
@@ -67,7 +67,7 @@
                     singular = "%d package found.",
                     plural = "%d packages found.",
                     prefix = "/packages" %}
-                {% include "partials/widgets/pager.html" %}
+                {% include "partials/pager.html" %}
             {% endwith %}
 
             {# Package action form: persists query parameters. #}
@@ -84,7 +84,7 @@
                         singular = "%d package found.",
                         plural = "%d packages found.",
                         prefix = "/packages" %}
-                    {% include "partials/widgets/pager.html" %}
+                    {% include "partials/pager.html" %}
                 {% endwith %}
 
                 {% if request.user.is_authenticated() %}
diff --git a/templates/partials/packages/statistics.html b/templates/partials/packages/statistics.html
index f841ae0e..8a6546b9 100644
--- a/templates/partials/packages/statistics.html
+++ b/templates/partials/packages/statistics.html
@@ -51,5 +51,5 @@
 
 {% if request.user.is_authenticated() %}
     <!-- Include "My Statistics" -->
-    {% include 'partials/widgets/statistics.html' %}
+    {% include 'partials/statistics.html' %}
 {% endif %}
diff --git a/templates/partials/widgets/pager.html b/templates/partials/pager.html
similarity index 100%
rename from templates/partials/widgets/pager.html
rename to templates/partials/pager.html
diff --git a/templates/partials/widgets/statistics.html b/templates/partials/statistics.html
similarity index 100%
rename from templates/partials/widgets/statistics.html
rename to templates/partials/statistics.html
diff --git a/templates/requests.html b/templates/requests.html
index 6701af5d..c9e63e60 100644
--- a/templates/requests.html
+++ b/templates/requests.html
@@ -8,7 +8,7 @@
         {% if not total %}
             <p>{{ "No requests matched your search criteria." | tr }}</p>
         {% else %}
-            {% include "partials/widgets/pager.html" %}
+            {% include "partials/pager.html" %}
             <table class="results">
                 <thead>
                     <tr>
@@ -121,7 +121,7 @@
                     {% endfor %}
                 </tbody>
             </table>
-            {% include "partials/widgets/pager.html" %}
+            {% include "partials/pager.html" %}
         {% endif %}
     </div>
 {% endblock %}
diff --git a/test/test_templates.py b/test/test_templates.py
index 96380fbe..0d36d0b9 100644
--- a/test/test_templates.py
+++ b/test/test_templates.py
@@ -142,7 +142,7 @@ def test_pager_no_results():
     """ Test the pager partial with no results. """
     num_packages = 0
     context = pager_context(num_packages)
-    body = base_template("partials/widgets/pager.html").render(context)
+    body = base_template("partials/pager.html").render(context)
 
     root = parse_root(body)
     stats = root.xpath('//div[@class="pkglist-stats"]/p')
@@ -154,7 +154,7 @@ def test_pager():
     """ Test the pager partial with two pages of results. """
     num_packages = 100
     context = pager_context(num_packages)
-    body = base_template("partials/widgets/pager.html").render(context)
+    body = base_template("partials/pager.html").render(context)
 
     root = parse_root(body)
     stats = root.xpath('//div[@class="pkglist-stats"]/p')

From 12f74fc40a3c55fcecf09246defe7a4dc1be0e90 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 09:05:10 -0800
Subject: [PATCH 838/844] fix: docker cron config timing and doc

This wasn't matching up with what's suggested in doc/maintenance.
This patch resolves that inconsistency.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 INSTALL                   | 10 +++++-----
 docker/config/aurweb-cron | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4b904e25..3821d7d1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -120,12 +120,12 @@ The following crontab file uses every script meant to be run on an
 interval:
 
     AUR_CONFIG='/etc/aurweb/config'
-    */5 * * * * bash -c 'poetry run aurweb-aurblup'
     */5 * * * * bash -c 'poetry run aurweb-mkpkglists --extended'
-    */5 * * * * bash -c 'poetry run aurweb-pkgmaint'
-    */5 * * * * bash -c 'poetry run aurweb-usermaint'
-    */5 * * * * bash -c 'poetry run aurweb-tuvotereminder'
-    */5 * * * * bash -c 'poetry run aurweb-popupdate'
+    */2 * * * * bash -c 'poetry run aurweb-aurblup'
+    */2 * * * * bash -c 'poetry run aurweb-pkgmaint'
+    */2 * * * * bash -c 'poetry run aurweb-usermaint'
+    */2 * * * * bash -c 'poetry run aurweb-popupdate'
+    */12 * * * * bash -c 'poetry run aurweb-tuvotereminder'
 
 7) Create a new database and a user and import the aurweb SQL schema:
 
diff --git a/docker/config/aurweb-cron b/docker/config/aurweb-cron
index 8b502149..21fd35dc 100644
--- a/docker/config/aurweb-cron
+++ b/docker/config/aurweb-cron
@@ -1,7 +1,7 @@
 AUR_CONFIG='/aurweb/conf/config'
-*/5 * * * * bash -c 'aurweb-aurblup'
 */5 * * * * bash -c 'aurweb-mkpkglists --extended'
-*/5 * * * * bash -c 'aurweb-pkgmaint'
-*/5 * * * * bash -c 'aurweb-usermaint'
-*/5 * * * * bash -c 'aurweb-tuvotereminder'
-*/5 * * * * bash -c 'aurweb-popupdate'
+*/2 * * * * bash -c 'aurweb-aurblup'
+*/2 * * * * bash -c 'aurweb-pkgmaint'
+*/2 * * * * bash -c 'aurweb-usermaint'
+*/2 * * * * bash -c 'aurweb-popupdate'
+*/12 * * * * bash -c 'aurweb-tuvotereminder'

From 8d8f7954e9b9732926768bd31d8e7f573690390f Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 09:10:28 -0800
Subject: [PATCH 839/844] fix(routers.trusted_user): html.escape agenda

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/trusted_user.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index ff1ebfa1..07ee17af 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -1,5 +1,4 @@
 import html
-import re
 import typing
 
 from http import HTTPStatus
@@ -291,21 +290,18 @@ async def trusted_user_addvote_post(request: Request,
     duration, quorum = ADDVOTE_SPECIFICS.get(type)
     timestamp = time.utcnow()
 
-    # TODO: Review this. Is this even necessary?
-    # Remove <script> and <style> tags.
-    agenda = re.sub(r'<[/]?script.*>', '', agenda)
-    agenda = re.sub(r'<[/]?style.*>', '', agenda)
-
+    # Active TU types we filter for.
     types = {TRUSTED_USER_ID, TRUSTED_USER_AND_DEV_ID}
-    active_tus = db.query(User).filter(
-        and_(User.Suspended == 0,
-             User.InactivityTS.isnot(None),
-             User.AccountTypeID.in_(types))
-    ).count()
 
     # Create a new TUVoteInfo (proposal)!
     with db.begin():
-        voteinfo = db.create(models.TUVoteInfo, User=user, Agenda=agenda,
+        active_tus = db.query(User).filter(
+            and_(User.Suspended == 0,
+                 User.InactivityTS.isnot(None),
+                 User.AccountTypeID.in_(types))
+        ).count()
+        voteinfo = db.create(models.TUVoteInfo, User=user,
+                             Agenda=html.escape(agenda),
                              Submitted=timestamp, End=(timestamp + duration),
                              Quorum=quorum, ActiveTUs=active_tus,
                              Submitter=request.user)

From d3d4424bc5224573c146cb54cc99ffc5378331cf Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Fri, 3 Dec 2021 20:30:15 -0800
Subject: [PATCH 840/844] merge: updated translations

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 po/ar.po    |  103 ++-
 po/az.po    | 2335 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/az_AZ.po | 2335 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/bg.po    | 2335 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/ca.po    |  196 +++--
 po/ca_ES.po | 2335 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/cs.po    |  636 ++++++++------
 po/da.po    |  103 ++-
 po/de.po    |  139 ++-
 po/el.po    |  126 ++-
 po/es.po    |  103 ++-
 po/et.po    | 2335 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fi.po    |  105 ++-
 po/fi_FI.po | 2335 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fr.po    |  164 +++-
 po/he.po    |  107 ++-
 po/hi_IN.po | 2336 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/hr.po    |  103 ++-
 po/hu.po    |  252 ++++--
 po/id.po    | 2332 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/id_ID.po | 2330 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/is.po    | 2335 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/it.po    |  230 +++--
 po/ja.po    |  105 ++-
 po/ko.po    | 2330 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/lt.po    | 2345 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/nb.po    |  107 ++-
 po/nb_NO.po | 2337 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/nl.po    |  813 ++++++++++--------
 po/pl.po    |  108 ++-
 po/pt.po    | 2336 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/pt_BR.po |  239 ++++--
 po/pt_PT.po |  103 ++-
 po/ro.po    |  103 ++-
 po/ru.po    |  119 ++-
 po/sk.po    |  103 ++-
 po/sr.po    |  103 ++-
 po/sr_RS.po | 2341 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/sv_SE.po | 2340 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/tr.po    |  268 ++++--
 po/uk.po    |  103 ++-
 po/vi.po    | 2330 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh.po    | 2330 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh_CN.po |  294 ++++---
 po/zh_TW.po |  107 ++-
 45 files changed, 45900 insertions(+), 1174 deletions(-)
 create mode 100644 po/az.po
 create mode 100644 po/az_AZ.po
 create mode 100644 po/bg.po
 create mode 100644 po/ca_ES.po
 create mode 100644 po/et.po
 create mode 100644 po/fi_FI.po
 create mode 100644 po/hi_IN.po
 create mode 100644 po/id.po
 create mode 100644 po/id_ID.po
 create mode 100644 po/is.po
 create mode 100644 po/ko.po
 create mode 100644 po/lt.po
 create mode 100644 po/nb_NO.po
 create mode 100644 po/pt.po
 create mode 100644 po/sr_RS.po
 create mode 100644 po/sv_SE.po
 create mode 100644 po/vi.po
 create mode 100644 po/zh.po

diff --git a/po/ar.po b/po/ar.po
index 7664c478..676a5025 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/lfleischer/aurweb/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -472,6 +472,12 @@ msgid ""
 "checkbox."
 msgstr "لم يُتنازل عن الحزم المحدّدة، افحص مربع تأشير التّأكيد."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "تعذّر العثور على الحزمة لدمج التّصويتات والتّعليقات معها."
@@ -570,6 +576,14 @@ msgstr ""
 msgid "Flag Package Out-Of-Date"
 msgstr "علّم الحزمة كقديمة"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -866,6 +880,10 @@ msgstr "استمارة الولوج معطّلة حاليًّا لعنوان IP
 msgid "Account suspended"
 msgstr "عُلّق الحساب"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -951,6 +969,30 @@ msgstr "خطأ في استرجاع تفاصيل الحزمة."
 msgid "Package details could not be found."
 msgstr "تعذّر العثور على تفاصيل الحزمة."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "عليك الولوج قبل تعليم الحزم."
@@ -987,6 +1029,10 @@ msgstr "لا صلاحيّة لديك لحذف الحزم."
 msgid "You did not select any packages to delete."
 msgstr "لم تحدّد أيّ حزم لحذفها."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "حُذفت الحزم المحدّدة."
@@ -995,10 +1041,18 @@ msgstr "حُذفت الحزم المحدّدة."
 msgid "You must be logged in before you can adopt packages."
 msgstr "عليك الولوج قبل تبنّي الحزم."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "عليك الولوج قبل التّنازل عن الحزم."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "لم تحدّد أيّ حزم لتبنّيها."
@@ -2256,3 +2310,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/az.po b/po/az.po
new file mode 100644
index 00000000..7e534b4c
--- /dev/null
+++ b/po/az.po
@@ -0,0 +1,2335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/lfleischer/aurweb/language/az/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: az\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/az_AZ.po b/po/az_AZ.po
new file mode 100644
index 00000000..e903027b
--- /dev/null
+++ b/po/az_AZ.po
@@ -0,0 +1,2335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Azerbaijani (Azerbaijan) (http://www.transifex.com/lfleischer/aurweb/language/az_AZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: az_AZ\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
new file mode 100644
index 00000000..7864f5dc
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,2335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/lfleischer/aurweb/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/ca.po b/po/ca.po
index c30fb1d8..391dd146 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,14 +5,15 @@
 # Translators:
 # Adolfo Jayme-Barrientos, 2014
 # Hector Mtz-Seara <hseara@gmail.com>, 2011,2013
+# Ícar <icar.nin@gmail.com>, 2021
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/lfleischer/aurweb/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,38 +31,38 @@ msgstr "Ho sentim, la pàgina que ha sol·licitat no existeix."
 
 #: html/404.php template/pkgreq_close_form.php
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #: html/404.php
 msgid "Git clone URLs are not meant to be opened in a browser."
-msgstr ""
+msgstr "Les URL de clonació del Git no estan destinades a ser obertes en un navegador."
 
 #: html/404.php
 #, php-format
 msgid "To clone the Git repository of %s, run %s."
-msgstr ""
+msgstr "Per clonar el repositori Git de %s, executeu %s."
 
 #: html/404.php
 #, php-format
 msgid "Click %shere%s to return to the %s details page."
-msgstr ""
+msgstr "Clica %saquí%s per tornar a la pàgina de detalls de %s."
 
 #: html/503.php
 msgid "Service Unavailable"
-msgstr ""
+msgstr "Servei no disponible"
 
 #: html/503.php
 msgid ""
 "Don't panic! This site is down due to maintenance. We will be back soon."
-msgstr ""
+msgstr "No pateixis! Aquest lloc està caigut a causa d'un manteniment. Tornarem aviat."
 
 #: html/account.php
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #: html/account.php template/header.php
 msgid "Accounts"
-msgstr "Compte"
+msgstr "Comptes"
 
 #: html/account.php html/addvote.php
 msgid "You are not allowed to access this area."
@@ -77,7 +78,7 @@ msgstr "No teniu permís per a editar aquest compte."
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Contrasenya no vàlida."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -135,19 +136,19 @@ msgstr "Tipus"
 
 #: html/addvote.php
 msgid "Addition of a TU"
-msgstr ""
+msgstr "Adició d'un TU"
 
 #: html/addvote.php
 msgid "Removal of a TU"
-msgstr ""
+msgstr "Elimincació d'un TU"
 
 #: html/addvote.php
 msgid "Removal of a TU (undeclared inactivity)"
-msgstr ""
+msgstr "Elimincació d'un TU (inactivitat no declarada)"
 
 #: html/addvote.php
 msgid "Amendment of Bylaws"
-msgstr ""
+msgstr "Modificació de les lleis"
 
 #: html/addvote.php template/tu_list.php
 msgid "Proposal"
@@ -159,15 +160,15 @@ msgstr "Envia"
 
 #: html/comaintainers.php template/comaintainers_form.php
 msgid "Manage Co-maintainers"
-msgstr ""
+msgstr "Gestiona els co-mantenidors"
 
 #: html/commentedit.php template/pkg_comments.php
 msgid "Edit comment"
-msgstr ""
+msgstr "Edita el comentari"
 
 #: html/home.php template/header.php
 msgid "Dashboard"
-msgstr ""
+msgstr "Tauler"
 
 #: html/home.php template/header.php
 msgid "Home"
@@ -175,11 +176,11 @@ msgstr "Inici"
 
 #: html/home.php
 msgid "My Flagged Packages"
-msgstr ""
+msgstr "Els meus paquets marcats"
 
 #: html/home.php
 msgid "My Requests"
-msgstr ""
+msgstr "Les meves peticions"
 
 #: html/home.php
 msgid "My Packages"
@@ -187,15 +188,15 @@ msgstr "Els meus paquets"
 
 #: html/home.php
 msgid "Search for packages I maintain"
-msgstr ""
+msgstr "Cerca paquets que mantinc"
 
 #: html/home.php
 msgid "Co-Maintained Packages"
-msgstr ""
+msgstr "Paquets co-mantinguts"
 
 #: html/home.php
 msgid "Search for packages I co-maintain"
-msgstr ""
+msgstr "Cerca paquets que co-mantinc"
 
 #: html/home.php
 #, php-format
@@ -227,68 +228,68 @@ msgstr "Avís legal"
 msgid ""
 "AUR packages are user produced content. Any use of the provided files is at "
 "your own risk."
-msgstr ""
+msgstr "Els paquets de l'AUR són contingut produït per usuaris. Qualsevol ús dels fitxers proporcionats és sota el seu propi risc."
 
 #: html/home.php
 msgid "Learn more..."
-msgstr ""
+msgstr "Més informació..."
 
 #: html/home.php
 msgid "Support"
-msgstr ""
+msgstr "Suport"
 
 #: html/home.php
 msgid "Package Requests"
-msgstr ""
+msgstr "Sol·licituds de paquets"
 
 #: html/home.php
 #, php-format
 msgid ""
 "There are three types of requests that can be filed in the %sPackage "
 "Actions%s box on the package details page:"
-msgstr ""
+msgstr "Hi ha tres tipus de sol·licituds que es poden presentar al quadre %sAccions del paquet%s a la pàgina de detalls del paquet:"
 
 #: html/home.php
 msgid "Orphan Request"
-msgstr ""
+msgstr "Sol·licitud d'orfenat"
 
 #: html/home.php
 msgid ""
 "Request a package to be disowned, e.g. when the maintainer is inactive and "
 "the package has been flagged out-of-date for a long time."
-msgstr ""
+msgstr "Sol·licita que un paquet sigui renegat, per exemple quan el mantenidor estigui inactiu i el paquet s'ha marcat com a obsolet durant molt de temps."
 
 #: html/home.php
 msgid "Deletion Request"
-msgstr ""
+msgstr "Sol·licitud de supressió"
 
 #: html/home.php
 msgid ""
 "Request a package to be removed from the Arch User Repository. Please do not"
 " use this if a package is broken and can be fixed easily. Instead, contact "
 "the package maintainer and file orphan request if necessary."
-msgstr ""
+msgstr "Sol·liciteu que s'elimini un paquet de l'AUR. Si us plau, no ho utilitzeu si un paquet està trencat i es pot arreglar fàcilment. En lloc d'això, poseu-vos en contacte amb el mantenidor del paquet i sol·liciteu que es se'n renegui si cal."
 
 #: html/home.php
 msgid "Merge Request"
-msgstr ""
+msgstr "Sol·licitud de fusió"
 
 #: html/home.php
 msgid ""
 "Request a package to be merged into another one. Can be used when a package "
 "needs to be renamed or replaced by a split package."
-msgstr ""
+msgstr "Sol·licita que un paquet es fusioni en un altre. Es pot utilitzar quan un paquet s'ha de reanomenar o substituir per un paquet dividit."
 
 #: html/home.php
 #, php-format
 msgid ""
 "If you want to discuss a request, you can use the %saur-requests%s mailing "
 "list. However, please do not use that list to file requests."
-msgstr ""
+msgstr "Si voleu debatre una sol·licitud, podeu utilitzar la llista de correu %saur-requests%s. No obstant això, si us plau, no utilitzeu aquesta llista per a enviar una petició."
 
 #: html/home.php
 msgid "Submitting Packages"
-msgstr ""
+msgstr "Enviar paquets"
 
 #: html/home.php
 #, php-format
@@ -296,11 +297,11 @@ msgid ""
 "Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
 " packages%s section of the Arch User Repository ArchWiki page for more "
 "details."
-msgstr ""
+msgstr "Ara s'utilitza Git a sobre d'SSH per enviar paquets a l'AUR. Feu un cop d'ull a la secció \"%sSubmitting packages%s\" de la pàgina de l'ArchWIki de l'AUR per més detalls."
 
 #: html/home.php
 msgid "The following SSH fingerprints are used for the AUR:"
-msgstr ""
+msgstr "Les següents empremtes digitals d'SSH són usades per l'AUR:"
 
 #: html/home.php
 msgid "Discussion"
@@ -312,7 +313,7 @@ msgid ""
 "General discussion regarding the Arch User Repository (AUR) and Trusted User"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr ""
+msgstr "El debat general sobre el repositori per usuaris d'Arch (AUR) i de l'estructura dels Usuaris de Confiança es realitza a %saur-general%s. Per la discussió relacionada amb el desenvolupament de la interfície web de l'AUR, utilitzeu la llista de correu %saur-dev%s."
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -325,7 +326,7 @@ msgid ""
 "our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
 " %sonly%s. To report packaging bugs contact the package maintainer or leave "
 "a comment on the appropriate package page."
-msgstr ""
+msgstr "Si troba un error en la interfície web de l'AUR, si us plau, ompliu un informe d'error al nostre %srastrejador d'errades%s. Utilitzeu el rastrejador per reportar %snomés%s errors de l'interfície web. Per informar d'errades en els paquets contacteu directament amb el responsable del paquet o deixeu un comentari a la pàgina del paquet corresponent."
 
 #: html/home.php
 msgid "Package Search"
@@ -333,7 +334,7 @@ msgstr "Cercar Paquets"
 
 #: html/index.php
 msgid "Adopt"
-msgstr ""
+msgstr "Adopta"
 
 #: html/index.php
 msgid "Vote"
@@ -374,7 +375,7 @@ msgstr "Introduïu les credencials d'inici de sessió"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "Nom d'usuari o adreça de correu primària"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -438,7 +439,7 @@ msgstr "La seva contrasenya s'ha restablert correctament."
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "Confirmeu el vostre nom d'usuari o l'adreça de correu electrònic primària:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -457,20 +458,26 @@ msgstr "Continuar"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Si heu oblidat el nom d'usuari i l'adreça de correu electrònic primària utilitzada al registrar-vos, si us plau envieu un missatge a la llista de correu %saur-general%s."
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "Entreu el vostre nom d'usuari o la vostra adreça de correu electrònic primària:"
 
 #: html/pkgbase.php
 msgid "Package Bases"
-msgstr ""
+msgstr "Bases del paquet"
 
 #: html/pkgbase.php
 msgid ""
 "The selected packages have not been disowned, check the confirmation "
 "checkbox."
+msgstr "Els paquets seleccionats no han sigut renegats, marqueu la casella de confirmació."
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
 msgstr ""
 
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
@@ -479,7 +486,7 @@ msgstr "No es pot trobar el paquet on combinar vots i comentaris."
 
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot merge a package base with itself."
-msgstr ""
+msgstr "No es pot fusionar la base d'un paquet amb la mateixa."
 
 #: html/pkgbase.php
 msgid ""
@@ -500,7 +507,7 @@ msgstr "Esborrar el paquet"
 msgid ""
 "Use this form to delete the package base %s%s%s and the following packages "
 "from the AUR: "
-msgstr ""
+msgstr "Utilitzeu aquest formulari per eliminar la base del paquet %s%s%s i els següents paquets de l'AUR:"
 
 #: html/pkgdel.php
 msgid "Deletion of a package is permanent. "
@@ -571,6 +578,14 @@ msgstr ""
 msgid "Flag Package Out-Of-Date"
 msgstr ""
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -867,6 +882,10 @@ msgstr "El formulari de registre està deshabilitat per la seva adreça IP, prob
 msgid "Account suspended"
 msgstr ""
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -952,6 +971,30 @@ msgstr "No s'han pogut obtenir els detalls del paquet."
 msgid "Package details could not be found."
 msgstr "No s'han pogut trobar els detalls del paquet."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Heu d'identificar-vos abans de marcar paquets."
@@ -988,6 +1031,10 @@ msgstr "No té permís per eliminar paquets."
 msgid "You did not select any packages to delete."
 msgstr "No heu seleccionat cap paquet per a esborrar."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Els paquets seleccionats s'han esborrat."
@@ -996,10 +1043,18 @@ msgstr "Els paquets seleccionats s'han esborrat."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Heu d'identificar-vos abans d'apropiar-se paquets."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Heu d'identificar-vos abans de desapropiàr-se paquets."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "No heu seleccionat cap paquet per apropiar-se'n."
@@ -2237,3 +2292,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/ca_ES.po b/po/ca_ES.po
new file mode 100644
index 00000000..bad69bd1
--- /dev/null
+++ b/po/ca_ES.po
@@ -0,0 +1,2335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/lfleischer/aurweb/language/ca_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
index ef165358..b9bd739a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,18 +4,21 @@
 # 
 # Translators:
 # Daniel Milde <daniel@milde.cz>, 2017
+# Daniel Peukert <daniel@peukert.cc>, 2021
+# Daniel Peukert <daniel@peukert.cc>, 2021
 # Jaroslav Lichtblau <jlichtblau@seznam.cz>, 2015-2016
 # Jaroslav Lichtblau <jlichtblau@seznam.cz>, 2014
 # Jiří Vírava <appukonrad@gmail.com>, 2017-2018
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
+# Lukáš Kucharczyk <lukas@kucharczyk.xyz>, 2020
 # Pavel Ševeček <pavel.sevecek@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Czech (http://www.transifex.com/lfleischer/aurweb/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +32,7 @@ msgstr "Stránka nenalezena"
 
 #: html/404.php
 msgid "Sorry, the page you've requested does not exist."
-msgstr "Omlouváme se, požadovaná stránka neexistuje."
+msgstr "Omlouváme se, ale požadovaná stránka neexistuje."
 
 #: html/404.php template/pkgreq_close_form.php
 msgid "Note"
@@ -42,12 +45,12 @@ msgstr "URL adresy pro klonování Git repozitáře nejsou určeny k otevření
 #: html/404.php
 #, php-format
 msgid "To clone the Git repository of %s, run %s."
-msgstr "Pro naklonování Git repozitáře %s, spusťte %s."
+msgstr "Pro naklonování Git repozitáře %s použijte příkaz %s."
 
 #: html/404.php
 #, php-format
 msgid "Click %shere%s to return to the %s details page."
-msgstr "Klikněte %s zde %s pro návrat na %s stránku detailu."
+msgstr "Klikněte %s zde %s pro návrat na stránku o balíčku %s. "
 
 #: html/503.php
 msgid "Service Unavailable"
@@ -56,7 +59,7 @@ msgstr "Služba nedostupná"
 #: html/503.php
 msgid ""
 "Don't panic! This site is down due to maintenance. We will be back soon."
-msgstr "Nepanikařte! Na tomto webu dochází k údržbě. Brzy budeme zpět."
+msgstr "Nepanikařte! Na tomto webu probíhá údržba. Brzy budeme zpět."
 
 #: html/account.php
 msgid "Account"
@@ -72,23 +75,23 @@ msgstr "Zde nemáte povolený přístup."
 
 #: html/account.php
 msgid "Could not retrieve information for the specified user."
-msgstr "Nelze obdržet informace pro vybraného uživatele."
+msgstr "Načtení informací o daném uživateli se nezdařilo."
 
 #: html/account.php
 msgid "You do not have permission to edit this account."
-msgstr "Nemáte oprávnění pro úpravu tohoto účtu."
+msgstr "Pro úpravu tohoto účtu nemáte oprávnění. "
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Neplatné heslo."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
-msgstr "Pro vyhledání existujících účtů použíte tento formulář."
+msgstr "Tento formulář použijte pro vyhledání existujících účtů."
 
 #: html/account.php
 msgid "You must log in to view user information."
-msgstr "Musíte se přihlásit, pro zobrazení informací o uživateli."
+msgstr "Pro zobrazení informací o uživateli se musíte přihlásit."
 
 #: html/addvote.php template/tu_list.php
 msgid "Add Proposal"
@@ -105,7 +108,7 @@ msgstr "Uživatelské jméno neexistuje."
 #: html/addvote.php
 #, php-format
 msgid "%s already has proposal running for them."
-msgstr "Pro %s se již hlasuje."
+msgstr "Pro %s již existuje návrh."
 
 #: html/addvote.php
 msgid "Invalid type."
@@ -113,23 +116,23 @@ msgstr "Chybný typ."
 
 #: html/addvote.php
 msgid "Proposal cannot be empty."
-msgstr "Návrh nemůže být prázdný."
+msgstr "Návrh nesmí být prázdný."
 
 #: html/addvote.php
 msgid "New proposal submitted."
-msgstr "Nový návrh podán."
+msgstr "Nový návrh předložen."
 
 #: html/addvote.php
 msgid "Submit a proposal to vote on."
-msgstr "Předložit návrh na hlasování."
+msgstr "Předložit návrh k hlasování."
 
 #: html/addvote.php
 msgid "Applicant/TU"
-msgstr "Uchazeč/TU"
+msgstr "Uchazeč/důvěryhodný uživatel"
 
 #: html/addvote.php
 msgid "(empty if not applicable)"
-msgstr "(vynechat pokud neni vhodný)"
+msgstr "(nevyhovující přeskočte)"
 
 #: html/addvote.php template/account_search_results.php
 #: template/pkgreq_results.php
@@ -138,15 +141,15 @@ msgstr "Typ"
 
 #: html/addvote.php
 msgid "Addition of a TU"
-msgstr "Přidání TU"
+msgstr "Přidání důvěryhodného uživatele"
 
 #: html/addvote.php
 msgid "Removal of a TU"
-msgstr "Odebrání TU"
+msgstr "Odebrání důvěryhodného uživatele"
 
 #: html/addvote.php
 msgid "Removal of a TU (undeclared inactivity)"
-msgstr "Odebrání TU (nehlášená neaktivita)"
+msgstr "Odebrání důvěryhodného uživatele (neohlášená neaktivita)"
 
 #: html/addvote.php
 msgid "Amendment of Bylaws"
@@ -162,7 +165,7 @@ msgstr "Odeslat"
 
 #: html/comaintainers.php template/comaintainers_form.php
 msgid "Manage Co-maintainers"
-msgstr "Správa spolu-správců"
+msgstr "Správa spolusprávců"
 
 #: html/commentedit.php template/pkg_comments.php
 msgid "Edit comment"
@@ -170,11 +173,11 @@ msgstr "Upravit komentář"
 
 #: html/home.php template/header.php
 msgid "Dashboard"
-msgstr "Dashboard"
+msgstr "Nástěnka"
 
 #: html/home.php template/header.php
 msgid "Home"
-msgstr "Domů"
+msgstr "hlavní stránka"
 
 #: html/home.php
 msgid "My Flagged Packages"
@@ -194,25 +197,25 @@ msgstr "Hledat balíčky, které spravuji"
 
 #: html/home.php
 msgid "Co-Maintained Packages"
-msgstr "Spolu-spravované balíčky"
+msgstr "Spoluspravované balíčky"
 
 #: html/home.php
 msgid "Search for packages I co-maintain"
-msgstr "Hledat balíčky, které spolu-spravuji"
+msgstr "Hledat balíčky, které spoluspravuji"
 
 #: html/home.php
 #, php-format
 msgid ""
 "Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
 "Guidelines%s for more information."
-msgstr ""
+msgstr "Vítejte na webu repozitáře AUR! Další informace naleznete na wiki v článcích o %srepozitáři AUR%s a %sdůvěryhodných uživatelích AUR%s."
 
 #: html/home.php
 #, php-format
 msgid ""
 "Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
 "otherwise they will be deleted!"
-msgstr ""
+msgstr "Nahrané soubory PKGBUILD %smusí%s dodržovat %sstandardy balíčků systému Arch%s, jinak budou smazány!"
 
 #: html/home.php
 msgid "Remember to vote for your favourite packages!"
@@ -224,13 +227,13 @@ msgstr "Některé balíčky mohou být poskytnuty v binární podobě v repozit
 
 #: html/home.php
 msgid "DISCLAIMER"
-msgstr ""
+msgstr "UPOZORNĚNÍ"
 
 #: html/home.php template/footer.php
 msgid ""
 "AUR packages are user produced content. Any use of the provided files is at "
 "your own risk."
-msgstr "Obsah balíčků AUR je vytvořen uživateli. Jakékoli použití poskytnutých souborů je na vlastní nebezpečí."
+msgstr "Obsah balíčků v repozitáři AUR je tvořen uživateli. Použití zde nalezených souborů je na vlastní nebezpečí."
 
 #: html/home.php
 msgid "Learn more..."
@@ -242,24 +245,24 @@ msgstr "Podpora"
 
 #: html/home.php
 msgid "Package Requests"
-msgstr "Žádosti o balíčky"
+msgstr "Žádosti související s balíčky"
 
 #: html/home.php
 #, php-format
 msgid ""
 "There are three types of requests that can be filed in the %sPackage "
 "Actions%s box on the package details page:"
-msgstr ""
+msgstr "Existují tři typy žádostí, které je možné vybrat v nabídce %sAkce balíčku%s na stránce balíčku:"
 
 #: html/home.php
 msgid "Orphan Request"
-msgstr "Žádost o osiření"
+msgstr "Žádost o odebrání vlastnictví"
 
 #: html/home.php
 msgid ""
 "Request a package to be disowned, e.g. when the maintainer is inactive and "
 "the package has been flagged out-of-date for a long time."
-msgstr ""
+msgstr "Požádá o zrušení vlastnictví, např. pokud je správce neaktivní a balíček je již dlouho označen za neaktuální."
 
 #: html/home.php
 msgid "Deletion Request"
@@ -270,7 +273,7 @@ msgid ""
 "Request a package to be removed from the Arch User Repository. Please do not"
 " use this if a package is broken and can be fixed easily. Instead, contact "
 "the package maintainer and file orphan request if necessary."
-msgstr ""
+msgstr "Požádá o smazání z repozitáře AUR. Nepoužívejte, pokud balíček nefunguje a je možné ho snadno opravit. Místo toho kontaktuje správce balíčku nebo v případě potřeby požádejte o odebrání vlastnictví."
 
 #: html/home.php
 msgid "Merge Request"
@@ -280,18 +283,18 @@ msgstr "Žádost o sloučení"
 msgid ""
 "Request a package to be merged into another one. Can be used when a package "
 "needs to be renamed or replaced by a split package."
-msgstr ""
+msgstr "Požádá o sloučení balíčku s jiným balíčkem. Může být použito, pokud je nutné balíček přejmenovat nebo nahradit rozděleným balíčkem."
 
 #: html/home.php
 #, php-format
 msgid ""
 "If you want to discuss a request, you can use the %saur-requests%s mailing "
 "list. However, please do not use that list to file requests."
-msgstr ""
+msgstr "Pokud chcete nějakou žádost prodiskutovat, použijte poštovní konferenci %saur-requests%s. Žádosti samotné tam však nepatří."
 
 #: html/home.php
 msgid "Submitting Packages"
-msgstr "Odeslání balíčků"
+msgstr "Tvorba balíčků"
 
 #: html/home.php
 #, php-format
@@ -299,11 +302,11 @@ msgid ""
 "Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
 " packages%s section of the Arch User Repository ArchWiki page for more "
 "details."
-msgstr ""
+msgstr "Pro odesílání balíčků do repozitáře AUR se nyní používá git přes SSH. Další informace naleznete na wiki v sekci %so přidávání balíčků%s na stránce o uživatelském repozitáři systému Arch Linux."
 
 #: html/home.php
 msgid "The following SSH fingerprints are used for the AUR:"
-msgstr "Pro AUR se používají následující otisky SSH"
+msgstr "Pro repozitář AUR se používají následující otisky SSH:"
 
 #: html/home.php
 msgid "Discussion"
@@ -315,7 +318,7 @@ msgid ""
 "General discussion regarding the Arch User Repository (AUR) and Trusted User"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr ""
+msgstr "Obecná diskuze o struktuře repozitáře AUR a důvěryhodných uživatelích se odehrává v poštovní konferenci %saur-general%s. Diskuzi o vývoji webového rozhraní AUR pak naleznete v poštovní konferenci %saur-dev%s."
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -328,7 +331,7 @@ msgid ""
 "our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
 " %sonly%s. To report packaging bugs contact the package maintainer or leave "
 "a comment on the appropriate package page."
-msgstr ""
+msgstr "Pokud ve webovém rozhraní repozitáře AUR najdete chybu, nahlaste to na %swebu pro sledování chyb%s. Zmíněný web se používá %sjen%s pro chyby webového rozhraní AUR. Pokud chcete nahlásit chyby v balíčcích, kontaktujte správce daného balíčku nebo k balíčku napište komentář."
 
 #: html/home.php
 msgid "Package Search"
@@ -336,11 +339,11 @@ msgstr "Vyhledávání balíčků"
 
 #: html/index.php
 msgid "Adopt"
-msgstr "Adoptovat"
+msgstr "Převzít balíček"
 
 #: html/index.php
 msgid "Vote"
-msgstr "Hlasovat"
+msgstr "Dát hlas balíčku"
 
 #: html/index.php
 msgid "UnVote"
@@ -348,11 +351,11 @@ msgstr "Odebrat hlas"
 
 #: html/index.php template/pkg_search_form.php template/pkg_search_results.php
 msgid "Notify"
-msgstr "Oznamovat"
+msgstr "Sledovat"
 
 #: html/index.php template/pkg_search_results.php
 msgid "UnNotify"
-msgstr "Neoznamovat"
+msgstr "Nesledovat"
 
 #: html/index.php
 msgid "UnFlag"
@@ -360,7 +363,7 @@ msgstr "Odznačit"
 
 #: html/login.php template/header.php
 msgid "Login"
-msgstr "Přihlásit"
+msgstr "Přihlášení"
 
 #: html/login.php html/tos.php
 #, php-format
@@ -373,11 +376,11 @@ msgstr "Odhlásit"
 
 #: html/login.php
 msgid "Enter login credentials"
-msgstr "Vložit přihlašovací údaje"
+msgstr "Zadejte přihlašovací údaje:"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "Uživatelské jméno nebo hlavní emailová adresa"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -385,7 +388,7 @@ msgstr "Heslo"
 
 #: html/login.php
 msgid "Remember me"
-msgstr "Pamatuj si mě"
+msgstr "Zapamatovat přihlášení"
 
 #: html/login.php
 msgid "Forgot Password"
@@ -408,7 +411,7 @@ msgstr "Balíčky"
 
 #: html/packages.php
 msgid "Error trying to retrieve package details."
-msgstr "Došlo k chybě při získávání detailů balíčku."
+msgstr "Při získávání informací o balíčku došlo k chybě."
 
 #: html/passreset.php lib/acctfuncs.inc.php
 msgid "Missing a required field."
@@ -416,7 +419,7 @@ msgstr "Chybí povinný údaj."
 
 #: html/passreset.php lib/acctfuncs.inc.php
 msgid "Password fields do not match."
-msgstr "Hesla se neshodují"
+msgstr "Hesla se neshodují."
 
 #: html/passreset.php lib/acctfuncs.inc.php
 #, php-format
@@ -441,7 +444,7 @@ msgstr "Heslo bylo úspěšně resetováno."
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "Potvrďte uživatelské jméno nebo hlavní emailovou adresu:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -460,21 +463,27 @@ msgstr "Pokračovat"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Pokud jste zapomněli, jaké uživatelské jméno nebo hlavní emailovou adresu jste při registraci použili, pošlete nám zprávu do poštovní konference %saur-general%s."
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "Zadejte uživatelské jméno nebo hlavní emailovou adresu:"
 
 #: html/pkgbase.php
 msgid "Package Bases"
-msgstr ""
+msgstr "Základní balíčky"
 
 #: html/pkgbase.php
 msgid ""
 "The selected packages have not been disowned, check the confirmation "
 "checkbox."
-msgstr ""
+msgstr "Zřeknutí se daných balíčků nebylo provedeno. Zřeknutí se je nutné potvrdit zaškrtnutím políčka."
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "Dané balíčky nebyly převzaty. Převzetí je nutné potvrdit zaškrtnutím políčka."
 
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
@@ -482,13 +491,13 @@ msgstr "Nelze najít balíček pro sloučení hlasů a komentářů."
 
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot merge a package base with itself."
-msgstr ""
+msgstr "Základní balíček není možné sloučit do sebe."
 
 #: html/pkgbase.php
 msgid ""
 "The selected packages have not been deleted, check the confirmation "
 "checkbox."
-msgstr ""
+msgstr "Dané balíčky nebyly smazány. Smazání je nutné potvrdit zaškrtnutím políčka."
 
 #: html/pkgdel.php
 msgid "Package Deletion"
@@ -503,7 +512,7 @@ msgstr "Smazat balíček"
 msgid ""
 "Use this form to delete the package base %s%s%s and the following packages "
 "from the AUR: "
-msgstr ""
+msgstr "Pomocí tohoto formuláře je možné z repozitáře AUR odstranit základní balíček  %s%s%s a tyto související balíčky:"
 
 #: html/pkgdel.php
 msgid "Deletion of a package is permanent. "
@@ -523,76 +532,84 @@ msgstr "Smazat"
 
 #: html/pkgdel.php
 msgid "Only Trusted Users and Developers can delete packages."
-msgstr ""
+msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou mazat balíčky."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
-msgstr ""
+msgstr "Zřeknout se balíčku"
 
 #: html/pkgdisown.php
 #, php-format
 msgid ""
 "Use this form to disown the package base %s%s%s which includes the following"
 " packages: "
-msgstr ""
+msgstr "Pomocí tohoto formuláře je možné zřeknout se základního balíčku %s%s%s, který obsahuje tyto další balíčky:"
 
 #: html/pkgdisown.php
 msgid ""
 "By selecting the checkbox, you confirm that you want to no longer be a "
 "package co-maintainer."
-msgstr ""
+msgstr "Zaškrtnutím potvrzujete, že již nadále nechte být spolusprávcem balíčku."
 
 #: html/pkgdisown.php
 #, php-format
 msgid ""
 "By selecting the checkbox, you confirm that you want to disown the package "
 "and transfer ownership to %s%s%s."
-msgstr ""
+msgstr "Zaškrtnutím potvrzujete, že se chcete zřeknout balíčku a předat ho uživateli %s%s%s."
 
 #: html/pkgdisown.php
 msgid ""
 "By selecting the checkbox, you confirm that you want to disown the package."
-msgstr ""
+msgstr "Zaškrtnutím potvrzujete, že se chcete zřeknout balíčku."
 
 #: html/pkgdisown.php
 msgid "Confirm to disown the package"
-msgstr ""
+msgstr "Potvrzuji, že se zříkám balíčku"
 
 #: html/pkgdisown.php
 msgid "Disown"
-msgstr ""
+msgstr "Odebrat vlastnictví"
 
 #: html/pkgdisown.php
 msgid "Only Trusted Users and Developers can disown packages."
-msgstr ""
+msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou odebrat vlastnictví balíčku."
 
 #: html/pkgflagcomment.php
 msgid "Flag Comment"
-msgstr ""
+msgstr "Označit komentář za nevhodný"
 
 #: html/pkgflag.php
 msgid "Flag Package Out-Of-Date"
-msgstr ""
+msgstr "Označit balíček za neaktuální"
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "Tento balíček je pravděpodobně typu VCS. Prosíme, %sneoznačujte ho%s za neaktuální jen kvůli tomu, že verze balíčku v repozitáři AUR neodpovídá nejnovějšímu commitu. Balíček by měl být označen za neaktuální pouze pokud došlo ke změně umístění zdroje nebo pokud je následkem změn v upstreamu nutná úprava souboru PKGBUILD."
 
 #: html/pkgflag.php
 #, php-format
 msgid ""
 "Use this form to flag the package base %s%s%s and the following packages "
 "out-of-date: "
-msgstr ""
+msgstr "Pomocí tohoto formuláře je možné označit základní balíček %s%s%s a další tyto balíčky za neaktuální:"
 
 #: html/pkgflag.php
 #, php-format
 msgid ""
 "Please do %snot%s use this form to report bugs. Use the package comments "
 "instead."
-msgstr ""
+msgstr "Tento formulář %sneslouží%s k hlášení chyb. O těch napište komentář k balíčku."
 
 #: html/pkgflag.php
 msgid ""
 "Enter details on why the package is out-of-date below, preferably including "
 "links to the release announcement or the new release tarball."
-msgstr ""
+msgstr "Uveďte, proč si myslíte, že je balíček neaktuální. Nejlépe přijdete i odkaz na oznámení o nové verzi nebo odkaz na zdrojový tarball."
 
 #: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
 #: template/pkgreq_results.php
@@ -605,11 +622,11 @@ msgstr "Označit"
 
 #: html/pkgflag.php
 msgid "Only registered users can flag packages out-of-date."
-msgstr ""
+msgstr "Pouze registrovaní uživatelé mohou označovat balíčky za neaktuální."
 
 #: html/pkgmerge.php
 msgid "Package Merging"
-msgstr "Spojení balíčku"
+msgstr "Sloučení balíčku"
 
 #: html/pkgmerge.php template/pkgbase_actions.php
 msgid "Merge Package"
@@ -618,19 +635,19 @@ msgstr "Sloučit balíček"
 #: html/pkgmerge.php
 #, php-format
 msgid "Use this form to merge the package base %s%s%s into another package. "
-msgstr ""
+msgstr "Pomocí tohoto formuláře je možné sloučit základní balíček %s%s%s do jiného balíčku."
 
 #: html/pkgmerge.php
 msgid "The following packages will be deleted: "
-msgstr "Následující balíkčy budou smazány:"
+msgstr "Následující balíčky budou smazány:"
 
 #: html/pkgmerge.php
 msgid "Once the package has been merged it cannot be reversed. "
-msgstr ""
+msgstr "Po sloučení již není možné tento úkon vrátit zpět."
 
 #: html/pkgmerge.php
 msgid "Enter the package name you wish to merge the package into. "
-msgstr ""
+msgstr "Zadejte název balíčku, do kterého chcete tento balíček sloučit."
 
 #: html/pkgmerge.php
 msgid "Merge into:"
@@ -646,7 +663,7 @@ msgstr "Spojit"
 
 #: html/pkgmerge.php
 msgid "Only Trusted Users and Developers can merge packages."
-msgstr ""
+msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou slučovat balíčky."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
@@ -678,29 +695,29 @@ msgstr "Žádosti"
 
 #: html/register.php template/header.php
 msgid "Register"
-msgstr "Registrovat"
+msgstr "Registrace"
 
 #: html/register.php
 msgid "Use this form to create an account."
-msgstr "Použíte tento formulář k založení účtu."
+msgstr "Tento formulář použijte k vytvoření účtu."
 
 #: html/tos.php
 msgid "Terms of Service"
-msgstr ""
+msgstr "Podmínky užívání"
 
 #: html/tos.php
 msgid ""
 "The following documents have been updated. Please review them carefully:"
-msgstr ""
+msgstr "Následující dokumenty byly aktualizovány. Pozorně si je prosím přečtěte:"
 
 #: html/tos.php
 #, php-format
 msgid "revision %d"
-msgstr ""
+msgstr "revize %d"
 
 #: html/tos.php
 msgid "I accept the terms and conditions above."
-msgstr ""
+msgstr "Souhlasím s výše uvedenými podmínkami."
 
 #: html/tu.php template/account_details.php template/header.php
 msgid "Trusted User"
@@ -708,7 +725,7 @@ msgstr "Důvěryhodný uživatel"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
-msgstr "Nelze obdržet navrhované detaily."
+msgstr "Načtení informací o návrhu se nezdařilo."
 
 #: html/tu.php
 msgid "Voting is closed for this proposal."
@@ -716,19 +733,19 @@ msgstr "Toto hlasování již skončilo."
 
 #: html/tu.php
 msgid "Only Trusted Users are allowed to vote."
-msgstr ""
+msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou hlasovat."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
-msgstr "Nemůžete volit sami pro sebe."
+msgstr "Hlasovat pro sebe se nesmí."
 
 #: html/tu.php
 msgid "You've already voted for this proposal."
-msgstr "Již jste hlasoval."
+msgstr "Pro tento návrh jsi již hlasoval/a."
 
 #: html/tu.php
 msgid "Vote ID not valid."
-msgstr "Nesprávné ID hlasování."
+msgstr "ID hlasování není platné."
 
 #: html/tu.php template/tu_list.php
 msgid "Current Votes"
@@ -750,11 +767,11 @@ msgstr "Registrace účtu byla pro vaši IP adresu zakázána, pravděpodobně k
 
 #: lib/acctfuncs.inc.php
 msgid "Missing User ID"
-msgstr "Chybějící Uživateské ID"
+msgstr "Chybí ID uživatele"
 
 #: lib/acctfuncs.inc.php
 msgid "The username is invalid."
-msgstr "Chybně zadané uživatelské jméno"
+msgstr "Uživatelské jméno není platné."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -771,15 +788,15 @@ msgstr "Může obsahovat pouze jednu tečku, podtržítko nebo spojovník."
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
-msgstr ""
+msgstr "Potvrďte své nové heslo:"
 
 #: lib/acctfuncs.inc.php
 msgid "The email address is invalid."
-msgstr "Vadná emailová adresa."
+msgstr "Emailová adresa není platná."
 
 #: lib/acctfuncs.inc.php
 msgid "The backup email address is invalid."
-msgstr ""
+msgstr "Záložní emailová adresa není platná."
 
 #: lib/acctfuncs.inc.php
 msgid "The home page is invalid, please specify the full HTTP(s) URL."
@@ -822,15 +839,15 @@ msgstr "Veřejný SSH klíč, %s%s%s, je již použit."
 
 #: lib/acctfuncs.inc.php
 msgid "The CAPTCHA is missing."
-msgstr ""
+msgstr "Chybí vyplněná CAPTCHA."
 
 #: lib/acctfuncs.inc.php
 msgid "This CAPTCHA has expired. Please try again."
-msgstr ""
+msgstr "Platnost CAPTCHA vypršela. Zkuste to znovu."
 
 #: lib/acctfuncs.inc.php
 msgid "The entered CAPTCHA answer is invalid."
-msgstr ""
+msgstr "Zadaná CAPTCHA není platná."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -848,7 +865,7 @@ msgstr "Na vaši e-mailovou adresu byl odeslán klíč pro obnovení hesla."
 
 #: lib/acctfuncs.inc.php
 msgid "Click on the Login link above to use your account."
-msgstr "Kliknutím na odkaz Přihlásit se výše použijte svůj účet."
+msgstr "Pro použití svého účtu klikněte na výše uvedený odkaz Přihlášení."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -864,12 +881,16 @@ msgstr "Účet, %s%s%s, byl úspěšně změněn."
 msgid ""
 "The login form is currently disabled for your IP address, probably due to "
 "sustained spam attacks. Sorry for the inconvenience."
-msgstr "Přihlašovací formulář je momentálně pro vaši IP adresu zakázán, pravděpodobně kvůli trvalým spamovým útokům. Omluvám se za nepříjemnost."
+msgstr "Přihlášení je momentálně pro vaši IP adresu zakázáno. Důvodem je nejspíše opakované zasílání spamu z této adresy. Za nepříjemnosti se omlouváme."
 
 #: lib/acctfuncs.inc.php
 msgid "Account suspended"
 msgstr "Účet pozastaven"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "Nemáte oprávnění k pozastavení účtů."
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -892,7 +913,7 @@ msgstr "Neplatná kombinace resetovacího klíče a e-mailu."
 
 #: lib/aur.inc.php template/pkg_details.php
 msgid "None"
-msgstr ""
+msgstr "Žádný"
 
 #: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
 #, php-format
@@ -901,7 +922,7 @@ msgstr "Zobrazení informací o účtu pro %s"
 
 #: lib/aurjson.class.php
 msgid "Package base ID or package base name missing."
-msgstr ""
+msgstr "Chybí ID nebo název základního balíčku."
 
 #: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to edit this comment."
@@ -921,11 +942,11 @@ msgstr "Komentář byl přidán"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can edit package information."
-msgstr "Musíte být přihlášeni, než budete moci upravovat informace o balíčcích."
+msgstr "Pro úpravu informací o balíčcích je nutné se přihlásit."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Missing comment ID."
-msgstr "Chybějící ID komentáře."
+msgstr "Chybí ID komentáře."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "No more than 5 comments can be pinned."
@@ -937,7 +958,7 @@ msgstr "Nemáte oprávnění připnout tento komentář."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to unpin this comment."
-msgstr "Nemáte oprávnění k odepnout tento komentář."
+msgstr "Nemáte oprávnění odepnout tento komentář."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been pinned."
@@ -949,39 +970,63 @@ msgstr "Zrušeno připnutí komentáře."
 
 #: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
 msgid "Error retrieving package details."
-msgstr "Došlo k chybě při získávání detailů o balíčku."
+msgstr "Načtení informací o balíčku se nezdařilo."
 
 #: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
 msgid "Package details could not be found."
-msgstr "Detailní informace o balíčku nejsou dostupné."
+msgstr "Informace o balíčku nebyly nalezeny."
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "Nevybrali jste žádné balíčky pro zapnutí oznámení."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "Oznámení pro vybrané balíčky byla zapnuta."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "Nevybrali jste žádné balíčky pro vypnutí oznámení."
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "Vybraný balíček nemá zapnutá oznámení."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "Oznámení pro vybrané balíčky byla vypnuta."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
-msgstr "Před nastavením příznaku balíčků se musíte přihlásit."
+msgstr "Před označením balíčku se musíte přihlásit."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to flag."
-msgstr "Nezvolili jste žádný balíček k označení."
+msgstr "Nebyly vybrány žádné balíčky k označení."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have not been flagged, please enter a comment."
-msgstr ""
+msgstr "Vybrané balíčky nebyly označeny. Zadejte komentář."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been flagged out-of-date."
-msgstr "Zvoleným balíčkům byl nastaven příznak zastaralé."
+msgstr "Vybrané balíčky byly označeny za neaktuální."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can unflag packages."
-msgstr "Musíte být příhlášeni, abyste mohli odznačit balíčky."
+msgstr "Před zrušením označení se musíte přihlásit."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to unflag."
-msgstr "Nevybrali jste žádne balíčky k odebrání příznaku."
+msgstr "Nevybrali jste žádné balíčky, jejichž označení chcete zrušit."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been unflagged."
-msgstr "Zvoleným bálíčkům bylo odebráno označení."
+msgstr "Označení vybraných balíčků bylo zrušeno."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You do not have permission to delete packages."
@@ -989,69 +1034,81 @@ msgstr "Nemáte oprávnění k odstranění balíčků."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to delete."
-msgstr "Nevybrali jste žádné balíčky ke smazání."
+msgstr "Nebyly vybrány žádné balíčky ke smazání."
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "Některý z vybraných balíčků neexistuje."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
-msgstr "Zvolené balíčky byly smazány."
+msgstr "Vybrané balíčky byly smazány."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can adopt packages."
-msgstr "Musíte být přihlášeni, než si budete moci osvojit balíčky."
+msgstr "Pro převzetí balíčku je nutné se přihlásit."
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "Nemáte oprávnění převzít některý z vybraných balíčků."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
-msgstr "Musíte být přihlášeni, pro odebrání vlastnictví u svých balíčků."
+msgstr "Pro odebrání vlastnictví balíčku je nutné se přihlásit."
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "Nemáte oprávnění zřeknout se některého z vybraných balíčků."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
-msgstr "Nevybrali jste žádný balíček k osvojení."
+msgstr "Nevybrali jste žádný balíček k převzetí."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to disown."
-msgstr "Nevybrali jste žádný balíček pro odebrání vlastnictví."
+msgstr "Nebyl vybrán žádný balíček k odebrání vlastnictví."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been adopted."
-msgstr "Zvolené balíčky byly osvojeny."
+msgstr "Vybrané balíčky byly převzaty."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been disowned."
-msgstr "Vybraným balíčkům bylo odebráno vlastnictví."
+msgstr "Vlastnictví vybraných balíčků bylo odebráno."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can vote for packages."
-msgstr "Před hlasováním se musíte přihlásit."
+msgstr "Pro hlasování pro balíček je nutné se přihlásit."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can un-vote for packages."
-msgstr "Musíte být přihlášeni, než budete moci odebrat hlasování pro balíčky."
+msgstr "Pro odebrání hlasu balíčku je nutné se přihlásit."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to vote for."
-msgstr "Nezvolili jste žádné balíčky k hlasování."
+msgstr "Nebyly vybrány žádné balíčky pro hlasování."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Your votes have been removed from the selected packages."
-msgstr "Vaše hlasování bylo odebráno vybraným balíčkům."
+msgstr "Vybraným balíčkům byl odebrán hlas."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Your votes have been cast for the selected packages."
-msgstr "Vaše hlasování bylo započteno pro vybrané balíčky."
+msgstr "Vybraným balíčkům byl přidán hlas."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Couldn't add to notification list."
-msgstr "Nelze přidat do seznamu upozornění."
+msgstr "Nelze přidat do seznamu uživatelů k obeznámení."
 
 #: lib/pkgbasefuncs.inc.php
 #, php-format
 msgid "You have been added to the comment notification list for %s."
-msgstr "Byly jste přidáni do seznamu oznámení ohledně %s."
+msgstr "Byly jste přidáni do seznamu uživatelů k obeznámení o balíčku %s."
 
 #: lib/pkgbasefuncs.inc.php
 #, php-format
 msgid "You have been removed from the comment notification list for %s."
-msgstr "Byli jste odebrání ze seznamu upozornění ohledně %s."
+msgstr "Byli jste odebráni ze seznamu uživatelů k obeznámení o balíčku %s."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to undelete this comment."
@@ -1063,7 +1120,7 @@ msgstr "Komentář byl obnoven."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to delete this comment."
-msgstr "Nemáte oprávnění pro smazání tohoto komentáře."
+msgstr "Pro smazání tohoto komentáře nemáte oprávnění."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been deleted."
@@ -1079,11 +1136,11 @@ msgstr "Nemáte oprávnění upravit klíčová slova tohoto balíčku."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The package base keywords have been updated."
-msgstr ""
+msgstr "Klíčová slova základního balíčku byla aktualizována."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to manage co-maintainers of this package base."
-msgstr ""
+msgstr "Nemáte oprávnění spravovat spolusprávce tohoto balíčku."
 
 #: lib/pkgbasefuncs.inc.php
 #, php-format
@@ -1092,7 +1149,7 @@ msgstr "Neplatné uživatelské jméno: %s"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The package base co-maintainers have been updated."
-msgstr ""
+msgstr "Spolusprávci základního balíčku byli aktualizováni."
 
 #: lib/pkgfuncs.inc.php template/pkgbase_details.php
 msgid "View packages details for"
@@ -1105,11 +1162,11 @@ msgstr "vyžaduje %s"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "You must be logged in to file package requests."
-msgstr ""
+msgstr "Před podáním žádosti se musíte přihlásit."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid name: only lowercase letters are allowed."
-msgstr "Chybný název: jsou povolena pouze malá písmena."
+msgstr "Neplatný název: jsou povolena pouze malá písmena."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "The comment field must not be empty."
@@ -1129,7 +1186,7 @@ msgstr "Neplatný důvod."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Only TUs and developers can close requests."
-msgstr ""
+msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou zavírat žádosti."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Request closed successfully."
@@ -1138,7 +1195,7 @@ msgstr "Žádost byla úspěšně uzavřena."
 #: template/account_delete.php
 #, php-format
 msgid "You can use this form to permanently delete the AUR account %s."
-msgstr "Tento formulář můžete použít k trvalému odstranění účtu AUR %s."
+msgstr "Tento formulář můžete použít k trvalému odstranění účtu repozitáře AUR %s."
 
 #: template/account_delete.php
 #, php-format
@@ -1195,7 +1252,7 @@ msgstr "Domovská stránka"
 #: template/account_details.php template/account_edit_form.php
 #: template/account_search_results.php template/search_accounts_form.php
 msgid "IRC Nick"
-msgstr "IRC přezdívka"
+msgstr "Přezdívka na IRC"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/account_search_results.php
@@ -1205,7 +1262,7 @@ msgstr "Otisk klíče PGP"
 #: template/account_details.php template/account_search_results.php
 #: template/pkgreq_results.php
 msgid "Status"
-msgstr "Status"
+msgstr "Stav"
 
 #: template/account_details.php
 msgid "Inactive since"
@@ -1243,36 +1300,36 @@ msgstr "Upravit tento uživatelský účet"
 
 #: template/account_details.php
 msgid "List this user's comments"
-msgstr ""
+msgstr "Zobrazit komentáře tohoto uživatele"
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s if you want to permanently delete this account."
-msgstr ""
+msgstr "Pokud chcete trvale smazat tento účet, klikněte %szde%s."
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s for user details."
-msgstr ""
+msgstr "Podrobnosti o uživateli naleznete %szde%s."
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s to list the comments made by this account."
-msgstr ""
+msgstr "Komentáře tohoto účtu naleznete %szde%s."
 
 #: template/account_edit_form.php
 msgid "required"
-msgstr "vyžadováno"
+msgstr "povinný údaj"
 
 #: template/account_edit_form.php
 msgid ""
 "Your user name is the name you will use to login. It is visible to the "
 "general public, even if your account is inactive."
-msgstr ""
+msgstr "Vaše uživatelské jméno je vaše přihlašovací jméno. Je veřejně viditelné i v případě neaktivního účtu."
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Normal user"
-msgstr "Obyčejný uživatel"
+msgstr "Běžný uživatel"
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Trusted user"
@@ -1301,30 +1358,30 @@ msgid ""
 "If you do not hide your email address, it is visible to all registered AUR "
 "users. If you hide your email address, it is visible to members of the Arch "
 "Linux staff only."
-msgstr ""
+msgstr "Pokud svou emailovou adresu neskryjete, bude viditelná všem registrovaným uživatelům repozitáře AUR. Skrytá emailová adresa je viditelná pouze správcům systému Arch Linux."
 
 #: template/account_edit_form.php
 msgid "Backup Email Address"
-msgstr ""
+msgstr "Záložní emailová adresa"
 
 #: template/account_edit_form.php
 msgid ""
 "Optionally provide a secondary email address that can be used to restore "
 "your account in case you lose access to your primary email address."
-msgstr ""
+msgstr "Volitelná záložní adresa, pomocí které je možné obnovit přístup k účtu do repozitáře AUR i bez přístupu k hlavní emailové adrese."
 
 #: template/account_edit_form.php
 msgid ""
 "Password reset links are always sent to both your primary and your backup "
 "email address."
-msgstr ""
+msgstr "Odkazy na obnovení hesla jsou vždy zasílány na hlavní i záložní emailovou adresu."
 
 #: template/account_edit_form.php
 #, php-format
 msgid ""
 "Your backup email address is always only visible to members of the Arch "
 "Linux staff, independent of the %s setting."
-msgstr ""
+msgstr "Záložní emailová adresa je vždy viditelná jen správcům systému Arch Linux, bez ohledu na nastavení %s."
 
 #: template/account_edit_form.php
 msgid "Language"
@@ -1338,7 +1395,7 @@ msgstr "Časové pásmo"
 msgid ""
 "If you want to change the password, enter a new password and confirm the new"
 " password by entering it again."
-msgstr ""
+msgstr "Pokud chcete své heslo změnit, zadejte nové heslo a pak nové heslo ještě jednou pro potvrzení."
 
 #: template/account_edit_form.php
 msgid "Re-type password"
@@ -1348,7 +1405,7 @@ msgstr "Heslo znovu"
 msgid ""
 "The following information is only required if you want to submit packages to"
 " the Arch User Repository."
-msgstr "Následující informace jsou požadovány pouze v případě, že chcete odeslat balíčky do Arch User Repository."
+msgstr "Následující informace jsou požadovány pouze v případě, že máte v plánu do uživatelského repozitáře systému Arch Linux přidávat balíčky."
 
 #: template/account_edit_form.php
 msgid "SSH Public Key"
@@ -1356,7 +1413,7 @@ msgstr "Veřejný SSH klíč"
 
 #: template/account_edit_form.php
 msgid "Notification settings"
-msgstr "Nastavení upozornění"
+msgstr "Nastavení oznámení"
 
 #: template/account_edit_form.php
 msgid "Notify of new comments"
@@ -1364,29 +1421,29 @@ msgstr "Oznamovat nové komentáře"
 
 #: template/account_edit_form.php
 msgid "Notify of package updates"
-msgstr "Oznámení o aktualizacích balíčku"
+msgstr "Oznamovat aktualizace balíčků"
 
 #: template/account_edit_form.php
 msgid "Notify of ownership changes"
-msgstr "Oznámit změnu vlastnictví"
+msgstr "Oznamovat změny vlastnictví"
 
 #: template/account_edit_form.php
 msgid "To confirm the profile changes, please enter your current password:"
-msgstr ""
+msgstr "Pro potvrzení změn profilu zadejte své aktuální heslo:"
 
 #: template/account_edit_form.php
 msgid "Your current password"
-msgstr ""
+msgstr "Vaše aktuální heslo:"
 
 #: template/account_edit_form.php
 msgid ""
 "To protect the AUR against automated account creation, we kindly ask you to "
 "provide the output of the following command:"
-msgstr ""
+msgstr "Abychom zamezili automatizované tvorbě účtů v repozitáři AUR, laskavě žádáme uživatele, aby zadali výstup z následujícího příkazu:"
 
 #: template/account_edit_form.php
 msgid "Answer"
-msgstr ""
+msgstr "Odpovědět"
 
 #: template/account_edit_form.php template/pkgbase_details.php
 #: template/pkg_details.php
@@ -1403,7 +1460,7 @@ msgstr "Reset"
 
 #: template/account_search_results.php
 msgid "No results matched your search criteria."
-msgstr "Pro Váš dotaz nebyl nalezen žádný odpovídající výsledek."
+msgstr "Zadaným kritériím neodpovídají žádné výsledky."
 
 #: template/account_search_results.php
 msgid "Edit Account"
@@ -1433,7 +1490,7 @@ msgstr "Žádné další výsledky."
 #, php-format
 msgid ""
 "Use this form to add co-maintainers for %s%s%s (one user name per line):"
-msgstr ""
+msgstr "Pomocí tohoto formuláře je možné přidat spolusprávce pro %s%s%s (jedno uživatelské jméno na řádek):"
 
 #: template/comaintainers_form.php
 msgid "Users"
@@ -1446,21 +1503,21 @@ msgstr "Uložit"
 #: template/flag_comment.php
 #, php-format
 msgid "Flagged Out-of-Date Comment: %s"
-msgstr ""
+msgstr "Komentář k označení za neaktuální: %s"
 
 #: template/flag_comment.php
 #, php-format
 msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
-msgstr ""
+msgstr "Uživatel %s%s%s označil balíček %s%s%s za neaktuální dne %s%s%s z následujícího důvodu:"
 
 #: template/flag_comment.php
 #, php-format
 msgid "%s%s%s is not flagged out-of-date."
-msgstr ""
+msgstr "Balíček %s%s%s nebyl označen za neaktuální."
 
 #: template/flag_comment.php
 msgid "Return to Details"
-msgstr ""
+msgstr "Zpět na podrobnosti balíčku"
 
 #: template/footer.php
 #, php-format
@@ -1473,7 +1530,7 @@ msgstr "Můj účet"
 
 #: template/pkgbase_actions.php
 msgid "Package Actions"
-msgstr "Dostupné akce pro balíček"
+msgstr "Akce balíčku"
 
 #: template/pkgbase_actions.php
 msgid "View PKGBUILD"
@@ -1494,11 +1551,11 @@ msgstr "Prohledat wiki"
 #: template/pkgbase_actions.php
 #, php-format
 msgid "Flagged out-of-date (%s)"
-msgstr ""
+msgstr "Označeno za neaktuální (%s)"
 
 #: template/pkgbase_actions.php
 msgid "Flag package out-of-date"
-msgstr "Označit balíček jako zastaralý"
+msgstr "Označit balíček za neaktuální"
 
 #: template/pkgbase_actions.php
 msgid "Unflag package"
@@ -1522,28 +1579,28 @@ msgstr "Zapnout oznámení"
 
 #: template/pkgbase_actions.php
 msgid "Manage Co-Maintainers"
-msgstr ""
+msgstr "Spravovat spolusprávce"
 
 #: template/pkgbase_actions.php
 #, php-format
 msgid "%d pending request"
 msgid_plural "%d pending requests"
-msgstr[0] "%d čekající požadavek"
+msgstr[0] "%d žádost na vyřízení"
 msgstr[1] "%d čekající požadavky"
-msgstr[2] "%d čekajících žádostí"
-msgstr[3] "%d čekajících žádostí"
+msgstr[2] "%d žádostí na vyřízení"
+msgstr[3] "%d žádostí na vyřízení"
 
 #: template/pkgbase_actions.php
 msgid "Adopt Package"
-msgstr "Adoptovat balíček"
+msgstr "Převzít balíček"
 
 #: template/pkgbase_details.php
 msgid "Package Base Details"
-msgstr ""
+msgstr "Informace o základním balíčku"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "Git Clone URL"
-msgstr ""
+msgstr "URL pro příkaz git clone"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "read-only"
@@ -1551,7 +1608,7 @@ msgstr "jen pro čtení"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "click to copy"
-msgstr ""
+msgstr "kliknutím zkopírujete"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
@@ -1561,7 +1618,7 @@ msgstr "Klíčová slova"
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
 msgid "Submitter"
-msgstr ""
+msgstr "Vytvořil"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php template/pkg_search_results.php
@@ -1570,7 +1627,7 @@ msgstr "Správce"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "Last Packager"
-msgstr ""
+msgstr "Naposledy zabalil"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php template/pkg_search_results.php
@@ -1584,7 +1641,7 @@ msgstr "Popularita"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "First Submitted"
-msgstr "Poprvé vložen"
+msgstr "Poprvé vytvořil"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "Last Updated"
@@ -1593,7 +1650,7 @@ msgstr "Naposledy aktualizováno"
 #: template/pkg_comment_box.php
 #, php-format
 msgid "Edit comment for: %s"
-msgstr ""
+msgstr "Upravit komentář pro: %s"
 
 #: template/pkg_comment_box.php template/pkg_comment_form.php
 msgid "Add Comment"
@@ -1603,12 +1660,12 @@ msgstr "Přidat komentář"
 msgid ""
 "Git commit identifiers referencing commits in the AUR package repository and"
 " URLs are converted to links automatically."
-msgstr ""
+msgstr "Identifikátory git commitů v repozitáři AUR a URL jsou automaticky převáděny na klikatelné odkazy."
 
 #: template/pkg_comment_form.php
 #, php-format
 msgid "%sMarkdown syntax%s is partially supported."
-msgstr ""
+msgstr "Značkovací %ssyntaxe Markdown%s je částěčně podporována."
 
 #: template/pkg_comments.php
 msgid "Pinned Comments"
@@ -1620,7 +1677,7 @@ msgstr "Nejnovější komentáře"
 
 #: template/pkg_comments.php
 msgid "Comments for"
-msgstr ""
+msgstr "Komentáře uživatele"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1630,22 +1687,22 @@ msgstr "%s přidal komentář %s"
 #: template/pkg_comments.php
 #, php-format
 msgid "Anonymous comment on %s"
-msgstr ""
+msgstr "Anonymní komentář dne %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "Commented on package %s on %s"
-msgstr ""
+msgstr "Okomentoval balíček %s dne %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "deleted on %s by %s"
-msgstr ""
+msgstr "smazáno dne %s uživatelem %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "deleted on %s"
-msgstr ""
+msgstr "smazáno dne %s"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1659,7 +1716,7 @@ msgstr "upraveno %s"
 
 #: template/pkg_comments.php
 msgid "Undelete comment"
-msgstr ""
+msgstr "Zrušit smazání komentáře"
 
 #: template/pkg_comments.php
 msgid "Delete comment"
@@ -1675,11 +1732,11 @@ msgstr "Odepnout komentář"
 
 #: template/pkg_details.php
 msgid "Package Details"
-msgstr "Detaily balíčku"
+msgstr "Informace o balíčku"
 
 #: template/pkg_details.php template/pkg_search_form.php
 msgid "Package Base"
-msgstr ""
+msgstr "Základní balíček"
 
 #: template/pkg_details.php template/pkg_search_results.php
 msgid "Description"
@@ -1687,11 +1744,11 @@ msgstr "Popis"
 
 #: template/pkg_details.php
 msgid "Upstream URL"
-msgstr ""
+msgstr "URL pro upstream"
 
 #: template/pkg_details.php
 msgid "Visit the website for"
-msgstr ""
+msgstr "Navštívit web pro"
 
 #: template/pkg_details.php
 msgid "Licenses"
@@ -1715,11 +1772,11 @@ msgstr "Nahrazuje"
 
 #: template/pkg_details.php
 msgid "Dependencies"
-msgstr "Závislosti"
+msgstr "Vyžadované balíčky"
 
 #: template/pkg_details.php
 msgid "Required by"
-msgstr "Vyžadováno"
+msgstr "Vyžadováno balíčky"
 
 #: template/pkg_details.php
 msgid "Sources"
@@ -1728,13 +1785,13 @@ msgstr "Zdroje"
 #: template/pkgreq_close_form.php
 #, php-format
 msgid "Use this form to close the request for package base %s%s%s."
-msgstr ""
+msgstr "Pomocí tohoto formuláře je možné zavřít požadavek pro základní balíček %s%s%s."
 
 #: template/pkgreq_close_form.php
 msgid ""
 "The comments field can be left empty. However, it is highly recommended to "
 "add a comment when rejecting a request."
-msgstr ""
+msgstr "Pole pro komentáře může být prázdné. Silně se však doporučuje nějaký komentář přidat, pokud požadavek odmítáte."
 
 #: template/pkgreq_close_form.php
 msgid "Reason"
@@ -1755,7 +1812,7 @@ msgstr "Zamítnuto"
 msgid ""
 "Use this form to file a request against package base %s%s%s which includes "
 "the following packages:"
-msgstr ""
+msgstr "Pomocí tohoto formuláře je možné vytvořit požadavek pro základní balíček %s%s%s, který obsahuje tyto další balíčky:"
 
 #: template/pkgreq_form.php
 msgid "Request type"
@@ -1767,18 +1824,18 @@ msgstr "Smazání"
 
 #: template/pkgreq_form.php
 msgid "Orphan"
-msgstr "Sirotek"
+msgstr "Odebrání vlastnictví"
 
 #: template/pkgreq_form.php template/pkg_search_results.php
 msgid "Merge into"
-msgstr "Sloučit do"
+msgstr "Sloučení"
 
 #: template/pkgreq_form.php
 msgid ""
 "By submitting a deletion request, you ask a Trusted User to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr ""
+msgstr "Vytvořením žádosti o smazání žádáte důvěryhodného uživatele, aby smazal základní balíček. Tento typ požadavku by se měl používat pro duplicitní balíčky, software, který již v upstreamu neexistuje, nebo v případě nelegálních či nezvratně rozbitých balíčků."
 
 #: template/pkgreq_form.php
 msgid ""
@@ -1786,7 +1843,7 @@ msgid ""
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr ""
+msgstr "Vytvořením žádosti o sloučení žádáte důvěryhodného uživatele, aby smazal základní balíček a přesunul s ním spojené hlasy a komentáře do jiného balíčku. Sloučení balíčku nemá vliv na související repozitáře Git. Aktualizace Git historie cílového balíčku je na vás."
 
 #: template/pkgreq_form.php
 msgid ""
@@ -1794,7 +1851,7 @@ msgid ""
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr ""
+msgstr "Vytvořením žádosti o odebrání vlastnictví žádáte důvěryhodného uživatele, aby odebral vlastnictví aktuálnímu správci základního balíčku. Tento požadavek používejte jen v případě, že balíček potřebuje zásah správce, správce není k zastižení a již jste se správce pokusili v minulosti kontaktovat."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
@@ -1804,10 +1861,10 @@ msgstr "Žádné žádosti neodpovídaly vašim kritériím vyhledávání."
 #, php-format
 msgid "%d package request found."
 msgid_plural "%d package requests found."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Byl nalezen %d požadavek na balíček."
+msgstr[1] "Byly nalezeny %d požadavky na balíček."
+msgstr[2] "Bylo nalezeno %d požadavků na balíček."
+msgstr[3] "Bylo nalezeno %d požadavků na balíček."
 
 #: template/pkgreq_results.php template/pkg_search_results.php
 #, php-format
@@ -1820,7 +1877,7 @@ msgstr "Balíček"
 
 #: template/pkgreq_results.php
 msgid "Filed by"
-msgstr ""
+msgstr "Zadal"
 
 #: template/pkgreq_results.php
 msgid "Date"
@@ -1830,23 +1887,23 @@ msgstr "Datum"
 #, php-format
 msgid "~%d day left"
 msgid_plural "~%d days left"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Zbývá asi %dden"
+msgstr[1] "Zbývají asi %d dny"
+msgstr[2] "Zbývá asi %d dní"
+msgstr[3] "Zbývá asi %d dní"
 
 #: template/pkgreq_results.php
 #, php-format
 msgid "~%d hour left"
 msgid_plural "~%d hours left"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Zbývá asi %d hodina"
+msgstr[1] "Zbývají asi %d hodiny"
+msgstr[2] "Zbývá asi %d hodin"
+msgstr[3] "Zbývá asi %d hodin"
 
 #: template/pkgreq_results.php
 msgid "<1 hour left"
-msgstr ""
+msgstr "Zbývá méně než 1 hodina"
 
 #: template/pkgreq_results.php
 msgid "Accept"
@@ -1862,7 +1919,7 @@ msgstr "Uzavřít"
 
 #: template/pkgreq_results.php
 msgid "Pending"
-msgstr ""
+msgstr "Čeká na vyřízení"
 
 #: template/pkgreq_results.php
 msgid "Closed"
@@ -1882,15 +1939,15 @@ msgstr "Přesné jméno"
 
 #: template/pkg_search_form.php
 msgid "Exact Package Base"
-msgstr ""
+msgstr "Přesný název základního balíčku"
 
 #: template/pkg_search_form.php
 msgid "Co-maintainer"
-msgstr ""
+msgstr "Spolusprávce"
 
 #: template/pkg_search_form.php
 msgid "Maintainer, Co-maintainer"
-msgstr ""
+msgstr "Správce, spolusprávce"
 
 #: template/pkg_search_form.php
 msgid "All"
@@ -1911,7 +1968,7 @@ msgstr "Název"
 #: template/pkg_search_form.php template/pkg_search_results.php
 #: template/tu_details.php template/tu_list.php
 msgid "Voted"
-msgstr "Hlasováno"
+msgstr "Hlasoval/a jsem"
 
 #: template/pkg_search_form.php
 msgid "Last modified"
@@ -1935,11 +1992,11 @@ msgstr "Vyhledat dle"
 
 #: template/pkg_search_form.php template/stats/user_table.php
 msgid "Out of Date"
-msgstr "Zastaralé"
+msgstr "Neaktuální"
 
 #: template/pkg_search_form.php template/search_accounts_form.php
 msgid "Sort by"
-msgstr "Seřadit dle"
+msgstr "Řadit dle"
 
 #: template/pkg_search_form.php
 msgid "Sort order"
@@ -1947,23 +2004,23 @@ msgstr "Řadit"
 
 #: template/pkg_search_form.php
 msgid "Per page"
-msgstr "Na jedné stránce"
+msgstr "Výsledků na stránku"
 
 #: template/pkg_search_form.php template/pkg_search_results.php
 msgid "Go"
-msgstr "Jdi"
+msgstr "Hledat"
 
 #: template/pkg_search_form.php
 msgid "Orphans"
-msgstr "Sirotci"
+msgstr "Bez vlastníka"
 
 #: template/pkg_search_results.php
 msgid "Error retrieving package list."
-msgstr "Chyba při získávání seznamu balíčků."
+msgstr "Načtení seznamu balíčků se nezdařilo."
 
 #: template/pkg_search_results.php
 msgid "No packages matched your search criteria."
-msgstr "Žádný balíček neodpovídá zadaným kritériím."
+msgstr "Zadaným kritériím neodpovídá žádný balíček."
 
 #: template/pkg_search_results.php
 #, php-format
@@ -1992,7 +2049,7 @@ msgstr "Ano"
 
 #: template/pkg_search_results.php
 msgid "orphan"
-msgstr "sirotek"
+msgstr "bez vlastníka"
 
 #: template/pkg_search_results.php
 msgid "Actions"
@@ -2000,15 +2057,15 @@ msgstr "Akce"
 
 #: template/pkg_search_results.php
 msgid "Unflag Out-of-date"
-msgstr "Odebrat příznak zastaralý"
+msgstr "Zrušit označení za neaktuální"
 
 #: template/pkg_search_results.php
 msgid "Adopt Packages"
-msgstr "Osvojit balíček"
+msgstr "Převzít balíčky"
 
 #: template/pkg_search_results.php
 msgid "Disown Packages"
-msgstr "Odebrat vlastnictví"
+msgstr "Zřeknout se balíčků"
 
 #: template/pkg_search_results.php
 msgid "Delete Packages"
@@ -2032,31 +2089,31 @@ msgstr "Statistiky"
 
 #: template/stats/general_stats_table.php
 msgid "Orphan Packages"
-msgstr "Balíčků bez správce"
+msgstr "Bez vlastníka"
 
 #: template/stats/general_stats_table.php
 msgid "Packages added in the past 7 days"
-msgstr "Přidaných balíčků za posledních 7 dní"
+msgstr "Přidáno (poslední týden)"
 
 #: template/stats/general_stats_table.php
 msgid "Packages updated in the past 7 days"
-msgstr "Aktualizovaných balíčků za posledních 7 dní"
+msgstr "Aktualizováno (poslední týden)"
 
 #: template/stats/general_stats_table.php
 msgid "Packages updated in the past year"
-msgstr "Aktualizovaných balíčků v posledním roce"
+msgstr "Aktualizováno (poslední rok)"
 
 #: template/stats/general_stats_table.php
 msgid "Packages never updated"
-msgstr "Balíčků, které nebyly nikdy aktualizovány"
+msgstr "Nikdy neaktualizováno"
 
 #: template/stats/general_stats_table.php
 msgid "Registered Users"
-msgstr "Registrovaných uživatelů"
+msgstr "Registrovaní uživatelé"
 
 #: template/stats/general_stats_table.php
 msgid "Trusted Users"
-msgstr "Důvěryhodných uživatelů"
+msgstr "Důvěryhodní uživatelé"
 
 #: template/stats/updates_table.php
 msgid "Recent Updates"
@@ -2072,7 +2129,7 @@ msgstr "Moje statistiky"
 
 #: template/tu_details.php
 msgid "Proposal Details"
-msgstr "Detaily návrhu"
+msgstr "Informace o návrhu"
 
 #: template/tu_details.php
 msgid "This vote is still running."
@@ -2081,7 +2138,7 @@ msgstr "Hlasování stále probíhá."
 #: template/tu_details.php
 #, php-format
 msgid "Submitted: %s by %s"
-msgstr "Vloženo: %s od %s"
+msgstr "Vytvořeno: %s od %s"
 
 #: template/tu_details.php template/tu_list.php
 msgid "End"
@@ -2109,7 +2166,7 @@ msgstr "Účast"
 
 #: template/tu_last_votes_list.php
 msgid "Last Votes by TU"
-msgstr ""
+msgstr "Poslední hlasy důvěryhodného uživatele"
 
 #: template/tu_last_votes_list.php
 msgid "Last vote"
@@ -2117,7 +2174,7 @@ msgstr "Naposledy hlasováno"
 
 #: template/tu_last_votes_list.php template/tu_list.php
 msgid "No results found."
-msgstr "Žádné výsledky."
+msgstr "Nebyly nalezeny žádné výsledky."
 
 #: template/tu_list.php
 msgid "Start"
@@ -2129,7 +2186,7 @@ msgstr "Zpět"
 
 #: scripts/notify.py
 msgid "AUR Password Reset"
-msgstr ""
+msgstr "Obnovení hesla k účtu repozitáře AUR"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2137,90 +2194,90 @@ msgid ""
 "A password reset request was submitted for the account {user} associated "
 "with your email address. If you wish to reset your password follow the link "
 "[1] below, otherwise ignore this message and nothing will happen."
-msgstr ""
+msgstr "Obdrželi jsme žádost o obnovení hesla k účtu {user}, který je spojen s touto emailovou adresou. Pokud chcete heslo obnovit, použijte níže uvedený odkaz [1]. V opačném případě tuto zprávu ignorujte a ke žádné změně nedojde."
 
 #: scripts/notify.py
 msgid "Welcome to the Arch User Repository"
-msgstr ""
+msgstr "Vítejte v repozitáři AUR, uživatelském repozitáři systému Arch Linux"
 
 #: scripts/notify.py
 msgid ""
 "Welcome to the Arch User Repository! In order to set an initial password for"
 " your new account, please click the link [1] below. If the link does not "
 "work, try copying and pasting it into your browser."
-msgstr ""
+msgstr "Vítejte v uživatelském repozitáři systému Arch Linux! Pro nastavení počátečního heslo nového účtu použijte níže uvedený odkaz [1]. Pokud odkaz nefunguje, zkuste ho zkopírovat a vložit prohlížeče."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Comment for {pkgbase}"
-msgstr ""
+msgstr "Komentář na webu AUR u balíčku {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] added the following comment to {pkgbase} [2]:"
-msgstr ""
+msgstr "Uživatel {user} [1] přidal k balíčku {pkgbase} [2] následující komentář:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "If you no longer wish to receive notifications about this package, please go"
 " to the package page [2] and select \"{label}\"."
-msgstr ""
+msgstr "Pokud již nechcete dostávat oznámení související s tímto balíčkem, na stránce balíčku [2] vyberte možnost \"{label}\"."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package Update: {pkgbase}"
-msgstr ""
+msgstr "Aktualizace balíčku na webu AUR: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
-msgstr ""
+msgstr "Uživatel {user} [1] provedl aktualizaci balíčku {pkgbase} [2]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Out-of-date Notification for {pkgbase}"
-msgstr ""
+msgstr "Oznámení o neaktuálním stavu balíčku {pkgbase} na webu AUR"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
-msgstr ""
+msgstr "Váš balíček {pkgbase} [1] byl uživatel {user} [2] označen za neaktuální:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Ownership Notification for {pkgbase}"
-msgstr ""
+msgstr "Oznámení o změně vlastnictví balíčku {pkgbase} na webu AUR"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was adopted by {user} [2]."
-msgstr ""
+msgstr "Balíček {pkgbase} [1] byl převzat uživatelem {user} [2]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was disowned by {user} [2]."
-msgstr ""
+msgstr "Uživatel {user} [2] se zřekl balíčku {pkgbase} [1] a tento balíček je tak nyní bez vlastníka."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Co-Maintainer Notification for {pkgbase}"
-msgstr ""
+msgstr "Oznámení o spolusprávě balíčku {pkgbase} na webu AUR"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were added to the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "Byli jste přidáni jako spolusprávce balíčku {pkgbase} [1]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "Byli jste odebráni ze seznamu spolusprávců balíčku {pkgbase} [1]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package deleted: {pkgbase}"
-msgstr ""
+msgstr "Smazání balíčku {pkgbase} na webu AUR"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2229,7 +2286,7 @@ msgid ""
 "\n"
 "-- \n"
 "If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
-msgstr ""
+msgstr "Uživatel {user} [1] sloučil balíček {old} [2] do balíčku {new} [3].\n\n-- \nPokud již nechcete dostávat oznámení související s tímto balíčkem, na stránce balíčku [3] vyberte možnost \"{label}\"."
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2237,16 +2294,61 @@ msgid ""
 "{user} [1] deleted {pkgbase} [2].\n"
 "\n"
 "You will no longer receive notifications about this package."
-msgstr ""
+msgstr "Uživatel {user} [1] smazal balíček {pkgbase} [2].\n\nNadále již nebude dostávat oznámení související s tímto balíčkem."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "TU Vote Reminder: Proposal {id}"
-msgstr ""
+msgstr "Připomínka k hlasování důvěryhodných uživatelů: návrh {id}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
+msgstr "Nezapomeňte prosím hlasovat o návrhu {id} [1]. Hlasování končí za méně než 48 hodin."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "Poskytnutý typ účtu je neplatný."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "Nemáte oprávnění ke změnám typů účtů."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "Pro změnu typu tohoto účtu na %s nemáte oprávnění."
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
 msgstr ""
diff --git a/po/da.po b/po/da.po
index b78fc785..a6f290ea 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Danish (http://www.transifex.com/lfleischer/aurweb/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -473,6 +473,12 @@ msgid ""
 "checkbox."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr ""
@@ -571,6 +577,14 @@ msgstr ""
 msgid "Flag Package Out-Of-Date"
 msgstr ""
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -867,6 +881,10 @@ msgstr ""
 msgid "Account suspended"
 msgstr "Konto suspenderet"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -952,6 +970,30 @@ msgstr "Fejl ved modtagelse af pakkedetaljer."
 msgid "Package details could not be found."
 msgstr "Kunne ikke finde pakkedetaljerne.."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Du skal være logget ind for at markere pakker."
@@ -988,6 +1030,10 @@ msgstr "Du har ikke tilladelse til, at slette pakker."
 msgid "You did not select any packages to delete."
 msgstr "Du har ikke valgt nogle pakker at slette."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "De valgte pakker er blevet slettet."
@@ -996,10 +1042,18 @@ msgstr "De valgte pakker er blevet slettet."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Du skal være logget ind for at adoptere pakker."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Du skal være logget ind for at opgive ejerskabet for pakker."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Du har ikke valgt nogle pakker at adoptere."
@@ -2237,3 +2291,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/de.po b/po/de.po
index 8b2ea808..ec0a0fbe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,22 +13,24 @@
 # go2sh <c.seitz@tu-bs.de>, 2015
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
 # Mark Gerlach, 2015
-# Mark Gerlach, 2015
+# a980e5e9ed6813c0751cebb84f7948a8_ff57647, 2015
 # Matthias Gorissen <matthias@archlinux.de>, 2012
 # Nuc1eoN <nucrap@hotmail.com>, 2014
 # Nuc1eoN <nucrap@hotmail.com>, 2014
 # Simon Legner <simon.legner@gmail.com>, 2018
 # Simon Schneider <SPAM.schneida@gmail.com>, 2011
-# Stefan Auditor <stefan.auditor@erdfisch.de>, 2017-2018,2020
+# Stefan Auditor <stefan@auditor.email>, 2021
+# Stefan Auditor <stefan@auditor.email>, 2017-2018,2020
 # Thomas_Do <thomasdodo@buche17.de>, 2013-2014
 # Thomas_Do <thomasdodo@buche17.de>, 2012-2013
+# Yunus Kahveci, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 11:12+0000\n"
-"Last-Translator: Stefan Auditor <stefan.auditor@erdfisch.de>\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: German (http://www.transifex.com/lfleischer/aurweb/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +71,7 @@ msgstr "Dienst nicht verfügbar"
 #: html/503.php
 msgid ""
 "Don't panic! This site is down due to maintenance. We will be back soon."
-msgstr "Keine Panik! Diese Seite ist wegen Verwaltungs-Aufgaben geschlossen. Wir werden gleich zurück sein."
+msgstr "Keine Panik! Diese Seite ist wegen Wartungsarbeiten geschlossen. Wir werden gleich zurück sein."
 
 #: html/account.php
 msgid "Account"
@@ -283,7 +285,7 @@ msgid ""
 "Request a package to be removed from the Arch User Repository. Please do not"
 " use this if a package is broken and can be fixed easily. Instead, contact "
 "the package maintainer and file orphan request if necessary."
-msgstr "Anfrage zum Entfernen eines Pakets aus dem Arch User Repository. Bitte benutze diese nicht, wenn das Paket kaputt ist und leich repariert werden kann. Sondern kontaktiere den Maintainer und reiche eine Verwaisungsanfrage ein, wenn nötig."
+msgstr "Anfrage zum Entfernen eines Pakets aus dem Arch User Repository. Bitte benutze diese nicht, wenn das Paket kaputt ist und leicht repariert werden kann. Kontaktiere stattdessen den Maintainer und reiche eine Verwaisungsanfrage ein, wenn nötig."
 
 #: html/home.php
 msgid "Merge Request"
@@ -473,7 +475,7 @@ msgstr "Weiter"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Wenn Du den bei der Registrierung vernwendeten Benutzernamen und primäre E-Mail-Adresse vergessen hast, sende bitte eine Nachricht an die %saur-general%s Mailingliste."
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
@@ -489,6 +491,12 @@ msgid ""
 "checkbox."
 msgstr "Die Betreuung der ausgewählten Pakete wurde nicht abgegeben, überprüfe die Bestätigungs-Checkbox."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "Die ausgewählten Pakete wurden nicht übernommen, überprüfe die Bestätigungs-Checkbox."
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Das Paket, in das die Stimmen und Kommentare übernommen werden sollen, kann nicht gefunden werden."
@@ -577,7 +585,7 @@ msgstr "Gebe Paket ab"
 
 #: html/pkgdisown.php
 msgid "Only Trusted Users and Developers can disown packages."
-msgstr "Nur Tus und Developer können die Paket-Betreuung abgeben."
+msgstr "Nur TUs und Developer können die Paket-Betreuung abgeben."
 
 #: html/pkgflagcomment.php
 msgid "Flag Comment"
@@ -587,6 +595,14 @@ msgstr "Kommentar markieren"
 msgid "Flag Package Out-Of-Date"
 msgstr "Paket als \"veraltet\" markieren"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "Dies ist scheinbar ein VCS Paket. Bitte markiere es %snicht%s als veraltet, wenn die Paket-Version im AUR nicht dem letzten Commit entspricht. Dieses Paket sollte nur dann markiert werden, wenn die Quellen verschoben wurden oder Änderungen aufgrund kürzlicher Änderungen Upstream im PKGBUILD notwendig sind."
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -883,6 +899,10 @@ msgstr "Das Loginformular ist aktuell für deine IP-Adresse deaktiviert. Ein mö
 msgid "Account suspended"
 msgstr "Konto aufgehoben"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "Du hast keine Berechtigung Kontos zu sperren."
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -968,6 +988,30 @@ msgstr "Fehler beim Aufrufen der Paket-Details."
 msgid "Package details could not be found."
 msgstr "Paket-Details konnten nicht gefunden werden."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "Du hast keine Pakete ausgewählt über die Du benachrichtigt werden möchtest."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "Die Benachrichtigungen wurden für das ausgewählte Paket aktiviert."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "Du hast keine Pakete ausgewählt über die Du nicht mehr benachrichtigt werden möchtest."
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "Ein Paket das Du ausgewählt hast hat keine Benachrichtigungen aktiviert."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "Die Benachrichtigungen wurden für das ausgewählte Paket entfernt."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Du musst Dich anmelden, um Pakete markieren zu können."
@@ -1004,6 +1048,10 @@ msgstr "Du hast keine Berechtigung zum Löschen von Paketen."
 msgid "You did not select any packages to delete."
 msgstr "Du hast keine Pakete zum Löschen ausgewählt."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "Eines der ausgewählten Pakete existiert nicht."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Die gewählten Pakete wurden gelöscht."
@@ -1012,10 +1060,18 @@ msgstr "Die gewählten Pakete wurden gelöscht."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Du musst angemeldet sein, um Pakete übernehmen zu können."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "Du hast keine Berechtigung eines der ausgewählten Pakete zu übernehmen."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Du musst anmeldet sein, um die Betreuung eines Pakets abzugeben."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "Du hast keine Berechtigung eines der ausgewählten Pakete abzugeben."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Du hast keine Pakete zum Übernehmen gewählt."
@@ -1271,7 +1327,7 @@ msgstr "Klicke %shere%s für Benutzerdetails."
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s to list the comments made by this account."
-msgstr ""
+msgstr "Klicke %shier%s um die Kommentare aufzulisten, die dieser Benutzer gemacht hat."
 
 #: template/account_edit_form.php
 msgid "required"
@@ -1314,7 +1370,7 @@ msgid ""
 "If you do not hide your email address, it is visible to all registered AUR "
 "users. If you hide your email address, it is visible to members of the Arch "
 "Linux staff only."
-msgstr ""
+msgstr "Wenn Du Deine E-Mail-Adresse nicht versteckst, ist sie für alle registrierten AUR Benutzer sichtbar. Wenn Du sie versteckst, ist sie nur für Arch Linux Mitarbeiter sichtbar."
 
 #: template/account_edit_form.php
 msgid "Backup Email Address"
@@ -1324,20 +1380,20 @@ msgstr "Sicherungs E-Mail-Adresse"
 msgid ""
 "Optionally provide a secondary email address that can be used to restore "
 "your account in case you lose access to your primary email address."
-msgstr ""
+msgstr "Gib optional eine sekundäre E-Mail-Adresse an, mit der Du Dein Konto wiederherstellen kannst, falls der Zugriff auf die primäre E-Mail-Adresse verloren geht."
 
 #: template/account_edit_form.php
 msgid ""
 "Password reset links are always sent to both your primary and your backup "
 "email address."
-msgstr ""
+msgstr "Links zum Zurücksetzen des Passworts werden immer sowohl an die primäre als auch an die Backup-E-Mail-Adresse gesendet."
 
 #: template/account_edit_form.php
 #, php-format
 msgid ""
 "Your backup email address is always only visible to members of the Arch "
 "Linux staff, independent of the %s setting."
-msgstr ""
+msgstr "Die Backup-E-Mail-Adresse nur für die Arch Linux Mitarbeiter sichtbar, unabhängig von der %s-Einstellung."
 
 #: template/account_edit_form.php
 msgid "Language"
@@ -1351,7 +1407,7 @@ msgstr "Zeitzone"
 msgid ""
 "If you want to change the password, enter a new password and confirm the new"
 " password by entering it again."
-msgstr ""
+msgstr "Willst Du das Passwort ändern, gib ein neues Passwort ein und bestätige das neue Passwort durch erneute Eingabe."
 
 #: template/account_edit_form.php
 msgid "Re-type password"
@@ -1395,7 +1451,7 @@ msgstr "Dein aktuelles Passwort"
 msgid ""
 "To protect the AUR against automated account creation, we kindly ask you to "
 "provide the output of the following command:"
-msgstr ""
+msgstr "Um das AUR gegen automatische Benutzer-Erstellung zu schützen, gib bitte die Ausgabe folgenden Befehls an:"
 
 #: template/account_edit_form.php
 msgid "Answer"
@@ -1614,7 +1670,7 @@ msgstr "Kommentar hinzufügen"
 msgid ""
 "Git commit identifiers referencing commits in the AUR package repository and"
 " URLs are converted to links automatically."
-msgstr ""
+msgstr "Git Commit-Kennungen, die einen Commit in einem AUR Paket referenzieren und URLs werden automatisch in Links umgewandelt."
 
 #: template/pkg_comment_form.php
 #, php-format
@@ -1646,7 +1702,7 @@ msgstr "Anonym kommentierte %s"
 #: template/pkg_comments.php
 #, php-format
 msgid "Commented on package %s on %s"
-msgstr ""
+msgstr "Kommentiert auf Paket %s am %s"
 
 #: template/pkg_comments.php
 #, php-format
@@ -2198,7 +2254,7 @@ msgstr "AUR Besitzer Benachrichtigung für {pkgbase}"
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was adopted by {user} [2]."
-msgstr "Das Paket {pkgbase} [1] wurde von {user} [2] adoptiert."
+msgstr "Das Paket {pkgbase} [1] wurde von {user} [2] übernommen."
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2232,7 +2288,7 @@ msgid ""
 "\n"
 "-- \n"
 "If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
-msgstr ""
+msgstr "{user} [1] führte {old} [2] in {new} [3] zusammen.\n\n-- \nWenn Du Benachrichtigungen über das neue Paket nicht mehr erhalten möchtest, gehe bitte auf [3] und klicke \"{label}\"."
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2253,3 +2309,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "Bitte denke daran für Vorschlag {id} [1] deine Stimme anzugeben. Die Abstimmungspriode endet in weniger als 48 Stunden."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "Ungültiger Account-Typ bereitgestellt."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "Du hast keine Berechtigung Konto-Typen zu ändern."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "Du hast keine Berechtigung, den Konto-Typ dieses Benutzers zu %s zu ändern."
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/el.po b/po/el.po
index 7af57544..f1fe704e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,6 +8,7 @@
 # Achilleas Pipinellis, 2013
 # Achilleas Pipinellis, 2011
 # Achilleas Pipinellis, 2012
+# Leonidas Spyropoulos, 2021
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
 # flamelab <panosfilip@gmail.com>, 2011
 msgid ""
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Greek (http://www.transifex.com/lfleischer/aurweb/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +62,7 @@ msgstr ""
 
 #: html/account.php
 msgid "Account"
-msgstr ""
+msgstr "Λογαριασμός"
 
 #: html/account.php template/header.php
 msgid "Accounts"
@@ -81,7 +82,7 @@ msgstr "Δεν έχετε την άδεια να επεξεργαστείτε α
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Άκυρος κωδικός"
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -235,11 +236,11 @@ msgstr ""
 
 #: html/home.php
 msgid "Learn more..."
-msgstr ""
+msgstr "Μάθετε περισσότερα..."
 
 #: html/home.php
 msgid "Support"
-msgstr ""
+msgstr "Υποστήριξη"
 
 #: html/home.php
 msgid "Package Requests"
@@ -477,6 +478,12 @@ msgid ""
 "checkbox."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Δεν μπορεί να βρεθεί το πακέτο για τη συγχώνευση ψήφων και σχόλιων"
@@ -575,6 +582,14 @@ msgstr ""
 msgid "Flag Package Out-Of-Date"
 msgstr ""
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -598,7 +613,7 @@ msgstr ""
 #: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
 #: template/pkgreq_results.php
 msgid "Comments"
-msgstr ""
+msgstr "Σχόλια"
 
 #: html/pkgflag.php
 msgid "Flag"
@@ -651,11 +666,11 @@ msgstr "Μόνο οι Trusted Users και οι Developers μπορούν να 
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
-msgstr ""
+msgstr "Δημιουργία αιτήματος"
 
 #: html/pkgreq.php template/pkgreq_close_form.php
 msgid "Close Request"
-msgstr ""
+msgstr "Κλείσιμο αιτήματος"
 
 #: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
 msgid "First"
@@ -675,7 +690,7 @@ msgstr "Τελευταίο"
 
 #: html/pkgreq.php template/header.php
 msgid "Requests"
-msgstr ""
+msgstr "Αιτήματα"
 
 #: html/register.php template/header.php
 msgid "Register"
@@ -687,7 +702,7 @@ msgstr "Χρησιμοποιήστε αυτή τη φόρμα για να δημ
 
 #: html/tos.php
 msgid "Terms of Service"
-msgstr ""
+msgstr "Όροι χρήσης"
 
 #: html/tos.php
 msgid ""
@@ -701,7 +716,7 @@ msgstr ""
 
 #: html/tos.php
 msgid "I accept the terms and conditions above."
-msgstr ""
+msgstr "Αποδέχομαι τους παραπάνω όρους χρήσης."
 
 #: html/tu.php template/account_details.php template/header.php
 msgid "Trusted User"
@@ -772,7 +787,7 @@ msgstr "Μπορεί να περιλαμβάνει μόνο μία τελεία,
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
-msgstr ""
+msgstr "Παρακαλώ επαληθεύστε τον κωδικό σας."
 
 #: lib/acctfuncs.inc.php
 msgid "The email address is invalid."
@@ -871,6 +886,10 @@ msgstr "Η σύνδεση στο λογαριασμό σας έχει απενε
 msgid "Account suspended"
 msgstr "Ο λογαριασμός έχει ανασταλεί"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -956,6 +975,30 @@ msgstr "Σφάλμα κατά τη διάρκεια φόρτωσης των πλ
 msgid "Package details could not be found."
 msgstr "Οι πληροφορίες του πακέτου δεν μπόρεσαν να βρεθούν."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Πρέπει να έχετε συνδεθεί για να επισημάνετε τα πακέτα."
@@ -992,6 +1035,10 @@ msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για
 msgid "You did not select any packages to delete."
 msgstr "Δεν επιλέξατε κάποιο πακέτο για να διαγράψετε."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Tα επιλεγμένα πακέτα έχουν διαγραφεί."
@@ -1000,10 +1047,18 @@ msgstr "Tα επιλεγμένα πακέτα έχουν διαγραφεί."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Πρέπει να έχετε συνδεθεί για να μπορέσετε να υιοθετήσετε πακέτα."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Πρέπει να έχετε συνδεθεί για να μπορέσετε να αποδεσμεύσετε πακέτα."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Δεν επιλέξατε κανένα πακέτο για να υιοθετήσετε."
@@ -2241,3 +2296,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/es.po b/po/es.po
index d60f45f1..ea7ac099 100644
--- a/po/es.po
+++ b/po/es.po
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/lfleischer/aurweb/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -482,6 +482,12 @@ msgid ""
 "checkbox."
 msgstr "Los paquetes seleccionados no se han abandonado, marca la casilla de confirmación."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "No se puede encontrar el paquete para unir los votos y  comentarios en él."
@@ -580,6 +586,14 @@ msgstr "Marcar comentario"
 msgid "Flag Package Out-Of-Date"
 msgstr "Marcado como obsoleto"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -876,6 +890,10 @@ msgstr "El formulario de registro ha sido deshabilitado para tu dirección IP, p
 msgid "Account suspended"
 msgstr "Cuenta suspendida"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -961,6 +979,30 @@ msgstr "Error al recuperar los detalles del paquete."
 msgid "Package details could not be found."
 msgstr "Los detalles del paquete no se han podido encontrar."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Debes autentificarte antes de poder marcar paquetes."
@@ -997,6 +1039,10 @@ msgstr "No posees los permisos para eliminar paquetes."
 msgid "You did not select any packages to delete."
 msgstr "No seleccionaste ningún paquete a eliminar."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Los paquetes seleccionados se han eliminado."
@@ -1005,10 +1051,18 @@ msgstr "Los paquetes seleccionados se han eliminado."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Debes autentificarte antes de poder adoptar paquetes."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Debes autentificarte antes de poder abandonar paquetes."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "No haz seleccionado ningún paquete para ser adoptado."
@@ -2246,3 +2300,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 00000000..9b6493b5
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,2335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Estonian (http://www.transifex.com/lfleischer/aurweb/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/fi.po b/po/fi.po
index d2daad80..39cfe626 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,15 +5,15 @@
 # Translators:
 # Elias Autio, 2016
 # Jesse Jaara <jesse.jaara@gmail.com>, 2011-2012,2015
-# Nikolay Korotkiy <sikmir@gmail.com>, 2018-2019
+# Nikolay Korotkiy <sikmir@disroot.org>, 2018-2019
 # Sami Korkalainen, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Finnish (http://www.transifex.com/lfleischer/aurweb/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -474,6 +474,12 @@ msgid ""
 "checkbox."
 msgstr "Seuraavia paketteja ei ole hylätty. Tarkista varmistusruutu."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Pakettia, johon haluat siirtää äänet ja kommentit, ei löydy."
@@ -572,6 +578,14 @@ msgstr ""
 msgid "Flag Package Out-Of-Date"
 msgstr "Merkitse paketti vanhentuneeksi"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -868,6 +882,10 @@ msgstr "Kirjautumislomake on estetty IP-osoitteestasi, luultavasti toistuvien ro
 msgid "Account suspended"
 msgstr "Tili jäädytetty"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -953,6 +971,30 @@ msgstr "Virhe haettaessa paketin tietoja."
 msgid "Package details could not be found."
 msgstr "Paketin tietoja ei löydetty."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Sinun pitää kirjautua, ennen kuin voit muuttaa merkintöjä."
@@ -989,6 +1031,10 @@ msgstr "Sinulla ei ole oikeutta poistaa paketteja."
 msgid "You did not select any packages to delete."
 msgstr "Et valinnut yhtään pakettia poistettavaksi."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Valitut paketit on nyt poistettu."
@@ -997,10 +1043,18 @@ msgstr "Valitut paketit on nyt poistettu."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Sinun pitää kirjautua, ennen kuin voit adoptoida paketteja."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Sinun pitää kirjautua, ennen kuin voit hylätä paketteja."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Et valinnut yhtään pakettia adoptoitavaksi."
@@ -2238,3 +2292,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
new file mode 100644
index 00000000..f3253433
--- /dev/null
+++ b/po/fi_FI.po
@@ -0,0 +1,2335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/lfleischer/aurweb/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index e73a8c99..99d01460 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,18 +7,21 @@
 # Antoine Lubineau <antoine@lubignon.info>, 2012
 # Antoine Lubineau <antoine@lubignon.info>, 2012-2016
 # Cedric Girard <girard.cedric@gmail.com>, 2011,2014,2016
+# demostanis <demostanis@protonmail.com>, 2020
+# Kristien <kristien@mailo.com>, 2020
 # lordheavy <lordheavym@gmail.com>, 2011
 # lordheavy <lordheavym@gmail.com>, 2013-2014,2018
 # lordheavy <lordheavym@gmail.com>, 2011-2012
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
-# Xorg, 2015,2017,2019
+# Thibault <thibaultbruneliere@gmail.com>, 2020
+# df3de0cb43d289cd23a753345b3743cd_a20684f, 2015,2017,2019
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: French (http://www.transifex.com/lfleischer/aurweb/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,7 +86,7 @@ msgstr "Vous n’avez pas la permission d’éditer ce compte."
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Mot de passe invalide."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -380,7 +383,7 @@ msgstr "Entrez vos identifiants"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "Nom de l'utilisateur ou adresse email principale"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -444,7 +447,7 @@ msgstr "Votre mot de passe a été réinitialisé avec succès."
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "Veuillez confirmer votre nom d'utilisateur ou votre adresse email principale:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -463,11 +466,11 @@ msgstr "Continuer"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Si vous avez oublié votre nom d'utilisateur et votre adresse email principale, veuillez s'il vous plaît envoyer un message à %saur-general%s"
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "Entrez votre nom d'utilisateur ou votre email principal:"
 
 #: html/pkgbase.php
 msgid "Package Bases"
@@ -479,6 +482,12 @@ msgid ""
 "checkbox."
 msgstr "Les paquets sélectionnés n'ont pas été destitués, vérifiez la boîte de confirmation."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Impossible de trouver le paquet dans lequel fusionner les votes et les commentaires."
@@ -577,6 +586,14 @@ msgstr "Signaler le commentaire"
 msgid "Flag Package Out-Of-Date"
 msgstr "Marquer le paquet comme périmé"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -774,7 +791,7 @@ msgstr "ne peut contenir qu'un seul point, tiret bas ou virgule,"
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
-msgstr ""
+msgstr "Merci de confirmer votre mot de passe:"
 
 #: lib/acctfuncs.inc.php
 msgid "The email address is invalid."
@@ -782,7 +799,7 @@ msgstr "L'adresse email n'est pas valide."
 
 #: lib/acctfuncs.inc.php
 msgid "The backup email address is invalid."
-msgstr ""
+msgstr "Cette adresse email de secours est invalide."
 
 #: lib/acctfuncs.inc.php
 msgid "The home page is invalid, please specify the full HTTP(s) URL."
@@ -825,15 +842,15 @@ msgstr "La clé SSH publique, %s%s%s, est déjà utilisée."
 
 #: lib/acctfuncs.inc.php
 msgid "The CAPTCHA is missing."
-msgstr ""
+msgstr "Le CAPTCHA est manquant."
 
 #: lib/acctfuncs.inc.php
 msgid "This CAPTCHA has expired. Please try again."
-msgstr ""
+msgstr "Le CAPTCHA a expiré. Merci de réessayer."
 
 #: lib/acctfuncs.inc.php
 msgid "The entered CAPTCHA answer is invalid."
-msgstr ""
+msgstr "LE CAPTCHA que vous avez entré est invalide."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -873,6 +890,10 @@ msgstr "Le formulaire de connexion est actuellement désactivé pour votre adres
 msgid "Account suspended"
 msgstr "Compte suspendu."
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -958,6 +979,30 @@ msgstr "Erreur en recherchant les détails du paquet."
 msgid "Package details could not be found."
 msgstr "Les détails du paquet ne peuvent pas être trouvés."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Vous devez être authentifié avant de pouvoir étiqueter des paquets."
@@ -994,6 +1039,10 @@ msgstr "Vous n’avez pas la permission de supprimer des paquets."
 msgid "You did not select any packages to delete."
 msgstr "Vous n'avez sélectionné aucun paquet à supprimer."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Les paquets sélectionnés ont été supprimés."
@@ -1002,10 +1051,18 @@ msgstr "Les paquets sélectionnés ont été supprimés."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Vous devez être authentifié avant de pouvoir adopter des paquets."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Vous devez être authentifié avant de pouvoir abandonner des paquets."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Vous n'avez pas sélectionné de paquet à adopter."
@@ -1246,7 +1303,7 @@ msgstr "Éditer le compte de cet utilisateur."
 
 #: template/account_details.php
 msgid "List this user's comments"
-msgstr ""
+msgstr "Lister les commentaires de cet utilisateur"
 
 #: template/account_edit_form.php
 #, php-format
@@ -1261,7 +1318,7 @@ msgstr "Cliquez %sici%s pour obtenir les détails de l'utilisateur."
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s to list the comments made by this account."
-msgstr ""
+msgstr "Cliquez %sici%s pour lister les commentaires écrits par ce compte."
 
 #: template/account_edit_form.php
 msgid "required"
@@ -1304,30 +1361,30 @@ msgid ""
 "If you do not hide your email address, it is visible to all registered AUR "
 "users. If you hide your email address, it is visible to members of the Arch "
 "Linux staff only."
-msgstr ""
+msgstr "Si vous ne cachez pas votre adresse email, elle sera visible par l'ensemble des utilisateurs enregistrés de AUR. Si vous cachez votre adresse email, elle sera uniquement visible des membres de l'équipe AUR."
 
 #: template/account_edit_form.php
 msgid "Backup Email Address"
-msgstr ""
+msgstr "Adresse email de secours"
 
 #: template/account_edit_form.php
 msgid ""
 "Optionally provide a secondary email address that can be used to restore "
 "your account in case you lose access to your primary email address."
-msgstr ""
+msgstr "En option, fournis une seconde adresse email qui servira à la récupération de votre compte au cas où vous perdez l'accès à votre adresse email principale."
 
 #: template/account_edit_form.php
 msgid ""
 "Password reset links are always sent to both your primary and your backup "
 "email address."
-msgstr ""
+msgstr "Les liens pour changer votre mot de passe sont toujours envoyés à votre adresse email principale ainsi qu'à celle de secours."
 
 #: template/account_edit_form.php
 #, php-format
 msgid ""
 "Your backup email address is always only visible to members of the Arch "
 "Linux staff, independent of the %s setting."
-msgstr ""
+msgstr "Votre adresse email de secours n'est visible que par les membres du staff d'Arch Linux, sans prendre en compte le paramètre %s."
 
 #: template/account_edit_form.php
 msgid "Language"
@@ -1341,7 +1398,7 @@ msgstr "Fuseau horaire"
 msgid ""
 "If you want to change the password, enter a new password and confirm the new"
 " password by entering it again."
-msgstr ""
+msgstr "Si vous voulez changer de mot de passe, entrez votre nouveau mot de passe et confirmez le en l'écrivant à nouveau"
 
 #: template/account_edit_form.php
 msgid "Re-type password"
@@ -1375,21 +1432,21 @@ msgstr "Notifier des changements de propriétaire"
 
 #: template/account_edit_form.php
 msgid "To confirm the profile changes, please enter your current password:"
-msgstr ""
+msgstr "Pour confirmer les changements sur le profil, veuillez s'il vous plaît entrer votre mot de passe :"
 
 #: template/account_edit_form.php
 msgid "Your current password"
-msgstr ""
+msgstr "Votre mot de passe actuel"
 
 #: template/account_edit_form.php
 msgid ""
 "To protect the AUR against automated account creation, we kindly ask you to "
 "provide the output of the following command:"
-msgstr ""
+msgstr "Pour protéger AUR contre la création automatique de comptes, nous vous demandons s'il vous plaît de bien vouloir donner le résultat de la commande suivante:"
 
 #: template/account_edit_form.php
 msgid "Answer"
-msgstr ""
+msgstr "Réponse"
 
 #: template/account_edit_form.php template/pkgbase_details.php
 #: template/pkg_details.php
@@ -1552,7 +1609,7 @@ msgstr "lecture seule"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "click to copy"
-msgstr ""
+msgstr "Cliquez pour copier"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
@@ -1604,12 +1661,12 @@ msgstr "Ajouter un commentaire"
 msgid ""
 "Git commit identifiers referencing commits in the AUR package repository and"
 " URLs are converted to links automatically."
-msgstr ""
+msgstr "Les identifiants des commits Git faisant référence à des commits dans l'AUR et les URLs sont automatiquement convertis en liens."
 
 #: template/pkg_comment_form.php
 #, php-format
 msgid "%sMarkdown syntax%s is partially supported."
-msgstr ""
+msgstr "%sLa syntaxe Markdown %sn'est pas entièrement supportée."
 
 #: template/pkg_comments.php
 msgid "Pinned Comments"
@@ -1621,7 +1678,7 @@ msgstr "Derniers commentaires"
 
 #: template/pkg_comments.php
 msgid "Comments for"
-msgstr ""
+msgstr "Commentaires pour"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1636,7 +1693,7 @@ msgstr "Commentaire anonyme le %s"
 #: template/pkg_comments.php
 #, php-format
 msgid "Commented on package %s on %s"
-msgstr ""
+msgstr "Commenté sur %sle %s."
 
 #: template/pkg_comments.php
 #, php-format
@@ -2222,7 +2279,7 @@ msgid ""
 "\n"
 "-- \n"
 "If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
-msgstr ""
+msgstr "{user} [1] a fusionné {old} [2] dans {new} [3].\n\nSi vous ne souhaitez plus recevoir de notifications à propos du nouveau paquet, rendez-vous sur [3] puis cliquez \"{label}\". "
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2243,3 +2300,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "N'oubliez pas de voter sur la proposition {id} [1]. La période de vote se termine dans moins de 48 heures."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/he.po b/po/he.po
index 21ca1c8b..cd4a0f87 100644
--- a/po/he.po
+++ b/po/he.po
@@ -5,14 +5,14 @@
 # Translators:
 # GenghisKhan <genghiskhan@gmx.ca>, 2016
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2016-2020
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2016-2022
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-02-01 14:37+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Hebrew (http://www.transifex.com/lfleischer/aurweb/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -473,6 +473,12 @@ msgid ""
 "checkbox."
 msgstr "החבילות הבאות לא נותקו מבעליהן, נא לסמן את התיבה לאישור."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "החבילות הנבחרות לא אומצו, נא לסמן את תיבת האישור."
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "לא ניתן למצוא חבילה למיזוג הצבעות ותגובות אליה."
@@ -571,6 +577,14 @@ msgstr "סימון התגובה"
 msgid "Flag Package Out-Of-Date"
 msgstr "סימון תגובה כלא עדכנית"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "כנראה שזאת חבילה ממערכת ניהול גרסאות קוד. נא %sלא%s לסמן אותה כפגת תוקף אם גרסת החבילה ב־AUR אינה תואמת להגשה העדכנית ביותר. יש לסמן את החבילה רק אם המקורות הועברו או שיש צורך בשינוי ב־PKGBUILD עקב שינויים עדכניים במאגר המקורי."
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -867,6 +881,10 @@ msgstr "כתובת הכניסה מנוטרלת לכתובת ה־ IP שלך, כנ
 msgid "Account suspended"
 msgstr "חשבון מושעה"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "אין לך הרשאות להשהות חשבונות."
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -952,6 +970,30 @@ msgstr "שגיאה בקבלת נתוני חבילה."
 msgid "Package details could not be found."
 msgstr "נתוני חבילה לא נמצאו."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr "כותרת הפניה שגויה."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "לא בחרת חבילות לקבל עבורן התראות."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "ההתראות על החבילות הנבחרות הופעלו."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "לא בחרת חבילות כלשהן להסרת התראות."
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "לא מופעלות התראות על החבילה שבחרת."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "ההתראות על החבילות הנבחרות הוסרו."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "עליך להיכנס לפני שיהיה באפשרותך לסמן חבילות."
@@ -988,6 +1030,10 @@ msgstr "אין לך הרשאה למחוק חבילות."
 msgid "You did not select any packages to delete."
 msgstr "לא בחרת שום חבילות למחיקה."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "אחת החבילות שבחרת אינה קיימת."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "החבילות המסומנות נמחקו."
@@ -996,10 +1042,18 @@ msgstr "החבילות המסומנות נמחקו."
 msgid "You must be logged in before you can adopt packages."
 msgstr "עליך להיכנס לפני שיהיה באפשרותך לאמץ חבילות."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "אסור לך לאמץ את אחת החבילות שבחרת."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "עליך להיכנס לפני שיהיה באפשרותך לנתק בעלות על חבילות."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "אסור לך לנשל את אחת החבילות שבחרת."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "לא בחרת שום חבילות לאימוץ."
@@ -1700,7 +1754,7 @@ msgstr "קבוצות"
 
 #: template/pkg_details.php
 msgid "Conflicts"
-msgstr "התנגשויות"
+msgstr "סתירות"
 
 #: template/pkg_details.php
 msgid "Provides"
@@ -2247,3 +2301,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "נא לזכור להצביע בהצעה {id} [1]. ההצבעה תסתיים בעוד פחות מ־48 שעות."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "סוג החשבון שסופק שגוי."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "אין לך הרשאות לשנות סוגי חשבון."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "אין לך הרשאות לשנות את סוג חשבון המשתמש הזה לכדי %s."
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr "אין בקשות יתומות קיימות שתוקפן פג לאשר עבור %s."
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr "שגיאת שרת פנימית"
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr "קרתה תקלה משמעותית."
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr "הפרטים תועדו ויועברו לבדיקת ההנהלה במהירות האפשרות. אנו מתנצלים על אי הנוחות שנגרמה."
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr "שגיאת שרת ה־AUR"
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/hi_IN.po b/po/hi_IN.po
new file mode 100644
index 00000000..37fd082e
--- /dev/null
+++ b/po/hi_IN.po
@@ -0,0 +1,2336 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+# Panwar108 <caspian7pena@gmail.com>, 2018,2020-2021
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/lfleischer/aurweb/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr "पृष्ठ नहीं मिला"
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr "क्षमा करें, अनुरोधित पृष्ठ अनुपलब्ध है।"
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr "ध्यान दें"
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr "Git क्लोन यूआरएल ब्राउज़र में उपयोग नहीं होते हैं।"
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr "%s का पैकेज-संग्रह प्रतिरूपित करने हेतु, %s को निष्पादित करें।"
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr "%sयहाँ%s क्लिक कर %s विवरण पृष्ठ पर वापस जाएँ।"
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr "सेवा अनुपलब्ध"
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr "धैर्य रखें। अनुरक्षण के कारण साइट अभी बंद है। साइट शीघ्र ही चालू हो जाएगी।"
+
+#: html/account.php
+msgid "Account"
+msgstr "अकाउंट"
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr "अकाउंट"
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr "इस क्षेत्र हेतु आपका अभिगम निषेध है।"
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr "निर्दिष्ट उपयोक्ता हेतु जानकारी प्राप्त प्राप्त करना विफल।"
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr "आपके पास अकाउंट संपादन हेतु अनुमति नहीं है।"
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr "अमान्य कूटशब्द।"
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr "वर्तमान उपयोक्ता खोजने हेतु यह प्रपत्र उपयोग करें।"
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr "उपयोक्ता जानकारी देखने हेतु लॉगिन आवश्यक है।"
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr "प्रस्ताव जोड़ें"
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr "उपयोक्ता कार्य हेतु अमान्य टोकन।"
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr "अनुपस्थित उपयोक्ता नाम।"
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr "%s हेतु प्रस्ताव पहले से दर्ज है।"
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr "अमान्य प्रकार।"
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr "प्रस्ताव रिक्त नहीं होना चाहिए।"
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr "नवीन प्रस्ताव निवेदित किया गया।"
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr "मत हेतु प्रस्ताव निवेदित करें।"
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr "निवेदक/विश्वसनीय उपयोक्ता"
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr "(अनावश्यक होने पर रिक्त)"
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr "प्रकार"
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr "विश्वसनीय उपयोक्ता जोड़ना"
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr "विश्वसनीय उपयोक्ता हटाना"
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr "विश्वसनीय उपयोक्ता हटाना (अघोषित निष्क्रियता)"
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr "उपनियम संशोधन"
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr "प्रस्ताव"
+
+#: html/addvote.php
+msgid "Submit"
+msgstr "निवेदित करें"
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr "सह-अनुरक्षक प्रबंधन"
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr "टिप्पणी संपादन"
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr "डैशबोर्ड"
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr "होम"
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr "चिन्हित किए गए मेरे पैकेज"
+
+#: html/home.php
+msgid "My Requests"
+msgstr "मेरे अनुरोध"
+
+#: html/home.php
+msgid "My Packages"
+msgstr "मेरे पैकेज"
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr "मेरे द्वारा अनुरक्षित पैकेज"
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr "सह-अनुरक्षित पैकेज"
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr "मेरे द्वारा सह-अनुरक्षित पैकेज"
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr "AUR में स्वागत है! अधिक जानकारी हेतु %sAUR उपयोक्ता%s व %sAUR विश्वसनीय उपयोक्ता%s दिशा-निर्देश पढ़ें।"
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr "योगदान की गई PKGBUILD का %sआर्च पैकेज मानकों%s के अनुरूप होना %sआवश्यक%s है अन्यथा वे हटा दी जाएँगी!"
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr "अपने पसंदीदा पैकेज हेतु मतदान अवश्य करें!"
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr "[community] के कुछ पैकेज बाइनरी फाइल के रूप में उपलब्ध हो सकते हैं।"
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr "अस्वीकरण"
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr "AUR पैकेज उपयोक्ता निर्मित हैं। अतः उपलब्ध फाइलों का उपयोग सावधानीपूर्वक करें।"
+
+#: html/home.php
+msgid "Learn more..."
+msgstr "और जानें..."
+
+#: html/home.php
+msgid "Support"
+msgstr "सहायता"
+
+#: html/home.php
+msgid "Package Requests"
+msgstr "पैकेज अनुरोध"
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr "पैकेज विवरण पृष्ठ में %sपैकेज कार्य%s हेतु तीन प्रकार के निवेदन संभव हैं :"
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr "निरर्थक पैकेज हेतु अनुरोध"
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr "पैकेज स्वामित्व निरस्त करने हेतु अनुरोध; अत्यधिक समय तक अनुरक्षक के निष्क्रिय व पैकेज पुराना होने की स्थिति में।"
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr "पैकेज हटाने हेतु अनुरोध"
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr "आर्च उपयोक्ता पैकेज-संग्रह से पैकेज हटाने हेतु अनुरोध। कृपया पैकेज उपयोग संबंधी समस्या होने पर इसका उपयोग न करें। उचित होगा कि पैकेज अनुरक्षक से संपर्क करें व आवश्यकता हो तो निरर्थक पैकेज हेतु अनुरोध करें।"
+
+#: html/home.php
+msgid "Merge Request"
+msgstr "विलय अनुरोध"
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr "एकाधिक पैकेज का आपस में विलय हेतु अनुरोध। पैकेज नाम बदलाव या विभाजित पैकेज से बदलने की स्थिति में।"
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr "आप अनुरोध संबंधी चर्चा हेतु %saur-requests%s ईमेल-सूची उपयोग कर सकते हैं। ईमेल-सूची केवल चर्चा हेतु है न कि अनुरोध।"
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr "पैकेज निवेदन"
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr "AUR में पैकेज निवेदित करने हेतु एसएसएच द्वारा Git उपयोग होती है। अधिक जानकारी हेतु आर्च उपयोक्ता पैकेज-संग्रह आर्च विकी पृष्ठ का %sपैकेज निवेदन%s अनुखंड देखें।"
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr "AUR हेतु निम्नलिखित एसएसएच एन्क्रिप्शन पहचान चिन्ह उपयोग होते हैं :"
+
+#: html/home.php
+msgid "Discussion"
+msgstr "चर्चा"
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr "आर्च उपयोक्ता पैकेज-संग्रह (AUR) व विश्वसनीय उपयोक्ता संरचना संबंधी सामान्य चर्चा %saur-general%s पर होती है। AUR वेब अंतरफलक के विकास संबंधी चर्चा हेतु %saur-dev%s ईमेल-सूची उपयोग करें।"
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr "समस्या हेतु रिपोर्ट"
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr "AUR वेब अंतरफलक में समस्या होने पर कृपया हमारे %sसमस्या ट्रैकर%s पर समस्या रिपोर्ट दर्ज करें। ट्रैकर का उपयोग %sकेवल%s AUR वेब अंतरफलक संबंधी समस्याओं के लिए ही करें। पैकेज समस्याओं हेतु पैकेज अनुरक्षक से संपर्क करें या उपयुक्त पैकेज के पृष्ठ पर टिप्पणी करें।"
+
+#: html/home.php
+msgid "Package Search"
+msgstr "पैकेज खोज"
+
+#: html/index.php
+msgid "Adopt"
+msgstr "स्वामित्व लें"
+
+#: html/index.php
+msgid "Vote"
+msgstr "मतदान करें"
+
+#: html/index.php
+msgid "UnVote"
+msgstr "मत वापस लें"
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr "सूचित करें"
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr "सूचित न करें"
+
+#: html/index.php
+msgid "UnFlag"
+msgstr "अचिन्हित करें"
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr "लॉगिन"
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr "के तौर पर लॉग-इन हैं : %s"
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr "लॉगआउट"
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr "लॉगिन जानकारी दर्ज करें"
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr "उपयोक्ता नाम या प्राथमिक ईमेल पता"
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr "कूटशब्द"
+
+#: html/login.php
+msgid "Remember me"
+msgstr "लॉगिन स्मरण करें"
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr "कूटशब्द भूल गए"
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr "एचटीटीपी लॉगिन निष्क्रिय है। लॉगिन करने हेतु कृपया %sएचटीटीपीएस उपयोग%s करें।"
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr "खोज मानदंड"
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr "पैकेज"
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr "पैकेज विवरण प्राप्त करने हेतु त्रुटि।"
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr "आवश्यक जानकारी अनुपलब्ध।"
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr "कूटशब्द मेल नहीं खाते।"
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr "कूटशब्द में %s अक्षर आवश्यक हैं।"
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr "अमान्य ईमेल।"
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr "कूटशब्द पुनः सेट करें"
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr "पुष्टिकरण लिंक हेतु अपना ईमेल देखें।"
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr "कूटशब्द पुनः सेट करना सफल।"
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr "उपयोक्ता नाम या प्राथमिक ईमेल की पुष्टि करें :"
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr "नया कूटशब्द दर्ज करें :"
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr "नए कूटशब्द की पुष्टि करें :"
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr "जारी रखें"
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr "यदि आप पंजीकरण में उपयोग किया गया अपना उपयोक्ता नाम व प्राथमिक ईमेल भूल गए हैं तो %saur-general%s ईमेल-सूची पर संदेश भेजें।"
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr "उपयोक्ता नाम या प्राथमिक ईमेल दर्ज करें :"
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr "पैकेज बेस"
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr "चयनित पैकेज का स्वामित्व निरस्त नहीं हुआ, चिन्हित कर पुष्टि करें।"
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "चयनित पैकेज स्वामीविहीन हैं, चिन्हित कर पुष्टि करें।"
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr "मत व टिप्पणियाँ विलय करने हेतु पैकेज नहीं मिला।"
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr "पैकेज बेस का स्वयं के साथ विलय संभव नहीं है।"
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr "चयनित पैकेज हटाएँ नहीं गए, चिन्हित कर पुष्टि करें।"
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr "पैकेज हटाना"
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr "पैकेज हटाएँ"
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr "यह प्रपत्र उपयोग कर पैकेज बेस %s%s%s व निम्नलिखित पैकेज AUR से हटाएँ :"
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr "पैकेज स्थायी रूप से हट जाएगा।"
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr "चिन्हित कर कार्य की पुष्टि करें।"
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr "पैकेज हटाने की पुष्टि करें"
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr "हटाएँ"
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr "केवल विश्वसनीय उपयोक्ता व व सॉफ्टवेयर विकासकर्ता ही पैकेज हटा सकते हैं।"
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr "पैकेज स्वामित्व निरस्त करें"
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr "यह प्रपत्र उपयोग कर पैकेज बेस %s%s%s में सम्मिलित निम्नलिखित पैकेज हेतु स्वामित्व निरस्त करें :"
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr "इसे चिन्हित कर पुष्टि करें कि अब आप पैकेज सह-अनुरक्षक बने रहने के इच्छुक नहीं हैं।"
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr "इसे चिन्हित कर पुष्टि करें कि अब आप पैकेज हेतु अपना स्वामित्व निरस्त कर %s%s%s को स्वामित्व दे रहें हैं।"
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr "इसे चिन्हित कर पुष्टि करें कि अब आप पैकेज हेतु अपना स्वामित्व निरस्त कर रहें हैं।"
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr "पैकेज स्वामित्व निरस्त करने हेतु पुष्टि करें"
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr "स्वामित्व निरस्त करें"
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr "केवल विश्वसनीय उपयोक्ता व व सॉफ्टवेयर विकासकर्ता ही पैकेज स्वामित्व निरस्त कर सकते हैं।"
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr "टिप्पणी चिन्हित करें"
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr "पैकेज को पुराने के रूप में चिन्हित करें"
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "प्रतीत होता है कि यह एक वीसीएस पैकेज है। AUR पैकेज संस्करण का हालिया संचित कार्य से मिलान न होने की स्थिति में कृपया इसे पुराने के रूप में चिन्हित %sन%s करें। स्रोत अंतरण या स्रोत में हालिया परिवर्तनों के कारण PKGBUILD में परिवर्तन होने पर ही इस पैकेज को चिन्हित करें।"
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr "यह प्रपत्र उपयोग कर पैकेज बेस %s%s%s व निम्नलिखित पैकेज को पुराने के रूप में चिन्हित करें :"
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr "कृपया यह प्रपत्र समस्या रिपोर्ट हेतु उपयोग %sन%s करें। समस्या हेतु पैकेज पृष्ठ पर टिप्पणी करें।"
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr "नवीन संस्करण की घोषणा या उपलब्ध फाइल की साइट प्रदान कर टिप्पणी करें कि पैकेज पुराने से रूप में चिन्हित क्यों है।"
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr "टिप्पणियाँ"
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr "चिन्हित"
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr "केवल पंजीकृत उपयोक्ता ही पैकेज को पुराने के रूप में चिन्हित कर सकते हैं।"
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr "पैकेज विलय"
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr "पैकेज विलय करें"
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr "यह प्रपत्र उपयोग कर पैकेज बेस %s%s%s का अन्य पैकेज में विलय करें।"
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr "निम्नलिखित पैकेज हटेंगे :"
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr "पैकेज विलय उपरांत इसे पूर्ववत करना संभव नहीं है।"
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr "पैकेज विलय हेतु पैकेज नाम दर्ज करें।"
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr "इसमें विलय करें :"
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr "पैकेज विलय पुष्टिकरण"
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr "विलय करें"
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr "केवल विश्वसनीय उपयोक्ता व व सॉफ्टवेयर विकासकर्ता ही पैकेज विलय कर सकते हैं।"
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr "अनुरोध निवेदित करें"
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr "अनुरोध निरस्त करें"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr "पहला"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr "पिछला"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr "अगला"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr "अंतिम"
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr "अनुरोध"
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr "पंजीकरण"
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr "यह प्रपत्र उपयोग कर अकाउंट बनाएँ।"
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr "सेवा की शर्तें"
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr "निम्नलिखित प्रलेखों में परिवर्तन हुए हैं। कृपया ध्यानपूर्वक पढ़ें :"
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr "संशोधन %d"
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr "मैं ऊपर दिए गए नियम व शर्तों को स्वीकारता हूँ।"
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr "विश्वसनीय उपयोक्ता"
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr "प्रस्ताव विवरण प्राप्त करने में विफल।"
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr "इस प्रस्ताव हेतु वोट प्रक्रिया बंद है।"
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr "केवल विश्वसनीय उपयोक्ता ही मतदान कर सकते हैं।"
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr "स्वयं से संबंधित प्रस्ताव में मतदान निषेध है।"
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr "इस प्रस्ताव हेतु आपका मत दर्ज है।"
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr "अमान्य मतदान आईडी।"
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr "वर्तमान मत"
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr "पूर्व मत"
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr "मतदाता"
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr "संभवतः अवांछनीय इंटरनेट गतिविधिय के कारण आपके आईपी पते हेतु अकाउंट पंजीकरण निष्क्रिय है। असुविधा के लिए खेद है।"
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr "अनुपस्थित उपयोक्ता आईडी"
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr "अमान्य उपयोक्ता नाम।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr "%s से लेकर %s अक्षर होना आवश्यक है"
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr "आरंभ व अंत अक्षर या अंक से हो"
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr "केवल एक बिंदु, अंडरस्कोर या हायफ़न ही उपयोग करें।"
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr "कृपया नए कूटशब्द की पुष्टि करें।"
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr "अमान्य ईमेल पता।"
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr "अमान्य बैकअप ईमेल पता।"
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr "अमान्य होम पृष्ठ, कृपया पूर्ण एचटीटीपी(एस) यूआरएल दर्ज करें।"
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr "अमान्य पीजीपी कुंजी पहचान चिन्ह।"
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr "अमान्य सार्वजनिक एसएसएच कुंजी।"
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr "अकाउंट अनुमतियाँ बढ़ाना संभव नहीं है।"
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr "असमर्थित भाषा।"
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr "असमर्थित समयक्षेत्र।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr "उपयोक्ता नाम, %s%s%s, पहले से कार्यरत है।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr "पता, %s%s%s, पहले से कार्यरत है।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr "सार्वजनिक एसएसएच कुंजी, %s%s%s, पहले से कार्यरत है।"
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr "अनुपस्थित CAPTCHA।"
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr "CAPTCHA मान्यता समाप्त। पुनः प्रयास करें।"
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr "अमान्य CAPTCHA उत्तर दर्ज किया गया।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr "अकाउंट, %s%s%s बनाने हेतु त्रुटि।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr "अकाउंट,%s%s%s, सफलतापूर्वक बनाया गया।"
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr "कूटशब्द पुनः सेट करने हेतु कुंजी आपको ईमेल कर दी गई है।"
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr "अकाउंट उपयोग करने हेतु लॉगिन पर क्लिक करें।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr "अकाउंट, %s%s%s में कोई परिवर्तन नहीं हुआ।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr "अकाउंट,%s%s%s, हेतु परिवर्तन सफल।"
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr "संभवतः अवांछनीय इंटरनेट गतिविधि के कारण आपके आईपी पते हेतु लॉगिन प्रपत्र अभी निष्क्रिय है। असुविधा के लिए खेद है।"
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr "निलंबित अकाउंट"
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "आपके पास अकाउंट निलंबन हेतु अनुमति नहीं है।"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr "कूटशब्द पुनः सेट किया गया। यदि अकाउंट नवीन है तो, पुष्टिकरण ईमेल में दिए गए लिंक द्वारा आरंभिक कूटशब्द सेट करें। अन्यथा %sकूटशब्द पुनः सेट%s पृष्ठ द्वारा पुनः सेट करने हेतु कुंजी प्राप्त करें।"
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr "अनुचित उपयोक्ता नाम या कूटशब्द।"
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr "उपयोक्ता सत्र बनाने हेतु त्रुटि।"
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr "अमान्य ईमेल व पुनः सेट कुंजी संयोजन।"
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr "कुछ नहीं"
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr "%s हेतु अकाउंट जानकारी देखें"
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr "अनुपस्थित पैकेज बेस आईडी या पैकेज बेस नाम।"
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr "यह टिप्पणी संपादित करना संभव नहीं है।"
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr "अनुपस्थित टिप्पणी।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr "टिप्पणी रिक्त नहीं होनी चाहिए।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr "टिप्पणी जोड़ी गई।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr "पैकेज जानकारी संपादन हेतु लॉगिन आवश्यक है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr "अनुपस्थित टिप्पणी आईडी।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr "5 से अधिक कमेंट पिन करना संभव नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr "आप इस टिप्पणी को पिन नहीं कर सकते हैं।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr "आप इस टिप्पणी को पिन से नहीं हटा सकते हैं।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr "टिप्पणी पिन की गई।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr "टिप्पणी पिन से हटाई गई।"
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr "पैकेज विवरण प्राप्त करने हेतु त्रुटि।"
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr "पैकेज विवरण प्राप्त करने में विफल।"
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr "अनुचित संदर्भित हैडर।"
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "अधिसूचना हेतु कोई पैकेज चयनित नहीं है।"
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "चयनित पैकेज हेतु अधिसूचनाएँ सक्रिय हैं।"
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "अधिसूचना निष्क्रिय करने हेतु कोई पैकेज चयनित नहीं है।"
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "आपके द्वारा चयनित एक पैकेज हेतु अधिसूचनाएँ निष्क्रिय है।"
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "चयनित पैकेज हेतु अधिसूचनाएँ हटा दी गई हैं।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr "पैकेज चिन्हित करने हेतु लॉगिन आवश्यक है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr "चिन्हित करने हेतु कोई पैकेज चयनित नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr "चयनित पैकेज अचिन्हित हैं, कृपया टिप्पणी दर्ज करें।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr "चयनित पैकेज पुराने के रूप में चिन्हित हैं।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr "पैकेज अचिन्हित करने हेतु लॉगिन आवश्यक है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr "अचिन्हित करने हेतु कोई पैकेज चयनित नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr "चयनित पैकेज अचिन्हित किए गए।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr "आपके पास पैकेज हटाने हेतु अनुमति नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr "हटाने हेतु कोई पैकेज चयनित नहीं है।"
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "आपके द्वारा चयनित एक पैकेज अनुपलब्ध है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr "चयनित पैकेज हटाए गए।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr "पैकेज स्वामित्व प्राप्त करने हेतु लॉगिन आवश्यक है।"
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "आपके द्वारा चयनित पैकेज में से एक की स्वामित्व प्राप्ति निषेध है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr "पैकेज स्वामित्व निरस्त करने हेतु लॉगिन आवश्यक है।"
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "आपके द्वारा चयनित पैकेज में से एक का स्वामित्व निरस्त करना निषेध है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr "स्वामित्व प्राप्त करने हेतु कोई पैकेज चयनित नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr "स्वामित्व निरस्त करने हेतु कोई पैकेज चयनित नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr "चयनित पैकेज का स्वामित्व प्राप्त किया गया।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr "चयनित पैकेज का स्वामित्व निरस्त किया गया।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr "पैकेज के लिए मतदान करने हेतु लॉगिन आवश्यक है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr "पैकेज के लिए मतदान वापस लेने हेतु लॉगिन आवश्यक है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr "मतदान करने हेतु कोई पैकेज चयनित नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr "चयनित पैकेज हेतु आपके मत हटाए गए।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr "चयनित पैकेज हेतु आपके मत दर्ज किए गए।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr "अधिसूचना सूची में जोड़ना विफल।"
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr "आपको %s के लिए टिप्पणियों हेतु अधिसूचना सूची में जोड़ दिया गया है।"
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr "आपको %s के लिए टिप्पणियों हेतु अधिसूचना सूची में से हटा दिया गया है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr "आपके पास यह टिप्पणी नहीं हटाने हेतु अनुमति नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr "टिप्पणी हटाई नहीं गई।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr "आपके पास यह टिप्पणी हटाने हेतु अनुमति नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr "टिप्पणी हटा दी गई।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr "टिप्पणी संपादित की गई।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr "आपके पास इस पैकेज बेस के वर्गीकरण शब्द संपादित करने हेतु अनुमति नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr "पैकेज बेस के वर्गीकरण शब्द अपडेट किए गए।"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr "आपके पास इस पैकेज बेस के सह-अनुरक्षकों के प्रबंधन हेतु अनुमति नहीं है।"
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr "अमान्य उपयोक्ता नाम : %s"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr "पैकेज बेस के सह-अनुरक्षक अपडेट किए गए।"
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr "इस हेतु पैकेज विवरण देखें"
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr "%s आवश्यक है"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr "पैकेज अनुरोध करने हेतु लॉगिन आवश्यक है।"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr "अमान्य नाम : केवल लोअरकेस अक्षर ही स्वीकार्य हैं।"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr "टिप्पणी रिक्त नहीं होनी चाहिए।"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr "अमान्य अनुरोध प्रकार।"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr "अनुरोध जोड़ना सफल।"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr "अमान्य कारण।"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr "केवल विश्वसनीय उपयोक्ता व व सॉफ्टवेयर विकासकर्ता ही अनुरोध निरस्त कर सकते हैं।"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr "अनुरोध निरस्त करना सफल।"
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr "यह प्रपत्र उपयोग कर AUR अकाउंट स्थायी रूप से हटाएँ।%s"
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr "%sचेतावनी%s: यह कार्य पूर्ववत करना संभव नहीं है।"
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr "हटाने की पुष्टि करें"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr "उपयोक्ता नाम"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr "अकाउंट प्रकार"
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr "उपयोक्ता"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr "सॉफ्टवेयर विकासकर्ता"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr "विश्वसनीय उपयोक्ता व सॉफ्टवेयर विकासकर्ता"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr "ईमेल पता"
+
+#: template/account_details.php
+msgid "hidden"
+msgstr "अदृश्य"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr "वास्तविक नाम"
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr "होम पृष्ठ"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr "आईआरसी उपनाम"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr "पीजीपी कुंजी पहचान चिन्ह"
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr "स्थिति"
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr "तब से निष्क्रिय"
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr "सक्रिय"
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr "पंजीकरण दिनांक :"
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr "अज्ञात"
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr "अंतिम बार लॉगिन"
+
+#: template/account_details.php
+msgid "Never"
+msgstr "कभी नहीं"
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr "इस उपयोक्ता के पैकेज देखें"
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr "उपयोक्ता अकाउंट संपादित करें"
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr "इस उपयोक्ता की टिप्पणियाँ देखें"
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr "%sयहाँ%s क्लिक कर यह अकाउंट स्थायी रूप से हटाएँ।"
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr "%sयहाँ%s क्लिक कर उपयोक्ता विवरण देखें।"
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr "%sयहाँ%s क्लिक कर इस अकाउंट द्वारा की गई टिप्पणियाँ देखें।"
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr "आवश्यक है"
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr "लॉगिन हेतु प्रयुक्त नाम ही उपयोक्ता नाम होता है। अकाउंट निष्क्रिय होने पर भी यह सार्वजनिक रूप से दृश्यमान होगा।"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr "सामान्य उपयोक्ता"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr "विश्वसनीय उपयोक्ता"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr "निलंबित अकाउंट"
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr "निष्क्रिय"
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr "सुनिश्चित करें कि दर्ज किया गया ईमेल पता उचित है, अन्यथा अभिगम निरस्त हो जाएगी।"
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr "ईमेल पता छुपाएँ"
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr "ईमेल पता न छुपाने पर यह सभी पंजीकृत उपयोक्ताओं व छुपाने पर यह केवल आर्च लिनक्स कर्मियों को दृश्यमान होगा।"
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr "बैकअप ईमेल पता"
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr "एक वैकल्पिक ईमेल पता भी दर्ज करें ताकि प्राथमिक ईमेल हेतु अभिगम न होने पर भी आप अपना अकाउंट पुनः स्थापित कर सकें।"
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr "कूटशब्द पुनः सेट करने हेतु लिंक प्राथमिक व बैकअप दोनों पर ईमेल किए जाते हैं।"
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr "बैकअप ईमेल पता आर्च लिनक्स कर्मियों को सदैव दृश्यमान होता है, यह %s सेटिंग पर निर्भर नहीं है।"
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr "भाषा"
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr "समयक्षेत्र"
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr "कूटशब्द बदलने हेतु नया कूटशब्द दर्ज करें व पुनः दर्ज कर उसकी पुष्टि करें।"
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr "कूटशब्द पुनः दर्ज करें"
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr "निम्नलिखित जानकारी केवल आर्च उपयोक्ता पैकेज-संग्रह में पैकेज निवेदन करने हेतु ही आवश्यक है।"
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr "सार्वजनिक एसएसएच कुंजी"
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr "अधिसूचना सेटिंग्स"
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr "नवीन टिप्पणी हेतु सूचित करें"
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr "पैकेज अपडेट हेतु सूचित करें"
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr "स्वामित्व परिवर्तन हेतु सूचित करें"
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr "अपना वर्तमान कूटशब्द दर्ज कर, प्रोफाइल परिवर्तनों की पुष्टि करें :"
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr "वर्तमान कूटशब्द"
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr "AUR में स्वतः अकाउंट निर्माण रोकने हेतु कृपया नीचे दी गई कमांड का आउटपुट प्रदान करें :"
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr "उत्तर"
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr "अपडेट करें"
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr "बनाएँ"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr "पुनः सेट करें"
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr "आपके खोज मानदंड हेतु कोई परिणाम नहीं मिला।"
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr "अकाउंट संपादित करें"
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr "निलंबित"
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr "संपादित करें"
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr "कम"
+
+#: template/account_search_results.php
+msgid "More"
+msgstr "अधिक"
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr "कोई अन्य परिणाम नहीं है।"
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr "यह प्रपत्र उपयोग कर %s%s%s हेतु सह-अनुरक्षक जोड़ें (प्रत्येक पंक्ति में एक उपयोक्ता):"
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr "उपयोक्ता"
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr "संचित करें"
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr "पुराने के रूप में चिन्हित करती टिप्पणी : %s"
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr "%s%s%s द्वारा %s%s%s को निम्नलिखित कारण से %s%s%s को पुराने के रूप में चिन्हित किया गया :"
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr "%s%s%s पुराने के रूप में चिन्हित नहीं है।"
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr "विवरण पर वापस जाएँ"
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr "प्रतिलिप्याधिकार %s 2004-%d aurweb विकासकर्ता टीम।"
+
+#: template/header.php
+msgid " My Account"
+msgstr "मेरा अकाउंट"
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr "पैकेज संबंधी कार्य"
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr "PKGBUILD देखें"
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr "बदलाव देखें"
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr "स्नैपशॉट डाउनलोड"
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr "विकी में ढूँढें"
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr "पुराने के रूप में चिन्हित (%s)"
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr "पैकेज को पुराने के रूप में चिन्हित करें"
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr "पैकेज अचिन्हित करें"
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr "मत हटाएँ"
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr "इस पैकेज को वोट दें"
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr "अधिसूचनाएँ निष्क्रिय करें"
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr "अधिसूचनाएँ सक्रिय करें"
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr "सह-अनुरक्षक प्रबंधन"
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] "%d शेष अनुरोध"
+msgstr[1] "%d शेष अनुरोध"
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr "पैकेज स्वामित्व लें"
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr "पैकेज बेस विवरण"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr "Git प्रतिरूपण यूआरएल"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr "केवल रीड योग्य"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr "कॉपी करने हेतु क्लिक करें"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr "वर्गीकरण शब्द"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr "निवेदक"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr "अनुरक्षक"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr "अंतिम पैकेज कर्ता"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr "मत"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr "लोकप्रियता"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr "प्रथम बार निवेदित"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr "अंतिम बार अपडेट"
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr "इस हेतु टिप्पणी संपादन : %s"
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr "टिप्पणी करें"
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr "AUR पैकेज-संग्रह व यूआरएल संचय कार्यों की और इंगित करते Git संचय पहचान साधन स्वतः ही लिंक में परिवर्तित कर दिए जाते हैं।"
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr "%sमार्कडाउन वाक्य-विन्यास%s आंशिक रूप से ही समर्थित है।"
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr "पिन की गई टिप्पणियाँ"
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr "नवीनतम टिप्पणियाँ"
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr "इस हेतु टिप्पणियाँ"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr "%s ने %s को टिप्पणी की"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr "अज्ञात ने %s को टिप्पणी की"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr "%s पैकेज हेतु %s को टिप्पणी की"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr "%s ने %s को हटाया"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr "%s को हटाया गया"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr "%s द्वारा %s को संपादित"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr "%s को संपादित"
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr "टिप्पणी न हटाएँ"
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr "टिप्पणी हटाएँ"
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr "टिप्पणी पिन करें"
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr "टिप्पणी पिन से हटाएँ"
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr "पैकेज विवरण"
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr "पैकेज बेस"
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr "विवरण"
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr "स्रोत यूआरएल"
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr "इस हेतु वेबसाइट देखें"
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr "लाइसेंस"
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr "समूह"
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr "इनके विरुद्ध"
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr "प्रदान करता है"
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr "इनके स्थान पर"
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr "आश्रित पैकेज"
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr "इन हेतु आवश्यक"
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr "स्रोत"
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr "यह प्रपत्र उपयोग कर पैकेज बेस %s%s%s हेतु अनुरोध निरस्त करें।"
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr "टिप्पणी होना आवश्यक है। हालाँकि, अनुरोध निरस्त करने के उपरांत भी टिप्पणी करना आवश्यक है।"
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr "कारण"
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr "स्वीकृत"
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr "अस्वीकृत"
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr "यह प्रपत्र उपयोग कर पैकेज बेस %s%s%s व उसमें सम्मिलित निम्नलिखित पैकेज के विरुद्ध हेतु अनुरोध करें :"
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr "अनुरोध प्रकार"
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr "हटाना"
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr "निरर्थक पैकेज"
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr "इसमें विलय करें"
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr "हटाने हेतु अनुरोध से अभिप्राय है विश्वसनीय उपयोक्ता को पैकेज बेस हटाने हेतु निवेदन। यह प्रतिरूपित प्रोग्राम, स्रोत द्वारा त्यागे गए सॉफ्टवेयर के साथ ही अवैध व समाधान विहीन समस्यात्मक पैकेज हेतु उचित होता है।"
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr "विलय अनुरोध से अभिप्राय है विश्वसनीय उपयोक्ता को पैकेज बेस हटाकर मत व टिप्पणियाँ अन्य पैकेज बेस में अंतरण हेतु निवेदन। पैकेज बेस हटाने से संबंधित पैकेज-संग्रह प्रभावित नहीं होते हैं। सुनिश्चित करें कि आप लक्षित पैकेज का Git वृतांत स्वयं अपडेट करें।"
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr "निरर्थक पैकेज अनुरोध से अभिप्राय है विश्वसनीय उपयोक्ता को पैकेज स्वामित्व निरस्त करने हेतु निवेदन। अनुरक्षक कार्य अनिवार्यता, अनुरक्षक की अघोषित अनुपस्थिति और स्वयं अनुरक्षक से संपर्क हेतु प्रयास होने पर ही कृपया ऐसा करें।"
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr "आपके खोज मानदंड हेतु कोई अनुरोध नहीं मिला।"
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] "%d पैकेज अनुरोध मिला।"
+msgstr[1] "%d पैकेज अनुरोध मिले।"
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr "%d का %d पृष्ठ।"
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr "पैकेज"
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr "इन द्वारा निवेदित"
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr "दिनांक"
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] "~%d दिन शेष"
+msgstr[1] "~%d दिन शेष"
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] "~%d घंटा शेष"
+msgstr[1] "~%d घंटे शेष"
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr "<1 घंटा शेष"
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr "स्वीकारें"
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr "लॉक है"
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr "निरस्त"
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr "शेष"
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr "निरस्त है"
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr "नाम, विवरण"
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr "केवल नाम"
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr "सटीक नाम"
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr "सटीक पैकेज बेस"
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr "सह-अनुरक्षक"
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr "अनुरक्षक, सह-अनुरक्षक"
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr "सभी"
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr "चिन्हित"
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr "अचिन्हित"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr "नाम"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr "मतदान किया गया"
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr "अंतिम बार परिवर्तन"
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr "आरोह"
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr "अवरोह"
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr "खोज मानदंड दर्ज करें"
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr "खोज हेतु मापदंड"
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr "पुराने"
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr "अनुक्रमण"
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr "क्रम"
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr "प्रति पृष्ठ"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr "खोजें"
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr "निरर्थक पैकेज"
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr "पैकेज सूची प्राप्त करने हेतु त्रुटि।"
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr "आपके खोज मानदंड हेतु कोई पैकेज नहीं मिला।"
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] "%d पैकेज मिले।"
+msgstr[1] "%d पैकेज मिले।"
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr "संस्करण"
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr "पैकेज लोकप्रियता की गणना उसके निर्माण उपरांत प्रति दिन से %.2f कारक युक्त प्रत्येक मत के साथ सभी मतों के योग के रूप में की जाती है।"
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr "हाँ"
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr "निरर्थक पैकेज"
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr "कार्य"
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr "पुराने के रूप में अचिन्हित करें"
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr "पैकेज स्वामित्व लें"
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr "पैकेज स्वामित्व निरस्त करें"
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr "पैकेज हटाएँ"
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr "पुष्टि करें"
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr "कोई भी प्रकार"
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr "खोजें"
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr "आँकड़ें"
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr "निरर्थक पैकेज"
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr "पिछले 7 दिनों में जोड़ें गए पैकेज"
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr "पिछले 7 दिनों में अपडेट हुए पैकेज"
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr "पिछले वर्ष में अपडेट हुए पैकेज"
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr "कभी अपडेट नहीं हुए पैकेज"
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr "पंजीकृत उपयोक्ता"
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr "विश्वसनीय उपयोक्ता"
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr "हालिया अपडेट"
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr "अधिक"
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr "मेरे आँकड़ें"
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr "प्रस्ताव विवरण"
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr "मतदान प्रक्रिया चालू है।"
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr "निवेदित : %s द्वारा %s"
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr "अंत"
+
+#: template/tu_details.php
+msgid "Result"
+msgstr "परिणाम"
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr "नहीं"
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr "वोट न करें"
+
+#: template/tu_details.php
+msgid "Total"
+msgstr "कुल"
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr "भाग लिया"
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr "विश्वसनीय उपयोक्ताओं द्वारा अंतिम मत"
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr "अंतिम मत"
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr "कोई परिणाम नहीं मिला।"
+
+#: template/tu_list.php
+msgid "Start"
+msgstr "आरंभ"
+
+#: template/tu_list.php
+msgid "Back"
+msgstr "वापस"
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr "AUR कूटशब्द पुनः सेट करें"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr "आपके ईमेल पते से संबंधित अकाउंट {user} हेतु कूटशब्द पुनः सेट करने हेतु अनुरोध किया गया है। यदि आप कूटशब्द पुनः सेट करना चाहते हैं तो नीचे दिया लिंक [1] उपयोग करें, अन्यथा इस संदेश को अनदेखा करें।"
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr "आर्च उपयोक्ता पैकेज-संग्रह में स्वागत है"
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr "आर्च उपयोक्ता पैकेज-संग्रह में स्वागत है! नवीन अकाउंट हेतु आरंभिक कूटशब्द सेट करने हेतु, नीचे दिया लिंक [1] उपयोग करें। लिंक उपयोग में समस्या होने पर इस लिंक को कॉपी कर ब्राउज़र में पेस्ट करें।"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr "{pkgbase} हेतु AUR टिप्पणी"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr "{user} [1] द्वारा {pkgbase} [2] में निम्नलिखित टिप्पणी में जोड़ी गई :"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr "यदि आप इस पैकेज संबंधी अधिसूचना प्राप्त नहीं करना चाहते हैं तो पैकेज पृष्ठ [2] पर जाकर \"{label}\" चुनें।"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr "AUR पैकेज अपडेट : {pkgbase}"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr "{user} [1] द्वारा {pkgbase} [2] में निम्नलिखित संचित कार्य किया गया :"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr "{pkgbase} के पुराना होने की AUR अधिसूचना"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr "{user} [2] द्वारा आपका पैकेज {pkgbase} [1] पुराने के रूप में चिन्हित किया गया है :"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr "{pkgbase} हेतु स्वामित्व की AUR अधिसूचना"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr "{user} [2] द्वारा पैकेज {pkgbase} [1] का स्वामित्व लिया गया।"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr "{user} [2] द्वारा पैकेज {pkgbase} [1] का स्वामित्व निरस्त किया गया।"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr "{pkgbase} हेतु सह-अनुरक्षक की AUR अधिसूचना"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr "आपको {pkgbase} [1] की सह-अनुरक्षक सूची में जोड़ा गया।"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr "आपको {pkgbase} [1] की सह-अनुरक्षक सूची से हटाया गया।"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr "AUR पैकेज हटाया गया : {pkgbase}"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr "{user} [1] द्वारा {old} [2] का {new} [3] में विलय।\n\n-- \nयदि आप इस नवीन पैकेज संबंधी अधिसूचना प्राप्त नहीं करना चाहते हैं तो [3] पर जाकर \"{label}\" पर क्लिक करें।"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr "{user} [1] द्वारा {pkgbase} [2] हटाया गया।\n\nआपको इस पैकेज संबंधी कोई अधिसूचना प्राप्त नहीं होंगी।"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr "विश्वसनीय उपयोक्ता मतदान सूचक : प्रस्ताव {id}"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr "प्रस्ताव {id} [1] हेतु अवश्य मतदान करें। मतदान प्रक्रिया 48 घंटे में समाप्त होगी।"
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "प्रदान किया गया अकाउंट प्रकार अमान्य है।"
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "आपके पास अकाउंट प्रकार में परिवर्तन हेतु अनुमति नहीं है।"
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "आपके पास इस उपयोक्ता के अकाउंट प्रकार को %s में परिवर्तित करने हेतु अनुमति नहीं है।"
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr "%s स्वीकारनें हेतु कोई निरर्थक पैकेज अनुरोध शेष नहीं है।"
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 0a522fb8..4932bd7e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Croatian (http://www.transifex.com/lfleischer/aurweb/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -471,6 +471,12 @@ msgid ""
 "checkbox."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr ""
@@ -569,6 +575,14 @@ msgstr ""
 msgid "Flag Package Out-Of-Date"
 msgstr ""
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -865,6 +879,10 @@ msgstr ""
 msgid "Account suspended"
 msgstr ""
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -950,6 +968,30 @@ msgstr "Došlo je do greške prilikom preuzimanja detalja o paketu."
 msgid "Package details could not be found."
 msgstr "Nije moguće naći detalje o paketu."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Morate se logirati da bi obilježavali pakete."
@@ -986,6 +1028,10 @@ msgstr ""
 msgid "You did not select any packages to delete."
 msgstr "Niste odabrali pakete koje želite izbrisati."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Odabrani paketi su izbrisani."
@@ -994,10 +1040,18 @@ msgstr "Odabrani paketi su izbrisani."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Morate se logirati da bi posvojili pakete."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Morate se logirati da bi se mogli odreknuti paketa."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Niste odabrali pakete koje želite posvojiti."
@@ -2240,3 +2294,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 1d4cf856..51894457 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,13 +7,14 @@
 # Balló György <ballogyor@gmail.com>, 2011,2013-2016
 # Balló György <ballogyor@gmail.com>, 2016
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
+# PB, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/lfleischer/aurweb/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,17 +36,17 @@ msgstr "Megjegyzés"
 
 #: html/404.php
 msgid "Git clone URLs are not meant to be opened in a browser."
-msgstr ""
+msgstr "A Git tároló klónozásához használatos hivatkozásokat nem böngészővel kell megnyitni."
 
 #: html/404.php
 #, php-format
 msgid "To clone the Git repository of %s, run %s."
-msgstr ""
+msgstr "A(z) %s Git tárolójának klónozásához futtasd a következőt: %s."
 
 #: html/404.php
 #, php-format
 msgid "Click %shere%s to return to the %s details page."
-msgstr ""
+msgstr "Kattints %side%s a(z) %s adatlapjának megnyitásához."
 
 #: html/503.php
 msgid "Service Unavailable"
@@ -78,7 +79,7 @@ msgstr "Nincs engedélyed ennek a fióknak a szerkesztéséhez."
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Érvénytelen jelszó."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -168,7 +169,7 @@ msgstr "Hozzászólás szerkesztése"
 
 #: html/home.php template/header.php
 msgid "Dashboard"
-msgstr ""
+msgstr "Vezérlőpult"
 
 #: html/home.php template/header.php
 msgid "Home"
@@ -176,11 +177,11 @@ msgstr "Honlap"
 
 #: html/home.php
 msgid "My Flagged Packages"
-msgstr ""
+msgstr "Elavultnak jelölt csomagjaim"
 
 #: html/home.php
 msgid "My Requests"
-msgstr ""
+msgstr "Kérelmeim"
 
 #: html/home.php
 msgid "My Packages"
@@ -188,15 +189,15 @@ msgstr "Csomagjaim"
 
 #: html/home.php
 msgid "Search for packages I maintain"
-msgstr ""
+msgstr "Csomagok keresése, amelyeknek karbantartója vagyok"
 
 #: html/home.php
 msgid "Co-Maintained Packages"
-msgstr ""
+msgstr "Csomagok, amelyeknek társkarbantartója vagyok"
 
 #: html/home.php
 msgid "Search for packages I co-maintain"
-msgstr ""
+msgstr "Csomagok keresése, amelyeknek társkarbantartója vagyok"
 
 #: html/home.php
 #, php-format
@@ -375,7 +376,7 @@ msgstr "Bejelentkezési adatok megadása"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "Felhasználónév vagy elsődleges email cím"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -439,7 +440,7 @@ msgstr "Jelszavad sikeresen visszaállításra került."
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "Erősítsd meg a felhasználóneved vagy elsődleges email címed:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -458,15 +459,15 @@ msgstr "Folytatás"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Ha elfelejtetted a felhasználóneved és az elsődleges email címed, akkor kérlek küldj üzenetet az %saur-general%s levelezőlistára."
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "Add meg a felhasználóneved vagy elsődleges email címed:"
 
 #: html/pkgbase.php
 msgid "Package Bases"
-msgstr ""
+msgstr "Alapcsomagok"
 
 #: html/pkgbase.php
 msgid ""
@@ -474,6 +475,12 @@ msgid ""
 "checkbox."
 msgstr "A kiválasztott csomagok nem kerültek megtagadásra, ellenőrizd a megerősítő jelölőnégyzetet."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Nem található csomag, amelybe a szavazatok és hozzászólások beolvaszthatók lennének."
@@ -538,7 +545,7 @@ msgstr "Használd ezt az űrlapot a(z) %s%s%s alapcsomag megtagadásához, amely
 msgid ""
 "By selecting the checkbox, you confirm that you want to no longer be a "
 "package co-maintainer."
-msgstr ""
+msgstr "A jelölőnégyzet megjelölésével megerősíted, hogy nem akarsz társkarbantartó lenni."
 
 #: html/pkgdisown.php
 #, php-format
@@ -572,6 +579,14 @@ msgstr "Hozzászólás jelölése"
 msgid "Flag Package Out-Of-Date"
 msgstr "Csomag elvaultnak jelölése"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -684,21 +699,21 @@ msgstr "Használd ezt a űrlapot felhasználói fiók létrehozására."
 
 #: html/tos.php
 msgid "Terms of Service"
-msgstr ""
+msgstr "A szolgáltatás feltételei"
 
 #: html/tos.php
 msgid ""
 "The following documents have been updated. Please review them carefully:"
-msgstr ""
+msgstr "A következő dokumentumok frissítésre kerültek. Kérlek nézd át őket alaposan:"
 
 #: html/tos.php
 #, php-format
 msgid "revision %d"
-msgstr ""
+msgstr "revízió %d"
 
 #: html/tos.php
 msgid "I accept the terms and conditions above."
-msgstr ""
+msgstr "Elfogadom a feljebb megadott feltételeket."
 
 #: html/tu.php template/account_details.php template/header.php
 msgid "Trusted User"
@@ -769,7 +784,7 @@ msgstr "Csak egyetlen pontot, aláhúzást vagy kötőjelet tartalmazhat."
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
-msgstr ""
+msgstr "Kérlek erősítsd meg az új jelszavad."
 
 #: lib/acctfuncs.inc.php
 msgid "The email address is invalid."
@@ -777,11 +792,11 @@ msgstr "Érvénytelen e-mail cím."
 
 #: lib/acctfuncs.inc.php
 msgid "The backup email address is invalid."
-msgstr ""
+msgstr "A másodlagos email cím érvénytelen."
 
 #: lib/acctfuncs.inc.php
 msgid "The home page is invalid, please specify the full HTTP(s) URL."
-msgstr ""
+msgstr "A főoldal érvénytelen, kérlek add meg a teljes HTTP(s) URL-t."
 
 #: lib/acctfuncs.inc.php
 msgid "The PGP key fingerprint is invalid."
@@ -801,7 +816,7 @@ msgstr "A nyelv jelenleg nem támogatott."
 
 #: lib/acctfuncs.inc.php
 msgid "Timezone is not currently supported."
-msgstr ""
+msgstr "Az időzóna jelenleg nem támogatott."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -820,15 +835,15 @@ msgstr "A(z) %s%s%s nyilvános SSH kulcs már használatban van."
 
 #: lib/acctfuncs.inc.php
 msgid "The CAPTCHA is missing."
-msgstr ""
+msgstr "Hiányzó CAPTCHA."
 
 #: lib/acctfuncs.inc.php
 msgid "This CAPTCHA has expired. Please try again."
-msgstr ""
+msgstr "A CAPTCHA lejárt. Kérlek próbáld újra."
 
 #: lib/acctfuncs.inc.php
 msgid "The entered CAPTCHA answer is invalid."
-msgstr ""
+msgstr "A megadott CAPTCHA érvénytelen."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -868,6 +883,10 @@ msgstr "A bejelentkező űrlap jelenleg letiltásra került az IP címedre, val
 msgid "Account suspended"
 msgstr "Fiók felfüggesztve"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -953,6 +972,30 @@ msgstr "Hiba történt a csomag részletes információinak letöltése közben.
 msgid "Package details could not be found."
 msgstr "A csomag részletes információi nem találhatók."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Csomagok megjelöléséhez be kell jelentkezned."
@@ -989,6 +1032,10 @@ msgstr "Csomagok törléséhez nincs jogosultságod."
 msgid "You did not select any packages to delete."
 msgstr "Nem választottál ki egyetlen törlendő csomagot sem."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "A kiválasztott csomagok törlése megtörtént."
@@ -997,10 +1044,18 @@ msgstr "A kiválasztott csomagok törlése megtörtént."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Csomagok örökbefogadásához be kell jelentkezned."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Csomagok megtagadásához be kell jelentkezned."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Nem választottál ki egyetlen örökbe fogadandó csomagot sem."
@@ -1233,7 +1288,7 @@ msgstr "Soha"
 
 #: template/account_details.php
 msgid "View this user's packages"
-msgstr "A felhasználó csomagjainak megtekintése"
+msgstr "Ezen felhasználó csomagjainak megtekintése"
 
 #: template/account_details.php
 msgid "Edit this user's account"
@@ -1241,7 +1296,7 @@ msgstr "Ezen felhasználó fiókjának szerkesztése"
 
 #: template/account_details.php
 msgid "List this user's comments"
-msgstr ""
+msgstr "Ezen felhasználó hozzászólásainak megtekintése"
 
 #: template/account_edit_form.php
 #, php-format
@@ -1256,7 +1311,7 @@ msgstr "Kattints %side%s a felhasználó részleteihez."
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s to list the comments made by this account."
-msgstr ""
+msgstr "Kattints %side%s a felhasználó hozzászólásainak megtekintéséhez."
 
 #: template/account_edit_form.php
 msgid "required"
@@ -1266,7 +1321,7 @@ msgstr "kötelező"
 msgid ""
 "Your user name is the name you will use to login. It is visible to the "
 "general public, even if your account is inactive."
-msgstr ""
+msgstr "A felhasználóneved a bejelentkezéshez használt név lesz. Látható a mindenki számára még akkor is, ha a fiókod inaktív."
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Normal user"
@@ -1299,30 +1354,30 @@ msgid ""
 "If you do not hide your email address, it is visible to all registered AUR "
 "users. If you hide your email address, it is visible to members of the Arch "
 "Linux staff only."
-msgstr ""
+msgstr "A nem rejted el az email címed, akkor minden regisztrált AUR felhasználó láthatja. Ha elrejted az email címed, akkor csak az Arch Linux személyzet láthatja."
 
 #: template/account_edit_form.php
 msgid "Backup Email Address"
-msgstr ""
+msgstr "Másodlagos email cím"
 
 #: template/account_edit_form.php
 msgid ""
 "Optionally provide a secondary email address that can be used to restore "
 "your account in case you lose access to your primary email address."
-msgstr ""
+msgstr "Megadhatsz egy másodlagos email címet, amellyel visszaszerezheted a hozzáférést a fiókodhoz, ha elveszted a hozzáférést az elsődleges email címedhez."
 
 #: template/account_edit_form.php
 msgid ""
 "Password reset links are always sent to both your primary and your backup "
 "email address."
-msgstr ""
+msgstr "A jelszó visszaállító linkek az első- és másodlagos email címedre is kiküldésre kerülnek."
 
 #: template/account_edit_form.php
 #, php-format
 msgid ""
 "Your backup email address is always only visible to members of the Arch "
 "Linux staff, independent of the %s setting."
-msgstr ""
+msgstr "A másodlagos email címed csak az Arch Linux személyzet számára látható, a(z) %s beállítástól függetlenül."
 
 #: template/account_edit_form.php
 msgid "Language"
@@ -1330,13 +1385,13 @@ msgstr "Nyelv"
 
 #: template/account_edit_form.php
 msgid "Timezone"
-msgstr ""
+msgstr "Időzóna"
 
 #: template/account_edit_form.php
 msgid ""
 "If you want to change the password, enter a new password and confirm the new"
 " password by entering it again."
-msgstr ""
+msgstr "Ha meg akarod változtatni a jelszavad, akkor add meg az új jelszót kétszer a megerősítéshez."
 
 #: template/account_edit_form.php
 msgid "Re-type password"
@@ -1370,21 +1425,21 @@ msgstr "Értesítés tulajdonváltozásokról"
 
 #: template/account_edit_form.php
 msgid "To confirm the profile changes, please enter your current password:"
-msgstr ""
+msgstr "A fiók módosításának megerősítéséhez kérlek add meg a jelenlegi jelszavad:"
 
 #: template/account_edit_form.php
 msgid "Your current password"
-msgstr ""
+msgstr "Jelenlegi jelszavad"
 
 #: template/account_edit_form.php
 msgid ""
 "To protect the AUR against automated account creation, we kindly ask you to "
 "provide the output of the following command:"
-msgstr ""
+msgstr "Az automatizált regisztrációk kiszűrése érdekében, kérlek add meg a következő parancs kimenetét:"
 
 #: template/account_edit_form.php
 msgid "Answer"
-msgstr ""
+msgstr "Válasz"
 
 #: template/account_edit_form.php template/pkgbase_details.php
 #: template/pkg_details.php
@@ -1547,7 +1602,7 @@ msgstr "csak olvasható"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "click to copy"
-msgstr ""
+msgstr "kattints a másoláshoz"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
@@ -1593,18 +1648,18 @@ msgstr "Hozzászólás szerkesztése ehhez: %s"
 
 #: template/pkg_comment_box.php template/pkg_comment_form.php
 msgid "Add Comment"
-msgstr "Hosszászólás"
+msgstr "Hozzászólás"
 
 #: template/pkg_comment_form.php
 msgid ""
 "Git commit identifiers referencing commits in the AUR package repository and"
 " URLs are converted to links automatically."
-msgstr ""
+msgstr "A csomag tárolójában lévő Git kommitok azonosítói automatikusan hivatkozássá lesznek alakítva."
 
 #: template/pkg_comment_form.php
 #, php-format
 msgid "%sMarkdown syntax%s is partially supported."
-msgstr ""
+msgstr "A %sMarkdown leíró nyelv%s részlegesen támogatott."
 
 #: template/pkg_comments.php
 msgid "Pinned Comments"
@@ -1616,7 +1671,7 @@ msgstr "Legújabb hozzászólások"
 
 #: template/pkg_comments.php
 msgid "Comments for"
-msgstr ""
+msgstr "Felhasználó hozzászólásai:"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1631,7 +1686,7 @@ msgstr "Névtelen hozzászólás ekkor: %s"
 #: template/pkg_comments.php
 #, php-format
 msgid "Commented on package %s on %s"
-msgstr ""
+msgstr "Hozzászólás a(z) %s csomaghoz %s időpontban"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1774,7 +1829,7 @@ msgid ""
 "By submitting a deletion request, you ask a Trusted User to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr "Törlési kérelem beküldésével megkérsz egy megbízható felhasználót, hogy törölje az alapcsomagot. Ez a típusú kérelem duplikátumok, főági fejlesztők által felhagyott szoftverek, valamint illegális és helyrehozhatatlanul elromlott csomagokhoz használható."
+msgstr "Törlési kérelem beküldésével megkérsz egy megbízható felhasználót, hogy törölje az alapcsomagot. Ez a típusú kérelem duplikátumok, főági fejlesztők által felhagyott szoftverek, valamint illegális és helyrehozhatatlanul elromlott csomagok esetén használható."
 
 #: template/pkgreq_form.php
 msgid ""
@@ -1794,7 +1849,7 @@ msgstr "Megtagadási kérelem beküldésével megkérsz egy megbízható felhasz
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
-msgstr ""
+msgstr "Nincs a keresési feltételeknek megfelelő kérelem."
 
 #: template/pkgreq_results.php
 #, php-format
@@ -1852,7 +1907,7 @@ msgstr "Lezárás"
 
 #: template/pkgreq_results.php
 msgid "Pending"
-msgstr ""
+msgstr "Függőben lévő"
 
 #: template/pkgreq_results.php
 msgid "Closed"
@@ -1876,11 +1931,11 @@ msgstr "Pontos alapcsomag"
 
 #: template/pkg_search_form.php
 msgid "Co-maintainer"
-msgstr ""
+msgstr "Társkarbantartó"
 
 #: template/pkg_search_form.php
 msgid "Maintainer, Co-maintainer"
-msgstr ""
+msgstr "Karbantartó, társkarbantartó"
 
 #: template/pkg_search_form.php
 msgid "All"
@@ -2117,7 +2172,7 @@ msgstr "Vissza"
 
 #: scripts/notify.py
 msgid "AUR Password Reset"
-msgstr ""
+msgstr "AUR jelszó visszaállítása"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2125,90 +2180,90 @@ msgid ""
 "A password reset request was submitted for the account {user} associated "
 "with your email address. If you wish to reset your password follow the link "
 "[1] below, otherwise ignore this message and nothing will happen."
-msgstr ""
+msgstr "Jelszó visszaállítást kezdeményeztek a te email címeddel rendelkező {user} felhasználó számára. Ha szeretnéd visszaállítani a jelszavad, akkor nyisd meg a lenti linket [1], egyébként hagyd figyelmen kívül ezt az üzenetet, és semmi sem fog történni."
 
 #: scripts/notify.py
 msgid "Welcome to the Arch User Repository"
-msgstr ""
+msgstr "Üdvözlünk az Arch User Repositoryban"
 
 #: scripts/notify.py
 msgid ""
 "Welcome to the Arch User Repository! In order to set an initial password for"
 " your new account, please click the link [1] below. If the link does not "
 "work, try copying and pasting it into your browser."
-msgstr ""
+msgstr "Üdvözlünk az Arch User Repositoryban! A jelszó beállításához, kérlek nyisd meg a lenti linket [1]. Ha nem működik, akkor próbáld meg kimásolni, és beilleszteni a böngésződ címsorába."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Comment for {pkgbase}"
-msgstr ""
+msgstr "AUR hozzászólás: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] added the following comment to {pkgbase} [2]:"
-msgstr ""
+msgstr "{user} [1] hozzászólt a(z) {pkgbase} [2] csomaghoz:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "If you no longer wish to receive notifications about this package, please go"
 " to the package page [2] and select \"{label}\"."
-msgstr ""
+msgstr "Ha többé nem szeretnél értesítést kapni ezen csomaggal kapcsolatban, akkor kérlek nyisd meg a csomag adatlapját [2] és kattints a(z) \"{label}\" feliratra."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package Update: {pkgbase}"
-msgstr ""
+msgstr "AUR csomag frissítve: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
-msgstr ""
+msgstr "{user} [1] kommitolt a {pkgbase} [2] csomagba."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Out-of-date Notification for {pkgbase}"
-msgstr ""
+msgstr "AUR elavult csomag értesítés: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
-msgstr ""
+msgstr "Az általad karbantartott {pkgbase} [1] csomagot elavultnak jelölte meg {user} [2]:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Ownership Notification for {pkgbase}"
-msgstr ""
+msgstr "AUR tulajdonlási értesítés: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was adopted by {user} [2]."
-msgstr ""
+msgstr "A(z) {pkgbase} [1] csomagot {user} [2] örökbefogadta."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was disowned by {user} [2]."
-msgstr ""
+msgstr "A(z) {pkgbase} [1] csomagról {user} [2] lemondott."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Co-Maintainer Notification for {pkgbase}"
-msgstr ""
+msgstr "AUR társkarbantartói értesítés: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were added to the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "Hozzáadtak a(z) {pkgbase} [1] csomag társkarbantartóinak listájához."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "Eltávolítottak a(z) {pkgbase} [1] csomag társkarbantartóinak listájáról."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package deleted: {pkgbase}"
-msgstr ""
+msgstr "AUR csomag törölve: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2217,7 +2272,7 @@ msgid ""
 "\n"
 "-- \n"
 "If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
-msgstr ""
+msgstr "{user} [1] egyesítette a(z) {old} [2] csomagot a(z) {new} [3] csomagba.\n\n--\nHa többé nem szeretnél értesítéseket kapni az új csomaggal kapcsolatban, akkor nyisd meg a [3] hivatkozást és kattints a(z) \"{label}\" feliratra."
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2225,16 +2280,61 @@ msgid ""
 "{user} [1] deleted {pkgbase} [2].\n"
 "\n"
 "You will no longer receive notifications about this package."
-msgstr ""
+msgstr "{user} [1] törölte a(z) {pkgbase} [2] csomagt.\n\nTöbbé nem fogsz értesítéseket kapni ezen csomaggal kapcsolatban."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "TU Vote Reminder: Proposal {id}"
-msgstr ""
+msgstr "Szavazás megbízható felhasználóról: javaslat {id}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
+msgstr "Kérlek ne felejts el szavazni a(z) {id} azonosítójú javaslatról. A szavazási kevesebb, mint 48 óra múlva véget ér."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
 msgstr ""
diff --git a/po/id.po b/po/id.po
new file mode 100644
index 00000000..75a6c98b
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,2332 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+# se7entime <se7entime@disroot.org>, 2013
+# se7entime <se7entime@disroot.org>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Indonesian (http://www.transifex.com/lfleischer/aurweb/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr "Halaman Tidak Ditemukan"
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr "Maaf, halaman yang anda minta tidak ada."
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr "Layanan Tidak Tersedia"
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr "Jangan panik! Situs ini sedang tidak aktif karena sedang ada pemeliharaan. Kami akan kembali secepatnya."
+
+#: html/account.php
+msgid "Account"
+msgstr "Akun"
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr "Akun"
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr "Anda tidak diperbolehkan untuk mengakses area ini."
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr "Tidak dapat mengambil informasi untuk pengguna spesifik."
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr "Anda tidak mempunyai izin untuk menyunting akun ini."
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr "Gunakan formulir berikut untuk mencari akun yang ada."
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr "Anda harus masuk log untuk melihat informasi pengguna."
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr "Tambahkan Proposal"
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr "Token tidak sah untuk aksi pengguna."
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr "Nama pengguna tidak ada."
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr "%s telah mempunyai proposal yang berjalan untuk mereka."
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr "Tipe tidak sah."
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr "Proposal tidak bisa kosong."
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr "Proposal baru telah dimasukkan."
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr "Masukkan sebuah proposal untuk mengaktifkan voting."
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr "Pemohon/TU"
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr "(kosong jika tidak dapat diterapkan)"
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr "Tipe"
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr "Tambahan dari TU"
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr "Penghapusan dari TU"
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr "Penghapusan dari TU (tanpa aktifitas yang tidak dideklarasikan)"
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr "Amandemen Peraturan"
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr "Proposal"
+
+#: html/addvote.php
+msgid "Submit"
+msgstr "Masukkan"
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr "Kelola Co-maintainer"
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr "Sunting komentar"
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr "Beranda"
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr "Selamat datang di AUR! Harap baca %sPedoman Pengguna AUR%s dan %sPedoman TU AUR%s untuk info lebih lanjut."
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr "Ingat untuk memberika suara untuk paket favorit anda!"
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr "Beberapa paket mungkin disediakan sebagai binabinari di [comunity]."
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr "DISCLAIMER"
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr "Bantuan"
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr "Kriteria Pencarian"
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr "Paket"
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr "Galat saat mencoba untuk menerima rincian paket."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr "Paket yang dipilih belum dihapus, periksa kotak centang konfirmasi."
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/id_ID.po b/po/id_ID.po
new file mode 100644
index 00000000..d01294c8
--- /dev/null
+++ b/po/id_ID.po
@@ -0,0 +1,2330 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/lfleischer/aurweb/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/is.po b/po/is.po
new file mode 100644
index 00000000..a7a88b04
--- /dev/null
+++ b/po/is.po
@@ -0,0 +1,2335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Icelandic (http://www.transifex.com/lfleischer/aurweb/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 5dfdd9fc..436b6459 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,8 +3,9 @@
 # This file is distributed under the same license as the AURWEB package.
 # 
 # Translators:
+# Fanfurlio Farolfi <demolitions@gmail.com>, 2021-2022
 # Giovanni Scafora <giovanni@archlinux.org>, 2011-2015
-# Lorenzo Porta <lorenzoporta@outlook.it>, 2014
+# Lorenzo Porta <lorenzoporta@protonmail.com>, 2014
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
 # mattia_b89 <mattia.b89@gmail.com>, 2019
 msgid ""
@@ -12,8 +13,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Italian (http://www.transifex.com/lfleischer/aurweb/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,17 +36,17 @@ msgstr "Nota"
 
 #: html/404.php
 msgid "Git clone URLs are not meant to be opened in a browser."
-msgstr ""
+msgstr "Le URL per clonare un repository git non sono visualizzabili nel browser."
 
 #: html/404.php
 #, php-format
 msgid "To clone the Git repository of %s, run %s."
-msgstr ""
+msgstr "Per clonare il reposiroty git di %s, esegui %s."
 
 #: html/404.php
 #, php-format
 msgid "Click %shere%s to return to the %s details page."
-msgstr ""
+msgstr "Clicca %squi%s per tornare alla pagina dei dettagli di %s."
 
 #: html/503.php
 msgid "Service Unavailable"
@@ -78,7 +79,7 @@ msgstr "Non hai i permessi necessari per modificare questo account."
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Password non valida."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -168,7 +169,7 @@ msgstr "Edita il commento"
 
 #: html/home.php template/header.php
 msgid "Dashboard"
-msgstr ""
+msgstr "Cruscotto"
 
 #: html/home.php template/header.php
 msgid "Home"
@@ -176,11 +177,11 @@ msgstr "Home"
 
 #: html/home.php
 msgid "My Flagged Packages"
-msgstr ""
+msgstr "I miei pacchetti marcati"
 
 #: html/home.php
 msgid "My Requests"
-msgstr ""
+msgstr "Le mie richieste"
 
 #: html/home.php
 msgid "My Packages"
@@ -192,7 +193,7 @@ msgstr "Cerca i pacchetti da me mantenuti"
 
 #: html/home.php
 msgid "Co-Maintained Packages"
-msgstr "Pacchetti Co-mantenuti"
+msgstr "Pacchetti co-mantenuti"
 
 #: html/home.php
 msgid "Search for packages I co-maintain"
@@ -375,7 +376,7 @@ msgstr "Inserisci le credenziali di accesso"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "Nome utente o indirizzo email primario"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -439,7 +440,7 @@ msgstr "La tua password è stata ripristinata con successo."
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "Conferma il tuo nome utente o il tuo indirizzo email primario:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -458,15 +459,15 @@ msgstr "Continua"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Se hai dimenticato il nome utente e l'indirizzo email primario che hai usato per la registrazione, invia un messaggio alla mailing list %saur-general%s."
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "Inserisci il tuo nome utente o il tuo indirizzo email primario:"
 
 #: html/pkgbase.php
 msgid "Package Bases"
-msgstr ""
+msgstr "Pacchetti base"
 
 #: html/pkgbase.php
 msgid ""
@@ -474,6 +475,12 @@ msgid ""
 "checkbox."
 msgstr "I pacchetti selezionati non sono stati abbandonati, conferma la tua scelta inserendo un segno di spunta nell'apposita casella di controllo."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "I pacchetti selezionati non sono stati adottati, conferma la tua scelta inserendo un segno di spunta nell'apposita casella di controllo."
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Impossibile trovare il pacchetto da unire al suo interno i voti ed i commenti."
@@ -538,7 +545,7 @@ msgstr "Usa questo modulo per abbandonare il pacchetto base %s%s%s che contiene
 msgid ""
 "By selecting the checkbox, you confirm that you want to no longer be a "
 "package co-maintainer."
-msgstr ""
+msgstr "Selezionando la casella di controllo, confermi che non vuoi più essere un co-mantenitore del pacchetto."
 
 #: html/pkgdisown.php
 #, php-format
@@ -572,6 +579,14 @@ msgstr "Segnala Commento"
 msgid "Flag Package Out-Of-Date"
 msgstr "Segnala che il pacchetto non è aggiornato"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "Questo appare essere un pacchetto da VCS. Per favore %snon%s marcarlo come non aggiornato se la versione in AUR non corrisponde con il commit più recente, Questo pacchetto dovrebbe essere marcato solo se i sorgenti sono stati spostati o se sono necessari dei cambiamenti al PKGBUILD a causa delle recenti modifiche al sorgente."
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -769,7 +784,7 @@ msgstr "Può contenere solo un punto, un trattino basso o un trattino."
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
-msgstr ""
+msgstr "Per favore conferma la tua nuova password."
 
 #: lib/acctfuncs.inc.php
 msgid "The email address is invalid."
@@ -777,7 +792,7 @@ msgstr "L'indirizzo email non risulta valido."
 
 #: lib/acctfuncs.inc.php
 msgid "The backup email address is invalid."
-msgstr ""
+msgstr "L'indirizzo email di scorta non è valido."
 
 #: lib/acctfuncs.inc.php
 msgid "The home page is invalid, please specify the full HTTP(s) URL."
@@ -820,15 +835,15 @@ msgstr "La chiave pubblica SSH %s%s%s, è già in uso."
 
 #: lib/acctfuncs.inc.php
 msgid "The CAPTCHA is missing."
-msgstr ""
+msgstr "Manca la risposta CAPTCHA."
 
 #: lib/acctfuncs.inc.php
 msgid "This CAPTCHA has expired. Please try again."
-msgstr ""
+msgstr "Il CAPTCHA è scaduto, Per favore riprova."
 
 #: lib/acctfuncs.inc.php
 msgid "The entered CAPTCHA answer is invalid."
-msgstr ""
+msgstr "La risposta CAPTCHA inserita non è valida."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -868,6 +883,10 @@ msgstr "Il modulo d'accesso è attualmente disabilitato per il tuo indirizzo IP,
 msgid "Account suspended"
 msgstr "Account sospeso"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "Non hai il permesso per sospendere account."
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -953,6 +972,30 @@ msgstr "Si è verificato un errore durante il recupero dei dettagli del pacchett
 msgid "Package details could not be found."
 msgstr "Impossibile trovare i dettagli del pacchetto."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr "Intestazione Referer non valida."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "Non hai selezionato nessun pacchetto su cui essere notificato."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "Le notifiche sui pacchetti selezionati sono state attivate."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "Non hai selezionato nessun pacchetto a cui disattivare la notifica."
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "Un pacchetto fra quelli selezionati non ha notifiche attive."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "Le notifiche sui pacchetti selezionati sono state disattivate."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Devi autenticarti prima di poter contrassegnare i pacchetti."
@@ -989,6 +1032,10 @@ msgstr "Non hai il permesso per eliminare i pacchetti."
 msgid "You did not select any packages to delete."
 msgstr "Non hai selezionato nessun pacchetto da eliminare."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "Uno dei pacchetti che hai selezionato non esiste."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "I pacchetti selezionati sono stati eliminati."
@@ -997,10 +1044,18 @@ msgstr "I pacchetti selezionati sono stati eliminati."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Devi autenticarti prima di poter adottare i pacchetti."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "Non sei autorizzato ad adottare uno dei pacchetti selezionati."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Devi autenticarti prima di poter abbandonare i pacchetti."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "Non sei autorizzato ad abbandonare uno dei pacchetti selezionati."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Non hai selezionato nessun pacchetto da adottare."
@@ -1241,7 +1296,7 @@ msgstr "Modifica l'account di quest'utente"
 
 #: template/account_details.php
 msgid "List this user's comments"
-msgstr ""
+msgstr "Elenca i commenti di quest'utente"
 
 #: template/account_edit_form.php
 #, php-format
@@ -1256,7 +1311,7 @@ msgstr "Click %squì%s per il dettagli dell'utente."
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s to list the comments made by this account."
-msgstr ""
+msgstr "Clicca %squi%s per elencare i commenti inseriti da questo account."
 
 #: template/account_edit_form.php
 msgid "required"
@@ -1299,30 +1354,30 @@ msgid ""
 "If you do not hide your email address, it is visible to all registered AUR "
 "users. If you hide your email address, it is visible to members of the Arch "
 "Linux staff only."
-msgstr ""
+msgstr "Se non nascondi il tuo indirizzo email, sarà visibile a tutti gli utenti registrati su AUR. Se nascondi il tuo indirizzo email, sarà visibile solo ai membri dello staff di Arch Linux."
 
 #: template/account_edit_form.php
 msgid "Backup Email Address"
-msgstr ""
+msgstr "Indirizzo email di scorta"
 
 #: template/account_edit_form.php
 msgid ""
 "Optionally provide a secondary email address that can be used to restore "
 "your account in case you lose access to your primary email address."
-msgstr ""
+msgstr "Puoi fornire un secondo indirizzo email che potrà essere usato per ripristinare il tuo account, nel caso tu perda l'accesso al tuo indirizzo email primario."
 
 #: template/account_edit_form.php
 msgid ""
 "Password reset links are always sent to both your primary and your backup "
 "email address."
-msgstr ""
+msgstr "I link per resettare la password vengono sempre inviati ad entrambi i tuoi indirizzi email, primario e di scorta."
 
 #: template/account_edit_form.php
 #, php-format
 msgid ""
 "Your backup email address is always only visible to members of the Arch "
 "Linux staff, independent of the %s setting."
-msgstr ""
+msgstr "Il tuo indirizzo email di scorta è sempre visibile soltanto ai membri dello staff di Arch Linux, indipendentemente dall'impostazione %s."
 
 #: template/account_edit_form.php
 msgid "Language"
@@ -1336,7 +1391,7 @@ msgstr "Fuso orario"
 msgid ""
 "If you want to change the password, enter a new password and confirm the new"
 " password by entering it again."
-msgstr ""
+msgstr "Se vuoi cambiare la tua password, inseriscine una nuova e confermala inserendola di nuovo."
 
 #: template/account_edit_form.php
 msgid "Re-type password"
@@ -1366,25 +1421,25 @@ msgstr "Notifica degli aggiornamenti dei pacchetti"
 
 #: template/account_edit_form.php
 msgid "Notify of ownership changes"
-msgstr ""
+msgstr "Notifica cambiamenti di proprietà"
 
 #: template/account_edit_form.php
 msgid "To confirm the profile changes, please enter your current password:"
-msgstr ""
+msgstr "Per confermare le modifiche al profilo, per favore inserisci la tua password:"
 
 #: template/account_edit_form.php
 msgid "Your current password"
-msgstr ""
+msgstr "La tua password attuale"
 
 #: template/account_edit_form.php
 msgid ""
 "To protect the AUR against automated account creation, we kindly ask you to "
 "provide the output of the following command:"
-msgstr ""
+msgstr "Per proteggere AUR contro la creazione automatica di account, ti chiediamo gentilmente di fornire l'output del seguente comando:"
 
 #: template/account_edit_form.php
 msgid "Answer"
-msgstr ""
+msgstr "Rispondi"
 
 #: template/account_edit_form.php template/pkgbase_details.php
 #: template/pkg_details.php
@@ -1444,7 +1499,7 @@ msgstr "Salva"
 #: template/flag_comment.php
 #, php-format
 msgid "Flagged Out-of-Date Comment: %s"
-msgstr "Commento Segnalato come Non Aggiornato: %s"
+msgstr "Commento per la marcatura come Non Aggiornato: %s"
 
 #: template/flag_comment.php
 #, php-format
@@ -1547,7 +1602,7 @@ msgstr "sola lettura"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "click to copy"
-msgstr ""
+msgstr "clicca per copiare"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
@@ -1599,12 +1654,12 @@ msgstr "Aggiungi un commento"
 msgid ""
 "Git commit identifiers referencing commits in the AUR package repository and"
 " URLs are converted to links automatically."
-msgstr ""
+msgstr "Gli identificatori dei commit Git nel repository dei pacchetti AUR e le URL vengono convertite automaticamente in link."
 
 #: template/pkg_comment_form.php
 #, php-format
 msgid "%sMarkdown syntax%s is partially supported."
-msgstr ""
+msgstr "La %ssintassi Markdown%s è parzialmente supportata."
 
 #: template/pkg_comments.php
 msgid "Pinned Comments"
@@ -1616,7 +1671,7 @@ msgstr "Ultimi commenti"
 
 #: template/pkg_comments.php
 msgid "Comments for"
-msgstr ""
+msgstr "Commenti per"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1631,7 +1686,7 @@ msgstr "Commento anonimo su %s"
 #: template/pkg_comments.php
 #, php-format
 msgid "Commented on package %s on %s"
-msgstr ""
+msgstr "Ha commentato sul pacchetto %s su %s"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1774,7 +1829,7 @@ msgid ""
 "By submitting a deletion request, you ask a Trusted User to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr ""
+msgstr "Inserendo una richiesta di cancellazione, stai chiedendo ad un Trusted User di cancellare il pacchetto base. Questo tipo di richiesta dovrebbe essere usato per duplicati, software abbandonati dall'autore, sotware illegalmente distribuiti o pacchetti irreparabili."
 
 #: template/pkgreq_form.php
 msgid ""
@@ -1782,7 +1837,7 @@ msgid ""
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr ""
+msgstr "Inserendo una richiesta di unione, stai chiedendo ad un Trusted User di cancellare il pacchetto base e trasferire i suoi voti e commenti su un altro pacchetto base. Unire due pacchetti non ha effetto sul corrispondente repository Git. Assicurati di aggiornare lo storico Git del pacchetto di destinazione."
 
 #: template/pkgreq_form.php
 msgid ""
@@ -1790,11 +1845,11 @@ msgid ""
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr ""
+msgstr "Inserendo una richiesta di abbandono, stai chiedendo ad un Trusted User di rimuovere la proprietà del pacchetto base. Per favore procedi soltanto se il pacchetto necessita di manutenzione, il manutentore attuale non risponde, e hai già provato a contattarlo precedentemente."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
-msgstr ""
+msgstr "Nessuna richiesta corrisponde ai tuoi criteri di ricerca."
 
 #: template/pkgreq_results.php
 #, php-format
@@ -1824,8 +1879,8 @@ msgstr "Data"
 #, php-format
 msgid "~%d day left"
 msgid_plural "~%d days left"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "~%d giorno rimanente"
+msgstr[1] "~%d giorni rimanenti"
 
 #: template/pkgreq_results.php
 #, php-format
@@ -2125,7 +2180,7 @@ msgid ""
 "A password reset request was submitted for the account {user} associated "
 "with your email address. If you wish to reset your password follow the link "
 "[1] below, otherwise ignore this message and nothing will happen."
-msgstr ""
+msgstr "È stata inviata una richiesta per ripristinare la password dell'account {user} associato al tuo indirizzo e-mail. Se desideri ripristinare la tua password, clicca sul link [1] sottostante, altrimenti ignora questo messaggio e non succederà nulla."
 
 #: scripts/notify.py
 msgid "Welcome to the Arch User Repository"
@@ -2141,74 +2196,74 @@ msgstr "Benvenuto nel Arch User Repository! Per impostare una password iniziale
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Comment for {pkgbase}"
-msgstr ""
+msgstr "Commento AUR per {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] added the following comment to {pkgbase} [2]:"
-msgstr ""
+msgstr "{user} [1] ha commentato su {pkgbase} [2]:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "If you no longer wish to receive notifications about this package, please go"
 " to the package page [2] and select \"{label}\"."
-msgstr ""
+msgstr "Se non vuoi più ricevere notifiche su questo pacchetto, per favore vai alla pagina del pacchetto [2] e seleziona \"{label}\"."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package Update: {pkgbase}"
-msgstr ""
+msgstr "Aggiornamento pachetto base: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
-msgstr ""
+msgstr "{user} [1] ha inviato un nuovo commit su {pkgbase} [2]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Out-of-date Notification for {pkgbase}"
-msgstr ""
+msgstr "Notifica AUR per pacchetto {pkgbase} non aggiornato"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
-msgstr ""
+msgstr "Il tuo pacchetto {pkgbase} [1] è stato marcato come non aggiornato dall'utente {user} [2]:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Ownership Notification for {pkgbase}"
-msgstr ""
+msgstr "Notifica AUR di proprietà per pacchetto {pkgbase} "
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was adopted by {user} [2]."
-msgstr ""
+msgstr "Il pacchetto {pkgbase} [1] è stato adottato da {user} [2]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was disowned by {user} [2]."
-msgstr ""
+msgstr "Il pacchetto {pkgbase} [1] è stato abbandonato da {user} [2]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Co-Maintainer Notification for {pkgbase}"
-msgstr ""
+msgstr "Notifica AUR di co-manutenzione per pacchetto {pkgbase} "
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were added to the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "Sei stato aggiunto alla lista dei co-manutentori di {pkgbase} [1]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "Sei stato rimosso dalla lista dei co-manutentori di {pkgbase} [1]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package deleted: {pkgbase}"
-msgstr ""
+msgstr "Pacchetto AUR eliminato: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2217,7 +2272,7 @@ msgid ""
 "\n"
 "-- \n"
 "If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
-msgstr ""
+msgstr "{user} [1] ha unito {old} [2] in {new} [3].\n\n-- \nSe non vuoi più ricevere notifiche sul nuovo pacchetto, per favore vai a [3] e clicca su \"{label}\"."
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2225,16 +2280,61 @@ msgid ""
 "{user} [1] deleted {pkgbase} [2].\n"
 "\n"
 "You will no longer receive notifications about this package."
-msgstr ""
+msgstr "{user} [1] ha eliminato {pkgbase} [2].\n\nNon riceverai più notifiche su questo pacchetto."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "TU Vote Reminder: Proposal {id}"
-msgstr ""
+msgstr "Promemoria per voto TU: Proposta {id}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
+msgstr "Per favore ricordati di votare sulla proposta {id} [1]. La finestra di voto si chiude fra meno di 48 ore."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "Tipo di account non valido."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "Non hai il permesso per cambiare il tipo di account."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "Non hai il permesso per cambiare il tipo di account di questo utente in %s."
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr "Non ci sono richieste di abbandono da accettare per %s."
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr "Errore interno del server"
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr "Si è verificato un errore irreversibile."
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr "I dettagli sono stati registrati e verranno visionati da postmaster velocemente. Ci scusiamo per l'inconvenienza che questo possa aver causato."
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr "Errore server AUR"
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index d51319d2..55d056bf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,15 +5,15 @@
 # Translators:
 # kusakata, 2013
 # kusakata, 2013
-# kusakata, 2013-2018,2020
+# kusakata, 2013-2018,2020-2022
 # 尾ノ上卓朗 <onoue@showway.biz>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-02-26 12:49+0000\n"
-"Last-Translator: kusakata\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/lfleischer/aurweb/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -474,6 +474,12 @@ msgid ""
 "checkbox."
 msgstr "選択されたパッケージは孤児になっていません。確認チェックボックスにチェックを入れて下さい。"
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "選択されたパッケージはまだ継承されていません。確認チェックボックスにチェックを入れてください。"
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "投票やコメントのマージをするパッケージが見つかりません。"
@@ -572,6 +578,14 @@ msgstr "コメントのフラグを立てる"
 msgid "Flag Package Out-Of-Date"
 msgstr "パッケージの Out-Of-Date フラグを立てる"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "このパッケージは VCS パッケージです。AUR 上のパッケージのバージョンと最新のコミットが一致してない場合でも out-of-date フラグを%s立てないでください%s。フラグを立てていいのはソースが変わってしまった場合や上流の変更によって PKGBUILD に変更が必要な場合だけです。"
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -868,6 +882,10 @@ msgstr "スパムのために、現在あなたのIPアドレスからはログ
 msgid "Account suspended"
 msgstr "休眠アカウント"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "あなたはアカウントを停止する権限を持っていません。"
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -953,6 +971,30 @@ msgstr "パッケージの詳細の取得エラー。"
 msgid "Package details could not be found."
 msgstr "パッケージの詳細が見つかりませんでした。"
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr "不正なリファラヘッダー。"
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "通知するパッケージが選ばれていません。"
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "選択されたパッケージの通知が有効になりました。"
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "通知から外すパッケージが選ばれていません。"
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "選択されたパッケージの通知は有効になっていません。"
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "選択されたパッケージの通知は解除されました。"
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "パッケージのフラグを立てるにはログインする必要があります。"
@@ -989,6 +1031,10 @@ msgstr "あなたはパッケージを削除する許可を持っていません
 msgid "You did not select any packages to delete."
 msgstr "削除するパッケージが選ばれていません。"
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "存在しないパッケージが選択されています。"
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "選択されたパッケージが削除されました。"
@@ -997,10 +1043,18 @@ msgstr "選択されたパッケージが削除されました。"
 msgid "You must be logged in before you can adopt packages."
 msgstr "パッケージを承継するにはログインする必要があります。"
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "承継できないパッケージが選択されています。"
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "パッケージを放棄するにはログインする必要があります。"
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "放棄できないパッケージが選択されています。"
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "承継するパッケージが選択されていません。"
@@ -2233,3 +2287,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "{id} [1] の提案について投票してください。投票期限は48時間以内です。"
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "不正なアカウントタイプが指定されました。"
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "あなたはアカウントタイプを変更する権限を持っていません。"
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "あなたはこのユーザーのアカウントタイプを %s に変更する権限を持っていません。"
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr "%s の承認できる孤児リクエストは存在しません。"
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr "内部サーバーエラー"
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr "深刻なエラーが発生しました。"
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr "詳細はログに記録され即座に管理者によって確認されます。ご不便をおかけして申し訳ございません。"
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr "AUR サーバーエラー"
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 00000000..808ffe27
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,2330 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Korean (http://www.transifex.com/lfleischer/aurweb/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
new file mode 100644
index 00000000..d126f193
--- /dev/null
+++ b/po/lt.po
@@ -0,0 +1,2345 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/lfleischer/aurweb/language/lt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 200b6060..1cc090f1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,8 +3,8 @@
 # This file is distributed under the same license as the AURWEB package.
 # 
 # Translators:
-# Alexander F Rødseth <rodseth@gmail.com>, 2015,2017-2019
-# Alexander F Rødseth <rodseth@gmail.com>, 2011,2013-2014
+# Alexander F. Rødseth <rodseth@gmail.com>, 2015,2017-2019
+# Alexander F. Rødseth <rodseth@gmail.com>, 2011,2013-2014
 # Harald H. <haarektrans@gmail.com>, 2015
 # Kim Nordmo <kim.nordmo@gmail.com>, 2016
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/lfleischer/aurweb/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -476,6 +476,12 @@ msgid ""
 "checkbox."
 msgstr "De valgte pakkene har ikke blitt gjort eierløse, kryss av i boksen for å bekrefte."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Kunne ikke finne pakke for å flette stemmer og kommentarer inn i."
@@ -574,6 +580,14 @@ msgstr "Flagg kommentar"
 msgid "Flag Package Out-Of-Date"
 msgstr "Rapporter utdatert pakke"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -870,6 +884,10 @@ msgstr "Inlogging er slått av for din IP adresse, sannsynligvis på grunn av ve
 msgid "Account suspended"
 msgstr "Kontoen er stengt"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -955,6 +973,30 @@ msgstr "Kunne ikke finne frem pakkedetaljer."
 msgid "Package details could not be found."
 msgstr "Kunne ikke finne pakkedetaljer."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Du må være logget inn for å kunne markere pakker."
@@ -991,6 +1033,10 @@ msgstr "Du har ikke rettighetene som skal til for å kunne slette pakker."
 msgid "You did not select any packages to delete."
 msgstr "Du valgte ingen pakker for sletting."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "De valgte pakkene har blitt slettet."
@@ -999,10 +1045,18 @@ msgstr "De valgte pakkene har blitt slettet."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Du må være logget inn for å kunne adoptere pakker."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Du må være logget inn for å kunne gjøre pakker eierløse."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Du valgte ingen pakker for adopsjon."
@@ -2240,3 +2294,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "Vennligst husk å stemme på forslag {id} [1]. Avstemningsperioden vil være over om mindre enn 48 timer."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
new file mode 100644
index 00000000..74af6936
--- /dev/null
+++ b/po/nb_NO.po
@@ -0,0 +1,2337 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+# Kim Nordmo <kim.nordmo@gmail.com>, 2017,2019
+# Lukas Fleischer <transifex@cryptocrack.de>, 2011
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/lfleischer/aurweb/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr "Finner ikke siden"
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr "Beklager, siden du har bedt om finnes ikke."
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr "Tjeneste utilgjengelig"
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr "Ingen panikk! Siden er nede grunnet vedlikehold. Vi er snart tilbake."
+
+#: html/account.php
+msgid "Account"
+msgstr "Konto"
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr "Kontoer"
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr "Du har ikke adgang til dette området."
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr "Kunne ikke motta informasjon for den valgte brukeren."
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr "Du har ikke adgang til å endre denne kontoen."
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr "Bruk dette skjemaet for å søke etter eksisterende kontoer."
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr "Du må logge inn for å se informasjon om bruker."
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr "Legg til forslag"
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr "Brukernavn finnes ikke."
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr "%s har allerede et forslag."
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr "Forslag kan ikke være tomt."
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr "Nytt forslag innsendt."
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr "Send inn et forslag å stemme på."
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr "(tom hvis ikke anvendelig)"
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr "Type"
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr "Forslag"
+
+#: html/addvote.php
+msgid "Submit"
+msgstr "Send inn"
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr "Hjem"
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr "Mine pakker"
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr "Diskusjon"
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr "Stem"
+
+#: html/index.php
+msgid "UnVote"
+msgstr "Av-stem"
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr "Notifisér"
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr "Avnotifisér"
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr "Logg inn"
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr "Logget inn som: %s"
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr "Logg ut"
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr "Passord"
+
+#: html/login.php
+msgid "Remember me"
+msgstr "Husk meg"
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr "Søkekriterier"
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr "Pakker"
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr "Feil oppstod under mottagelse av pakkedetaljer."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr "Mangler et nødvendig felt."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr "Passord-felter stemmer ikke overens."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr "Passordet ditt må være minst %s tegn."
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr "Neste"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr "Bruk dette feltet for å opprette en konto."
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr "Betrodd bruker"
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr "Kunne ikke motta detaljer om forslag."
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr "Stemming er avsluttet for dette forslaget."
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr "Du kan ikke stemme i et forslag om deg."
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr "Du har allerede stemt for dette forslaget."
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr "Stemme-ID ikke gyldig."
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr "Foreløpige stemmer"
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr "Mangler bruker-ID"
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr "Brukernavnet er ikke gyldig."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr "Det må være mellom %s og %s tegn langt"
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr "Start og slutt med en bokstav eller et siffer"
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr "Kan kun innehold ett punktum, understrek, eller bindestrek."
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr "E-post-adressen er ugyldig."
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr "Språk er ikke støttet på dette tidspunktet."
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr "Du må være logget inn før du kan redigere pakkeinformasjon."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr "Mangler kommentar-ID."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr "Feil oppstod under mottagelse av pakkedetaljer."
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr "Pakkedetaljene kunne ikke bli funnet."
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr "Du må være logget inn før du kan markere pakker."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr "Du valgte ingen pakker å flagge."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr "De valgte pakkene har blitt flagget som utdatert."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr "Du må være logget inn før du kan fjerne \"utdatert\"-markeringen av pakker."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr "Du valgte ingen pakker å flagge bort."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr "De valgte pakkene har blitt flagget bort."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr "Du valgte ingen pakker å slette."
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr "De valgte pakkene har blitt slettet."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr "Du må være logget inn før du kan adoptere pakker."
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr "Du må være logget inn før du kan avslutte eierskap av pakker."
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr "Du valgte ingen pakker å adoptere."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr "Du valgte ingen pakker som skulle fjernes eierskap til."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr "Den valgte pakken har blitt adoptert."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr "De valgte pakkene eies ikke mer."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr "Du må være logget inn før du kan stemme på pakker."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr "Du må være logget inn før du av av-stemme pakker."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr "Du valgte ingen pakker å stemme på."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr "Stemmene dine har blitt fjernet fra de valgte pakkene."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr "Stemmene dine er talte for de valgte pakkene."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr "Kunne ikke legge til påminnelseslisten."
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr "Du har blitt lagt til påminnelselisten for kommentarer for %s."
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr "Du har blitt fjernet fra kommentarpåminnelselisten for %s."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr "Du har ikke tilgang til å slette denne kommentaren."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr "Kommentar har blitt slettet."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr "Invalid navn - kun små bokstaver er tillatte."
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr "Brukernavn"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr "Konto-type"
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr "Bruker"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr "Utvikler"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr "E-post-adresse"
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr "Ekte navn"
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr "IRC-nick"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr "Status"
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr "Aktiv"
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr "Aldri"
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr "Se denne brukereren sine pakker"
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr "trengs av"
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr "Vanlig bruker"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr "Betrodd bruker"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr "Konto suspendert"
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr "Språk"
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr "Tast inn passord på nytt"
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr "Oppdatér"
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr "Opprett"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr "Omstart"
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr "Ingen søk stemte overens med dine søkekriterier."
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr "Endre brukerkonto"
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr "Suspendert"
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr "Færre"
+
+#: template/account_search_results.php
+msgid "More"
+msgstr "Flere"
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr "Ingen flere resultater å vise."
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr "Vedlikeholder"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr "Stemmer"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr "Slett kommentar"
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr "Pakkedetaljer"
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr "Avhengigheter"
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr "Trengs av"
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr "Navn"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr "Stemmet"
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr "Søk etter"
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr "Sortér med"
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr "Sorteringsrekkefølge"
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr "Per side"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr "Gå"
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr "Hjemløse"
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr "Feil oppstod under mottagelse av pakkeliste."
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr "Ingen pakker stemmer overens med dine søkekriterier."
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr "Ja"
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr "hjemløs"
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr "Handlinger"
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr "Fjern markering av \"utdatert\""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr "Adoptér pakker"
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr "Avslutt eierskap av pakker"
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr "Slett pakker"
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr "Hvilken som helst type"
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr "Søk"
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr "Resultater for forslag"
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr "Stemmingen er fortsatt aktiv."
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr "Innsendt: %s av %s"
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr "Slutt"
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr "Nei"
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr "Avhold deg fra"
+
+#: template/tu_details.php
+msgid "Total"
+msgstr "Totalt"
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr "Ingen resultater funnet."
+
+#: template/tu_list.php
+msgid "Start"
+msgstr "Start"
+
+#: template/tu_list.php
+msgid "Back"
+msgstr "Tilbake"
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e5dc26d0..282b5b40 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,8 +3,10 @@
 # This file is distributed under the same license as the AURWEB package.
 # 
 # Translators:
-# Heimen Stoffels <vistausss@outlook.com>, 2015
+# Heimen Stoffels <vistausss@fastmail.com>, 2021-2022
+# Heimen Stoffels <vistausss@fastmail.com>, 2015,2021
 # jelly <jelle@vdwaa.nl>, 2011
+# Kevin Morris <kevr@0cost.org>, 2022
 # Sietse <sietse@vdmolen.eu>, 2013
 # Sietse <sietse@vdmolen.eu>, 2013
 # Wijnand Modderman-Lenstra <accounts+transifex@maze.io>, 2015
@@ -13,8 +15,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/lfleischer/aurweb/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,38 +26,38 @@ msgstr ""
 
 #: html/404.php
 msgid "Page Not Found"
-msgstr "De pagina kon niet worden gevonden"
+msgstr "Pagina niet gevonden"
 
 #: html/404.php
 msgid "Sorry, the page you've requested does not exist."
-msgstr "Sorry, de pagina die u heeft aangevraagd bestaat niet."
+msgstr "De opgevraagde pagina bestaat niet."
 
 #: html/404.php template/pkgreq_close_form.php
 msgid "Note"
-msgstr "Notitie"
+msgstr "Opmerking"
 
 #: html/404.php
 msgid "Git clone URLs are not meant to be opened in a browser."
-msgstr ""
+msgstr "Git clone-url's horen niet te worden geopend in een webbrowser."
 
 #: html/404.php
 #, php-format
 msgid "To clone the Git repository of %s, run %s."
-msgstr ""
+msgstr "Wilt u de Git-repo van %s klonen? Voer dan %s uit."
 
 #: html/404.php
 #, php-format
 msgid "Click %shere%s to return to the %s details page."
-msgstr ""
+msgstr "Klik %shier%s om terug te keren naar de %s informatiepagina."
 
 #: html/503.php
 msgid "Service Unavailable"
-msgstr "De dienst is niet beschikbaar"
+msgstr "Dienst is niet beschikbaar"
 
 #: html/503.php
 msgid ""
 "Don't panic! This site is down due to maintenance. We will be back soon."
-msgstr "Raak niet in paniek! De website is uit de lucht wegens werkzaamheden. We zullen snel weer terug in de lucht zijn."
+msgstr "Raak niet in paniek: de website is vanwege werkzaamheden uit de lucht. We zijn zo spoedig mogelijk weer terug."
 
 #: html/account.php
 msgid "Account"
@@ -67,44 +69,44 @@ msgstr "Accounts"
 
 #: html/account.php html/addvote.php
 msgid "You are not allowed to access this area."
-msgstr "U heeft geen toegang tot dit gebied."
+msgstr "U heeft geen toegang tot deze sectie."
 
 #: html/account.php
 msgid "Could not retrieve information for the specified user."
-msgstr "Kon geen informatie ophalen voor de opgegeven gebruiker."
+msgstr "Er kan geen informatie worden opgehaald over de opgegeven gebruiker."
 
 #: html/account.php
 msgid "You do not have permission to edit this account."
-msgstr "U heeft geen toestemming om dit account te bewerken."
+msgstr "U bent niet bevoegd om dit account te bewerken."
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Ongeldig wachtwoord."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
-msgstr "Gebruik dit formulier om bestaande accounts te zoeken."
+msgstr "Gebruik dit formulier om te zoeken naar bestaande accounts."
 
 #: html/account.php
 msgid "You must log in to view user information."
-msgstr "U moet inloggen om de gebruikersinformatie te bekijken."
+msgstr "Log in om gebruikersinformatie te bekijken."
 
 #: html/addvote.php template/tu_list.php
 msgid "Add Proposal"
-msgstr "Voorstel toevoegen"
+msgstr "Voorstel doen"
 
 #: html/addvote.php
 msgid "Invalid token for user action."
-msgstr "Ongeldige token voor gebruikersactie."
+msgstr "Ongeldige toegangssleutel voor gebruikersactie."
 
 #: html/addvote.php
 msgid "Username does not exist."
-msgstr "De gebruikersnaam bestaat niet."
+msgstr "Deze gebruikersnaam bestaat niet."
 
 #: html/addvote.php
 #, php-format
 msgid "%s already has proposal running for them."
-msgstr "%s heeft al een voorstel ervoor lopen."
+msgstr "%s heeft hier al een voorstel voor ingediend."
 
 #: html/addvote.php
 msgid "Invalid type."
@@ -112,7 +114,7 @@ msgstr "Ongeldig type."
 
 #: html/addvote.php
 msgid "Proposal cannot be empty."
-msgstr "Het voorstel mag niet leeg worden gelaten."
+msgstr "U mag geen blanco voorstel doen."
 
 #: html/addvote.php
 msgid "New proposal submitted."
@@ -120,7 +122,7 @@ msgstr "Het nieuwe voorstel is ingediend."
 
 #: html/addvote.php
 msgid "Submit a proposal to vote on."
-msgstr "Een voorstel indienen om op te stemmen."
+msgstr "Dien een voorstel in om op te stemmen."
 
 #: html/addvote.php
 msgid "Applicant/TU"
@@ -165,23 +167,23 @@ msgstr "Mede-onderhouders beheren"
 
 #: html/commentedit.php template/pkg_comments.php
 msgid "Edit comment"
-msgstr ""
+msgstr "Opmerking bewerken"
 
 #: html/home.php template/header.php
 msgid "Dashboard"
-msgstr ""
+msgstr "Overzicht"
 
 #: html/home.php template/header.php
 msgid "Home"
-msgstr "Startgedeelte"
+msgstr "Startpagina"
 
 #: html/home.php
 msgid "My Flagged Packages"
-msgstr ""
+msgstr "Mijn gemarkeerde pakketten"
 
 #: html/home.php
 msgid "My Requests"
-msgstr ""
+msgstr "Mijn verzoeken"
 
 #: html/home.php
 msgid "My Packages"
@@ -189,29 +191,29 @@ msgstr "Mijn pakketten"
 
 #: html/home.php
 msgid "Search for packages I maintain"
-msgstr ""
+msgstr "Zoeken naar pakketten die ik beheer"
 
 #: html/home.php
 msgid "Co-Maintained Packages"
-msgstr ""
+msgstr "Mede-onderhouden pakketten"
 
 #: html/home.php
 msgid "Search for packages I co-maintain"
-msgstr ""
+msgstr "Zoeken naar pakketten die ik mede onderhoud"
 
 #: html/home.php
 #, php-format
 msgid ""
 "Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
 "Guidelines%s for more information."
-msgstr "Welkom bij de AUR! Lees de %sAUR-gebruikersrichtlijnen%s en de %sAUR-ontwikkelaarsrichtlijnen%s voor meer informatie."
+msgstr "Welkom op AUR! Bekijk voor meer informatie de %sAUR-gebruikersrichtlijnen%s en %sAUR-ontwikkelaarsrichtlijnen%s."
 
 #: html/home.php
 #, php-format
 msgid ""
 "Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
 "otherwise they will be deleted!"
-msgstr "Bijgedragen PKGBUILDs %smoeten%s voldoen aan de %sArch-pakketstandaarden%s, anders zullen ze worden verwijderd!"
+msgstr "Bijgedragen PKGBUILDs %smoeten%s voldoen aan de %sArch-pakketstandaarden%s, anders worden ze verwijderd!"
 
 #: html/home.php
 msgid "Remember to vote for your favourite packages!"
@@ -219,7 +221,7 @@ msgstr "Vergeet niet te stemmen op uw favoriete pakketten!"
 
 #: html/home.php
 msgid "Some packages may be provided as binaries in [community]."
-msgstr "Sommige pakketten kunnen worden geleverd als uitvoerbare bestanden in [community]."
+msgstr "Sommige pakketten in [community] kunnen worden aangeleverd als uitvoerbare bestanden."
 
 #: html/home.php
 msgid "DISCLAIMER"
@@ -229,11 +231,11 @@ msgstr "DISCLAIMER"
 msgid ""
 "AUR packages are user produced content. Any use of the provided files is at "
 "your own risk."
-msgstr ""
+msgstr "AUR-pakketten zijn volledig samengesteld door gebruikers. Gebruik hiervan is op eigen risico."
 
 #: html/home.php
 msgid "Learn more..."
-msgstr "Meer leren..."
+msgstr "Meer informatie…"
 
 #: html/home.php
 msgid "Support"
@@ -241,56 +243,56 @@ msgstr "Ondersteuning"
 
 #: html/home.php
 msgid "Package Requests"
-msgstr "Pakketaanvragen"
+msgstr "Pakketverzoeken"
 
 #: html/home.php
 #, php-format
 msgid ""
 "There are three types of requests that can be filed in the %sPackage "
 "Actions%s box on the package details page:"
-msgstr "Er zijn drie typen aanvragen die kunnen worden ingedeeld in het %sPakketacties%s-veld op de pakketdetails-pagina:"
+msgstr "Er zijn drie soorten verzoeken die kunnen worden ingediend middels het %sPakketacties%s-veld op de pakketinformatiepagina:"
 
 #: html/home.php
 msgid "Orphan Request"
-msgstr "Weesaanvraag"
+msgstr "Onteigeningsverzoek"
 
 #: html/home.php
 msgid ""
 "Request a package to be disowned, e.g. when the maintainer is inactive and "
 "the package has been flagged out-of-date for a long time."
-msgstr "Vragen om het pakket te markeren als wees, bijv. wanneer de onderhouder inactief is en het pakket langere tijd als verouderd gemarkeerd is."
+msgstr "Verzoek om het pakket te markeren als onteigend, bijv. als de eigenaar inactief is en het pakket langere tijd als verouderd gemarkeerd is."
 
 #: html/home.php
 msgid "Deletion Request"
-msgstr "Verwijderaanvraag"
+msgstr "Verwijderingsverzoek"
 
 #: html/home.php
 msgid ""
 "Request a package to be removed from the Arch User Repository. Please do not"
 " use this if a package is broken and can be fixed easily. Instead, contact "
 "the package maintainer and file orphan request if necessary."
-msgstr "Verzoek om een pakket uit de Arch User Repository te laten verwijderen. Gebruik dit niet als een pakket niet naar behoren functioneert en eenvoudig gerepareerd kan worden. Neem in zo'n geval contact op met de pakketontwikkelaar en open zo nodig een weesverzoek."
+msgstr "Verzoek om een pakket uit de Arch User Repository te laten verwijderen. Gebruik dit niet als een pakket niet naar behoren functioneert en eenvoudig gerepareerd kan worden. Neem in dat geval contact op met de eigenaar en open zo nodig een onteigeningsverzoek."
 
 #: html/home.php
 msgid "Merge Request"
-msgstr "Aanvraag samenvoegen"
+msgstr "Samenvoegverzoek"
 
 #: html/home.php
 msgid ""
 "Request a package to be merged into another one. Can be used when a package "
 "needs to be renamed or replaced by a split package."
-msgstr "Verzoek om een pakket samen te laten voegen met een ander pakket. Dit kan gebruikt worden als een pakket hernoemd moet worden of vervangen wordt door een opgesplitst pakket."
+msgstr "Verzoek om een pakket samen te laten voegen met een ander pakket. Dit kan gebruikt worden als een pakketnaam gewijzigd moet worden of vervangen wordt door een opgesplitst pakket."
 
 #: html/home.php
 #, php-format
 msgid ""
 "If you want to discuss a request, you can use the %saur-requests%s mailing "
 "list. However, please do not use that list to file requests."
-msgstr "Indien je het verzoek wilt bediscussiëren, dan kun je de %saur-requests%s maillijst gebruiken. Gebruik deze lijst niet om verzoeken in te dienen."
+msgstr "Als u het verzoek wilt bediscussiëren, dan kunt u hiervoor de %saur-requests%s-mailinglijst gebruiken. Gebruik deze lijst niet om verzoeken in te dienen."
 
 #: html/home.php
 msgid "Submitting Packages"
-msgstr "Het bijdragen van pakketten"
+msgstr "Pakketten bijdragen"
 
 #: html/home.php
 #, php-format
@@ -298,15 +300,15 @@ msgid ""
 "Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
 " packages%s section of the Arch User Repository ArchWiki page for more "
 "details."
-msgstr "Git via SSA is nu in gebruik om pakketten bij te dragen aan de AUR. Zie de %sHet bijdragen van pakketten%s-gedeelte van de Arch User Repository ArchWiki-pagina voor meer details."
+msgstr "U dient git via ssh te gebruiken om pakketten bij te dragen aan de AUR. Bekijk voor meer informatie de pagina %sPakketten bijdragen%s op de Arch User Repository ArchWiki-pagina."
 
 #: html/home.php
 msgid "The following SSH fingerprints are used for the AUR:"
-msgstr "De volgende SSH-vingerafdrukken worden gebruikt voor de AUR:"
+msgstr "De volgende ssh-vingerafdrukken worden gebruikt voor de AUR:"
 
 #: html/home.php
 msgid "Discussion"
-msgstr "Discussie"
+msgstr "Discussiëren"
 
 #: html/home.php
 #, php-format
@@ -314,11 +316,11 @@ msgid ""
 "General discussion regarding the Arch User Repository (AUR) and Trusted User"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr "Algemene discussies met betrekking tot de Arch User Repository (AUR) en de opzet van Trusted Users vinden plaats op %saur-general%s. Voor discussies gerelateerd aan de ontwikkeling van de AUR web interface, gebruik de %saur-dev%s mailinglijst."
+msgstr "Algemene discussies met betrekking tot de Arch User Repository (AUR) en de opzet van Trusted Users vinden plaats op %saur-general%s. Discussies met betrekking tot de ontwikkeling van de AUR-webapp vinden plaats op de %saur-dev%s-mailinglijst."
 
 #: html/home.php
 msgid "Bug Reporting"
-msgstr "Bug-rapportage"
+msgstr "Bugmeldingen"
 
 #: html/home.php
 #, php-format
@@ -327,15 +329,15 @@ msgid ""
 "our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
 " %sonly%s. To report packaging bugs contact the package maintainer or leave "
 "a comment on the appropriate package page."
-msgstr ""
+msgstr "Als u een bug tegenkomt in de AUR-webapp, open dan een ticket op onze %sbugtracker%s. Gebruik de bugtracker %salléén%s om bugs over AUR te melden. Als u fouten tegenkomt in een pakketsamenstelling, meld dit dan aan de eigenaar of laat een opmerking achter op de bijbehorende pakketpagina."
 
 #: html/home.php
 msgid "Package Search"
-msgstr "Pakketten zoeken"
+msgstr "Zoeken naar pakketten"
 
 #: html/index.php
 msgid "Adopt"
-msgstr "Adopteren"
+msgstr "Eigenaar worden"
 
 #: html/index.php
 msgid "Vote"
@@ -343,19 +345,19 @@ msgstr "Stemmen"
 
 #: html/index.php
 msgid "UnVote"
-msgstr "Stem verwijderen"
+msgstr "Stem intrekken"
 
 #: html/index.php template/pkg_search_form.php template/pkg_search_results.php
 msgid "Notify"
-msgstr "Informeren"
+msgstr "Melding bij activiteit"
 
 #: html/index.php template/pkg_search_results.php
 msgid "UnNotify"
-msgstr "Niet informeren"
+msgstr "Geen melding bij activiteit"
 
 #: html/index.php
 msgid "UnFlag"
-msgstr "De-markeren"
+msgstr "Demarkeren"
 
 #: html/login.php template/header.php
 msgid "Login"
@@ -372,11 +374,11 @@ msgstr "Uitloggen"
 
 #: html/login.php
 msgid "Enter login credentials"
-msgstr "Vul uw inloggegevens in"
+msgstr "Voer uw inloggegevens in"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "Gebruikersnaam of e-mailadres"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -394,7 +396,7 @@ msgstr "Wachtwoord vergeten"
 #, php-format
 msgid ""
 "HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
-msgstr "HTTP-inloggen is uitgeschakeld. %sVerander naar HTTPs%s om in te loggen."
+msgstr "Inloggen via http is uitgeschakeld. %sSchakel over naar https%s om in te loggen."
 
 #: html/packages.php template/pkg_search_form.php
 msgid "Search Criteria"
@@ -407,20 +409,20 @@ msgstr "Pakketten"
 
 #: html/packages.php
 msgid "Error trying to retrieve package details."
-msgstr "Fout bij het ophalen van pakket details."
+msgstr "De pakketinformatie kan niet worden opgehaald."
 
 #: html/passreset.php lib/acctfuncs.inc.php
 msgid "Missing a required field."
-msgstr "Er ontbreekt een verplicht veld."
+msgstr "Er is een verplicht veld leeggelaten."
 
 #: html/passreset.php lib/acctfuncs.inc.php
 msgid "Password fields do not match."
-msgstr "Wachtwoordvelden komen niet overeen."
+msgstr "De wachtwoordvelden komen niet overeen."
 
 #: html/passreset.php lib/acctfuncs.inc.php
 #, php-format
 msgid "Your password must be at least %s characters."
-msgstr "Uw wachtwoord moet minimaal %s karakters lang zijn."
+msgstr "Uw wachtwoord dient minimaal %s tekens te bevatten."
 
 #: html/passreset.php
 msgid "Invalid e-mail."
@@ -432,15 +434,15 @@ msgstr "Wachtwoordherstel"
 
 #: html/passreset.php
 msgid "Check your e-mail for the confirmation link."
-msgstr "Controleer uw e-mail voor de bevestigingslink."
+msgstr "Er is een e-mail met bevestigingslink aan u verstuurd."
 
 #: html/passreset.php
 msgid "Your password has been reset successfully."
-msgstr "Uw wachtwoord is met succes teruggezet."
+msgstr "Uw wachtwoord is hersteld."
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "Bevestig uw gebruikersnaam of e-mailadres:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -459,25 +461,31 @@ msgstr "Doorgaan"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Als u uw gebruikersnaam en e-mailadres vergeten bent, stuur dan een bericht aan de %saur-general%s-mailinglijst."
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "Voer uw gebruikersnaam of e-mailadres in:"
 
 #: html/pkgbase.php
 msgid "Package Bases"
-msgstr ""
+msgstr "Basispakketten"
 
 #: html/pkgbase.php
 msgid ""
 "The selected packages have not been disowned, check the confirmation "
 "checkbox."
-msgstr "De geselecteerde pakketten zijn niet onteigend, vink het bevestigingsvakje aan."
+msgstr "De geselecteerde pakketten zijn niet onteigend. Kruis het bevestigingsvakje aan."
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "De geselecteerde pakketten zijn niet overgedragen. Kruis het bevestigingsvakje aan."
 
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
-msgstr "Kan geen pakket vinden om stemmen en comments mee samen te voegen"
+msgstr "Er is geen pakket gevonden om stemmen en opmerkingen mee samen te voegen."
 
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot merge a package base with itself."
@@ -487,7 +495,7 @@ msgstr "Het basispakket kan niet met zichzelf worden samengevoegd."
 msgid ""
 "The selected packages have not been deleted, check the confirmation "
 "checkbox."
-msgstr "De geselecteerde pakketten zijn niet gewist, vink het bevestigingsvakje aan."
+msgstr "De geselecteerde pakketten zijn niet gewist. Kruis het bevestigingsvakje aan."
 
 #: html/pkgdel.php
 msgid "Package Deletion"
@@ -495,26 +503,26 @@ msgstr "Pakketverwijdering"
 
 #: html/pkgdel.php template/pkgbase_actions.php
 msgid "Delete Package"
-msgstr "Verwijder Pakket"
+msgstr "Pakket verwijderen"
 
 #: html/pkgdel.php
 #, php-format
 msgid ""
 "Use this form to delete the package base %s%s%s and the following packages "
 "from the AUR: "
-msgstr "Gebruik dit formulier om basispakket %s%s%s te verwijderen van AUR met inbegrip van de volgende pakketten:"
+msgstr "Gebruik dit formulier om het basispakket ‘%s%s%s’, te verwijderen van AUR, evenals de volgende pakketten:"
 
 #: html/pkgdel.php
 msgid "Deletion of a package is permanent. "
-msgstr "Verwijdering van een pakket is permanent."
+msgstr "De verwijdering is permanent."
 
 #: html/pkgdel.php html/pkgmerge.php
 msgid "Select the checkbox to confirm action."
-msgstr "Vink het veld aan om de actie te bevestigen."
+msgstr "Kruis het veld aan om de actie te bevestigen."
 
 #: html/pkgdel.php
 msgid "Confirm package deletion"
-msgstr "Bevestig pakketverwijdering"
+msgstr "Verwijdering bevestigen"
 
 #: html/pkgdel.php template/account_delete.php
 msgid "Delete"
@@ -522,7 +530,7 @@ msgstr "Verwijderen"
 
 #: html/pkgdel.php
 msgid "Only Trusted Users and Developers can delete packages."
-msgstr "Alleen Trusted Users en Ontwikkelaars kunnen pakketten verwijderen."
+msgstr "Alleen Trusted Users en Developers kunnen pakketten verwijderen."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
@@ -533,29 +541,29 @@ msgstr "Pakket onteigenen"
 msgid ""
 "Use this form to disown the package base %s%s%s which includes the following"
 " packages: "
-msgstr "Gebruik dit formulier om basispakket %s%s%s te onteigenen met inbegrip van de volgende pakketten:"
+msgstr "Gebruik dit formulier om het basispakket ‘%s%s%s’, te onteigenen, evenals de volgende pakketten:"
 
 #: html/pkgdisown.php
 msgid ""
 "By selecting the checkbox, you confirm that you want to no longer be a "
 "package co-maintainer."
-msgstr ""
+msgstr "Door het bevestigingsvakje aan te kruisen, stemt u in met het feit dat u geen mede-onderhouder meer bent."
 
 #: html/pkgdisown.php
 #, php-format
 msgid ""
 "By selecting the checkbox, you confirm that you want to disown the package "
 "and transfer ownership to %s%s%s."
-msgstr "Door het bevestigingsvakje aan te vinken, stem je in met het onteigenen het pakket en het eigendom over te dragen aan %s%s%s."
+msgstr "Door het bevestigingsvakje aan te kruisen, bevestigt u dat u het pakket wilt onteigenen en het wilt overdragen aan %s%s%s."
 
 #: html/pkgdisown.php
 msgid ""
 "By selecting the checkbox, you confirm that you want to disown the package."
-msgstr "Door het bevestigingsvakje aan te vinken, stem je in met het onteigenen van het pakket."
+msgstr "Door het bevestigingsvakje aan te kruisen, stemt u in met het onteigenen van het pakket."
 
 #: html/pkgdisown.php
 msgid "Confirm to disown the package"
-msgstr "Bevestig de onteigening van het pakket"
+msgstr "Bevestig de pakketonteigening"
 
 #: html/pkgdisown.php
 msgid "Disown"
@@ -563,40 +571,48 @@ msgstr "Onteigenen"
 
 #: html/pkgdisown.php
 msgid "Only Trusted Users and Developers can disown packages."
-msgstr "Alleen Vertouwde Gebruikers en ontwikkelaars kunnen pakketten onteigenen."
+msgstr "Alleen Trusted Users en Developers kunnen pakketten onteigenen."
 
 #: html/pkgflagcomment.php
 msgid "Flag Comment"
-msgstr ""
+msgstr "Markeringsopmerking"
 
 #: html/pkgflag.php
 msgid "Flag Package Out-Of-Date"
-msgstr ""
+msgstr "Pakket markeren als verouderd"
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "Dit lijkt een VCS-pakket te zijn. Markeer dit pakket %sniet%s als verouderd als de pakketversie op AUR niet overeenkomt met de recentste commit. Markeer het alleen als de broncodelocatie gewijzigd is of de PKGBUILD moet worden aangepast."
 
 #: html/pkgflag.php
 #, php-format
 msgid ""
 "Use this form to flag the package base %s%s%s and the following packages "
 "out-of-date: "
-msgstr ""
+msgstr "Gebruik dit formulier om het basispakket ‘%s%s%s’ te markeren als verouderd, evenals de volgende pakketten:"
 
 #: html/pkgflag.php
 #, php-format
 msgid ""
 "Please do %snot%s use this form to report bugs. Use the package comments "
 "instead."
-msgstr ""
+msgstr "Gebruik dit formulier %sniet%s om bugs te melden. Bugs kunt u melden in de opmerkingen."
 
 #: html/pkgflag.php
 msgid ""
 "Enter details on why the package is out-of-date below, preferably including "
 "links to the release announcement or the new release tarball."
-msgstr ""
+msgstr "Vertel hieronder duidelijk waarom het pakket verouderd is, bij voorkeur met een link naar de aankondiging van de nieuwe versie of een link naar de tarball."
 
 #: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
 #: template/pkgreq_results.php
 msgid "Comments"
-msgstr "Commentaar"
+msgstr "Opmerkingen"
 
 #: html/pkgflag.php
 msgid "Flag"
@@ -604,7 +620,7 @@ msgstr "Markeren"
 
 #: html/pkgflag.php
 msgid "Only registered users can flag packages out-of-date."
-msgstr ""
+msgstr "Alleen geregistreerde gebruikers kunnen pakketten markeren als verouderd."
 
 #: html/pkgmerge.php
 msgid "Package Merging"
@@ -612,28 +628,28 @@ msgstr "Pakketsamenvoeging"
 
 #: html/pkgmerge.php template/pkgbase_actions.php
 msgid "Merge Package"
-msgstr "Voeg Pakket Samen"
+msgstr "Pakket samenvoegen"
 
 #: html/pkgmerge.php
 #, php-format
 msgid "Use this form to merge the package base %s%s%s into another package. "
-msgstr "Gebruik dit formulier om basispakkete %s%s%s samen te voegen met een ander pakket."
+msgstr "Gebruik dit formulier om het basispakket ‘%s%s%s’ samen te voegen met een ander pakket."
 
 #: html/pkgmerge.php
 msgid "The following packages will be deleted: "
-msgstr "De volgende pakketten zullen worden verwijderd:"
+msgstr "De volgende pakketten worden verwijderd:"
 
 #: html/pkgmerge.php
 msgid "Once the package has been merged it cannot be reversed. "
-msgstr "Als dit pakket samengevoegd is kan dit niet teruggedraaid worden."
+msgstr "Als dit pakket is samengevoegd, dan kan het proces niet worden teruggedraaid."
 
 #: html/pkgmerge.php
 msgid "Enter the package name you wish to merge the package into. "
-msgstr "Geef de naam van het pakket waarmee dit pakket samengevoegd moet worden."
+msgstr "Geef de naam op van het pakket waarmee dit pakket moet worden samengevoegd."
 
 #: html/pkgmerge.php
 msgid "Merge into:"
-msgstr "Samenvoegen naar:"
+msgstr "Samenvoegen met:"
 
 #: html/pkgmerge.php
 msgid "Confirm package merge"
@@ -645,15 +661,15 @@ msgstr "Samenvoegen"
 
 #: html/pkgmerge.php
 msgid "Only Trusted Users and Developers can merge packages."
-msgstr "Alleen Trusted Users en Ontwikkelaars kunnen pakketten samen voegen."
+msgstr "Alleen Trusted Users en Developers kunnen pakketten samenvoegen."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
-msgstr ""
+msgstr "Verzoek indienen"
 
 #: html/pkgreq.php template/pkgreq_close_form.php
 msgid "Close Request"
-msgstr "Aanvraag sluiten"
+msgstr "Verzoek sluiten"
 
 #: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
 msgid "First"
@@ -673,7 +689,7 @@ msgstr "Laatste"
 
 #: html/pkgreq.php template/header.php
 msgid "Requests"
-msgstr "Aanvragen"
+msgstr "Verzoeken"
 
 #: html/register.php template/header.php
 msgid "Register"
@@ -685,21 +701,21 @@ msgstr "Gebruik dit formulier om een ​​account aan te maken."
 
 #: html/tos.php
 msgid "Terms of Service"
-msgstr ""
+msgstr "Algemene voorwaarden"
 
 #: html/tos.php
 msgid ""
 "The following documents have been updated. Please review them carefully:"
-msgstr ""
+msgstr "De volgende documenten zijn bijgewerkt - lees ze zorgvuldig door:"
 
 #: html/tos.php
 #, php-format
 msgid "revision %d"
-msgstr ""
+msgstr "revisie %d"
 
 #: html/tos.php
 msgid "I accept the terms and conditions above."
-msgstr ""
+msgstr "Ik ga akkoord met de algemene voorwaarden."
 
 #: html/tu.php template/account_details.php template/header.php
 msgid "Trusted User"
@@ -707,15 +723,15 @@ msgstr "Trusted User"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
-msgstr "Voorsteldetails kunnen niet opgehaald worden."
+msgstr "Het voorstel kan niet worden geladen."
 
 #: html/tu.php
 msgid "Voting is closed for this proposal."
-msgstr "Stemmen is gesloten voor dit voorstel."
+msgstr "U kunt niet meer stemmen op dit voorstel."
 
 #: html/tu.php
 msgid "Only Trusted Users are allowed to vote."
-msgstr "Alleen Trusted Users kunnen stemmen."
+msgstr "Alleen Trusted Users zijn bevoegd om te stemmen."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -745,7 +761,7 @@ msgstr "Stemmers"
 msgid ""
 "Account registration has been disabled for your IP address, probably due to "
 "sustained spam attacks. Sorry for the inconvenience."
-msgstr "Registratie is uitgeschakeld voor jouw IP adres, waarschijnlijk vanwege langdurige spam aanvallen. Excuses voor het ongemak."
+msgstr "Registratie is uitgeschakeld op uw IP-adres, waarschijnlijk vanwege langdurige spamaanvallen. Excuses voor het ongemak."
 
 #: lib/acctfuncs.inc.php
 msgid "Missing User ID"
@@ -758,19 +774,19 @@ msgstr "De gebruikersnaam is ongeldig."
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "It must be between %s and %s characters long"
-msgstr "Het moet tussen de %s en %s karakters lang zijn"
+msgstr "Het moet tussen de %s en %s tekens bevatten"
 
 #: lib/acctfuncs.inc.php
 msgid "Start and end with a letter or number"
-msgstr "Beginnen en eindigen met een letter of nummer"
+msgstr "Begin en eindig met een letter of nummer"
 
 #: lib/acctfuncs.inc.php
 msgid "Can contain only one period, underscore or hyphen."
-msgstr "Kan maar één punt, komma of koppelteken bevatten."
+msgstr "Mag maar één punt, komma of koppelteken bevatten."
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
-msgstr ""
+msgstr "Bevestig uw nieuwe wachtwoord."
 
 #: lib/acctfuncs.inc.php
 msgid "The email address is invalid."
@@ -778,15 +794,15 @@ msgstr "Het e-mailadres is ongeldig."
 
 #: lib/acctfuncs.inc.php
 msgid "The backup email address is invalid."
-msgstr ""
+msgstr "Het tweede e-mailadres is ongeldig."
 
 #: lib/acctfuncs.inc.php
 msgid "The home page is invalid, please specify the full HTTP(s) URL."
-msgstr ""
+msgstr "Het website-adres is ongeldig. Geef een volledige http(s)-url op."
 
 #: lib/acctfuncs.inc.php
 msgid "The PGP key fingerprint is invalid."
-msgstr "De vingerafdruk van de PGP sleutel is ongeldig."
+msgstr "De PGP-vingerafdruk is ongeldig."
 
 #: lib/acctfuncs.inc.php
 msgid "The SSH public key is invalid."
@@ -794,100 +810,104 @@ msgstr "De publieke SSH-sleutel is ongeldig."
 
 #: lib/acctfuncs.inc.php
 msgid "Cannot increase account permissions."
-msgstr "Kan de account permissies niet verhogen."
+msgstr "De accountbevoegdheden kunnen niet worden uitgebreid."
 
 #: lib/acctfuncs.inc.php
 msgid "Language is not currently supported."
-msgstr "Taal wordt momenteel niet ondersteund."
+msgstr "Deze taal wordt momenteel niet ondersteund."
 
 #: lib/acctfuncs.inc.php
 msgid "Timezone is not currently supported."
-msgstr ""
+msgstr "Deze tijdzone wordt momenteel niet ondersteund."
 
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "The username, %s%s%s, is already in use."
-msgstr "De gebruikersnaam %s%s%s is al in gebruik."
+msgstr "De gebruikersnaam, %s%s%s, is al in gebruik."
 
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "The address, %s%s%s, is already in use."
-msgstr "Het adres %s%s%s is al in gebruik."
+msgstr "Het adres, %s%s%s, is al in gebruik."
 
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "The SSH public key, %s%s%s, is already in use."
-msgstr "De SSH publieke sleutel, %s%s%s, is al ingebruik."
+msgstr "De publieke ssh-sleutel, %s%s%s, is al in gebruik."
 
 #: lib/acctfuncs.inc.php
 msgid "The CAPTCHA is missing."
-msgstr ""
+msgstr "U heeft de captcha niet ingevuld."
 
 #: lib/acctfuncs.inc.php
 msgid "This CAPTCHA has expired. Please try again."
-msgstr ""
+msgstr "Deze captcha is verlopen - probeer het opnieuw."
 
 #: lib/acctfuncs.inc.php
 msgid "The entered CAPTCHA answer is invalid."
-msgstr ""
+msgstr "Het opgegeven captcha-antwoord is ongeldig."
 
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "Error trying to create account, %s%s%s."
-msgstr "Fout bij het aanmaken van account %s%s%s."
+msgstr "Er is een fout opgetreden tijdens het aanmaken van het account ‘%s%s%s’."
 
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "The account, %s%s%s, has been successfully created."
-msgstr "Het account %s%s%s is met succes aangemaakt."
+msgstr "Het account, %s%s%s, is aangemaakt."
 
 #: lib/acctfuncs.inc.php
 msgid "A password reset key has been sent to your e-mail address."
-msgstr "Een sleutel voor het resetten van je wachtwoord is verstuurd naar je e-mail adres."
+msgstr "Er is een wachtwoordherstelsleutel verstuurd naar uw e-mailadres."
 
 #: lib/acctfuncs.inc.php
 msgid "Click on the Login link above to use your account."
-msgstr "Klik op de Login link hierboven om je account te gebruiken"
+msgstr "Klik op bovenstaande inloglink om uw account in gebruik te nemen."
 
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "No changes were made to the account, %s%s%s."
-msgstr "Geen veranderingen zijn gemaakt aan het account, %s%s%s."
+msgstr "Er zijn geen aanpassingen gedaan aan het account ‘%s%s%s’."
 
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "The account, %s%s%s, has been successfully modified."
-msgstr "Het account %s%s%s is met succes aangepast."
+msgstr "Het account, %s%s%s, is aangepast."
 
 #: lib/acctfuncs.inc.php
 msgid ""
 "The login form is currently disabled for your IP address, probably due to "
 "sustained spam attacks. Sorry for the inconvenience."
-msgstr "Het log-in formulier is uitgeschakeld voor je IP adres, waarschijnlijk vanwege langdurige spam-aanvallen. Excuses voor het ongemak."
+msgstr "Het inlogformulier is uitgeschakeld op uw IP-adres, waarschijnlijk vanwege langdurige spamaanvallen. Excuses voor het ongemak."
 
 #: lib/acctfuncs.inc.php
 msgid "Account suspended"
 msgstr "Account is geschorst"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "U bent niet bevoegd om accounts te schorsen."
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
 "Your password has been reset. If you just created a new account, please use "
 "the link from the confirmation email to set an initial password. Otherwise, "
 "please request a reset key on the %sPassword Reset%s page."
-msgstr "Je wachtwoord is gereset. Als je net een nieuwe account hebt aangemaakt, gebruik dan de link uit de bevestigingsmail om een wachtwoord te genereren.  In andere gevallen, vraag een herstelsleutel aan op de %sPassword Reset%s pagina."
+msgstr "Uw wachtwoord is hersteld. Als u net een nieuw account heeft aangemaakt, gebruik dan de link uit de bevestigingsmail om een wachtwoord te genereren. Als dat niet zo is, vraag dan een herstelsleutel aan op de %swachtwoordherstel%spagina."
 
 #: lib/acctfuncs.inc.php
 msgid "Bad username or password."
-msgstr "Verkeerd gebruiker of wachtwoord"
+msgstr "Onjuiste gebruikersnaam of wachtwoord"
 
 #: lib/acctfuncs.inc.php
 msgid "An error occurred trying to generate a user session."
-msgstr "Er is een fout opgetreden bij het aanmaken van een gebruikerssessie."
+msgstr "Er is een fout opgetreden tijdens het aanmaken van een gebruikerssessie."
 
 #: lib/acctfuncs.inc.php
 msgid "Invalid e-mail and reset key combination."
-msgstr "Ongeldige e-mail en reset-toets combinatie."
+msgstr "Ongeldige e-mailadres- en herstelsleutel-combinatie."
 
 #: lib/aur.inc.php template/pkg_details.php
 msgid "None"
@@ -896,75 +916,99 @@ msgstr "Geen"
 #: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
 #, php-format
 msgid "View account information for %s"
-msgstr "Toon accountinformatie voor %s"
+msgstr "Bekijk accountinformatie van %s"
 
 #: lib/aurjson.class.php
 msgid "Package base ID or package base name missing."
-msgstr ""
+msgstr "De basispakket-id of -naam ontbreekt."
 
 #: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to edit this comment."
-msgstr ""
+msgstr "U bent niet bevoegd om deze opmerking te bewerken."
 
 #: lib/aurjson.class.php
 msgid "Comment does not exist."
-msgstr ""
+msgstr "Deze opmerking bestaat niet."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment cannot be empty."
-msgstr ""
+msgstr "U mag geen blanco opmerking achterlaten."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been added."
-msgstr "Opmerking is toegevoegd."
+msgstr "De opmerking is toegevoegd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can edit package information."
-msgstr "Je moet ingelogd zijn voordat je pakketinformatie kunt bewerken."
+msgstr "Log in om pakketinformatie aan te passen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Missing comment ID."
-msgstr "Missende comment ID."
+msgstr "Ontbrekende opmerkings-ID."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "No more than 5 comments can be pinned."
-msgstr ""
+msgstr "Er kunnen max. 5 opmerkingen worden vastgezet."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to pin this comment."
-msgstr ""
+msgstr "U bent niet bevoegd om deze opmerking vast te maken."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to unpin this comment."
-msgstr ""
+msgstr "U bent niet bevoegd om deze opmerking los te maken."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been pinned."
-msgstr ""
+msgstr "De opmerking is vastgemaakt."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been unpinned."
-msgstr ""
+msgstr "De opmerking is losgemaakt."
 
 #: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
 msgid "Error retrieving package details."
-msgstr "Fout bij het ophalen van pakketdetails."
+msgstr "De pakketinformatie kan niet worden geladen."
 
 #: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
 msgid "Package details could not be found."
-msgstr "Pakketdetails kunnen niet gevonden worden."
+msgstr "Er is geen pakketinformatie gevonden."
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr "Onjuiste doorverwijskop."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "U heeft geen pakketten geselecteerd om meldingen over te ontvangen."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "Meldingen omtrent de geselecteerde pakketten zijn ingeschakeld."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "U heeft geen pakketten geselecteerd om meldingen van uit te schakelen."
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "Bij één van de geselecteerde pakketten zijn meldingen niet ingeschakeld."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "Meldingen omtrent de geselecteerde pakketten zijn uitgeschakeld."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
-msgstr "Je moet ingelogd zijn voordat je pakketten kunt markeren."
+msgstr "Log in om pakketten te markeren."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to flag."
-msgstr "Je hebt geen pakketten geselecteerd om te markeren."
+msgstr "U heeft geen te markeren pakketten geselecteerd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have not been flagged, please enter a comment."
-msgstr ""
+msgstr "De geselecteerde pakketten zijn nog niet gemarkeerd. Laat een opmerking achter."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been flagged out-of-date."
@@ -972,23 +1016,27 @@ msgstr "De geselecteerde pakketten zijn gemarkeerd als verouderd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can unflag packages."
-msgstr "Je moet ingelogd zijn voordat je een markering voor een pakket kunt verwijderen."
+msgstr "Log in om pakketten te demarkeren."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to unflag."
-msgstr "Je hebt geen pakketten geselecteerd om de markering van te verwijderen."
+msgstr "U heeft geen te demarkeren pakketten geselecteerd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been unflagged."
-msgstr "De markering voor de geselecteerde pakketten is verwijderd."
+msgstr "De geselecteerde pakketten zijn gedemarkeerd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You do not have permission to delete packages."
-msgstr "Je hebt geen toestemming om pakketten te verwijderen."
+msgstr "U bent niet bevoegd om pakketten te verwijderen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to delete."
-msgstr "Je hebt geen pakketten geselecteerd om te verwijderen."
+msgstr "U hebt geen te verwijderen pakketten geselecteerd."
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "Eén van de geselecteerde pakketten bestaat niet."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
@@ -996,23 +1044,31 @@ msgstr "De geselecteerde pakketten zijn verwijderd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can adopt packages."
-msgstr "Je moet ingelogd zijn voordat je pakketten kunt adopteren."
+msgstr "Log in om eigenaar van pakketten te kunnen worden."
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "U bent niet bevoegd om één van de geselecteerde pakketten over te nemen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
-msgstr "Je moet ingelogd zijn voordat je pakketten kunt onteigenen."
+msgstr "Log in om pakketten te onteigenen."
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "U bent niet bevoegd om één van de geselecteerde pakketten te onteigenen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
-msgstr "Je hebt geen pakketten geselecteerd om te adopteren."
+msgstr "U heeft geen over te nemen pakketten geselecteerd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to disown."
-msgstr "Je hebt geen pakketten geselecteerd om te onteigenen."
+msgstr "U heeft geen te onteigenen pakketten geselecteerd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been adopted."
-msgstr "De geselecteerde pakketten zijn geadopteerd."
+msgstr "De geselecteerde pakketten zijn overgedragen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been disowned."
@@ -1020,69 +1076,69 @@ msgstr "De geselecteerde pakketten zijn onteigend."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can vote for packages."
-msgstr "Je moet ingelogd zijn voordat je kunt stemmen op pakketten."
+msgstr "Log in om te stemmen op pakketten."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can un-vote for packages."
-msgstr "Je moet ingelogd zijn voordat je je stem kunt verwijderen."
+msgstr "Log in om stemmen in te trekken."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to vote for."
-msgstr "Je hebt geen pakketten geselecteerd om op te stemmen."
+msgstr "U heeft geen pakketten geselecteerd om op te stemmen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Your votes have been removed from the selected packages."
-msgstr "Je stem is verwijderd voor de geselecteerde pakketten."
+msgstr "Uw stem op de geselecteerde pakketten is ingetrokken."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Your votes have been cast for the selected packages."
-msgstr "Je hebt gestemd voor de geselecteerde pakketten."
+msgstr "U heeft gestemd op de geselecteerde pakketten."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Couldn't add to notification list."
-msgstr "Kon niet toevoegen aan notificatielijst."
+msgstr "U kunt niet worden toegevoegd aan de meldingslijst."
 
 #: lib/pkgbasefuncs.inc.php
 #, php-format
 msgid "You have been added to the comment notification list for %s."
-msgstr "Je bent toegevoegd aan de comment notificatielijst voor %s."
+msgstr "U bent toegevoegd aan de meldingslijst met opmerkingen bij %s."
 
 #: lib/pkgbasefuncs.inc.php
 #, php-format
 msgid "You have been removed from the comment notification list for %s."
-msgstr "Je bent verwijderd van de comment notificatielijst voor %s."
+msgstr "U bent toegevoegd van de meldingslijst met opmerkingen bij %s."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to undelete this comment."
-msgstr ""
+msgstr "U bent niet bevoegd om deze opmerking terug te plaatsen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been undeleted."
-msgstr ""
+msgstr "De opmerking is teruggeplaatst."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to delete this comment."
-msgstr "Je hebt geen toestemming deze comment te verwijderen."
+msgstr "U bent niet bevoegd om deze opmerking te verwijderen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been deleted."
-msgstr "Comment is verwijderd."
+msgstr "De opmerking is verwijderd."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been edited."
-msgstr ""
+msgstr "De opmerking is bewerkt."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to edit the keywords of this package base."
-msgstr "Je hebt geen toestemming de sleutelwoorden van dit basispakket aan te passen."
+msgstr "U bent niet bevoegd om de trefwoorden van dit basispakket aan te passen."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The package base keywords have been updated."
-msgstr "De sleutelwoorden van het basispakket zijn bijgewerkt."
+msgstr "De trefwoorden van dit basispakket zijn bijgewerkt."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to manage co-maintainers of this package base."
-msgstr "Je hebt geen toestemming om de mede-eigenaren van dit basispakket aan te passen."
+msgstr "U bent niet bevoegd om de mede-onderhouders van dit basispakket aan te passen."
 
 #: lib/pkgbasefuncs.inc.php
 #, php-format
@@ -1091,20 +1147,20 @@ msgstr "Ongeldige gebruikersnaam: %s"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The package base co-maintainers have been updated."
-msgstr "De mede-onderhouders van het basispakket zijn bijgewerkt."
+msgstr "De mede-onderhouders van dit basispakket zijn bijgewerkt."
 
 #: lib/pkgfuncs.inc.php template/pkgbase_details.php
 msgid "View packages details for"
-msgstr "Toon pakketdetails voor"
+msgstr "Bekijk pakketinformatie van"
 
 #: lib/pkgfuncs.inc.php
 #, php-format
 msgid "requires %s"
-msgstr ""
+msgstr "vereist %s"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "You must be logged in to file package requests."
-msgstr "Je moet ingelogd zijn voordat je pekketverzoeken kunt indienen."
+msgstr "Log in om pakketverzoeken in te dienen."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid name: only lowercase letters are allowed."
@@ -1112,15 +1168,15 @@ msgstr "Ongeldige naam: alleen kleine letters zijn toegestaan."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "The comment field must not be empty."
-msgstr "Het commentaarveld mag niet leeg zijn."
+msgstr "U mag geen blanco opmerking achterlaten."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid request type."
-msgstr "Ongeldig verzoektype."
+msgstr "Ongeldig verzoek."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Added request successfully."
-msgstr "Verzoek succesvol toegevoegd."
+msgstr "Het verzoek is toegevoegd."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid reason."
@@ -1128,25 +1184,25 @@ msgstr "Ongeldige reden."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Only TUs and developers can close requests."
-msgstr "Alleen TUs en ontwikkelaars mogen verzoeken sluiten."
+msgstr "Alleen TU's en ontwikkelaars mogen verzoeken sluiten."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Request closed successfully."
-msgstr "Verzoek succesvol gesloten."
+msgstr "Het verzoek is gesloten."
 
 #: template/account_delete.php
 #, php-format
 msgid "You can use this form to permanently delete the AUR account %s."
-msgstr "Gebruik dit formulier om permanent AUR account %s te verwijderen."
+msgstr "Gebruik dit formulier om het AUR-account ‘%s’ permanent te verwijderen."
 
 #: template/account_delete.php
 #, php-format
 msgid "%sWARNING%s: This action cannot be undone."
-msgstr "%sWAARSCHUWING%s: Deze actie kan niet ongedaan worden gemaakt."
+msgstr "%sWAARSCHUWING%s: deze actie kan niet ongedaan worden gemaakt!"
 
 #: template/account_delete.php
 msgid "Confirm deletion"
-msgstr "Bevestig verwijdering"
+msgstr "Verwijdering bevestigen"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/account_search_results.php template/search_accounts_form.php
@@ -1156,7 +1212,7 @@ msgstr "Gebruikersnaam"
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
 msgid "Account Type"
-msgstr "Account Type"
+msgstr "Soort account"
 
 #: template/account_details.php template/tu_details.php
 #: template/tu_last_votes_list.php template/tu_list.php
@@ -1171,16 +1227,16 @@ msgstr "Ontwikkelaar"
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
 msgid "Trusted User & Developer"
-msgstr "Trusted User & Ontwikkelaar"
+msgstr "Trusted User en ontwikkelaar"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
 msgid "Email Address"
-msgstr "E-mail adres"
+msgstr "E-mailadres"
 
 #: template/account_details.php
 msgid "hidden"
-msgstr ""
+msgstr "verborgen"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/account_search_results.php template/search_accounts_form.php
@@ -1189,17 +1245,17 @@ msgstr "Echte naam"
 
 #: template/account_details.php template/account_edit_form.php
 msgid "Homepage"
-msgstr ""
+msgstr "Website"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/account_search_results.php template/search_accounts_form.php
 msgid "IRC Nick"
-msgstr "IRC Nick"
+msgstr "IRC-bijnaam"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/account_search_results.php
 msgid "PGP Key Fingerprint"
-msgstr "PGP sleutel vingerafdruk"
+msgstr "PGP-vingerafdruk"
 
 #: template/account_details.php template/account_search_results.php
 #: template/pkgreq_results.php
@@ -1208,7 +1264,7 @@ msgstr "Status"
 
 #: template/account_details.php
 msgid "Inactive since"
-msgstr "Geen activiteit sinds"
+msgstr "Inactief sinds"
 
 #: template/account_details.php template/account_search_results.php
 msgid "Active"
@@ -1216,7 +1272,7 @@ msgstr "Actief"
 
 #: template/account_details.php
 msgid "Registration date:"
-msgstr ""
+msgstr "Registratiedatum:"
 
 #: template/account_details.php template/pkgbase_details.php
 #: template/pkg_details.php template/pkgreq_results.php
@@ -1226,7 +1282,7 @@ msgstr "onbekend"
 
 #: template/account_details.php
 msgid "Last Login"
-msgstr "Laatste Login"
+msgstr "Laatst ingelogd"
 
 #: template/account_details.php
 msgid "Never"
@@ -1234,30 +1290,30 @@ msgstr "Nooit"
 
 #: template/account_details.php
 msgid "View this user's packages"
-msgstr "Bekijk gebruiker zijn pakketten"
+msgstr "Bekijk pakketten van deze gebruiker"
 
 #: template/account_details.php
 msgid "Edit this user's account"
-msgstr "Bewerk account van deze gebruiker"
+msgstr "Bewerk het account van deze gebruiker"
 
 #: template/account_details.php
 msgid "List this user's comments"
-msgstr ""
+msgstr "Toon de opmerkingen van deze gebruiker"
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s if you want to permanently delete this account."
-msgstr "Klik %shier%s als u dit account permanent wilt verwijderen."
+msgstr "Klik %shier%s om dit account permanent te verwijderen."
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s for user details."
-msgstr ""
+msgstr "Klik %shier%s om de gebruikersgegevens te bekijken."
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s to list the comments made by this account."
-msgstr ""
+msgstr "Klik %shier%s om de opmerkingen te bekijken die geplaatst zijn door dit account."
 
 #: template/account_edit_form.php
 msgid "required"
@@ -1267,7 +1323,7 @@ msgstr "verplicht"
 msgid ""
 "Your user name is the name you will use to login. It is visible to the "
 "general public, even if your account is inactive."
-msgstr ""
+msgstr "Uw gebruikersnaam gebruikt u om in te loggen. Deze naam is openbaar, zelfs als uw account inactief is."
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Normal user"
@@ -1275,11 +1331,11 @@ msgstr "Normale gebruiker"
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Trusted user"
-msgstr "Trusted user"
+msgstr "Trusted User"
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
-msgstr "Account Geschorst"
+msgstr "Account geschorst"
 
 #: template/account_edit_form.php
 msgid "Inactive"
@@ -1289,41 +1345,41 @@ msgstr "Inactief"
 msgid ""
 "Please ensure you correctly entered your email address, otherwise you will "
 "be locked out."
-msgstr ""
+msgstr "Zorg er voor dat u het e-mailadres goed hebt ingevoerd, anders wordt u buitengesloten."
 
 #: template/account_edit_form.php
 msgid "Hide Email Address"
-msgstr ""
+msgstr "E-mailadres verbergen"
 
 #: template/account_edit_form.php
 msgid ""
 "If you do not hide your email address, it is visible to all registered AUR "
 "users. If you hide your email address, it is visible to members of the Arch "
 "Linux staff only."
-msgstr ""
+msgstr "Als u uw e-mailadres níet verbergt, dan is het zichtbaar voor alle geregistreerde AUR-gebruikers. Als u uw e-mailadres wél verbergt, dan is het alleen zichtbaar voor Arch Linux-medewerkers."
 
 #: template/account_edit_form.php
 msgid "Backup Email Address"
-msgstr ""
+msgstr "Tweede e-mailadres"
 
 #: template/account_edit_form.php
 msgid ""
 "Optionally provide a secondary email address that can be used to restore "
 "your account in case you lose access to your primary email address."
-msgstr ""
+msgstr "U kunt desgewenst een tweede e-mailadres opgeven. Zo kunt u uw account herstellen als u geen toegang meer heeft tot uw primaire e-mailaccount."
 
 #: template/account_edit_form.php
 msgid ""
 "Password reset links are always sent to both your primary and your backup "
 "email address."
-msgstr ""
+msgstr "Er is een wachtwoordherstelsleutel verstuurd naar uw e-mailadres en uw tweede e-mailadres."
 
 #: template/account_edit_form.php
 #, php-format
 msgid ""
 "Your backup email address is always only visible to members of the Arch "
 "Linux staff, independent of the %s setting."
-msgstr ""
+msgstr "Uw tweede e-mailadres is alleen zichtbaar voor Arch Linux-medewerkers, ongeacht de instelling ‘%s’."
 
 #: template/account_edit_form.php
 msgid "Language"
@@ -1331,17 +1387,17 @@ msgstr "Taal"
 
 #: template/account_edit_form.php
 msgid "Timezone"
-msgstr ""
+msgstr "Tijdzone"
 
 #: template/account_edit_form.php
 msgid ""
 "If you want to change the password, enter a new password and confirm the new"
 " password by entering it again."
-msgstr ""
+msgstr "Als u uw wachtwoord wilt wijzigen, voer dan een nieuw wachtwoord in en bevestig het door het nogmaals in te voeren."
 
 #: template/account_edit_form.php
 msgid "Re-type password"
-msgstr "Voer wachtwoord opnieuw in"
+msgstr "Wachtwoord bevestigen"
 
 #: template/account_edit_form.php
 msgid ""
@@ -1351,46 +1407,46 @@ msgstr "De volgende informatie is alleen verplicht als u pakketten aan de Arch U
 
 #: template/account_edit_form.php
 msgid "SSH Public Key"
-msgstr "SSH Publieke Sleutel"
+msgstr "Publieke ssh-sleutel"
 
 #: template/account_edit_form.php
 msgid "Notification settings"
-msgstr ""
+msgstr "Meldingsinstellingen"
 
 #: template/account_edit_form.php
 msgid "Notify of new comments"
-msgstr "Notificatie bij nieuwe comment"
+msgstr "Melding bij nieuwe opmerkingen"
 
 #: template/account_edit_form.php
 msgid "Notify of package updates"
-msgstr ""
+msgstr "Melding bij pakketupdates"
 
 #: template/account_edit_form.php
 msgid "Notify of ownership changes"
-msgstr ""
+msgstr "Melding bij nieuwe pakketeigenaar"
 
 #: template/account_edit_form.php
 msgid "To confirm the profile changes, please enter your current password:"
-msgstr ""
+msgstr "Voer uw huidige wachtwoord in om uw profiel op te slaan:"
 
 #: template/account_edit_form.php
 msgid "Your current password"
-msgstr ""
+msgstr "Huidig wachtwoord"
 
 #: template/account_edit_form.php
 msgid ""
 "To protect the AUR against automated account creation, we kindly ask you to "
 "provide the output of the following command:"
-msgstr ""
+msgstr "Geef de uitvoer van de volgende opdracht op om automatische accountaanmaak te voorkomen:"
 
 #: template/account_edit_form.php
 msgid "Answer"
-msgstr ""
+msgstr "Antwoord"
 
 #: template/account_edit_form.php template/pkgbase_details.php
 #: template/pkg_details.php
 msgid "Update"
-msgstr "Update"
+msgstr "Bijwerken"
 
 #: template/account_edit_form.php
 msgid "Create"
@@ -1398,15 +1454,15 @@ msgstr "Aanmaken"
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Reset"
-msgstr "Reset"
+msgstr "Standaardwaarden"
 
 #: template/account_search_results.php
 msgid "No results matched your search criteria."
-msgstr "Geen resultaten die voldoen aan je zoekcriteria."
+msgstr "Er zijn geen zoekresultaten die overeenkomen met uw zoekcriteria."
 
 #: template/account_search_results.php
 msgid "Edit Account"
-msgstr "Bewerk account"
+msgstr "Account bewerken"
 
 #: template/account_search_results.php
 msgid "Suspended"
@@ -1426,13 +1482,13 @@ msgstr "Meer"
 
 #: template/account_search_results.php
 msgid "No more results to display."
-msgstr "Geen andere resultaten gevonden "
+msgstr "Geen verdere resultaten gevonden."
 
 #: template/comaintainers_form.php
 #, php-format
 msgid ""
 "Use this form to add co-maintainers for %s%s%s (one user name per line):"
-msgstr "Gebruik dit formulier om mede-onderhouders voor %s%s%s toe te voegen (een gebruikersnaam per regel):"
+msgstr "Gebruik dit formulier om mede-onderhouders toe te voegen aan ‘%s%s%s’ (één gebruikersnaam per regel):"
 
 #: template/comaintainers_form.php
 msgid "Users"
@@ -1440,88 +1496,88 @@ msgstr "Gebruikers"
 
 #: template/comaintainers_form.php template/pkg_comment_form.php
 msgid "Save"
-msgstr "Bewaren"
+msgstr "Opslaan"
 
 #: template/flag_comment.php
 #, php-format
 msgid "Flagged Out-of-Date Comment: %s"
-msgstr ""
+msgstr "Gemarkeerde verouderde opmerking: %s"
 
 #: template/flag_comment.php
 #, php-format
 msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
-msgstr ""
+msgstr "%s%s%s heeft %s%s%s gemarkeerd als verouderd op %s%s%s omwille van de volgende reden:"
 
 #: template/flag_comment.php
 #, php-format
 msgid "%s%s%s is not flagged out-of-date."
-msgstr ""
+msgstr "%s%s%s is niet gemarkeerd als verouderd."
 
 #: template/flag_comment.php
 msgid "Return to Details"
-msgstr ""
+msgstr "Terug naar informatiepagina"
 
 #: template/footer.php
 #, php-format
 msgid "Copyright %s 2004-%d aurweb Development Team."
-msgstr ""
+msgstr "Copyright %s 2004-%d aurweb-ontwikkelaarsteam."
 
 #: template/header.php
 msgid " My Account"
-msgstr "Mijn Account"
+msgstr "Mijn account"
 
 #: template/pkgbase_actions.php
 msgid "Package Actions"
-msgstr "Pakket Acties"
+msgstr "Pakketacties"
 
 #: template/pkgbase_actions.php
 msgid "View PKGBUILD"
-msgstr "Toon PKGBUILD"
+msgstr "PKGBUILD tonen"
 
 #: template/pkgbase_actions.php
 msgid "View Changes"
-msgstr "Bekijk Wijzigingen"
+msgstr "Wijzigingen bekijken"
 
 #: template/pkgbase_actions.php
 msgid "Download snapshot"
-msgstr "Download momentopname"
+msgstr "Momentopname downloaden"
 
 #: template/pkgbase_actions.php
 msgid "Search wiki"
-msgstr "Doorzoek wiki"
+msgstr "Wiki doorzoeken"
 
 #: template/pkgbase_actions.php
 #, php-format
 msgid "Flagged out-of-date (%s)"
-msgstr ""
+msgstr "Gemarkeerd als verouderd (%s)"
 
 #: template/pkgbase_actions.php
 msgid "Flag package out-of-date"
-msgstr "Markeer pakket als verouderd"
+msgstr "Markeren als verouderd"
 
 #: template/pkgbase_actions.php
 msgid "Unflag package"
-msgstr "Verwijder markering"
+msgstr "Markering verwijderen"
 
 #: template/pkgbase_actions.php
 msgid "Remove vote"
-msgstr "Verwijder stem"
+msgstr "Stem intrekken"
 
 #: template/pkgbase_actions.php
 msgid "Vote for this package"
-msgstr "Stem voor dit pakket"
+msgstr "Stemmen op dit pakket"
 
 #: template/pkgbase_actions.php scripts/notify.py
 msgid "Disable notifications"
-msgstr "Schakel notificaties uit"
+msgstr "Meldingen uitschakelen"
 
 #: template/pkgbase_actions.php template/pkg_comment_form.php
 msgid "Enable notifications"
-msgstr ""
+msgstr "Meldingen inschakelen"
 
 #: template/pkgbase_actions.php
 msgid "Manage Co-Maintainers"
-msgstr "Beheer mede-onderhouders"
+msgstr "Mede-onderhouders beheren"
 
 #: template/pkgbase_actions.php
 #, php-format
@@ -1532,28 +1588,28 @@ msgstr[1] "%d verzoeken in wachtrij"
 
 #: template/pkgbase_actions.php
 msgid "Adopt Package"
-msgstr "Adopteer Pakket"
+msgstr "Eigenaar worden"
 
 #: template/pkgbase_details.php
 msgid "Package Base Details"
-msgstr "Details van Basispakket"
+msgstr "Details van basispakket"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "Git Clone URL"
-msgstr "Git Clone URL"
+msgstr "Git clone-url"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "read-only"
-msgstr ""
+msgstr "alleen-lezen"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "click to copy"
-msgstr ""
+msgstr "klik om te kopiëren"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
 msgid "Keywords"
-msgstr "Sleutelwoorden"
+msgstr "Trefwoorden"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
@@ -1563,11 +1619,11 @@ msgstr "Inzender"
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php template/pkg_search_results.php
 msgid "Maintainer"
-msgstr "Beheerder"
+msgstr "Eigenaar"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "Last Packager"
-msgstr "Laatste Packager"
+msgstr "Recentste pakketbouwer"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php template/pkg_search_results.php
@@ -1585,94 +1641,94 @@ msgstr "Toegevoegd"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "Last Updated"
-msgstr "Laatste Update"
+msgstr "Recentste update"
 
 #: template/pkg_comment_box.php
 #, php-format
 msgid "Edit comment for: %s"
-msgstr ""
+msgstr "Opmerking bewerken van: %s"
 
 #: template/pkg_comment_box.php template/pkg_comment_form.php
 msgid "Add Comment"
-msgstr "Voeg Comment Toe"
+msgstr "Opmerking toevoegen"
 
 #: template/pkg_comment_form.php
 msgid ""
 "Git commit identifiers referencing commits in the AUR package repository and"
 " URLs are converted to links automatically."
-msgstr ""
+msgstr "Git-commitidentificaties die verwijzen naar commits in de AUR-bron en url's, worden automatisch omgezet naar links."
 
 #: template/pkg_comment_form.php
 #, php-format
 msgid "%sMarkdown syntax%s is partially supported."
-msgstr ""
+msgstr "%sMarkdown-syntax%s wordt gedeeltelijk ondersteund."
 
 #: template/pkg_comments.php
 msgid "Pinned Comments"
-msgstr ""
+msgstr "Vastgemaakte opmerkingen"
 
 #: template/pkg_comments.php
 msgid "Latest Comments"
-msgstr "Nieuwste Comments"
+msgstr "Nieuwste opmerkingen"
 
 #: template/pkg_comments.php
 msgid "Comments for"
-msgstr ""
+msgstr "Opmerkingen bij"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "%s commented on %s"
-msgstr ""
+msgstr "%s heeft een opmerking geplaatst bij %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "Anonymous comment on %s"
-msgstr ""
+msgstr "Anonieme opmerking bij %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "Commented on package %s on %s"
-msgstr ""
+msgstr "Opmerking geplaatst bij %s op %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "deleted on %s by %s"
-msgstr ""
+msgstr "verwijderd op %s door %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "deleted on %s"
-msgstr ""
+msgstr "verwijderd op %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "edited on %s by %s"
-msgstr ""
+msgstr "bewerkt op %s door %s"
 
 #: template/pkg_comments.php
 #, php-format
 msgid "edited on %s"
-msgstr ""
+msgstr "bewerkt op %s"
 
 #: template/pkg_comments.php
 msgid "Undelete comment"
-msgstr ""
+msgstr "Opmerking terugplaatsen"
 
 #: template/pkg_comments.php
 msgid "Delete comment"
-msgstr "Verwijder opmerking"
+msgstr "Opmerking verwijderen"
 
 #: template/pkg_comments.php
 msgid "Pin comment"
-msgstr ""
+msgstr "Opmerking vastmaken"
 
 #: template/pkg_comments.php
 msgid "Unpin comment"
-msgstr ""
+msgstr "Opmerking losmaken"
 
 #: template/pkg_details.php
 msgid "Package Details"
-msgstr "Pakketdetails"
+msgstr "Pakketinformatie"
 
 #: template/pkg_details.php template/pkg_search_form.php
 msgid "Package Base"
@@ -1684,11 +1740,11 @@ msgstr "Omschrijving"
 
 #: template/pkg_details.php
 msgid "Upstream URL"
-msgstr "Upstream URL"
+msgstr "Upstream-url"
 
 #: template/pkg_details.php
 msgid "Visit the website for"
-msgstr "Bezoek de website voor"
+msgstr "Ga naar de website van"
 
 #: template/pkg_details.php
 msgid "Licenses"
@@ -1725,13 +1781,13 @@ msgstr "Bronnen"
 #: template/pkgreq_close_form.php
 #, php-format
 msgid "Use this form to close the request for package base %s%s%s."
-msgstr "Gebruik dit formulier om het verzoek voor basispakket %s%s%s te sluiten."
+msgstr "Gebruik dit formulier om het verzoek aangaande het basispakket ‘%s%s%s’ te sluiten."
 
 #: template/pkgreq_close_form.php
 msgid ""
 "The comments field can be left empty. However, it is highly recommended to "
 "add a comment when rejecting a request."
-msgstr "Het commentaarveld mag leeg blijven. Echter, het wordt sterk aanbevolen om een afwijzing van commentaar te voorzien."
+msgstr "Het commentaarveld mag worden leeggelaten, maar het wordt sterk aanbevolen om een afwijzing van commentaar te voorzien."
 
 #: template/pkgreq_close_form.php
 msgid "Reason"
@@ -1740,7 +1796,7 @@ msgstr "Reden"
 #: template/pkgreq_close_form.php template/pkgreq_results.php
 #: template/tu_details.php
 msgid "Accepted"
-msgstr "Geaccepteerd"
+msgstr "Goedgekeurd"
 
 #: template/pkgreq_close_form.php template/pkgreq_results.php
 #: template/tu_details.php
@@ -1752,11 +1808,11 @@ msgstr "Afgewezen"
 msgid ""
 "Use this form to file a request against package base %s%s%s which includes "
 "the following packages:"
-msgstr "Gebruik dit formulier om een verzoek in te dienen voor basispakket %s%s%s welke de volgende pakketten omvat:"
+msgstr "Gebruik dit formulier om een verzoek in te dienen voor het basispakket ‘%s%s%s’, wat de volgende pakketten bevat:"
 
 #: template/pkgreq_form.php
 msgid "Request type"
-msgstr "Verzoektype"
+msgstr "Soort verzoek"
 
 #: template/pkgreq_form.php
 msgid "Deletion"
@@ -1764,18 +1820,18 @@ msgstr "Verwijdering"
 
 #: template/pkgreq_form.php
 msgid "Orphan"
-msgstr "Wees"
+msgstr "Onbeheerd"
 
 #: template/pkgreq_form.php template/pkg_search_results.php
 msgid "Merge into"
-msgstr "Voeg samen met"
+msgstr "Samenvoegen met"
 
 #: template/pkgreq_form.php
 msgid ""
 "By submitting a deletion request, you ask a Trusted User to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr ""
+msgstr "Als u een verwijderingsverzoek doet, vraagt u aan een zogeheten ‘Trusted User’ om het basispakket te verwijderen. Dit verzoek is bedoeld om duplicaten, niet-onderhouden (door upstream), illegale en onherstelbare pakketten te verwijderen."
 
 #: template/pkgreq_form.php
 msgid ""
@@ -1783,7 +1839,7 @@ msgid ""
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr ""
+msgstr "Als u een samenvoegingsverzoek doet, vraagt u aan een zogeheten ‘Trusted User’ om het basispakket te verwijderen en de bijbehorende opmerkingen en stemmen over te zetten naar een ander basispakket. Dit heeft geen invloed op de bijbehorende git-repo's, maar u dient wél zelf de git-geschiedenis van het doelpakket bij te werken."
 
 #: template/pkgreq_form.php
 msgid ""
@@ -1791,11 +1847,11 @@ msgid ""
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr ""
+msgstr "Als u een onteigeningsverzoek doet, vraagt u aan een zogeheten ‘Trusted User’ om het basispakket te onteigenen. Doe dit alleen als een pakket dringend onderhoud nodig heeft, maar de eigenaar niet thuis geeft, ook niet na een persoonlijk verzoek."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
-msgstr ""
+msgstr "Er zijn geen verzoeken die overeenkomen met uw zoekcriteria."
 
 #: template/pkgreq_results.php
 #, php-format
@@ -1825,8 +1881,8 @@ msgstr "Datum"
 #, php-format
 msgid "~%d day left"
 msgid_plural "~%d days left"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "~%d dag resterend"
+msgstr[1] "~%d dagen resterend"
 
 #: template/pkgreq_results.php
 #, php-format
@@ -1841,7 +1897,7 @@ msgstr "<1 uur resterend"
 
 #: template/pkgreq_results.php
 msgid "Accept"
-msgstr "Accepteer"
+msgstr "Goedkeuren"
 
 #: template/pkgreq_results.php
 msgid "Locked"
@@ -1849,11 +1905,11 @@ msgstr "Vergrendeld"
 
 #: template/pkgreq_results.php
 msgid "Close"
-msgstr "Sluit"
+msgstr "Sluiten"
 
 #: template/pkgreq_results.php
 msgid "Pending"
-msgstr ""
+msgstr "In behandeling"
 
 #: template/pkgreq_results.php
 msgid "Closed"
@@ -1869,19 +1925,19 @@ msgstr "Alleen de naam"
 
 #: template/pkg_search_form.php
 msgid "Exact Name"
-msgstr "Exacte Naam"
+msgstr "Exacte naam"
 
 #: template/pkg_search_form.php
 msgid "Exact Package Base"
-msgstr "Exact Basispakket"
+msgstr "Exact basispakket"
 
 #: template/pkg_search_form.php
 msgid "Co-maintainer"
-msgstr ""
+msgstr "Mede-onderhouder"
 
 #: template/pkg_search_form.php
 msgid "Maintainer, Co-maintainer"
-msgstr ""
+msgstr "Eigenaar, Mede-onderhouder"
 
 #: template/pkg_search_form.php
 msgid "All"
@@ -1906,7 +1962,7 @@ msgstr "Gestemd"
 
 #: template/pkg_search_form.php
 msgid "Last modified"
-msgstr ""
+msgstr "Laatst gewijzigd"
 
 #: template/pkg_search_form.php
 msgid "Ascending"
@@ -1922,7 +1978,7 @@ msgstr "Voer zoekcriteria in"
 
 #: template/pkg_search_form.php
 msgid "Search by"
-msgstr "Zoek op"
+msgstr "Zoeken op"
 
 #: template/pkg_search_form.php template/stats/user_table.php
 msgid "Out of Date"
@@ -1930,7 +1986,7 @@ msgstr "Verouderd"
 
 #: template/pkg_search_form.php template/search_accounts_form.php
 msgid "Sort by"
-msgstr "Sorteer Op"
+msgstr "Sorteren op"
 
 #: template/pkg_search_form.php
 msgid "Sort order"
@@ -1946,15 +2002,15 @@ msgstr "Ga"
 
 #: template/pkg_search_form.php
 msgid "Orphans"
-msgstr "Wezen"
+msgstr "Onbeheerd"
 
 #: template/pkg_search_results.php
 msgid "Error retrieving package list."
-msgstr "Fout bij het ophalen van pakkettenlijst"
+msgstr "De pakketlijst kan niet worden opgehaald."
 
 #: template/pkg_search_results.php
 msgid "No packages matched your search criteria."
-msgstr "Geen pakketen gevonden die aan uw zoekcriteria voldoen"
+msgstr "Er zijn geen pakketten die overeenkomen met uw zoekcriteria."
 
 #: template/pkg_search_results.php
 #, php-format
@@ -1972,7 +2028,7 @@ msgstr "Versie"
 msgid ""
 "Popularity is calculated as the sum of all votes with each vote being "
 "weighted with a factor of %.2f per day since its creation."
-msgstr ""
+msgstr "De populariteit wordt vastgesteld op basis van het totaal aantal stemmen plus een factor %.2f per dag sinds de aanmaak."
 
 #: template/pkg_search_results.php template/tu_details.php
 #: template/tu_list.php
@@ -1981,7 +2037,7 @@ msgstr "Ja"
 
 #: template/pkg_search_results.php
 msgid "orphan"
-msgstr "wees"
+msgstr "onbeheerd"
 
 #: template/pkg_search_results.php
 msgid "Actions"
@@ -1989,23 +2045,23 @@ msgstr "Acties"
 
 #: template/pkg_search_results.php
 msgid "Unflag Out-of-date"
-msgstr "Hef Out-of-Date markering op"
+msgstr "Demarkeren als verouderd"
 
 #: template/pkg_search_results.php
 msgid "Adopt Packages"
-msgstr "Adopteer Pakketten"
+msgstr "Eigenaar worden"
 
 #: template/pkg_search_results.php
 msgid "Disown Packages"
-msgstr "Onteigen Pakketten"
+msgstr "Pakketten onteigenen"
 
 #: template/pkg_search_results.php
 msgid "Delete Packages"
-msgstr "Verwijder pakketten"
+msgstr "Pakketten verwijderen"
 
 #: template/pkg_search_results.php
 msgid "Confirm"
-msgstr "Bevestig"
+msgstr "Bevestigen"
 
 #: template/search_accounts_form.php
 msgid "Any type"
@@ -2013,7 +2069,7 @@ msgstr "Elk type"
 
 #: template/search_accounts_form.php
 msgid "Search"
-msgstr "Zoek"
+msgstr "Zoeken"
 
 #: template/stats/general_stats_table.php
 msgid "Statistics"
@@ -2021,27 +2077,27 @@ msgstr "Statistieken"
 
 #: template/stats/general_stats_table.php
 msgid "Orphan Packages"
-msgstr "Weespakketten"
+msgstr "Onteigend"
 
 #: template/stats/general_stats_table.php
 msgid "Packages added in the past 7 days"
-msgstr "Pakketten toegevoegd in de laatste 7 dagen"
+msgstr "Toegevoegd in de afgelopen 7 dagen"
 
 #: template/stats/general_stats_table.php
 msgid "Packages updated in the past 7 days"
-msgstr "Pakketten geüpdatet in de laatste 7 dagen"
+msgstr "Bijgewerkt in de afgelopen 7 dagen"
 
 #: template/stats/general_stats_table.php
 msgid "Packages updated in the past year"
-msgstr "Pakketen geüpdatet in het laatste jaar"
+msgstr "Bijgewerkt in het afgelopen jaar"
 
 #: template/stats/general_stats_table.php
 msgid "Packages never updated"
-msgstr "Nooit geüpdate pakketten"
+msgstr "Nooit bijgewerkt"
 
 #: template/stats/general_stats_table.php
 msgid "Registered Users"
-msgstr "Geregistreerde Gebruikers"
+msgstr "Geregistreerde gebruikers"
 
 #: template/stats/general_stats_table.php
 msgid "Trusted Users"
@@ -2053,7 +2109,7 @@ msgstr "Recente updates"
 
 #: template/stats/updates_table.php
 msgid "more"
-msgstr ""
+msgstr "meer"
 
 #: template/stats/user_table.php
 msgid "My Statistics"
@@ -2065,12 +2121,12 @@ msgstr "Voorsteldetails"
 
 #: template/tu_details.php
 msgid "This vote is still running."
-msgstr "Dit voorstel is nog bezig"
+msgstr "De stemming loopt nog."
 
 #: template/tu_details.php
 #, php-format
 msgid "Submitted: %s by %s"
-msgstr "Opgestuurd: %s door %s"
+msgstr "Ingediend: %s, door %s"
 
 #: template/tu_details.php template/tu_list.php
 msgid "End"
@@ -2086,7 +2142,7 @@ msgstr "Nee"
 
 #: template/tu_details.php
 msgid "Abstain"
-msgstr "Onthouden"
+msgstr "Blanco stemmen"
 
 #: template/tu_details.php
 msgid "Total"
@@ -2094,15 +2150,15 @@ msgstr "Totaal"
 
 #: template/tu_details.php
 msgid "Participation"
-msgstr "Participatie"
+msgstr "Deelname"
 
 #: template/tu_last_votes_list.php
 msgid "Last Votes by TU"
-msgstr "Laatste stemmen door TU"
+msgstr "Recentste stemmen van TU"
 
 #: template/tu_last_votes_list.php
 msgid "Last vote"
-msgstr "Laatste stem"
+msgstr "Recentste stem"
 
 #: template/tu_last_votes_list.php template/tu_list.php
 msgid "No results found."
@@ -2118,7 +2174,7 @@ msgstr "Terug"
 
 #: scripts/notify.py
 msgid "AUR Password Reset"
-msgstr ""
+msgstr "AUR-wachtwoordherstel"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2126,90 +2182,90 @@ msgid ""
 "A password reset request was submitted for the account {user} associated "
 "with your email address. If you wish to reset your password follow the link "
 "[1] below, otherwise ignore this message and nothing will happen."
-msgstr ""
+msgstr "Er is een verzoek ingediend om het wachtwoord te herstellen van het account ‘{user}’, wat geregistreerd staat op uw e-mailadres. Als u uw wachtwoord wilt herstellen, volg dan onderstaande link ([1]). Als u dat niet wilt, kunt u deze e-mail beschouwen als niet-verzonden."
 
 #: scripts/notify.py
 msgid "Welcome to the Arch User Repository"
-msgstr ""
+msgstr "Welkom bij de Arch User Respository"
 
 #: scripts/notify.py
 msgid ""
 "Welcome to the Arch User Repository! In order to set an initial password for"
 " your new account, please click the link [1] below. If the link does not "
 "work, try copying and pasting it into your browser."
-msgstr ""
+msgstr "Welkom bij de Arch User Repository! Als u een nieuw wachtwoord voor uw account wilt instellen, klik dan op de link ([1]) hieronder. Als de link niet werkt, kopieer en plak deze dan in uw browser."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Comment for {pkgbase}"
-msgstr ""
+msgstr "AUR-opmerking bij {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] added the following comment to {pkgbase} [2]:"
-msgstr ""
+msgstr "{user} ([1]) heeft een opmerking geplaatst bij {pkgbase} ([2]): "
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "If you no longer wish to receive notifications about this package, please go"
 " to the package page [2] and select \"{label}\"."
-msgstr ""
+msgstr "Als u geen meldingen aangaande dit pakket meer wilt ontvangen, ga dan naar de pakketpagina ([2]) en klik op ‘{label}’."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package Update: {pkgbase}"
-msgstr ""
+msgstr "AUR-pakketupdate: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
-msgstr ""
+msgstr "{user} ([1]) heeft een commit toegevoegd aan {pkgbase} ([2]): "
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Out-of-date Notification for {pkgbase}"
-msgstr ""
+msgstr "AUR-verouderingsmelding van {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
-msgstr ""
+msgstr "Uw pakket genaamd ‘{pkgbase} ([1])’ is als verouderd gemarkeerd door {user} [2]:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Ownership Notification for {pkgbase}"
-msgstr ""
+msgstr "AUR-eigenaarsmelding van {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was adopted by {user} [2]."
-msgstr ""
+msgstr "{user} [2] is de nieuwe eigenaar van het pakket ‘{pkgbase}’ [1]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was disowned by {user} [2]."
-msgstr ""
+msgstr "{pkgbase} [1] is onteigend door {user} [2]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Co-Maintainer Notification for {pkgbase}"
-msgstr ""
+msgstr "AUR-mede-eigenaarsmelding van {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were added to the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "U bent toegevoegd aan de lijst met onderhouder van {pkgbase} [1]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "U bent verwijderd van de lijst met onderhouder van {pkgbase} [1]."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package deleted: {pkgbase}"
-msgstr ""
+msgstr "AUR-pakket verwijderd: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2218,7 +2274,7 @@ msgid ""
 "\n"
 "-- \n"
 "If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
-msgstr ""
+msgstr "{user} [1] heeft {old} [2] samengevoegd met {new} [3].\n\n--\nAls u geen meldingen aangaande dit pakket meer wilt ontvangen, ga dan naar de pakketpagina ([2]) en klik op ‘{label}’."
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2226,16 +2282,61 @@ msgid ""
 "{user} [1] deleted {pkgbase} [2].\n"
 "\n"
 "You will no longer receive notifications about this package."
-msgstr ""
+msgstr "{user} [1] heeft {pkgbase} [2] verwijderd.\n\n\nU ontvangt geen meldingen meer aangaande dit pakket."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "TU Vote Reminder: Proposal {id}"
-msgstr ""
+msgstr "TU-stemherinnering aangaande het voorstel ‘{id}’"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
+msgstr "Vergeet niet uw stem uit te brengen op het voorstel ‘{id}’ [1]. De stemming sluit over minder dan 48 uur."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "Ongeldig accounttype."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "U bent niet bevoegd om accounttypes te wijzigen."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "U bent niet bevoegd om het accounttype van deze gebruiker te wijzigen in ‘%s’."
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr "Er zijn geen goed te keuren onteigeningsverzoeken omtrent %s."
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr "Interne serverfout"
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr "Er is een kritieke fout opgetreden."
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr "De details zijn vastgelegd en worden nagekeken door de beheerder. Onze excuses voor het eventuele ontstane ongemak."
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr "AUR-serverfout"
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 56e9f6bb..4856f22b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,18 +10,19 @@
 # Chris Warrick, 2012
 # Kwpolska <kwpolska@kwpolska.tk>, 2011
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
-# Marcin Mikołajczak <me@mkljczk.pl>, 2017
+# marcin mikołajczak <me@mkljczk.pl>, 2017
 # Michal T <zorza2@gmail.com>, 2016
 # Nuc1eoN <nucrap@hotmail.com>, 2014
 # Piotr Strębski <strebski@gmail.com>, 2017-2018
 # Piotr Strębski <strebski@gmail.com>, 2013-2016
+# Przemyslaw Ka. <przemyslaw.karpeta@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Polish (http://www.transifex.com/lfleischer/aurweb/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +87,7 @@ msgstr "Nie masz uprawnień do edycji tego konta."
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Błędne hasło."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -482,6 +483,12 @@ msgid ""
 "checkbox."
 msgstr "Wybrane pakiety nie zostały porzucone, sprawdź pole wyboru potwierdzenia."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Nie można znaleźć pakietu do scalenia głosów i komentarzy."
@@ -580,6 +587,14 @@ msgstr "Oznacz komentarz"
 msgid "Flag Package Out-Of-Date"
 msgstr "Oznacz pakiet jako nieaktualny"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -876,6 +891,10 @@ msgstr "Formularz logowania jest obecnie wyłączony dla Twojego adresu IP, najp
 msgid "Account suspended"
 msgstr "Konto zawieszone"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -961,6 +980,30 @@ msgstr "Błąd podczas pobierania informacji o pakiecie."
 msgid "Package details could not be found."
 msgstr "Nie odnaleziono informacji o pakiecie."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Musisz być zalogowany aby móc oznaczyć pakiety."
@@ -997,6 +1040,10 @@ msgstr "Nie masz uprawnień do usuwania pakietów."
 msgid "You did not select any packages to delete."
 msgstr "Nie wybrałeś żadnych pakietów do usunięcia."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Wybrane pakiety zostały usunięte."
@@ -1005,10 +1052,18 @@ msgstr "Wybrane pakiety zostały usunięte."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Musisz być zalogowany aby móc przejmować pakiety."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Musisz być zalogowany, aby móc porzucać pakiety."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Nie wybrałeś żadnych pakietów do przejęcia."
@@ -2256,3 +2311,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 00000000..b2cf86b2
--- /dev/null
+++ b/po/pt.po
@@ -0,0 +1,2336 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+# Lukas Fleischer <transifex@cryptocrack.de>, 2011
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Portuguese (http://www.transifex.com/lfleischer/aurweb/language/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr "Contas"
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr "Você não está autorizado a acessar esta área."
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr "Não foi possível recuperar as informações do usuário especificado."
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr "Você não tem permissão para editar este conta."
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr "Use este formulário para pesquisar as contas existentes."
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr "Você precisa efetuar o login para visualizar as informações do usuário."
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr "Tipo"
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr "Enviar"
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr "Inicial"
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr "Meus Pacotes"
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr "Lembre-se de votar nos seus pacotes favoritos!"
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr "Discussão"
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr "Votar"
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr "Notificar"
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr "Retirar Notificação"
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr "Login"
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr "Logado como: %s"
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr "Sair"
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr "Senha"
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr "Critério de Pesquisa"
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr "Pacotes"
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr "Erro ao tentar retornar os detalhes do pacote."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr "Um campo requerido não foi informado."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr "As senhas informadas não conferem."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr "Use este formulário para criar uma conta."
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr "Usuário Confiável"
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr "ID de usuário não encontrada"
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr "O endereço de email é inválido."
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr "Idioma atualmente não suportado."
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr "Comentário foi adicionado."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr "Você deve ter efetuado o login antes de poder editar as informações do pacote."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr "ID de comentário não encontrada."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr "Erro ao retornar os detalhes do pacote."
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr "Detalhes do Pacote não foram encontrados."
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr "Você deve efetuar o login antes de poder marcar pacotes."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr "Você não selecionou nenhum pacote para marcar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr "Os pacotes selecionados foram marcados como desatualizados."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr "Você deve efetuar o login antes de poder desmarcar pacotes."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr "Você não selecionou nenhum pacote para desmarcar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr "Os pacotes selecionados tiveram seus marcadores retirados."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr "Você não selecionou nenhum pacote para excluir."
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr "Os pacotes selecionados foram excluídos."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr "Você deve efetuar o login antes de poder adotar pacotes."
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr "Você deve efetuar o login antes de poder abandonar pacotes"
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr "Você não selecionou nenhum pacote para adotar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr "Você não selecionou nenhum pacote para abandonar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr "Os pacotes selecionados foram adotados."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr "Os pacotes selecionados foram abandonados."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr "Você deve efetuar o login antes de poder votar nos pacotes."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr "Você deve efetuar o login antes de poder retirar seu voto de um pacote."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr "Você não selecionou nenhum pacote para votar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr "Seus votos foram removidos dos pacotes selecionados."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr "Os pacotes selecionados foram votados."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr "Não foi possível adicionar para a lista de notificação."
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr "Você não está autorizado a apagar este comentário."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr "Comentário foi excluído."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr "Nome inválido: somente letras minúsculas são permitidas."
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr "Nome de Usuário"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr "Tipo da Conta"
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr "Usuário"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr "Desenvolvedor"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr "Endereço de Email"
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr "Nome Real"
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr "Nick de IRC"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr "Status"
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr "Ativo"
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr "Desconhecida"
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr "Nunca"
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr "Visualizar os pacotes deste usuário"
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr "requerido"
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr "Usuário Normal"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr "Usuário Confiável"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr "Conta Suspensa"
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr "Idioma"
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr "Confirme a senha"
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr "Atualizar"
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr "Criar"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr "Resetar"
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr "Seu critério de pesquisa não retornou nenhum resultado."
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr "Editar Conta"
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr "Suspenso"
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr "Menor"
+
+#: template/account_search_results.php
+msgid "More"
+msgstr "Mais"
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr "Sem mais resultados para exibir."
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr "Colaborador"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr "Mantenedor"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr "Votos"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr "Submetido pela primeira vez"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr "Últimos Pacotes Atualizados"
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr "Excluir Comentário"
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr "Detalhes do Pacote"
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr "Descrição"
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr "Dependências"
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr "Fontes"
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr "Todos"
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr "Nome"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr "Votado"
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr "Decrescente"
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr "Pesquisar por"
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr "Ordenar por"
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr "Ordem"
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr "Por página"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr "Ir"
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr "Orfãos"
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr "Erro ao retornar a lista de pacotes."
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr "Seu critério de pesquisa não retornou nenhum pacote."
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr "Sim"
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr "orfão"
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr "Ações"
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr "Retirar marcador de Desatualizado"
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr "Adotar Pacotes"
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr "Abandonar Pacotes"
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr "Excluir Pacote"
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr "Qualquer tipo"
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr "Pesquisa'"
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr "Usuários Registrados"
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr "Usuários Confiáveis"
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr "Atualizações Recentes"
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr "Minhas Estatísticas"
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr "Não"
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1a54b01a..c9c15d72 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 # Albino Biasutti Neto Bino <biasuttin@gmail.com>, 2011
 # Fábio Nogueira <deb.user.ba@gmail.com>, 2016
 # Rafael Fontenelle <rffontenelle@gmail.com>, 2012-2015
-# Rafael Fontenelle <rffontenelle@gmail.com>, 2011,2015-2018,2020
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2011,2015-2018,2020-2022
 # Rafael Fontenelle <rffontenelle@gmail.com>, 2011
 # Sandro <sandrossv@hotmail.com>, 2011
 # Sandro <sandrossv@hotmail.com>, 2011
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 12:57+0000\n"
-"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/lfleischer/aurweb/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,7 +57,7 @@ msgstr "Serviço indisponível"
 #: html/503.php
 msgid ""
 "Don't panic! This site is down due to maintenance. We will be back soon."
-msgstr "Sem pânico! Este site está fechado para manutenção. Voltaremos às atividades em breve."
+msgstr "Sem pânico! Este site está indisponível para manutenção. Voltaremos às atividades em breve."
 
 #: html/account.php
 msgid "Account"
@@ -89,7 +89,7 @@ msgstr "Utilize este formulário para procurar contas existentes."
 
 #: html/account.php
 msgid "You must log in to view user information."
-msgstr "Você precisa fazer login para ver as informações do usuário."
+msgstr "Você precisa se conectar para ver as informações de usuários."
 
 #: html/addvote.php template/tu_list.php
 msgid "Add Proposal"
@@ -101,7 +101,7 @@ msgstr "Token inválido para a ação de usuário."
 
 #: html/addvote.php
 msgid "Username does not exist."
-msgstr "Usuário não existe."
+msgstr "Nome de usuário não existe."
 
 #: html/addvote.php
 #, php-format
@@ -126,7 +126,7 @@ msgstr "Enviar uma proposta para ser votada."
 
 #: html/addvote.php
 msgid "Applicant/TU"
-msgstr "Requerente/UC"
+msgstr "Requerente/TU"
 
 #: html/addvote.php
 msgid "(empty if not applicable)"
@@ -139,15 +139,15 @@ msgstr "Tipo"
 
 #: html/addvote.php
 msgid "Addition of a TU"
-msgstr "Adição de um UC"
+msgstr "Adição de um TU"
 
 #: html/addvote.php
 msgid "Removal of a TU"
-msgstr "Remoção de um UC"
+msgstr "Remoção de um TU"
 
 #: html/addvote.php
 msgid "Removal of a TU (undeclared inactivity)"
-msgstr "Remoção de um UC (inatividade não declarada)"
+msgstr "Remoção de um TU (inatividade não declarada)"
 
 #: html/addvote.php
 msgid "Amendment of Bylaws"
@@ -163,7 +163,7 @@ msgstr "Enviar"
 
 #: html/comaintainers.php template/comaintainers_form.php
 msgid "Manage Co-maintainers"
-msgstr "Gerenciar co-mantenedores"
+msgstr "Gerenciar comantenedores"
 
 #: html/commentedit.php template/pkg_comments.php
 msgid "Edit comment"
@@ -171,7 +171,7 @@ msgstr "Editar comentário"
 
 #: html/home.php template/header.php
 msgid "Dashboard"
-msgstr "Dashboard"
+msgstr "Painel de controle"
 
 #: html/home.php template/header.php
 msgid "Home"
@@ -235,7 +235,7 @@ msgstr "Os pacotes do AUR são conteúdos produzidos por usuários. Qualquer uso
 
 #: html/home.php
 msgid "Learn more..."
-msgstr "Aprenda mais..."
+msgstr "Saiba mais..."
 
 #: html/home.php
 msgid "Support"
@@ -260,7 +260,7 @@ msgstr "Requisição para tornar o pacote órfão"
 msgid ""
 "Request a package to be disowned, e.g. when the maintainer is inactive and "
 "the package has been flagged out-of-date for a long time."
-msgstr "Requisite que seja desvinculado um pacote de seu mantenedor, de forma que o pacote fique órfão, quando, por exemplo, o mantenedor está inativo e o pacote foi marcado como desatualizado há muito tempo."
+msgstr "Requisite que um pacote seja desvinculado de seu mantenedor, de forma que o pacote fique órfão, quando, por exemplo, o mantenedor está inativo e o pacote foi marcado como desatualizado há muito tempo."
 
 #: html/home.php
 msgid "Deletion Request"
@@ -271,7 +271,7 @@ msgid ""
 "Request a package to be removed from the Arch User Repository. Please do not"
 " use this if a package is broken and can be fixed easily. Instead, contact "
 "the package maintainer and file orphan request if necessary."
-msgstr "Requisite que um pacote seja removido do Arch User Repository. Por favor, não use esta opção se um pacote está quebrado, mas que pode ser corrigido facilmente. Ao invés disso, contate o mantenedor do pacote e, se necessário, preencha uma requisição para tornar esse pacote órfão."
+msgstr "Requisite que um pacote seja removido do Arch User Repository. Por favor, não use esta opção se um pacote está quebrado, mas que pode ser corrigido facilmente. Ao invés disso, contate o mantenedor do pacote e, se necessário, preencha uma requisição para tornar o pacote órfão."
 
 #: html/home.php
 msgid "Merge Request"
@@ -288,7 +288,7 @@ msgstr "Requisite que um pacote seja mesclado com outro. Pode ser usado quando u
 msgid ""
 "If you want to discuss a request, you can use the %saur-requests%s mailing "
 "list. However, please do not use that list to file requests."
-msgstr "Se você quiser discutir uma requisição, você pode user a lista de discussão %saur-request%s. Porém, por favor não use essa lista para fazer requisições."
+msgstr "Se você quiser discutir uma requisição, você pode usar a lista de discussão %saur-request%s. Porém, por favor não use essa lista para fazer requisições."
 
 #: html/home.php
 msgid "Submitting Packages"
@@ -316,7 +316,7 @@ msgid ""
 "General discussion regarding the Arch User Repository (AUR) and Trusted User"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr "Discussões gerais no que se refere à estrutura do Arch User Repository (AUR) e do Usuário Confiável acontecem no %saur-general%s. Para discussão relacionada ao desenvolvimento do AUR web, use a lista de discussão do %saur-dev%s"
+msgstr "Discussões gerais no que se refere à estrutura do Arch User Repository (AUR) e de Trusted Users acontecem no %saur-general%s. Para discussão relacionada ao desenvolvimento da interface web do AUR, use a lista de discussão do %saur-dev%s"
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -329,7 +329,7 @@ msgid ""
 "our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
 " %sonly%s. To report packaging bugs contact the package maintainer or leave "
 "a comment on the appropriate package page."
-msgstr "Se você encontrar um erro na interface web do AUR, por favor preencha um relatório de erro no nosso %sbug tracker%s. Use o tracker para relatar erros encontrados no AUR web, %ssomente%s. Para relatar erros de empacotamento, contate o mantenedor do pacote ou deixe um comentário na página de pacote apropriada."
+msgstr "Se você encontrar um erro na interface web do AUR, por favor preencha um relatório de erro no nosso %srastreador de erros%s. Use o rastreador para relatar erros encontrados no AUR web, %ssomente%s. Para relatar erros de empacotamento, contate o mantenedor do pacote ou deixe um comentário na página de pacote apropriada."
 
 #: html/home.php
 msgid "Package Search"
@@ -361,7 +361,7 @@ msgstr "Desmarcar"
 
 #: html/login.php template/header.php
 msgid "Login"
-msgstr "Login"
+msgstr "Conectar"
 
 #: html/login.php html/tos.php
 #, php-format
@@ -374,7 +374,7 @@ msgstr "Sair"
 
 #: html/login.php
 msgid "Enter login credentials"
-msgstr "Digite as credenciais de login"
+msgstr "Digite as credenciais para se conectar"
 
 #: html/login.php
 msgid "User name or primary email address"
@@ -396,7 +396,7 @@ msgstr "Esqueci minha senha"
 #, php-format
 msgid ""
 "HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
-msgstr "Login via HTTP está desabilitado. Favor %sacesse via HTTPs%s caso queira fazer login."
+msgstr "Acesso por HTTP está desabilitado. Favor %sacesse via HTTPs%s caso queira se conectar."
 
 #: html/packages.php template/pkg_search_form.php
 msgid "Search Criteria"
@@ -446,7 +446,7 @@ msgstr "Confirme seu nome de usuário ou endereço de e-mail primário:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
-msgstr "Informe com sua senha:"
+msgstr "Digite a sua senha:"
 
 #: html/passreset.php
 msgid "Confirm your new password:"
@@ -477,9 +477,15 @@ msgid ""
 "checkbox."
 msgstr "Os pacotes selecionados não foram abandonados, marque a caixa de confirmação."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "Os pacotes selecionados não foram adotados, marque a caixa de confirmação."
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
-msgstr "Não foi possível encontrar pacote para nele fundir votos e comentários."
+msgstr "Não foi possível encontrar pacote para mesclar votos e comentários nele."
 
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot merge a package base with itself."
@@ -489,7 +495,7 @@ msgstr "Não é possível mesclar um pacote base com ele mesmo"
 msgid ""
 "The selected packages have not been deleted, check the confirmation "
 "checkbox."
-msgstr "Os pacotes selecionados não foram apagados, marque a caixa de confirmação."
+msgstr "Os pacotes selecionados não foram excluídos, marque a caixa de confirmação."
 
 #: html/pkgdel.php
 msgid "Package Deletion"
@@ -524,7 +530,7 @@ msgstr "Excluir"
 
 #: html/pkgdel.php
 msgid "Only Trusted Users and Developers can delete packages."
-msgstr "Somente Usuários Confiáveis e Desenvolvedores podem excluir pacotes."
+msgstr "Somente Trusted Users e Desenvolvedores podem excluir pacotes."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
@@ -535,7 +541,7 @@ msgstr "Abandonar pacote"
 msgid ""
 "Use this form to disown the package base %s%s%s which includes the following"
 " packages: "
-msgstr "Use esse formulário para abandonar o pacote base %s%s%s que incluem os seguintes pacotes:"
+msgstr "Use este formulário para abandonar o pacote base %s%s%s que inclui os seguintes pacotes:"
 
 #: html/pkgdisown.php
 msgid ""
@@ -565,7 +571,7 @@ msgstr "Abandonar"
 
 #: html/pkgdisown.php
 msgid "Only Trusted Users and Developers can disown packages."
-msgstr "Apenas Usuários Confiáveis e Desenvolvedores podem abandonar pacotes."
+msgstr "Apenas Trusted Users e Desenvolvedores podem abandonar pacotes."
 
 #: html/pkgflagcomment.php
 msgid "Flag Comment"
@@ -575,6 +581,14 @@ msgstr "Comentário da marcação"
 msgid "Flag Package Out-Of-Date"
 msgstr "Marcar pacote desatualizado"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "Este parece ser um pacote VCS. %sNão%s marque como desatualizado se a versão do pacote no AUR não corresponder ao commit mais recente. A marcação deste pacote só deve ser feita se as fontes forem movidas ou mudanças no PKGBUILD forem necessárias devido a mudanças recentes no upstream."
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -587,7 +601,7 @@ msgstr "Use este formulário para marcar o pacote base %s%s%s e os seguintes pac
 msgid ""
 "Please do %snot%s use this form to report bugs. Use the package comments "
 "instead."
-msgstr "Por favor, %snão%s use esse formulário para relatar erros. Para isto, use os comentários do pacote."
+msgstr "Por favor, %snão%s use este formulário para relatar erros. Para isto, use os comentários do pacote."
 
 #: html/pkgflag.php
 msgid ""
@@ -647,7 +661,7 @@ msgstr "Mesclar"
 
 #: html/pkgmerge.php
 msgid "Only Trusted Users and Developers can merge packages."
-msgstr "Somente Usuários Confiáveis e Desenvolvedores podem mesclar pacotes."
+msgstr "Somente Trusted Users e Desenvolvedores podem mesclar pacotes."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
@@ -705,7 +719,7 @@ msgstr "Eu aceito os termos e condições acima."
 
 #: html/tu.php template/account_details.php template/header.php
 msgid "Trusted User"
-msgstr "Usuário confiável"
+msgstr "Trusted User"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
@@ -717,7 +731,7 @@ msgstr "A votação está encerrada para esta proposta."
 
 #: html/tu.php
 msgid "Only Trusted Users are allowed to vote."
-msgstr "Apenas Usuários Confiáveis têm permissão para votar."
+msgstr "Apenas Trusted Users têm permissão para votar."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -725,7 +739,7 @@ msgstr "Você não pode votar em uma proposta sobre você."
 
 #: html/tu.php
 msgid "You've already voted for this proposal."
-msgstr "Você já votou nessa proposta."
+msgstr "Você já votou nesta proposta."
 
 #: html/tu.php
 msgid "Vote ID not valid."
@@ -755,7 +769,7 @@ msgstr "Faltando ID de usuário"
 
 #: lib/acctfuncs.inc.php
 msgid "The username is invalid."
-msgstr "O usuário é inválido."
+msgstr "O nome de usuário é inválido."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -768,7 +782,7 @@ msgstr "Começo e fim com uma letra ou um número"
 
 #: lib/acctfuncs.inc.php
 msgid "Can contain only one period, underscore or hyphen."
-msgstr "Pode conter somente um ponto, traço inferior ou hífen."
+msgstr "Pode conter somente um ponto, sublinhado ou hífen."
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
@@ -784,7 +798,7 @@ msgstr "O endereço de e-mail reserva é inválido"
 
 #: lib/acctfuncs.inc.php
 msgid "The home page is invalid, please specify the full HTTP(s) URL."
-msgstr "A página inicial é inválida. Por favor especificar a URL HTTP(s) completa."
+msgstr "A página inicial é inválida. Por favor, especificar a URL HTTP(s) completa."
 
 #: lib/acctfuncs.inc.php
 msgid "The PGP key fingerprint is invalid."
@@ -819,7 +833,7 @@ msgstr "O endereço, %s%s%s, já está sendo usado."
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "The SSH public key, %s%s%s, is already in use."
-msgstr "A chave pública de SSH, %s%s%s, já está em uso."
+msgstr "A chave pública de SSH, %s%s%s, já está sendo usada."
 
 #: lib/acctfuncs.inc.php
 msgid "The CAPTCHA is missing."
@@ -849,7 +863,7 @@ msgstr "Uma chave de redefinição de senha foi enviada para seu endereço de e-
 
 #: lib/acctfuncs.inc.php
 msgid "Click on the Login link above to use your account."
-msgstr "Clique no link de Login acima para usar a sua conta."
+msgstr "Clique no link de Conectar acima para usar a sua conta."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -859,29 +873,33 @@ msgstr "Nenhuma alteração foi feita na conta, %s%s%s."
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid "The account, %s%s%s, has been successfully modified."
-msgstr "A conta %s%s%s foi modificada com sucesso."
+msgstr "A conta, %s%s%s, foi modificada com sucesso."
 
 #: lib/acctfuncs.inc.php
 msgid ""
 "The login form is currently disabled for your IP address, probably due to "
 "sustained spam attacks. Sorry for the inconvenience."
-msgstr "O formulário de login está desabilitado momento para seu endereço IP, provavelmente por causa de ataques continuados de spam. Desculpe a inconveniência."
+msgstr "O formulário para se conectar está desabilitado momento para seu endereço IP, provavelmente por causa de ataques continuados de spam. Desculpe a inconveniência."
 
 #: lib/acctfuncs.inc.php
 msgid "Account suspended"
 msgstr "Conta suspensa"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "Você não tem permissão para suspender contas."
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
 "Your password has been reset. If you just created a new account, please use "
 "the link from the confirmation email to set an initial password. Otherwise, "
 "please request a reset key on the %sPassword Reset%s page."
-msgstr "Sua senha foi redefinida. Se você acabou de criar uma conta, por favor use o link do e-mail de confirmação para definir uma senha inicial. Do contrário, por favor requisite uma chave de senha na página de %sRedefinição de senha%s."
+msgstr "Sua senha foi redefinida. Se você acabou de criar uma conta, por favor, use o link do e-mail de confirmação para definir uma senha inicial. Do contrário, requisite uma chave de senha na página de %sRedefinição de senha%s."
 
 #: lib/acctfuncs.inc.php
 msgid "Bad username or password."
-msgstr "Usuário ou senha inválida."
+msgstr "Nome de usuário ou senha inválida."
 
 #: lib/acctfuncs.inc.php
 msgid "An error occurred trying to generate a user session."
@@ -889,7 +907,7 @@ msgstr "Ocorreu um erro ao tentar gerar uma sessão de usuário."
 
 #: lib/acctfuncs.inc.php
 msgid "Invalid e-mail and reset key combination."
-msgstr "Combinação entre email e chave de redefinição é inválida"
+msgstr "Combinação entre e-mail e chave de redefinição é inválida"
 
 #: lib/aur.inc.php template/pkg_details.php
 msgid "None"
@@ -922,7 +940,7 @@ msgstr "O comentário foi adicionado."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can edit package information."
-msgstr "Você tem que estar conectado para poder editar informações do pacote."
+msgstr "Você deve estar conectado para poder editar informações do pacote."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Missing comment ID."
@@ -956,17 +974,41 @@ msgstr "Erro ao obter detalhes do pacote."
 msgid "Package details could not be found."
 msgstr "Não foi possível encontrar os detalhes do pacote."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr "Cabeçalho de referenciador incorreto."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "Você não selecionou nenhum pacote sobre o qual deva ser notificado."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "As notificações dos pacotes selecionados foram habilitadas."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "Você não selecionou nenhum pacote para remoção de notificação."
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "Um pacote que você selecionou não está com notificações habilitadas."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "As notificações dos pacotes selecionados foram removidas."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Você deve estar conectado para marcar os pacotes."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to flag."
-msgstr "Você não selecionou nenhum pacote para marcar."
+msgstr "Você selecionou nenhum pacote para marcar."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have not been flagged, please enter a comment."
-msgstr "Os pacotes selecionados não foram marcados como desatualizados, por favor insira um comentário."
+msgstr "Os pacotes selecionados não foram marcados como desatualizados. Por favor, insira um comentário."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been flagged out-of-date."
@@ -978,7 +1020,7 @@ msgstr "Você deve estar conectado para desmarcar os pacotes."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to unflag."
-msgstr "Você não selecionou nenhum pacote para desmarcar."
+msgstr "Você selecionou nenhum pacote para desmarcar."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been unflagged."
@@ -992,6 +1034,10 @@ msgstr "Você não tem permissão para excluir pacotes."
 msgid "You did not select any packages to delete."
 msgstr "Você selecionou nenhum pacote para excluir."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "Um dos pacotes que você selecionou não existe."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Os pacotes selecionados foram excluídos."
@@ -1000,13 +1046,21 @@ msgstr "Os pacotes selecionados foram excluídos."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Você deve estar conectado para adotar pacotes."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "Você não tem permissão para adotar um dos pacotes selecionados."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Você deve estar conectado para abandonar pacotes."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "Você não tem permissão para abandonar um dos pacotes selecionados."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
-msgstr "Você não selecionou pacote para adotar."
+msgstr "Você selecionou nenhum pacote para adotar."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to disown."
@@ -1118,33 +1172,33 @@ msgstr "O campo de comentário não pode estar vazio"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid request type."
-msgstr "Tipo de requisição inválida"
+msgstr "Tipo de requisição inválida."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Added request successfully."
-msgstr "Requisição adicionada com sucesso"
+msgstr "Requisição adicionada com sucesso."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid reason."
-msgstr "Motivo inválido"
+msgstr "Motivo inválido."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Only TUs and developers can close requests."
-msgstr "Apenas UCs e desenvolvedores podem fechar requisições."
+msgstr "Apenas TUs e desenvolvedores podem fechar requisições."
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Request closed successfully."
-msgstr "Requisição fechada com sucesso"
+msgstr "Requisição fechada com sucesso."
 
 #: template/account_delete.php
 #, php-format
 msgid "You can use this form to permanently delete the AUR account %s."
-msgstr "Você pode usar esse formulário para excluir permanentemente a conta %s do AUR."
+msgstr "Você pode usar este formulário para excluir permanentemente a conta %s do AUR."
 
 #: template/account_delete.php
 #, php-format
 msgid "%sWARNING%s: This action cannot be undone."
-msgstr "%sAVISO%s: Essa ação não pode ser desfeita."
+msgstr "%sAVISO%s: Esta ação não pode ser desfeita."
 
 #: template/account_delete.php
 msgid "Confirm deletion"
@@ -1153,7 +1207,7 @@ msgstr "Confirmar exclusão"
 #: template/account_details.php template/account_edit_form.php
 #: template/account_search_results.php template/search_accounts_form.php
 msgid "Username"
-msgstr "Usuário"
+msgstr "Nome de usuário"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
@@ -1173,7 +1227,7 @@ msgstr "Desenvolvedor"
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
 msgid "Trusted User & Developer"
-msgstr "Usuário Confiável & Desenvolvedor"
+msgstr "Trusted User & Desenvolvedor"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
@@ -1228,7 +1282,7 @@ msgstr "desconhecido"
 
 #: template/account_details.php
 msgid "Last Login"
-msgstr "Último login"
+msgstr "Último acesso"
 
 #: template/account_details.php
 msgid "Never"
@@ -1240,7 +1294,7 @@ msgstr "Visualizar pacotes deste usuário"
 
 #: template/account_details.php
 msgid "Edit this user's account"
-msgstr "Edite a conta desse usuário"
+msgstr "Edite a conta deste usuário"
 
 #: template/account_details.php
 msgid "List this user's comments"
@@ -1269,7 +1323,7 @@ msgstr "obrigatório"
 msgid ""
 "Your user name is the name you will use to login. It is visible to the "
 "general public, even if your account is inactive."
-msgstr "Seu nome de usuário é o nome que você vai usar para se autenticar. É visível para o público geral, mesmo se sua contas estiver inativa."
+msgstr "Seu nome de usuário é o nome que você vai usar para se autenticar. É visível para o público geral, mesmo se sua conta estiver inativa."
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Normal user"
@@ -1349,11 +1403,11 @@ msgstr "Re-digite a senha"
 msgid ""
 "The following information is only required if you want to submit packages to"
 " the Arch User Repository."
-msgstr "A informação a seguir é necessária apenas se você deseja enviar pacotes para o Repositório de Usuário do Arch."
+msgstr "A informação a seguir é necessária apenas se você deseja enviar pacotes para o Arch User Repository."
 
 #: template/account_edit_form.php
 msgid "SSH Public Key"
-msgstr "Chave pública de SSH"
+msgstr "Chave pública SSH"
 
 #: template/account_edit_form.php
 msgid "Notification settings"
@@ -1529,8 +1583,8 @@ msgstr "Gerenciar comantenedores"
 #, php-format
 msgid "%d pending request"
 msgid_plural "%d pending requests"
-msgstr[0] "%d requisição pentende"
-msgstr[1] "%d requisições pentendes"
+msgstr[0] "%d requisição pendente"
+msgstr[1] "%d requisições pendentes"
 
 #: template/pkgbase_actions.php
 msgid "Adopt Package"
@@ -1686,7 +1740,7 @@ msgstr "Descrição"
 
 #: template/pkg_details.php
 msgid "Upstream URL"
-msgstr "URL"
+msgstr "URL upstream"
 
 #: template/pkg_details.php
 msgid "Visit the website for"
@@ -1727,7 +1781,7 @@ msgstr "Fontes"
 #: template/pkgreq_close_form.php
 #, php-format
 msgid "Use this form to close the request for package base %s%s%s."
-msgstr "Use esse formulário para fechar a requisição para o pacote base %s%s%s."
+msgstr "Use este formulário para fechar a requisição para o pacote base %s%s%s."
 
 #: template/pkgreq_close_form.php
 msgid ""
@@ -1754,7 +1808,7 @@ msgstr "Rejeitado"
 msgid ""
 "Use this form to file a request against package base %s%s%s which includes "
 "the following packages:"
-msgstr "Use esse formulário para fazer uma requisição sobre o pacote base %s%s%s que inclui os seguintes pacotes:"
+msgstr "Use este formulário para fazer uma requisição sobre o pacote base %s%s%s que inclui os seguintes pacotes:"
 
 #: template/pkgreq_form.php
 msgid "Request type"
@@ -1793,7 +1847,7 @@ msgid ""
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr "Ao enviar uma requisição de tornar órfão, você pede que um Trusted User abandona o pacote base. Por favor, apenas faça isto se o pacote precise de ação do mantenedor, estando este ausente por muito tempo, e você já tentou - e não conseguiu - contatá-lo anteriormente."
+msgstr "Ao enviar uma requisição de tornar órfão, você pede que um Trusted User abandona o pacote base. Por favor, apenas faça isto se o pacote precise de ação do mantenedor, estando este ausente por muito tempo, e você já tentou – e não conseguiu – contatá-lo anteriormente."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
@@ -2047,7 +2101,7 @@ msgstr "Usuários registrados"
 
 #: template/stats/general_stats_table.php
 msgid "Trusted Users"
-msgstr "Usuários Confiáveis"
+msgstr "Trusted Users"
 
 #: template/stats/updates_table.php
 msgid "Recent Updates"
@@ -2100,7 +2154,7 @@ msgstr "Participação"
 
 #: template/tu_last_votes_list.php
 msgid "Last Votes by TU"
-msgstr "Últimos votos por UC"
+msgstr "Últimos votos por TU"
 
 #: template/tu_last_votes_list.php
 msgid "Last vote"
@@ -2139,7 +2193,7 @@ msgid ""
 "Welcome to the Arch User Repository! In order to set an initial password for"
 " your new account, please click the link [1] below. If the link does not "
 "work, try copying and pasting it into your browser."
-msgstr "Bem-vindo ao Arch User Repository! Para definir uma senha inicial para sua nova conta, por favor clique no link [1] abaixo. Se o link não funcionar, tente copiar e colá-lo no seu navegador."
+msgstr "Bem-vindo ao Arch User Repository! Para definir uma senha inicial para sua nova conta, clique no link [1] abaixo. Se o link não funcionar, tente copiar e colá-lo no seu navegador."
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2241,3 +2295,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "Por favor, lembre-se de votar na proposta {id} [1]. O período de votação termina em menos de 48 horas."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "Tipo de conta inválido fornecido."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "Você não tem permissão para alterar tipos de contas."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "Você não tem permissão para alterar o tipo de conta deste usuário para %s."
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr "Nenhum pedido para tornar órfão pendente aceitação para %s."
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr "Erro Interno do Servidor"
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr "Ocorreu um erro fatal."
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr "Os detalhes foram registrados e serão revisados ​​pelo postmaster posthaste. Pedimos desculpas por qualquer inconveniente que isso possa ter causado."
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr "Erro do Servidor AUR"
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 0303993a..3518cb7b 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/lfleischer/aurweb/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -476,6 +476,12 @@ msgid ""
 "checkbox."
 msgstr "Os pacotes selecionados não foram desaprovados, verifique a caixa de confirmação."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Não é possível encontrar o pacote onde juntar os votos e os comentários."
@@ -574,6 +580,14 @@ msgstr "Marcar comentário."
 msgid "Flag Package Out-Of-Date"
 msgstr "Marcar pacote desatualizado."
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -870,6 +884,10 @@ msgstr "O formulário de início de sessão encontra-se inibido para pedidos do
 msgid "Account suspended"
 msgstr "Conta Suspensa"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -955,6 +973,30 @@ msgstr "Erro ao obter os detalhes do pacote."
 msgid "Package details could not be found."
 msgstr "Não foi possivel encontrar detalhes acerca do pacote."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Tem de iniciar sessão antes de poder marcar pacotes."
@@ -991,6 +1033,10 @@ msgstr "Não tem permissão para eliminar pacotes."
 msgid "You did not select any packages to delete."
 msgstr "Não seleccionou nenhum pacote a apagar."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Os pacotes seleccionados foram apagados."
@@ -999,10 +1045,18 @@ msgstr "Os pacotes seleccionados foram apagados."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Tem de iniciar se sessão antes de poder adoptar pacotes."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Tem de iniciar se sessão antes de poder renunciar pacotes."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Não seleccionou nenhum pacote a adoptar."
@@ -2240,3 +2294,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 7394ed83..fa159928 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/lfleischer/aurweb/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -473,6 +473,12 @@ msgid ""
 "checkbox."
 msgstr ""
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Nu s-a putut găsi pachet pentru fuzionare voturi și comentarii."
@@ -571,6 +577,14 @@ msgstr ""
 msgid "Flag Package Out-Of-Date"
 msgstr ""
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -867,6 +881,10 @@ msgstr "Formularul de autentificare a fost dezactivat pentru adresa ta IP, proba
 msgid "Account suspended"
 msgstr "Cont suspendat"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -952,6 +970,30 @@ msgstr "Eroare la preluarea detaliilor pachetului."
 msgid "Package details could not be found."
 msgstr "Detaliile pachetului nu pot fi găsite."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Trebuie să fi autentificat înainte de a putea marca pachetele."
@@ -988,6 +1030,10 @@ msgstr "Nu ai permisiune pentru a șterge pachete."
 msgid "You did not select any packages to delete."
 msgstr "Nu ai selectat niciun pachet pentru a fi șters."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Pachetele selectate au fost șterse."
@@ -996,10 +1042,18 @@ msgstr "Pachetele selectate au fost șterse."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Trebuie să fi autentificat înainte de a putea adopta pachete."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Trebuie să te autentifici înainte de a abandona pachete."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Nu ai selectat niciun pachet pentru a-l adopta."
@@ -2242,3 +2296,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 86a01cc6..75550c8c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,9 +3,11 @@
 # This file is distributed under the same license as the AURWEB package.
 # 
 # Translators:
+# Alex <kekcuha@gmail.com>, 2021
 # Evgeniy Alekseev <esalexeev@gmail.com>, 2014-2015
 # Evgeniy Alekseev <esalexeev@gmail.com>, 2014-2015, 2016
 # Igor <f2404@yandex.ru>, 2017
+# Kevin Morris <kevr@0cost.org>, 2021
 # Kyrylo Silin <curacaothe@gmail.com>, 2011
 # Kyrylo Silin <curacaothe@gmail.com>, 2011
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
@@ -18,8 +20,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Russian (http://www.transifex.com/lfleischer/aurweb/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,11 +82,11 @@ msgstr "Не удалось получить информацию об указ
 
 #: html/account.php
 msgid "You do not have permission to edit this account."
-msgstr "Вы не имеете права редактировать эту учетную запись."
+msgstr "У вас недостаточно прав для изменения этой учётной записи."
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Неверный пароль."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -381,7 +383,7 @@ msgstr "Введите учётные данные"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "Имя пользователя или основной адрес эл. почты"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -445,7 +447,7 @@ msgstr "Ваш пароль успешно сброшен."
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "Подтвердите своё имя пользователя или основной адрес эл. почты:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -464,11 +466,11 @@ msgstr "Продолжить"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Если вы забыли имя пользователя или основной  адрес эл. почты, который  использовали для регистрации, напишите сообщение в список рассылки %saur-general%s."
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "Введите своё имя пользователя или основной адрес эл. почты:"
 
 #: html/pkgbase.php
 msgid "Package Bases"
@@ -480,6 +482,12 @@ msgid ""
 "checkbox."
 msgstr "Выбранные пакеты будут брошены."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Не могу найти пакет для объединения голосов и комментариев."
@@ -578,6 +586,14 @@ msgstr "Отметить комментарий"
 msgid "Flag Package Out-Of-Date"
 msgstr "Отметить пакет устаревшим"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -874,6 +890,10 @@ msgstr "Доступ к форме входа с вашего IP адреса з
 msgid "Account suspended"
 msgstr "Действие аккаунта приостановлено."
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -959,9 +979,33 @@ msgstr "Ошибка получения информации о пакете."
 msgid "Package details could not be found."
 msgstr "Не найдена информация о пакете."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
-msgstr "Вы должны войти чтобы ставить флажки на пакеты."
+msgstr "Вы должны войти чтобы отмечать пакеты."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to flag."
@@ -995,6 +1039,10 @@ msgstr "У вас нет права на удаление пакетов."
 msgid "You did not select any packages to delete."
 msgstr "Вы не выбрали ни одного пакета для удаления."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Выбранные пакеты удалены."
@@ -1003,10 +1051,18 @@ msgstr "Выбранные пакеты удалены."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Вы должны войти чтобы усыновлять пакеты."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Вы должны войти чтобы бросать пакеты."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Вы не выбрали ни одного пакета для усыновления."
@@ -2254,3 +2310,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/sk.po b/po/sk.po
index d54a9dab..76d3d1a8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/lfleischer/aurweb/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -473,6 +473,12 @@ msgid ""
 "checkbox."
 msgstr "Vybrané balíčky neboli vyvlastnené, pozrite potvrdzovacie zaškrtávacie políčko."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Nepodarilo sa nájsť balíček, do ktorého sa mali zlúčiť hlasy a komentáre."
@@ -571,6 +577,14 @@ msgstr "Označ komentár"
 msgid "Flag Package Out-Of-Date"
 msgstr "Označ balíček ako zastaranú verziu"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -867,6 +881,10 @@ msgstr "Prihlasovací formulár je v súčasnosti zablokovaný pre vašu IP adre
 msgid "Account suspended"
 msgstr "Účet bol pozastavený"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -952,6 +970,30 @@ msgstr "Chyba pri získavaní informácií o balíčku."
 msgid "Package details could not be found."
 msgstr "Informácie o balíčku sa nepodarilo nájsť."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Musíte byť prihlásený ak chcete označovať balíčky."
@@ -988,6 +1030,10 @@ msgstr "Nemáte práve vymazať balíčky."
 msgid "You did not select any packages to delete."
 msgstr "Nebol vybraný žiadny balíček na vymazanie."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Vybrané balíčky boli vymazané."
@@ -996,10 +1042,18 @@ msgstr "Vybrané balíčky boli vymazané."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Musíte byť prihlásený ak chcete adoptovať balíčky."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Musíte byť prihlásený ak chcete vyvlastniť balíčky."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Nebol vybraný žiadny balíček na adopciu."
@@ -2247,3 +2301,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 24a52ab7..dae37bcd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Serbian (http://www.transifex.com/lfleischer/aurweb/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -473,6 +473,12 @@ msgid ""
 "checkbox."
 msgstr "Izabrani paketi nisu odreknuti, pogledajte kućicu za potvrdu."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Ne mogu da nađem paket kako bih stopio glasove i komentare."
@@ -571,6 +577,14 @@ msgstr "Označi komentar"
 msgid "Flag Package Out-Of-Date"
 msgstr "Označi paket kao zastareo"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -867,6 +881,10 @@ msgstr "Formular za prijavljivanje je trenutno onemogućen za vašu IP adresu, n
 msgid "Account suspended"
 msgstr "Nalog je suspendovan"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -952,6 +970,30 @@ msgstr "Greška pri dobavaljanju podataka o paketu."
 msgid "Package details could not be found."
 msgstr "Ne mogu naći podatke o paketu."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Morate se prijaviti pre označavanja paketa."
@@ -988,6 +1030,10 @@ msgstr "Nemate dozvole za brisanje paketa."
 msgid "You did not select any packages to delete."
 msgstr "Niste izabrali pakete za brisanje."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Izbrani paketi su obrisani."
@@ -996,10 +1042,18 @@ msgstr "Izbrani paketi su obrisani."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Morate se prijaviti da bi usvojili pakete."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Morate se prijaviti da bi ste se odrekli paketa."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Niste izabrali paketa za usvajanje."
@@ -2242,3 +2296,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/sr_RS.po b/po/sr_RS.po
new file mode 100644
index 00000000..985ee007
--- /dev/null
+++ b/po/sr_RS.po
@@ -0,0 +1,2341 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+# Nikola Stojković <dragstor@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Serbian (Serbia) (http://www.transifex.com/lfleischer/aurweb/language/sr_RS/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr_RS\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr "Почетна"
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr "Не заборави да гласаш за омиљене пакете!"
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr "Критеријум за претрагу"
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr "Пакети"
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
new file mode 100644
index 00000000..6d09e207
--- /dev/null
+++ b/po/sv_SE.po
@@ -0,0 +1,2340 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+# Johannes Löthberg <johannes@kyriasis.com>, 2015-2016
+# Kim Svensson <ks6g10@soton.ac.uk>, 2011
+# Kim Svensson <ks@linux.com>, 2012
+# Luna Jernberg <bittin@cafe8bitar.se>, 2021
+# Robin Björnsvik <robin@bjornsvik.se>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/lfleischer/aurweb/language/sv_SE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr "Sidan kunde inte hittas"
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr "Tyvärr, sidan du försöker nå existerar inte."
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr "Notera"
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr "Tjänsten är otillgänglig"
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr "Få inte panik! Den här sidan är nere för underhåll. Vi kommer tillbaka snart."
+
+#: html/account.php
+msgid "Account"
+msgstr "Konto"
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr "Konton"
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr "Du har inte åtkomst till den här sidan."
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr "Kunde inte nå information för den önskade användaren."
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr "Du har inte tillåtelse att ändra det här kontot."
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr "Ogiltigt lösenord."
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr "Använd det här fältet för söka efter existerande konton."
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr "Du måste var inloggad för att se användarinformation."
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr "Lägg till förslag"
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr "Ogiltigt värde för användareåtgärd."
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr "Användarnamnet finns inte."
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr "%s har redan förslag som är aktivt."
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr "Ogiltig typ."
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr "Förslag kan inte vara tomt."
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr "Nytt förslag har skickats."
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr "Skicka ett förslag att rösta på."
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr "Sökande/TU"
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr "(tom ifall irrelevant)"
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr "Typ"
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr "Tillägg av en TU"
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr "Borttagning av en TU"
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr "Borttagning av en TU (odeklarerad inaktivitet)"
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr "Andringar av stadgar"
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr "Förslag"
+
+#: html/addvote.php
+msgid "Submit"
+msgstr "Skicka"
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr "Hantera sam-ansvariga"
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr "Redigera kommentar"
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr "Hem"
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr "Mina flaggade paket"
+
+#: html/home.php
+msgid "My Requests"
+msgstr "Mina Förfrågningar"
+
+#: html/home.php
+msgid "My Packages"
+msgstr "Mina paket"
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr "Sök efter paket jag underhåller"
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr "Sam-ansvariga paket"
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr "Välkommen till AUR! Var god och läs %sAUR User Guidelines%s  och %sAUR TU Guidelines%s för mer information"
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr "Bidragna PKGBUILDer %småste%s följa %sArch Packaging Standards%s, annars kommer de bli borttagna!"
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr "Kom ihåg att rösta på dina favorit paket!"
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr "Några paket kan vara tillhandahållna som binära filer i [community]."
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr "ANSVARSFRISKRIVNING"
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr "AUR paket är användarproducerat innehåll. All användning av de tillhandahållna filerna görs på egen risk."
+
+#: html/home.php
+msgid "Learn more..."
+msgstr "Lär dig mer..."
+
+#: html/home.php
+msgid "Support"
+msgstr "Hjälp"
+
+#: html/home.php
+msgid "Package Requests"
+msgstr "Paket förfrågningar"
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr "Det finns tre typer av förfrågningar som kan öppnas i boxen %sPaket hanteringar%s på paket detaljer sidan:"
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr "Härrelösnings förfrågning"
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr "Öppna en förfrågan om att göra ett paket herrelöst, till exempel när den ansvarige är inaktiv och paketet har varit flaggat utdaterat en lång tid."
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr "Raderings förfrågan"
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr "Begär att ett paket ska bli borttaget från Arch User Repository. Snälla använd inte detta om packetet bara är trasigt och kan enkelt bli fixat. Kontakta paket ansvarige istället, och begär att paketet ska bli herrelöst"
+
+#: html/home.php
+msgid "Merge Request"
+msgstr "Ihopslags förfrågning"
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr "Begär att ett paket ska bli ihopslaget med ett annat. Kan användas när ett paket behöver bli omdöpt, eller ersatt av ett delat paket."
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr "Om du vill diskutera en förfrågning kan du använda %saur-requests%s maillistan. Men snälla använd inte den listan för att öppna nya förfrågningar."
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr "Ladda up paket"
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr "Git över SSH används nu för att ladda up paket till AUR. Se %sSubmitting packages%s sectionen av Arch User Repository artikeln på ArchWiki för mer information."
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr "De följande SSH fingeravtryck används för AUR:"
+
+#: html/home.php
+msgid "Discussion"
+msgstr "Diskussion"
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr "Generella diskussioner om Arch User Repository (AUR) och Trusted User strukturen tar plats på %saur-general%s. För diskussioner om utvecklingen av AUR web interfacet, använd %saur-dev%s maillistan."
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr "Bugg Rapportering"
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr "Om du hittar en bug i AUR webbgränssnittet, var snäll och fyll i en rapport i vårt %särendehanteringssystem%s. Använd systemet %sbara%s för buggar i webbgränssnittet. För att raportera paketbuggar kontakta den som är ansvarig för paketet istället, eller lämna en kommentar på paketets sida."
+
+#: html/home.php
+msgid "Package Search"
+msgstr "Sök Paket"
+
+#: html/index.php
+msgid "Adopt"
+msgstr "Adoptera"
+
+#: html/index.php
+msgid "Vote"
+msgstr "Rösta"
+
+#: html/index.php
+msgid "UnVote"
+msgstr "Ångra Röst"
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr "Meddela"
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr "Meddela inte"
+
+#: html/index.php
+msgid "UnFlag"
+msgstr "Flagga inte"
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr "Logga in"
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr "Inloggad som: %s"
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr "Logga ut"
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr "Ange inloggningsuppgifter"
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr "Användarnamn eller primär epostadress"
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr "Lösenord"
+
+#: html/login.php
+msgid "Remember me"
+msgstr "Kom ihåg mig"
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr "Glömt lösenordet"
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr "HTTP inloggning ej tillgänglig. Byt %sswtich till HTTPS%s om du vill logga in."
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr "Sökkriterier"
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr "Paket"
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr "Fel vid hämtning av paketdetaljer."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr "Ett nödvändigt fält saknas."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr "Lösenorden stämmer inte överens."
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr "Ditt lösenord måste vara åtminstone %s karaktärer."
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr "Ogiltig e-postadress."
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr "Återställ Lösenord"
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr "Kolla din e-mailadress efter en bekräftelselänk."
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr "Återställningen av ditt lösenord lyckades."
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr "Bekräfta ditt användarnamn eller primär e-postadress:"
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr "Ange ett nytt lösenord:"
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr "Bekfräfta ditt nya lösenord:"
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr "Fortsätt"
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr "Ange ditt användarnamn eller primär e-postadress:"
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr "Paket baser"
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr "De valda paketen har inte gjorts herrelösa, kryssa i konfirmationsrutan."
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr "Kan inte hitta paket att slå ihop röster och kommentarer i."
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr "Kan inte slå ihop en paket bas med sig självt."
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr "De valda paketen har inte blivit raderade, kryssa i konfirmationsrutan."
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr "Paket radering"
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr "Radera paket"
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr "Använd det här formuläret för att radera paket basen %s%s%s och de följande paketen från AUR:"
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr "Radering av ett paket är permanent."
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr "Kryssa i kryssrutan för att konfirmera handlingen."
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr "Konfirmera paket radering"
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr "Radera"
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr "Bara Trusted Users och Developers kan radera paket."
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr "Gör paket herrelös"
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr "Använd det här formuläret för att göra paket basen %s%s%s  och de följande paketen härrelösa i AUR:"
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr "Genom att kryssa i kryssrutan konfirmerar du att du vill överföra ansvaret för detta paket till %s%s%s."
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr "Genom att kryssa i kryssrutan konfirmerar du att du vill göra paketet herrelöst."
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr "Konfirmera för att göra paketet herrelöst"
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr "Gör herrelös"
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr "Bara Trusted Users och Developers kan göra paket herrelösa."
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr "Flagga Kommentar"
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr "Flagga Paketet Gammalt"
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr "Använd det här formuläret för att flagga paketbasen %s%s%s och de följande paketen som gammla: "
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr "Var snäll och använd %sinte%s detta formulär för att raportera buggar. Andvänd paketkommentarerna istället."
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr "Skriv in detaljer om varför paketet är gammalt nedan, helst med länkar till den nya releasen."
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr "Kommentarer"
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr "Flagga"
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr "Bara registrerade användare kan flagga paket som gammla."
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr "Paket ihopsammanslagning"
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr "Slå samman paket"
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr "Använd det här formuläret för att slå ihop paket basen %s%s%s med ett annat paket."
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr "De följande paketen kommer att bli raderade:"
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr "När paketet har blivit ihopsammanslaget kan det inte ogöras."
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr "Skriv in paket namnet du viss slå ihop detta paket med."
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr "Slå ihop in i:"
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr "Konfirmera ihopslagning"
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr "Slå ihop"
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr "Bara Trusted Users och Developers kan slå ihop paket."
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr "Skicka In Förfrågning"
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr "Stäng förfrågning"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr "Första"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr "Förra"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr "Nästa"
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr "Sista"
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr "Förfrågningar"
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr "Registrera"
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr "Använd det här fältet för att skapa ett konto."
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr "Användarvillkor"
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr "Följande dokument har uppdaterats. Vänligen granska dem noggrant:"
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr "revision %d"
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr "Jag accepterar villkoren ovan."
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr "Trusted User"
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr "Kunde inte hämta förslagsdetaljer."
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr "Röstning för detta förslag är stängt."
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr "Bara Trusted Users är tillåtna att rösta."
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr "Du kan inte rösta för ett förslag om dig."
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr "Du har redan röstat för detta förslag."
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr "Omröstnings IDt är inte giltigt"
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr "Nuvaranda omröstningar"
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr "Tidigare omröstningar"
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr "Röstare"
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr "Konto registrering har blivit avstängt för din IP, troligen på grund av spam attacker. Vi ber om ursäkt för besväret."
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr "Användar ID fattas"
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr "Användarnamnet är ogiltigt."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr "Det måste vara mellan %s och %s karaktärer långt"
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr "Starta och sluta med en bokstav eller nummer"
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr "Kan bara innehålla en punkt, understreck, eller bindestreck."
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr "Vänligen bekräfta ditt nya lösenord."
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr "Email adressen är ogiltigt."
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr "Backup-e-postadressen är ogiltig."
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr "Hemsidan är ogiltig, ange den fullständiga HTTP(s) URL."
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr "Fingeravtrycket för PGP nyckeln är ogiltigt."
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr "Den publika SSH nyckeln är ogiltig."
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr "Kan inte öka kontots tillgång."
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr "Språket stöds för nuvarande inte."
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr "Tidszon stöds för nuvarande inte."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr "Användarnamnet %s%s%s används redan."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr "Addressen %s%s%s används redan."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr "Den publika SSH nyckeln %s%s%s används redan."
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr "CAPTCHA saknas."
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr "Denna CAPTCHA har löpt ut. Var god försök igen."
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr "Det angivna CAPTCHA-svaret är ogiltigt."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr "Fel vid skapande av kontot %s%s%s"
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr "Kontot %s%s%s har skapats framgångsrikt."
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr "En lösenordsåterställnings nyckel har skickats till din e-mail adress."
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr "Klicka på Inloggning länken ovan för att använda ditt konto."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr "Inga ändringar gjordes till kontot, %s%s%s."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr "Kontot %s%s%s har blivit modifierat framgångsrikt."
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr "Inloggnings formuläret är för närvarande avstängt för din IP adress, troligen på grund av spam attacker. Vi ber om ursäkt för besväret."
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr "Konto avstängt"
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "Du har inte behörighet att stänga av konton."
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr "Ditt lösenord har blivit återställt. Om du precis skapade ett nytt konto, var god och följ länken i konfirmations mailet för att sätta ett första lösenord. Annars, var god och skicka in en förfrågan om en återställningsnyckel på %sLösenords Återställning%s sidan"
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr "Fel användarnamn eller lösenord."
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr "Ett fel inträffade vid genererandet av en användar session."
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr "Ogiltig e-mail och återställningsnyckel kombination."
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr "Ingen"
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr "Visa konto information för %s"
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr "Paketbas ID eller paketbasnamn saknas."
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr "Du har inte rättigheter till att redigera denna kommentar."
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr "Kommentaren existerar inte."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr "Kommentaren kan inte vara tom."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr "Kommentaren har blivit tillagd."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr "Du måste vara inloggad innan du kan redigera paket information."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr "Kommentars ID fattas."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr "Inte mer än 5 kommentarer kan bli fästa."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr "Du har inte rättigheter till att fästa denna kommentar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr "Du har inte rättigheter till att lossa denna kommentar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr "Kommentaren har blivit fäst."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr "Kommentaren har blivit lossad."
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr "Fel vid hämtning av paket detaljer."
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr "Paket detaljer kunde inte hittas."
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "Du har inte valt några paket att notifieras om."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr "Du måste vara inloggad före du kan flagga paket."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr "Du valde inte några paket att flagga."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr "De valda paketen har inte blivit flaggade, var snäll och skriv in en kommentar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr "De valda paketen har blivit flaggade utdaterade."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr "Du måste vara inloggad före du kan avflagga paket."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr "Du valde inte några paket att avflagga."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr "De valda paketen har blivit avflaggade."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr "Du har inte tillgång till att radera paket."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr "Du valde inte några paket att radera."
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "Ett av paketen du valde finns inte."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr "De valda paketen har blivit raderade."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr "Du måste vara inloggad före du kan adoptera paket."
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr "Du måste vara inloggad före du kan göra paket härrelösa."
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr "Du valde into några paket att adoptera."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr "Du valde inte några paket att göra härrelösa."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr "De valda paketen har blivit adopterade."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr "De valda paketen har blivit härrelösa."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr "Du måste vara inloggad före du kan rösta för paket"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr "Du måste vara inloggad före du kan ta bort din röst från paket."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr "Du valde inte något paket att rösta för."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr "Dina röster har blivit borttagna från de valda paketen."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr "Dina röster har blivit sparade för de valda paketen."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr "Kunde inte lägga till i notifierings listan."
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr "Du har blivit tillagd i kommentarnotifierings listan för %s"
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr "Du har blivit borttagen från kommentarsnotifierings listan för %s"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr "Du har inte rättigheter att återta denna kommentar."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr "Kommentaren har blivit återtagen."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr "Du kan inte ta bort den här kommentaren"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr "Kommentaren har blivit borttagen."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr "Kommentaren har bilvit redigerad."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr "Du kan inte redigera nyckelorden för den här paket basen."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr "Paket basens nyckelord har blivit updaterade."
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr "Du har inte tillåtelse att ändra sam-ansvariga för denna paket bas."
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr "Felaktigt användar namn: %s"
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr "Paket basens sam-ansvariga har blivit updaterade"
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr "Visa paket detaljer för"
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr "behöver %s"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr "Du måste vara inloggad för att öppna paket förfrågningar."
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr "Felaktigt namn: bara gemener är tillåtna"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr "Kommentarsfältet får inte vara tomt."
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr "Felaktig förfrågningstyp"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr "Lade till förfrågningen framgångsrikt."
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr "Felaktig anledning"
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr "Bara TUs och Developers kan stänga förfrågningar."
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr "Förfrågning stängt framgångsrikt"
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr "Du kan använda det här formuläret för att permanent radera AUR kontot %s."
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr "%sVARNING%s: Den här handlingen kan inte ogöras."
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr "Konfirmera radering"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr "Användarnamn"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr "Konto typ"
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr "Användare"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr "Developer"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr "Trusted User & Developer"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr "Email Adress"
+
+#: template/account_details.php
+msgid "hidden"
+msgstr "gömd"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr "Riktigt namn"
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr "Hemsida"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr "IRC nick"
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr "PGP nyckel fingerprint"
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr "Status"
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr "Inaktiv sen"
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr "Aktiv"
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr "Registrerings datum:"
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr "okänd"
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr "Sista inloggning"
+
+#: template/account_details.php
+msgid "Never"
+msgstr "Aldrig"
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr "Visa den här användarens paket"
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr "Redigera den här användarens konto"
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr "Lista denna användarens kommentarer"
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr "Klicka %shär%s om du vill permanent radera detta konto."
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr "Klicka %shär%s för användarinformation."
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr "Klicka %shär%s för att lista kommentarerna från detta konto."
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr "krävs"
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr "Ditt användarnamn är det namn du kommer att använda för att logga in. Det är synligt för allmänheten, även om ditt konto är inaktivt."
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr "Normal användare"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr "Trusted user"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr "Konto avstängt"
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr "Inaktiv"
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr "Var god och se till att du har skrivit in din epostadress korrect, annars kommer du bli utelåst."
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr "Göm epostadress"
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr "Backup e-postadress"
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr "Ange eventuellt en sekundär e-postadress som kan användas för att återställa ditt konto om du förlorar åtkomsten till din primära e-postadress."
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr "Språk"
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr "Tidszon"
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr "Om du vill ändra lösenordet, ange ett nytt lösenord och bekräfta det nya lösenordet genom att ange det igen."
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr "Skriv lösenord igen"
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr "Den följande informationen är bara nödvändig om du vill ladda upp paket till Arch User Repository."
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr "SSH publik nyckel"
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr "Notifieringsinställningar"
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr "Notifiera om nya kommentarer"
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr "Notifiera om paketupdateringar"
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr "Notifiera om ägarskaps ändringar."
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr "För att bekräfta profiländringarna, vänligen ange ditt nuvarande lösenord:"
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr "Ditt nuvarande lösenord"
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr "Svar"
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr "Updatera"
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr "Skapa"
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr "Återställ"
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr "Inga resultat matchade dina sök kriterier."
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr "Redigera konto"
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr "Stäng av"
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr "Redigera"
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr "Mindre"
+
+#: template/account_search_results.php
+msgid "More"
+msgstr "Mer"
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr "Inga mer resultat att visa."
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr "Använd den här formen för att lägga till sam-ansvariga för %s%s%s (ett användarnamn per linje):"
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr "Användare"
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr "Spara"
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr "Anledning till flaggning som gammal: %s"
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr "%s%s%s flaggades %s%s%s som gammalt på %s%s%s av följande anledning:"
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr "%s%s%s är inte flaggad som gammal."
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr "Återvänd till Detaljer"
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr "Upphovsrätt %s 2004-%d aurweb utvecklingsteamet"
+
+#: template/header.php
+msgid " My Account"
+msgstr " Mitt konto"
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr "Paket handlingar"
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr "Visa PKGBUILD"
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr "Visa ändringar"
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr "Ladda ned ögonblicksbild"
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr "Sök wiki"
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr "Flagga som gammalt (%s)"
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr "Flagga paketet utdaterat"
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr "Avflagga paket"
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr "Ta bort röst"
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr "Rösta för detta paket"
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr "Stäng av notifieringar"
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr "Email notifieringar"
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr "Hantera sam-ansvariga"
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] "%d väntande förfrågning"
+msgstr[1] "%d väntande förfrågningar"
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr "Adoptera paket"
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr "Paket bas detaljer"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr "Git klonings URL"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr "skrivskyddad"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr "klicka för att kopiera"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr "Nyckelord"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr "Första uppladdare"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr "Underhållare"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr "Sista paketerare"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr "Röster"
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr "Populäritet"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr "Först uppladdat"
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr "Sist updaterat"
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr "Redigera kommentar för: %s"
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr "Lägg till kommentar"
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr "%sMarkdown syntax%s stöds delvis."
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr "Fästa Kommentarer"
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr "Senaste kommentarer"
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr "Kommentarer för"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr "%s kommenterade %s"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr "Anonym kommentar från %s"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr "Kommenterade på paket %s på %s"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr "raderad %s av %s"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr "raderad %s"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr "redigerad %s av %s"
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr "redigerad %s"
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr "Återta kommentaren"
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr "Radera kommentar"
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr "Fäst kommentar"
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr "Lossa kommentar"
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr "Paket detaljer"
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr "Paket bas"
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr "Beskrivning"
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr "Uppströms URL"
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr "Besök hemsidan för"
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr "Licenser"
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr "Grupper"
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr "Konflikter"
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr "Erbjuder"
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr "Ersätter"
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr "Beroenden"
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr "Krävs av"
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr "Källor"
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr "Använd det här formuläret för att stänga förfrågningen för paket basen %s%s%s."
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr "Kommentarsfältet kan lämnas tomt, men det är rekommenderat att lämna en kommentar när man avböjer en förfrågning."
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr "Anledning"
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr "Accepterad"
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr "Avböjd"
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr "Använd det här formuläret för att öppna en förfrågning mot paket bas %s%s%s, villket inkluderar de följande paketen:"
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr "Förfrågningstyp"
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr "Radering"
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr "Herrelös"
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr "Slå ihop i"
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr "Inga förfrågningar matchade dina sökkriterier."
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] "%d paket förfrågning hittad."
+msgstr[1] "%d paket förfrågningar hittade."
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr "Sida %d av %d"
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr "Paket"
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr "Öppnad av"
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr "Datum"
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] "~%d dag kvar"
+msgstr[1] "~%d dagar kvar"
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] "~%d timme kvar"
+msgstr[1] "~%d timmar kvar"
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr "<1 timme kvar"
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr "Acceptera"
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr "Låst"
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr "Stäng"
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr "Stängd"
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr "Namn, Beskrivning"
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr "Bara namn"
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr "Exakt namn"
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr "Exakt paket bas"
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr "Sam-ansvarig"
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr "Ansvarig, Sam-ansvariga"
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr "Alla"
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr "Flaggade"
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr "Inte flaggade"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr "Namn"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr "Röstade"
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr "Senast modifierad"
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr "Stigande"
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr "Fallande"
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr "Skriv in sök kriterier"
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr "Sök efter"
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr "Utdaterat"
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr "Sortera efter"
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr "Sorterings ordning"
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr "Per sida"
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr "Gå"
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr "Herrelösa"
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr "Fel inträffade vid hämt av paket listan."
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr "Inga paket matchade dina sök kriterier."
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] "%d paket hittat"
+msgstr[1] "%d paket hittade"
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr "Version"
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr "Ja"
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr "herrelös"
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr "Handlingar"
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr "Avflagga utdaterat"
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr "Adoptera paketen"
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr "Gör paket herrelösa"
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr "Radera paketen"
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr "Konfirmera"
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr "Alla typer"
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr "Sök"
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr "Statistik"
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr "Härrelösa paket"
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr "Paket tillagda de senaste 7 dagarna"
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr "Paket uppdaterade de senaste 7 dagarna"
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr "Paket uppdaterade the senaste året"
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr "Paket aldrig updaterade"
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr "Registrerade användare"
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr "Trusted Users"
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr "Nyliga uppdateringar"
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr "mer"
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr "Mina statistiker"
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr "Förslagsdetaljer"
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr "Den här omröstningen är fortfarande öppen"
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr "Uppladdad: %s av %s"
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr "Slut"
+
+#: template/tu_details.php
+msgid "Result"
+msgstr "Resultat"
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr "Nej"
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr "Avstå"
+
+#: template/tu_details.php
+msgid "Total"
+msgstr "Totalt"
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr "Deltagande"
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr "Sista röstning per TU"
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr "Sista röstning"
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr "Inga resultat hittades."
+
+#: template/tu_list.php
+msgid "Start"
+msgstr "Start"
+
+#: template/tu_list.php
+msgid "Back"
+msgstr "Backåt"
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr "AUR Återställ Lösenord"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr "AUR Kommentar för {pkgbase}"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr "{user} [1] lade till följande kommentar till {pkgbase} [2]:"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr "AUR paket uppdatering: {pkgbase}"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr "AUR paket borttaget: {pkgbase}"
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "Ogiltig kontotyp har angetts."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "Du har inte behörighet att ändra kontotyper."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "Du har inte behörighet att ändra den här användarens kontotyp till %s."
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 04161700..83b1e4df 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,8 @@
 # Translators:
 # tarakbumba <tarakbumba@gmail.com>, 2011,2013-2015
 # tarakbumba <tarakbumba@gmail.com>, 2012,2014
-# Demiray Muhterem <mdemiray@msn.com>, 2015
+# Demiray Muhterem <mdemiray@msn.com>, 2015,2020-2021
+# Koray Biçer <kbicer@protonmail.ch>, 2020
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
 # Samed Beyribey <ras0ir@eventualis.org>, 2012
 # Samed Beyribey <samed@ozguryazilim.com.tr>, 2012
@@ -16,8 +17,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Turkish (http://www.transifex.com/lfleischer/aurweb/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +40,7 @@ msgstr "Not"
 
 #: html/404.php
 msgid "Git clone URLs are not meant to be opened in a browser."
-msgstr "Git clone linkleri bir tarayıcıda açılamazlar."
+msgstr "Git clone linkleri web tarayıcıda açılamazlar."
 
 #: html/404.php
 #, php-format
@@ -82,7 +83,7 @@ msgstr "Bu hesap üzerinde değişiklik yapma izniniz yok."
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "Yanlış şifre."
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -172,7 +173,7 @@ msgstr "Yorumu düzenle"
 
 #: html/home.php template/header.php
 msgid "Dashboard"
-msgstr ""
+msgstr "Kontrol Paneli"
 
 #: html/home.php template/header.php
 msgid "Home"
@@ -180,11 +181,11 @@ msgstr "Anasayfa"
 
 #: html/home.php
 msgid "My Flagged Packages"
-msgstr ""
+msgstr "İşaretli Paketlerim"
 
 #: html/home.php
 msgid "My Requests"
-msgstr ""
+msgstr "İsteklerim"
 
 #: html/home.php
 msgid "My Packages"
@@ -192,15 +193,15 @@ msgstr "Paketlerim"
 
 #: html/home.php
 msgid "Search for packages I maintain"
-msgstr ""
+msgstr "Bakımını yaptığım paketleri ara"
 
 #: html/home.php
 msgid "Co-Maintained Packages"
-msgstr ""
+msgstr "Ortak Bakılan Paketler"
 
 #: html/home.php
 msgid "Search for packages I co-maintain"
-msgstr ""
+msgstr "Birlikte baktığım paketleri ara"
 
 #: html/home.php
 #, php-format
@@ -330,7 +331,7 @@ msgid ""
 "our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
 " %sonly%s. To report packaging bugs contact the package maintainer or leave "
 "a comment on the appropriate package page."
-msgstr ""
+msgstr "AUR web arayüzünde bir hata bulursanız, lütfen %s hata izleyicimiz %s üzerinde bir hata raporu doldurun. AUR web arayüzündeki %s hataları raporlamak için sadece %s izleyiciyi kullanın . Paketleme hatalarını bildirmek için paket bakıcısına başvurun veya ilgili paket sayfasına yorum yapın."
 
 #: html/home.php
 msgid "Package Search"
@@ -338,7 +339,7 @@ msgstr "Paket Ara"
 
 #: html/index.php
 msgid "Adopt"
-msgstr "Sorumluluğunu Al"
+msgstr "Sahiplen"
 
 #: html/index.php
 msgid "Vote"
@@ -379,7 +380,7 @@ msgstr "Giriş bilgilerinizi doldurun"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "Kullanıcı adı veya birincil e-posta adresi"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -443,7 +444,7 @@ msgstr "Parolanız başarıyla sıfırlandı."
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "Kullanıcı adınızı veya birincil e-posta adresinizi doğrulayın:"
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -462,15 +463,15 @@ msgstr "Devam"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "Kaydettiğiniz kullanıcı adını ve birincil e-posta adresini unuttuysanız, lütfen %s genel %s posta listesine bir mesaj gönderin."
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "Kullanıcı adınızı veya birincil e-posta adresinizi girin:"
 
 #: html/pkgbase.php
 msgid "Package Bases"
-msgstr ""
+msgstr "Paket Tabanları"
 
 #: html/pkgbase.php
 msgid ""
@@ -478,6 +479,12 @@ msgid ""
 "checkbox."
 msgstr "Seçilen paketler için sahiplik bırakılamadı. Onaylama kutucuğunu işaretleyin."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "Seçilen paketler kabul edilmedi, onay kontrol kutusunu işaretleyin."
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Oyların ve yorumların ilişkilendirilebileceği herhangi bir paket bulunamadı."
@@ -542,7 +549,7 @@ msgstr "Şu paketleri içeren %s%s%s paket temelinin sahipliğini bırakmak içi
 msgid ""
 "By selecting the checkbox, you confirm that you want to no longer be a "
 "package co-maintainer."
-msgstr ""
+msgstr "Onay kutusunu işaretleyerek, artık bir paket yardımcısı olmak istemediğinizi onaylarsınız."
 
 #: html/pkgdisown.php
 #, php-format
@@ -576,19 +583,27 @@ msgstr "Yorumu İşaretle"
 msgid "Flag Package Out-Of-Date"
 msgstr "Paketi güncel değil olarak işaretle"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "Bu bir VCS paketi gibi görünüyor. AUR'daki paket sürümü en son taahhütle eşleşmiyorsa, lütfen güncelliğini %sdeğil%s olarak işaretleyin. Bu paketin işaretlenmesi, yalnızca, son yukarı akış değişiklikleri nedeniyle PKGBUILD içindeki kaynaklar taşınmışsa veya değişiklikler gerekliyse yapılmalıdır."
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
 "Use this form to flag the package base %s%s%s and the following packages "
 "out-of-date: "
-msgstr ""
+msgstr "%s%s%s paket tabanını ve aşağıdaki paketleri güncel olmayan olarak işaretlemek için bu formu kullanın:"
 
 #: html/pkgflag.php
 #, php-format
 msgid ""
 "Please do %snot%s use this form to report bugs. Use the package comments "
 "instead."
-msgstr ""
+msgstr "Lütfen %s değil, %s hataları bildirmek için bu formu kullanın. Bunun yerine paket yorumlarını kullanın."
 
 #: html/pkgflag.php
 msgid ""
@@ -652,7 +667,7 @@ msgstr "Sadece geliştiriciler ve güvenilir kullanıcılar paket birleştirebil
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
-msgstr ""
+msgstr "İstek Oluştur"
 
 #: html/pkgreq.php template/pkgreq_close_form.php
 msgid "Close Request"
@@ -688,21 +703,21 @@ msgstr "Yeni bir hesap oluşturmak için bu formu kullanın."
 
 #: html/tos.php
 msgid "Terms of Service"
-msgstr ""
+msgstr "Kullanım Şartları"
 
 #: html/tos.php
 msgid ""
 "The following documents have been updated. Please review them carefully:"
-msgstr ""
+msgstr "Aşağıdaki belgeler güncellendi. Lütfen bunları dikkatle inceleyin:"
 
 #: html/tos.php
 #, php-format
 msgid "revision %d"
-msgstr ""
+msgstr "düzeltme %d"
 
 #: html/tos.php
 msgid "I accept the terms and conditions above."
-msgstr ""
+msgstr "Yukarıdaki şartlar ve koşulları kabul ediyorum."
 
 #: html/tu.php template/account_details.php template/header.php
 msgid "Trusted User"
@@ -773,7 +788,7 @@ msgstr "Sadece bir nokta, alt çizgi veya tire barındırabilir."
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
-msgstr ""
+msgstr "Lütfen yeni şifrenizi onaylayın."
 
 #: lib/acctfuncs.inc.php
 msgid "The email address is invalid."
@@ -781,11 +796,11 @@ msgstr "E-posta adresi geçerli değil."
 
 #: lib/acctfuncs.inc.php
 msgid "The backup email address is invalid."
-msgstr ""
+msgstr "Yedekleme e-posta adresi geçersiz."
 
 #: lib/acctfuncs.inc.php
 msgid "The home page is invalid, please specify the full HTTP(s) URL."
-msgstr ""
+msgstr "Ana sayfa geçersiz, lütfen tam HTTP(li) URL belirtin."
 
 #: lib/acctfuncs.inc.php
 msgid "The PGP key fingerprint is invalid."
@@ -805,7 +820,7 @@ msgstr "Dil henüz desteklenmiyor."
 
 #: lib/acctfuncs.inc.php
 msgid "Timezone is not currently supported."
-msgstr ""
+msgstr "Saat dilimi şu anda desteklenmemektedir."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -824,15 +839,15 @@ msgstr "SSH kamu anahtarı, %s%s%s, zaten kullanımda."
 
 #: lib/acctfuncs.inc.php
 msgid "The CAPTCHA is missing."
-msgstr ""
+msgstr "CAPTCHA eksik."
 
 #: lib/acctfuncs.inc.php
 msgid "This CAPTCHA has expired. Please try again."
-msgstr ""
+msgstr "Bu CAPTCHA'nın süresi doldu. Lütfen tekrar deneyin."
 
 #: lib/acctfuncs.inc.php
 msgid "The entered CAPTCHA answer is invalid."
-msgstr ""
+msgstr "Girilen CAPTCHA yanıtı geçersiz."
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -872,6 +887,10 @@ msgstr "Muhtemelen sürekli spam saldırıları olması nedeniyle IP adresinizde
 msgid "Account suspended"
 msgstr "Hesap donduruldu"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "Hesapları askıya alma izniniz yok."
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -939,7 +958,7 @@ msgstr "Bu yorumu iğnelemek için yetkiniz yok."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to unpin this comment."
-msgstr ""
+msgstr "Bu yorumun sabitlemesini kaldırma izniniz yok."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been pinned."
@@ -947,7 +966,7 @@ msgstr "Yorum iğnelendi."
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been unpinned."
-msgstr ""
+msgstr "Yorum sabitlemesi kaldırıldı"
 
 #: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
 msgid "Error retrieving package details."
@@ -957,6 +976,30 @@ msgstr "Paket bilgileri alınırken hata oluştu."
 msgid "Package details could not be found."
 msgstr "Paket ayrıntıları bulunamadı."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr "Kötü Yönlendirici başlık."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "Bildirilecek herhangi bir paket seçmediniz."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "Seçilen paketlerin bildirimleri etkinleştirildi."
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "Bildirim kaldırma için herhangi bir paket seçmediniz."
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "Seçtiğiniz bir pakette bildirimler etkin değil."
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "Seçilen paketlerin bildirimleri kaldırıldı."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Paketleri işaretleyebilmek için giriş yapmalısınız."
@@ -993,6 +1036,10 @@ msgstr "Paket silmek için gerekli izne sahip değilsiniz."
 msgid "You did not select any packages to delete."
 msgstr "Silinecek paketleri seçmediniz."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "Seçtiğiniz paketlerden biri mevcut değil."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Seçilen paketler silindi."
@@ -1001,10 +1048,18 @@ msgstr "Seçilen paketler silindi."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Paketleri sahiplenmek için giriş yapmalısınız."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "Seçtiğiniz paketlerden birini benimsemenize izin verilmiyor."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Paketlerin sahipliğini bırakmak için giriş yapmalısınız."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "Seçtiğiniz paketlerden birini reddetme izniniz yok."
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Sahiplenilecek paketleri seçmediniz."
@@ -1245,7 +1300,7 @@ msgstr "Bu kullanıcının hesabını düzenleyin"
 
 #: template/account_details.php
 msgid "List this user's comments"
-msgstr ""
+msgstr "Bu kullanıcının yorumlarını listele"
 
 #: template/account_edit_form.php
 #, php-format
@@ -1260,7 +1315,7 @@ msgstr "Kullanıcı detayları için %sburaya%s tıklayın."
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s to list the comments made by this account."
-msgstr ""
+msgstr "Bu hesap tarafından yapılan yorumları listelemek için %s buraya %s tıklayın."
 
 #: template/account_edit_form.php
 msgid "required"
@@ -1270,7 +1325,7 @@ msgstr "gerekli"
 msgid ""
 "Your user name is the name you will use to login. It is visible to the "
 "general public, even if your account is inactive."
-msgstr ""
+msgstr "Kullanıcı adınız, oturum açmak için kullanacağınız addır. Hesabınız etkin olmasa bile, herkes tarafından görülebilir."
 
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Normal user"
@@ -1303,30 +1358,30 @@ msgid ""
 "If you do not hide your email address, it is visible to all registered AUR "
 "users. If you hide your email address, it is visible to members of the Arch "
 "Linux staff only."
-msgstr ""
+msgstr "E-posta adresinizi gizlemezseniz, tüm kayıtlı AUR kullanıcıları tarafından görülebilir. E-posta adresinizi gizlerseniz, adres yalnızca Arch Linux personeli tarafından görülebilir."
 
 #: template/account_edit_form.php
 msgid "Backup Email Address"
-msgstr ""
+msgstr "Yedekleme E-posta Adresi"
 
 #: template/account_edit_form.php
 msgid ""
 "Optionally provide a secondary email address that can be used to restore "
 "your account in case you lose access to your primary email address."
-msgstr ""
+msgstr "İsteğe bağlı olarak, birincil e-posta adresinize erişiminizi kaybetmeniz durumunda hesabınızı geri yüklemek için kullanılabilecek ikincil bir e-posta adresi sağlayın."
 
 #: template/account_edit_form.php
 msgid ""
 "Password reset links are always sent to both your primary and your backup "
 "email address."
-msgstr ""
+msgstr "Parola sıfırlama bağlantıları her zaman hem birincil adresinize hem de yedek e-posta adresinize gönderilir."
 
 #: template/account_edit_form.php
 #, php-format
 msgid ""
 "Your backup email address is always only visible to members of the Arch "
 "Linux staff, independent of the %s setting."
-msgstr ""
+msgstr "Yedek e-posta adresiniz her zaman %s ayarından bağımsız olarak yalnızca Arch Linux personeli tarafından görülebilir."
 
 #: template/account_edit_form.php
 msgid "Language"
@@ -1334,13 +1389,13 @@ msgstr "Dil"
 
 #: template/account_edit_form.php
 msgid "Timezone"
-msgstr ""
+msgstr "Saat dilimi"
 
 #: template/account_edit_form.php
 msgid ""
 "If you want to change the password, enter a new password and confirm the new"
 " password by entering it again."
-msgstr ""
+msgstr "Şifreyi değiştirmek istiyorsanız, yeni bir şifre girin ve yeni şifreyi tekrar girerek onaylayın."
 
 #: template/account_edit_form.php
 msgid "Re-type password"
@@ -1374,21 +1429,21 @@ msgstr "Sahiplik değişikliklerini bildir."
 
 #: template/account_edit_form.php
 msgid "To confirm the profile changes, please enter your current password:"
-msgstr ""
+msgstr "Profil değişikliklerini onaylamak için lütfen mevcut şifrenizi girin:"
 
 #: template/account_edit_form.php
 msgid "Your current password"
-msgstr ""
+msgstr "Mevcut şifreniz"
 
 #: template/account_edit_form.php
 msgid ""
 "To protect the AUR against automated account creation, we kindly ask you to "
 "provide the output of the following command:"
-msgstr ""
+msgstr "AUR otomatik hesap oluşturmaya karşı korumak için sizden aşağıdaki komutun çıktısını sağlamanızı rica ediyoruz:"
 
 #: template/account_edit_form.php
 msgid "Answer"
-msgstr ""
+msgstr "Cevap"
 
 #: template/account_edit_form.php template/pkgbase_details.php
 #: template/pkg_details.php
@@ -1453,7 +1508,7 @@ msgstr "Güncel olmayan olarak işaretli yorum: %s"
 #: template/flag_comment.php
 #, php-format
 msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
-msgstr ""
+msgstr "%s%s%s, aşağıdaki nedenlerden dolayı   %s%s%s'i %s%s%s olarak işaretledi:"
 
 #: template/flag_comment.php
 #, php-format
@@ -1467,7 +1522,7 @@ msgstr "Detaylara Geri Dön."
 #: template/footer.php
 #, php-format
 msgid "Copyright %s 2004-%d aurweb Development Team."
-msgstr ""
+msgstr "Telif Hakkı %s 2004-%d aurweb Gelişim Takımı."
 
 #: template/header.php
 msgid " My Account"
@@ -1551,7 +1606,7 @@ msgstr "salt okunur"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "click to copy"
-msgstr ""
+msgstr "kopyalamak için tıkla"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
@@ -1603,12 +1658,12 @@ msgstr "Yorum Ekle"
 msgid ""
 "Git commit identifiers referencing commits in the AUR package repository and"
 " URLs are converted to links automatically."
-msgstr ""
+msgstr "AUR paketindeki işlemleri referans alan Git işlem tanımlayıcıları ve URL adresleri otomatik olarak bağlantılara dönüştürülür."
 
 #: template/pkg_comment_form.php
 #, php-format
 msgid "%sMarkdown syntax%s is partially supported."
-msgstr ""
+msgstr "%s Markdown sözdizimi %s kısmen desteklenmektedir."
 
 #: template/pkg_comments.php
 msgid "Pinned Comments"
@@ -1620,7 +1675,7 @@ msgstr "Son Yorumlar"
 
 #: template/pkg_comments.php
 msgid "Comments for"
-msgstr ""
+msgstr "Yorum"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1635,7 +1690,7 @@ msgstr "%s'e isimsiz yorum"
 #: template/pkg_comments.php
 #, php-format
 msgid "Commented on package %s on %s"
-msgstr ""
+msgstr "%s paketinde %s yorumladı"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1671,7 +1726,7 @@ msgstr "Yorumu iğnele"
 
 #: template/pkg_comments.php
 msgid "Unpin comment"
-msgstr ""
+msgstr "Yorum sabitlemesini kaldır"
 
 #: template/pkg_details.php
 msgid "Package Details"
@@ -1794,11 +1849,11 @@ msgid ""
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr ""
+msgstr "Bir sahipsiz istek göndererek, Güvenilir Kullanıcıdan paket tabanını reddetmesini istersiniz. Lütfen bunu yalnızca paketin sürdürme eylemine ihtiyacı varsa, sürdürücü MIA ise ve daha önce bakım görevlisine başvurmayı denediyseniz yapın."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
-msgstr ""
+msgstr "Arama kriterlerinize uyan istek yok."
 
 #: template/pkgreq_results.php
 #, php-format
@@ -1856,7 +1911,7 @@ msgstr "Kapat"
 
 #: template/pkgreq_results.php
 msgid "Pending"
-msgstr ""
+msgstr "Bekliyor"
 
 #: template/pkgreq_results.php
 msgid "Closed"
@@ -1880,11 +1935,11 @@ msgstr "Tam Paket Temeli"
 
 #: template/pkg_search_form.php
 msgid "Co-maintainer"
-msgstr ""
+msgstr "Yardımcı Bakıcı"
 
 #: template/pkg_search_form.php
 msgid "Maintainer, Co-maintainer"
-msgstr ""
+msgstr "Bakıcı, Yardımcı Bakıcı"
 
 #: template/pkg_search_form.php
 msgid "All"
@@ -2056,7 +2111,7 @@ msgstr "Son Güncellemeler"
 
 #: template/stats/updates_table.php
 msgid "more"
-msgstr ""
+msgstr "daha fazla"
 
 #: template/stats/user_table.php
 msgid "My Statistics"
@@ -2121,7 +2176,7 @@ msgstr "Geri"
 
 #: scripts/notify.py
 msgid "AUR Password Reset"
-msgstr ""
+msgstr "AUR Şifre Sıfırlama"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2129,90 +2184,90 @@ msgid ""
 "A password reset request was submitted for the account {user} associated "
 "with your email address. If you wish to reset your password follow the link "
 "[1] below, otherwise ignore this message and nothing will happen."
-msgstr ""
+msgstr "E-posta adresinizle ilişkili {user} hesabı için bir şifre sıfırlama isteği gönderildi. Şifrenizi sıfırlamak isterseniz, aşağıdaki bağlantıyı [1] takip edin, aksi takdirde bu mesajı dikkate almayın; hiçbir şey olmaz."
 
 #: scripts/notify.py
 msgid "Welcome to the Arch User Repository"
-msgstr ""
+msgstr "Arch Kullanıcı Deposuna Hoş Geldiniz"
 
 #: scripts/notify.py
 msgid ""
 "Welcome to the Arch User Repository! In order to set an initial password for"
 " your new account, please click the link [1] below. If the link does not "
 "work, try copying and pasting it into your browser."
-msgstr ""
+msgstr "Arch Kullanıcı Deposuna Hoş Geldiniz! Yeni hesabınız için bir başlangıç şifresi belirlemek için lütfen aşağıdaki bağlantıyı [1] tıklayın. Bağlantı çalışmazsa, kopyalayıp tarayıcınıza yapıştırmayı deneyin."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Comment for {pkgbase}"
-msgstr ""
+msgstr "{pkgbase} için yorum yapın"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] added the following comment to {pkgbase} [2]:"
-msgstr ""
+msgstr "{user} [1], {pkgbase} [2] ürününe şu yorumu ekledi:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "If you no longer wish to receive notifications about this package, please go"
 " to the package page [2] and select \"{label}\"."
-msgstr ""
+msgstr "Artık bu paket hakkında bildirim almak istemiyorsanız, lütfen paket sayfasına [2] gidin ve \"{label}\" seçeneğini seçin."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package Update: {pkgbase}"
-msgstr ""
+msgstr "Diğer paket güncellemeleri: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
-msgstr ""
+msgstr "{user} [1], {pkgbase} [2] için yeni bir işlemde bulundu."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Out-of-date Notification for {pkgbase}"
-msgstr ""
+msgstr "{pkgbase} için AUR Güncel Değil Bildirimi"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
-msgstr ""
+msgstr "{pkgbase} [1] paketiniz {user} [2] tarafından eski olarak işaretlendi:"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Ownership Notification for {pkgbase}"
-msgstr ""
+msgstr "{pkgbase} için AUR Sahiplik Bildirimi"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was adopted by {user} [2]."
-msgstr ""
+msgstr "{pkgbase} [1] paketi {user} [2] tarafından kabul edildi."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "The package {pkgbase} [1] was disowned by {user} [2]."
-msgstr ""
+msgstr "{pkgbase} [1] paketi {user} [2] tarafından reddedildi."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Co-Maintainer Notification for {pkgbase}"
-msgstr ""
+msgstr "{pkgbase} için AUR Ortak Bakıcı bildirimi"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were added to the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "{pkgbase} [1] ortak bakıcı listesine eklendi."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
-msgstr ""
+msgstr "{pkgbase} [1] adlı ortak bakıcı listesinden çıkarıldınız."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "AUR Package deleted: {pkgbase}"
-msgstr ""
+msgstr "AUR Paketi silindi: {pkgbase}"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2221,7 +2276,7 @@ msgid ""
 "\n"
 "-- \n"
 "If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
-msgstr ""
+msgstr "{user} [1], {old} [2] ile {new} [3] arasını birleştirdi.\n\n-- \nEğer yeni paket hakkında bildirim almak istemiyorsanız, lütfen [3] 'e gidin ve \"{label}\" düğmesini tıklayın."
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2229,16 +2284,61 @@ msgid ""
 "{user} [1] deleted {pkgbase} [2].\n"
 "\n"
 "You will no longer receive notifications about this package."
-msgstr ""
+msgstr "{user} [1] {pkgbase} [2] paketini sildi.\n\nArtık bu paket hakkında bildirim almayacaksınız."
 
 #: scripts/notify.py
 #, python-brace-format
 msgid "TU Vote Reminder: Proposal {id}"
-msgstr ""
+msgstr "TU Oylama Hatırlatıcısı: Teklif {id}"
 
 #: scripts/notify.py
 #, python-brace-format
 msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
+msgstr "Lütfen {id} [1] teklifine oy vermeyi unutmayın. Oylama süresi 48 saatten az sürer."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "Geçersiz hesap türü sağlandı."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "Hesap türlerini değiştirme izniniz yok."
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "Bu kullanıcının hesap türünü %s olarak değiştirme izniniz yok."
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr "%s için kabul edilecek sahipsize gereksinim yok."
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 7dd65d90..a4410185 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/lfleischer/aurweb/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -476,6 +476,12 @@ msgid ""
 "checkbox."
 msgstr "Вибрані пакунки все ще мають власника, підтвердіть дію."
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "Не вдалося знайти пакунок для об’єднання голосів та коментарів."
@@ -574,6 +580,14 @@ msgstr "Позначити коментар"
 msgid "Flag Package Out-Of-Date"
 msgstr "Позначити пакунок як застарілий"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -870,6 +884,10 @@ msgstr "Форма логування зараз заборонена для В
 msgid "Account suspended"
 msgstr "Обліковий запис вилучено"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -955,6 +973,30 @@ msgstr "Помилка пошуку інформації про пакунок."
 msgid "Package details could not be found."
 msgstr "Інформації про пакунок не знайдено."
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "Для встановлення мітки слід увійти."
@@ -991,6 +1033,10 @@ msgstr "У Вас немає прав для вилучення пакунків
 msgid "You did not select any packages to delete."
 msgstr "Не вибрано жодного пакунку для вилучення."
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "Вибрані пакунки вилучено."
@@ -999,10 +1045,18 @@ msgstr "Вибрані пакунки вилучено."
 msgid "You must be logged in before you can adopt packages."
 msgstr "Для перейняття пакунків слід увійти."
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "Для зречення пакунків слід увійти."
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "Ви не вибрали жодного пакунку для переймання."
@@ -2250,3 +2304,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "Будь ласка, не забудьте подати свій голос на пропозицію {id} [1]. Голосування закінчиться за менш ніж 48 годин."
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 00000000..3ea5bad3
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,2330 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/lfleischer/aurweb/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/zh.po b/po/zh.po
new file mode 100644
index 00000000..04fe06f3
--- /dev/null
+++ b/po/zh.po
@@ -0,0 +1,2330 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the AURWEB package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: aurweb\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
+"POT-Creation-Date: 2020-01-31 09:29+0100\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
+"Language-Team: Chinese (http://www.transifex.com/lfleischer/aurweb/language/zh/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: html/404.php
+msgid "Page Not Found"
+msgstr ""
+
+#: html/404.php
+msgid "Sorry, the page you've requested does not exist."
+msgstr ""
+
+#: html/404.php template/pkgreq_close_form.php
+msgid "Note"
+msgstr ""
+
+#: html/404.php
+msgid "Git clone URLs are not meant to be opened in a browser."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "To clone the Git repository of %s, run %s."
+msgstr ""
+
+#: html/404.php
+#, php-format
+msgid "Click %shere%s to return to the %s details page."
+msgstr ""
+
+#: html/503.php
+msgid "Service Unavailable"
+msgstr ""
+
+#: html/503.php
+msgid ""
+"Don't panic! This site is down due to maintenance. We will be back soon."
+msgstr ""
+
+#: html/account.php
+msgid "Account"
+msgstr ""
+
+#: html/account.php template/header.php
+msgid "Accounts"
+msgstr ""
+
+#: html/account.php html/addvote.php
+msgid "You are not allowed to access this area."
+msgstr ""
+
+#: html/account.php
+msgid "Could not retrieve information for the specified user."
+msgstr ""
+
+#: html/account.php
+msgid "You do not have permission to edit this account."
+msgstr ""
+
+#: html/account.php lib/acctfuncs.inc.php
+msgid "Invalid password."
+msgstr ""
+
+#: html/account.php
+msgid "Use this form to search existing accounts."
+msgstr ""
+
+#: html/account.php
+msgid "You must log in to view user information."
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Add Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid token for user action."
+msgstr ""
+
+#: html/addvote.php
+msgid "Username does not exist."
+msgstr ""
+
+#: html/addvote.php
+#, php-format
+msgid "%s already has proposal running for them."
+msgstr ""
+
+#: html/addvote.php
+msgid "Invalid type."
+msgstr ""
+
+#: html/addvote.php
+msgid "Proposal cannot be empty."
+msgstr ""
+
+#: html/addvote.php
+msgid "New proposal submitted."
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit a proposal to vote on."
+msgstr ""
+
+#: html/addvote.php
+msgid "Applicant/TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "(empty if not applicable)"
+msgstr ""
+
+#: html/addvote.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Type"
+msgstr ""
+
+#: html/addvote.php
+msgid "Addition of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU"
+msgstr ""
+
+#: html/addvote.php
+msgid "Removal of a TU (undeclared inactivity)"
+msgstr ""
+
+#: html/addvote.php
+msgid "Amendment of Bylaws"
+msgstr ""
+
+#: html/addvote.php template/tu_list.php
+msgid "Proposal"
+msgstr ""
+
+#: html/addvote.php
+msgid "Submit"
+msgstr ""
+
+#: html/comaintainers.php template/comaintainers_form.php
+msgid "Manage Co-maintainers"
+msgstr ""
+
+#: html/commentedit.php template/pkg_comments.php
+msgid "Edit comment"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Dashboard"
+msgstr ""
+
+#: html/home.php template/header.php
+msgid "Home"
+msgstr ""
+
+#: html/home.php
+msgid "My Flagged Packages"
+msgstr ""
+
+#: html/home.php
+msgid "My Requests"
+msgstr ""
+
+#: html/home.php
+msgid "My Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I maintain"
+msgstr ""
+
+#: html/home.php
+msgid "Co-Maintained Packages"
+msgstr ""
+
+#: html/home.php
+msgid "Search for packages I co-maintain"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
+"Guidelines%s for more information."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
+"otherwise they will be deleted!"
+msgstr ""
+
+#: html/home.php
+msgid "Remember to vote for your favourite packages!"
+msgstr ""
+
+#: html/home.php
+msgid "Some packages may be provided as binaries in [community]."
+msgstr ""
+
+#: html/home.php
+msgid "DISCLAIMER"
+msgstr ""
+
+#: html/home.php template/footer.php
+msgid ""
+"AUR packages are user produced content. Any use of the provided files is at "
+"your own risk."
+msgstr ""
+
+#: html/home.php
+msgid "Learn more..."
+msgstr ""
+
+#: html/home.php
+msgid "Support"
+msgstr ""
+
+#: html/home.php
+msgid "Package Requests"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"There are three types of requests that can be filed in the %sPackage "
+"Actions%s box on the package details page:"
+msgstr ""
+
+#: html/home.php
+msgid "Orphan Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be disowned, e.g. when the maintainer is inactive and "
+"the package has been flagged out-of-date for a long time."
+msgstr ""
+
+#: html/home.php
+msgid "Deletion Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be removed from the Arch User Repository. Please do not"
+" use this if a package is broken and can be fixed easily. Instead, contact "
+"the package maintainer and file orphan request if necessary."
+msgstr ""
+
+#: html/home.php
+msgid "Merge Request"
+msgstr ""
+
+#: html/home.php
+msgid ""
+"Request a package to be merged into another one. Can be used when a package "
+"needs to be renamed or replaced by a split package."
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you want to discuss a request, you can use the %saur-requests%s mailing "
+"list. However, please do not use that list to file requests."
+msgstr ""
+
+#: html/home.php
+msgid "Submitting Packages"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting"
+" packages%s section of the Arch User Repository ArchWiki page for more "
+"details."
+msgstr ""
+
+#: html/home.php
+msgid "The following SSH fingerprints are used for the AUR:"
+msgstr ""
+
+#: html/home.php
+msgid "Discussion"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+" structure takes place on %saur-general%s. For discussion relating to the "
+"development of the AUR web interface, use the %saur-dev%s mailing list."
+msgstr ""
+
+#: html/home.php
+msgid "Bug Reporting"
+msgstr ""
+
+#: html/home.php
+#, php-format
+msgid ""
+"If you find a bug in the AUR web interface, please fill out a bug report on "
+"our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
+" %sonly%s. To report packaging bugs contact the package maintainer or leave "
+"a comment on the appropriate package page."
+msgstr ""
+
+#: html/home.php
+msgid "Package Search"
+msgstr ""
+
+#: html/index.php
+msgid "Adopt"
+msgstr ""
+
+#: html/index.php
+msgid "Vote"
+msgstr ""
+
+#: html/index.php
+msgid "UnVote"
+msgstr ""
+
+#: html/index.php template/pkg_search_form.php template/pkg_search_results.php
+msgid "Notify"
+msgstr ""
+
+#: html/index.php template/pkg_search_results.php
+msgid "UnNotify"
+msgstr ""
+
+#: html/index.php
+msgid "UnFlag"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Login"
+msgstr ""
+
+#: html/login.php html/tos.php
+#, php-format
+msgid "Logged-in as: %s"
+msgstr ""
+
+#: html/login.php template/header.php
+msgid "Logout"
+msgstr ""
+
+#: html/login.php
+msgid "Enter login credentials"
+msgstr ""
+
+#: html/login.php
+msgid "User name or primary email address"
+msgstr ""
+
+#: html/login.php template/account_delete.php template/account_edit_form.php
+msgid "Password"
+msgstr ""
+
+#: html/login.php
+msgid "Remember me"
+msgstr ""
+
+#: html/login.php
+msgid "Forgot Password"
+msgstr ""
+
+#: html/login.php
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
+msgstr ""
+
+#: html/packages.php template/pkg_search_form.php
+msgid "Search Criteria"
+msgstr ""
+
+#: html/packages.php template/header.php template/pkgbase_details.php
+#: template/stats/general_stats_table.php template/stats/user_table.php
+msgid "Packages"
+msgstr ""
+
+#: html/packages.php
+msgid "Error trying to retrieve package details."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Missing a required field."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+msgid "Password fields do not match."
+msgstr ""
+
+#: html/passreset.php lib/acctfuncs.inc.php
+#, php-format
+msgid "Your password must be at least %s characters."
+msgstr ""
+
+#: html/passreset.php
+msgid "Invalid e-mail."
+msgstr ""
+
+#: html/passreset.php
+msgid "Password Reset"
+msgstr ""
+
+#: html/passreset.php
+msgid "Check your e-mail for the confirmation link."
+msgstr ""
+
+#: html/passreset.php
+msgid "Your password has been reset successfully."
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your user name or primary e-mail address:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your new password:"
+msgstr ""
+
+#: html/passreset.php
+msgid "Confirm your new password:"
+msgstr ""
+
+#: html/passreset.php html/tos.php
+msgid "Continue"
+msgstr ""
+
+#: html/passreset.php
+#, php-format
+msgid ""
+"If you have forgotten the user name and the primary e-mail address you used "
+"to register, please send a message to the %saur-general%s mailing list."
+msgstr ""
+
+#: html/passreset.php
+msgid "Enter your user name or your primary e-mail address:"
+msgstr ""
+
+#: html/pkgbase.php
+msgid "Package Bases"
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been disowned, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
+#: html/pkgbase.php lib/pkgreqfuncs.inc.php
+msgid "Cannot merge a package base with itself."
+msgstr ""
+
+#: html/pkgbase.php
+msgid ""
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Package Deletion"
+msgstr ""
+
+#: html/pkgdel.php template/pkgbase_actions.php
+msgid "Delete Package"
+msgstr ""
+
+#: html/pkgdel.php
+#, php-format
+msgid ""
+"Use this form to delete the package base %s%s%s and the following packages "
+"from the AUR: "
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Deletion of a package is permanent. "
+msgstr ""
+
+#: html/pkgdel.php html/pkgmerge.php
+msgid "Select the checkbox to confirm action."
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Confirm package deletion"
+msgstr ""
+
+#: html/pkgdel.php template/account_delete.php
+msgid "Delete"
+msgstr ""
+
+#: html/pkgdel.php
+msgid "Only Trusted Users and Developers can delete packages."
+msgstr ""
+
+#: html/pkgdisown.php template/pkgbase_actions.php
+msgid "Disown Package"
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"Use this form to disown the package base %s%s%s which includes the following"
+" packages: "
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to no longer be a "
+"package co-maintainer."
+msgstr ""
+
+#: html/pkgdisown.php
+#, php-format
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package "
+"and transfer ownership to %s%s%s."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid ""
+"By selecting the checkbox, you confirm that you want to disown the package."
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Confirm to disown the package"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Disown"
+msgstr ""
+
+#: html/pkgdisown.php
+msgid "Only Trusted Users and Developers can disown packages."
+msgstr ""
+
+#: html/pkgflagcomment.php
+msgid "Flag Comment"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag Package Out-Of-Date"
+msgstr ""
+
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Use this form to flag the package base %s%s%s and the following packages "
+"out-of-date: "
+msgstr ""
+
+#: html/pkgflag.php
+#, php-format
+msgid ""
+"Please do %snot%s use this form to report bugs. Use the package comments "
+"instead."
+msgstr ""
+
+#: html/pkgflag.php
+msgid ""
+"Enter details on why the package is out-of-date below, preferably including "
+"links to the release announcement or the new release tarball."
+msgstr ""
+
+#: html/pkgflag.php template/pkgreq_close_form.php template/pkgreq_form.php
+#: template/pkgreq_results.php
+msgid "Comments"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Flag"
+msgstr ""
+
+#: html/pkgflag.php
+msgid "Only registered users can flag packages out-of-date."
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Package Merging"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgbase_actions.php
+msgid "Merge Package"
+msgstr ""
+
+#: html/pkgmerge.php
+#, php-format
+msgid "Use this form to merge the package base %s%s%s into another package. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "The following packages will be deleted: "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Once the package has been merged it cannot be reversed. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Enter the package name you wish to merge the package into. "
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Merge into:"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Confirm package merge"
+msgstr ""
+
+#: html/pkgmerge.php template/pkgreq_form.php
+msgid "Merge"
+msgstr ""
+
+#: html/pkgmerge.php
+msgid "Only Trusted Users and Developers can merge packages."
+msgstr ""
+
+#: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
+msgid "Submit Request"
+msgstr ""
+
+#: html/pkgreq.php template/pkgreq_close_form.php
+msgid "Close Request"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "First"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Previous"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php
+msgid "Next"
+msgstr ""
+
+#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php
+msgid "Last"
+msgstr ""
+
+#: html/pkgreq.php template/header.php
+msgid "Requests"
+msgstr ""
+
+#: html/register.php template/header.php
+msgid "Register"
+msgstr ""
+
+#: html/register.php
+msgid "Use this form to create an account."
+msgstr ""
+
+#: html/tos.php
+msgid "Terms of Service"
+msgstr ""
+
+#: html/tos.php
+msgid ""
+"The following documents have been updated. Please review them carefully:"
+msgstr ""
+
+#: html/tos.php
+#, php-format
+msgid "revision %d"
+msgstr ""
+
+#: html/tos.php
+msgid "I accept the terms and conditions above."
+msgstr ""
+
+#: html/tu.php template/account_details.php template/header.php
+msgid "Trusted User"
+msgstr ""
+
+#: html/tu.php
+msgid "Could not retrieve proposal details."
+msgstr ""
+
+#: html/tu.php
+msgid "Voting is closed for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Only Trusted Users are allowed to vote."
+msgstr ""
+
+#: html/tu.php
+msgid "You cannot vote in an proposal about you."
+msgstr ""
+
+#: html/tu.php
+msgid "You've already voted for this proposal."
+msgstr ""
+
+#: html/tu.php
+msgid "Vote ID not valid."
+msgstr ""
+
+#: html/tu.php template/tu_list.php
+msgid "Current Votes"
+msgstr ""
+
+#: html/tu.php
+msgid "Past Votes"
+msgstr ""
+
+#: html/voters.php template/tu_details.php
+msgid "Voters"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"Account registration has been disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Missing User ID"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The username is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "It must be between %s and %s characters long"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Start and end with a letter or number"
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Can contain only one period, underscore or hyphen."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Please confirm your new password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The backup email address is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The home page is invalid, please specify the full HTTP(s) URL."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The PGP key fingerprint is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The SSH public key is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Cannot increase account permissions."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Language is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Timezone is not currently supported."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The username, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The address, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The SSH public key, %s%s%s, is already in use."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The CAPTCHA is missing."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "This CAPTCHA has expired. Please try again."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "The entered CAPTCHA answer is invalid."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "Error trying to create account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully created."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "A password reset key has been sent to your e-mail address."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Click on the Login link above to use your account."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "No changes were made to the account, %s%s%s."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid "The account, %s%s%s, has been successfully modified."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid ""
+"The login form is currently disabled for your IP address, probably due to "
+"sustained spam attacks. Sorry for the inconvenience."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Account suspended"
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+#, php-format
+msgid ""
+"Your password has been reset. If you just created a new account, please use "
+"the link from the confirmation email to set an initial password. Otherwise, "
+"please request a reset key on the %sPassword Reset%s page."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Bad username or password."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "An error occurred trying to generate a user session."
+msgstr ""
+
+#: lib/acctfuncs.inc.php
+msgid "Invalid e-mail and reset key combination."
+msgstr ""
+
+#: lib/aur.inc.php template/pkg_details.php
+msgid "None"
+msgstr ""
+
+#: lib/aur.inc.php template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "View account information for %s"
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Package base ID or package base name missing."
+msgstr ""
+
+#: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit this comment."
+msgstr ""
+
+#: lib/aurjson.class.php
+msgid "Comment does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment cannot be empty."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been added."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can edit package information."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Missing comment ID."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "No more than 5 comments can be pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to pin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to unpin this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been pinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been unpinned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Error retrieving package details."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php lib/pkgfuncs.inc.php
+msgid "Package details could not be found."
+msgstr ""
+
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can flag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to flag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have not been flagged, please enter a comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been flagged out-of-date."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can unflag packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to unflag."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been unflagged."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You do not have permission to delete packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to delete."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can adopt packages."
+msgstr ""
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can disown packages."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to adopt."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to disown."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been adopted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The selected packages have been disowned."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You must be logged in before you can un-vote for packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You did not select any packages to vote for."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been removed from the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Your votes have been cast for the selected packages."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Couldn't add to notification list."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been added to the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "You have been removed from the comment notification list for %s."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to undelete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been undeleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to delete this comment."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been deleted."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "Comment has been edited."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to edit the keywords of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base keywords have been updated."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "You are not allowed to manage co-maintainers of this package base."
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+#, php-format
+msgid "Invalid user name: %s"
+msgstr ""
+
+#: lib/pkgbasefuncs.inc.php
+msgid "The package base co-maintainers have been updated."
+msgstr ""
+
+#: lib/pkgfuncs.inc.php template/pkgbase_details.php
+msgid "View packages details for"
+msgstr ""
+
+#: lib/pkgfuncs.inc.php
+#, php-format
+msgid "requires %s"
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "You must be logged in to file package requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid name: only lowercase letters are allowed."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "The comment field must not be empty."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid request type."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Added request successfully."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Invalid reason."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Only TUs and developers can close requests."
+msgstr ""
+
+#: lib/pkgreqfuncs.inc.php
+msgid "Request closed successfully."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "You can use this form to permanently delete the AUR account %s."
+msgstr ""
+
+#: template/account_delete.php
+#, php-format
+msgid "%sWARNING%s: This action cannot be undone."
+msgstr ""
+
+#: template/account_delete.php
+msgid "Confirm deletion"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Username"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Account Type"
+msgstr ""
+
+#: template/account_details.php template/tu_details.php
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "User"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Trusted User & Developer"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/search_accounts_form.php
+msgid "Email Address"
+msgstr ""
+
+#: template/account_details.php
+msgid "hidden"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "Real Name"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+msgid "Homepage"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php template/search_accounts_form.php
+msgid "IRC Nick"
+msgstr ""
+
+#: template/account_details.php template/account_edit_form.php
+#: template/account_search_results.php
+msgid "PGP Key Fingerprint"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+#: template/pkgreq_results.php
+msgid "Status"
+msgstr ""
+
+#: template/account_details.php
+msgid "Inactive since"
+msgstr ""
+
+#: template/account_details.php template/account_search_results.php
+msgid "Active"
+msgstr ""
+
+#: template/account_details.php
+msgid "Registration date:"
+msgstr ""
+
+#: template/account_details.php template/pkgbase_details.php
+#: template/pkg_details.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "unknown"
+msgstr ""
+
+#: template/account_details.php
+msgid "Last Login"
+msgstr ""
+
+#: template/account_details.php
+msgid "Never"
+msgstr ""
+
+#: template/account_details.php
+msgid "View this user's packages"
+msgstr ""
+
+#: template/account_details.php
+msgid "Edit this user's account"
+msgstr ""
+
+#: template/account_details.php
+msgid "List this user's comments"
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s if you want to permanently delete this account."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s for user details."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid "Click %shere%s to list the comments made by this account."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "required"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Your user name is the name you will use to login. It is visible to the "
+"general public, even if your account is inactive."
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Normal user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Trusted user"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Account Suspended"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Inactive"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Please ensure you correctly entered your email address, otherwise you will "
+"be locked out."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Hide Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you do not hide your email address, it is visible to all registered AUR "
+"users. If you hide your email address, it is visible to members of the Arch "
+"Linux staff only."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Backup Email Address"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Optionally provide a secondary email address that can be used to restore "
+"your account in case you lose access to your primary email address."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"Password reset links are always sent to both your primary and your backup "
+"email address."
+msgstr ""
+
+#: template/account_edit_form.php
+#, php-format
+msgid ""
+"Your backup email address is always only visible to members of the Arch "
+"Linux staff, independent of the %s setting."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Language"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Timezone"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"If you want to change the password, enter a new password and confirm the new"
+" password by entering it again."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Re-type password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"The following information is only required if you want to submit packages to"
+" the Arch User Repository."
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "SSH Public Key"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notification settings"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of new comments"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of package updates"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Notify of ownership changes"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "To confirm the profile changes, please enter your current password:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Your current password"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid ""
+"To protect the AUR against automated account creation, we kindly ask you to "
+"provide the output of the following command:"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Answer"
+msgstr ""
+
+#: template/account_edit_form.php template/pkgbase_details.php
+#: template/pkg_details.php
+msgid "Update"
+msgstr ""
+
+#: template/account_edit_form.php
+msgid "Create"
+msgstr ""
+
+#: template/account_edit_form.php template/search_accounts_form.php
+msgid "Reset"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No results matched your search criteria."
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit Account"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Suspended"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Edit"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "Less"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "More"
+msgstr ""
+
+#: template/account_search_results.php
+msgid "No more results to display."
+msgstr ""
+
+#: template/comaintainers_form.php
+#, php-format
+msgid ""
+"Use this form to add co-maintainers for %s%s%s (one user name per line):"
+msgstr ""
+
+#: template/comaintainers_form.php
+msgid "Users"
+msgstr ""
+
+#: template/comaintainers_form.php template/pkg_comment_form.php
+msgid "Save"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "Flagged Out-of-Date Comment: %s"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s flagged %s%s%s out-of-date on %s%s%s for the following reason:"
+msgstr ""
+
+#: template/flag_comment.php
+#, php-format
+msgid "%s%s%s is not flagged out-of-date."
+msgstr ""
+
+#: template/flag_comment.php
+msgid "Return to Details"
+msgstr ""
+
+#: template/footer.php
+#, php-format
+msgid "Copyright %s 2004-%d aurweb Development Team."
+msgstr ""
+
+#: template/header.php
+msgid " My Account"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Package Actions"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View PKGBUILD"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "View Changes"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Download snapshot"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Search wiki"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "Flagged out-of-date (%s)"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Flag package out-of-date"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Unflag package"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Remove vote"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Vote for this package"
+msgstr ""
+
+#: template/pkgbase_actions.php scripts/notify.py
+msgid "Disable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php template/pkg_comment_form.php
+msgid "Enable notifications"
+msgstr ""
+
+#: template/pkgbase_actions.php
+msgid "Manage Co-Maintainers"
+msgstr ""
+
+#: template/pkgbase_actions.php
+#, php-format
+msgid "%d pending request"
+msgid_plural "%d pending requests"
+msgstr[0] ""
+
+#: template/pkgbase_actions.php
+msgid "Adopt Package"
+msgstr ""
+
+#: template/pkgbase_details.php
+msgid "Package Base Details"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Git Clone URL"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "read-only"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "click to copy"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Keywords"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php
+msgid "Submitter"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Maintainer"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Packager"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Votes"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Popularity"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "First Submitted"
+msgstr ""
+
+#: template/pkgbase_details.php template/pkg_details.php
+msgid "Last Updated"
+msgstr ""
+
+#: template/pkg_comment_box.php
+#, php-format
+msgid "Edit comment for: %s"
+msgstr ""
+
+#: template/pkg_comment_box.php template/pkg_comment_form.php
+msgid "Add Comment"
+msgstr ""
+
+#: template/pkg_comment_form.php
+msgid ""
+"Git commit identifiers referencing commits in the AUR package repository and"
+" URLs are converted to links automatically."
+msgstr ""
+
+#: template/pkg_comment_form.php
+#, php-format
+msgid "%sMarkdown syntax%s is partially supported."
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pinned Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Latest Comments"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Comments for"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "%s commented on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Anonymous comment on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "Commented on package %s on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "deleted on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s by %s"
+msgstr ""
+
+#: template/pkg_comments.php
+#, php-format
+msgid "edited on %s"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Undelete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Delete comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Pin comment"
+msgstr ""
+
+#: template/pkg_comments.php
+msgid "Unpin comment"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Package Details"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_form.php
+msgid "Package Base"
+msgstr ""
+
+#: template/pkg_details.php template/pkg_search_results.php
+msgid "Description"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Upstream URL"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Visit the website for"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Licenses"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Groups"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Conflicts"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Provides"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Replaces"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Dependencies"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Required by"
+msgstr ""
+
+#: template/pkg_details.php
+msgid "Sources"
+msgstr ""
+
+#: template/pkgreq_close_form.php
+#, php-format
+msgid "Use this form to close the request for package base %s%s%s."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid ""
+"The comments field can be left empty. However, it is highly recommended to "
+"add a comment when rejecting a request."
+msgstr ""
+
+#: template/pkgreq_close_form.php
+msgid "Reason"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Accepted"
+msgstr ""
+
+#: template/pkgreq_close_form.php template/pkgreq_results.php
+#: template/tu_details.php
+msgid "Rejected"
+msgstr ""
+
+#: template/pkgreq_form.php
+#, php-format
+msgid ""
+"Use this form to file a request against package base %s%s%s which includes "
+"the following packages:"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Request type"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Deletion"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid "Orphan"
+msgstr ""
+
+#: template/pkgreq_form.php template/pkg_search_results.php
+msgid "Merge into"
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a deletion request, you ask a Trusted User to delete the "
+"package base. This type of request should be used for duplicates, software "
+"abandoned by upstream, as well as illegal and irreparably broken packages."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting a merge request, you ask a Trusted User to delete the package "
+"base and transfer its votes and comments to another package base. Merging a "
+"package does not affect the corresponding Git repositories. Make sure you "
+"update the Git history of the target package yourself."
+msgstr ""
+
+#: template/pkgreq_form.php
+msgid ""
+"By submitting an orphan request, you ask a Trusted User to disown the "
+"package base. Please only do this if the package needs maintainer action, "
+"the maintainer is MIA and you already tried to contact the maintainer "
+"previously."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "No requests matched your search criteria."
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "%d package request found."
+msgid_plural "%d package requests found."
+msgstr[0] ""
+
+#: template/pkgreq_results.php template/pkg_search_results.php
+#, php-format
+msgid "Page %d of %d."
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Package"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Filed by"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Date"
+msgstr ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d day left"
+msgid_plural "~%d days left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+#, php-format
+msgid "~%d hour left"
+msgid_plural "~%d hours left"
+msgstr[0] ""
+
+#: template/pkgreq_results.php
+msgid "<1 hour left"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Accept"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Locked"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Close"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Pending"
+msgstr ""
+
+#: template/pkgreq_results.php
+msgid "Closed"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name, Description"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Name Only"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Name"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Exact Package Base"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Maintainer, Co-maintainer"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "All"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Not Flagged"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Name"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+#: template/tu_details.php template/tu_list.php
+msgid "Voted"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Last modified"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Ascending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Descending"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Enter search criteria"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Search by"
+msgstr ""
+
+#: template/pkg_search_form.php template/stats/user_table.php
+msgid "Out of Date"
+msgstr ""
+
+#: template/pkg_search_form.php template/search_accounts_form.php
+msgid "Sort by"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Sort order"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Per page"
+msgstr ""
+
+#: template/pkg_search_form.php template/pkg_search_results.php
+msgid "Go"
+msgstr ""
+
+#: template/pkg_search_form.php
+msgid "Orphans"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Error retrieving package list."
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "No packages matched your search criteria."
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid "%d package found."
+msgid_plural "%d packages found."
+msgstr[0] ""
+
+#: template/pkg_search_results.php
+msgid "Version"
+msgstr ""
+
+#: template/pkg_search_results.php
+#, php-format
+msgid ""
+"Popularity is calculated as the sum of all votes with each vote being "
+"weighted with a factor of %.2f per day since its creation."
+msgstr ""
+
+#: template/pkg_search_results.php template/tu_details.php
+#: template/tu_list.php
+msgid "Yes"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "orphan"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Actions"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Unflag Out-of-date"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Adopt Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Disown Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Delete Packages"
+msgstr ""
+
+#: template/pkg_search_results.php
+msgid "Confirm"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Any type"
+msgstr ""
+
+#: template/search_accounts_form.php
+msgid "Search"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Statistics"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Orphan Packages"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages added in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past 7 days"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages updated in the past year"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Packages never updated"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Registered Users"
+msgstr ""
+
+#: template/stats/general_stats_table.php
+msgid "Trusted Users"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "Recent Updates"
+msgstr ""
+
+#: template/stats/updates_table.php
+msgid "more"
+msgstr ""
+
+#: template/stats/user_table.php
+msgid "My Statistics"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Proposal Details"
+msgstr ""
+
+#: template/tu_details.php
+msgid "This vote is still running."
+msgstr ""
+
+#: template/tu_details.php
+#, php-format
+msgid "Submitted: %s by %s"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "End"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Result"
+msgstr ""
+
+#: template/tu_details.php template/tu_list.php
+msgid "No"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Abstain"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Total"
+msgstr ""
+
+#: template/tu_details.php
+msgid "Participation"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last Votes by TU"
+msgstr ""
+
+#: template/tu_last_votes_list.php
+msgid "Last vote"
+msgstr ""
+
+#: template/tu_last_votes_list.php template/tu_list.php
+msgid "No results found."
+msgstr ""
+
+#: template/tu_list.php
+msgid "Start"
+msgstr ""
+
+#: template/tu_list.php
+msgid "Back"
+msgstr ""
+
+#: scripts/notify.py
+msgid "AUR Password Reset"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"A password reset request was submitted for the account {user} associated "
+"with your email address. If you wish to reset your password follow the link "
+"[1] below, otherwise ignore this message and nothing will happen."
+msgstr ""
+
+#: scripts/notify.py
+msgid "Welcome to the Arch User Repository"
+msgstr ""
+
+#: scripts/notify.py
+msgid ""
+"Welcome to the Arch User Repository! In order to set an initial password for"
+" your new account, please click the link [1] below. If the link does not "
+"work, try copying and pasting it into your browser."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Comment for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] added the following comment to {pkgbase} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"If you no longer wish to receive notifications about this package, please go"
+" to the package page [2] and select \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package Update: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Out-of-date Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "Your package {pkgbase} [1] has been flagged out-of-date by {user} [2]:"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Ownership Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was adopted by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "The package {pkgbase} [1] was disowned by {user} [2]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Co-Maintainer Notification for {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were added to the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "You were removed from the co-maintainer list of {pkgbase} [1]."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "AUR Package deleted: {pkgbase}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] merged {old} [2] into {new} [3].\n"
+"\n"
+"-- \n"
+"If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"{user} [1] deleted {pkgbase} [2].\n"
+"\n"
+"You will no longer receive notifications about this package."
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid "TU Vote Reminder: Proposal {id}"
+msgstr ""
+
+#: scripts/notify.py
+#, python-brace-format
+msgid ""
+"Please remember to cast your vote on proposal {id} [1]. The voting period "
+"ends in less than 48 hours."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 175ca3a2..53d42bc8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,21 +3,24 @@
 # This file is distributed under the same license as the AURWEB package.
 # 
 # Translators:
-# leonfeng <chaofeng111@qq.com>, 2015-2016
+# Feng Chao <chaofeng111@qq.com>, 2015-2016
 # dongfengweixiao <dongfengweixiao@gmail.com>, 2015
-# Felix Yan <felixonmars@gmail.com>, 2014
+# dongfengweixiao <dongfengweixiao@gmail.com>, 2015
+# Felix Yan <felixonmars@gmail.com>, 2014,2021
+# Feng Chao <chaofeng111@qq.com>, 2012,2021
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011
 # pingplug <pingplug@foxmail.com>, 2017-2018
-# leonfeng <chaofeng111@qq.com>, 2012
+# Feng Chao <chaofeng111@qq.com>, 2012
 # Weiwen Zhao <panda.hust@gmail.com>, 2013
 # Xiaodong Qi <xiaodong.que+github@gmail.com>, 2016
+# 林凌儿 <308627244@qq.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-01-31 08:29+0000\n"
-"Last-Translator: Lukas Fleischer\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/lfleischer/aurweb/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +42,7 @@ msgstr "提示"
 
 #: html/404.php
 msgid "Git clone URLs are not meant to be opened in a browser."
-msgstr "Git 克隆地址并不意味着能被浏览器打开"
+msgstr "Git clone URLs 并不意味着能被浏览器打开。"
 
 #: html/404.php
 #, php-format
@@ -49,7 +52,7 @@ msgstr "要克隆 Git 项目 %s，运行 %s。"
 #: html/404.php
 #, php-format
 msgid "Click %shere%s to return to the %s details page."
-msgstr "点击 %s这里%s 以回到 %s 的软件包详情页面"
+msgstr "点击 %s这里%s 以回到 %s 的软件包详情页面。"
 
 #: html/503.php
 msgid "Service Unavailable"
@@ -58,7 +61,7 @@ msgstr "服务不可用"
 #: html/503.php
 msgid ""
 "Don't panic! This site is down due to maintenance. We will be back soon."
-msgstr "别怕！本站正在维护中，我们会回来的。"
+msgstr "别慌！本站正在维护中，不久后将恢复。"
 
 #: html/account.php
 msgid "Account"
@@ -82,7 +85,7 @@ msgstr "您没有权限编辑此帐户。"
 
 #: html/account.php lib/acctfuncs.inc.php
 msgid "Invalid password."
-msgstr ""
+msgstr "密码无效。"
 
 #: html/account.php
 msgid "Use this form to search existing accounts."
@@ -207,14 +210,14 @@ msgstr "搜索共同维护的软件包"
 msgid ""
 "Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
 "Guidelines%s for more information."
-msgstr "欢迎来到 AUR！想了解更多信息，请阅读 %sAUR 用户指南%s和 %sAUR 受信用户指南%s。"
+msgstr "欢迎来到 AUR！想了解更多信息，请阅读 %sAUR 用户指南%s 和 %sAUR 受信用户指南%s。"
 
 #: html/home.php
 #, php-format
 msgid ""
 "Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s "
 "otherwise they will be deleted!"
-msgstr "提交的 PKGBUILD %s必须%s遵守 %sArch 软件包规范%s，否则它们将被删除！"
+msgstr "提交的 PKGBUILD %s必须%s 遵守 %sArch 软件包规范%s，否则它们将被删除！"
 
 #: html/home.php
 msgid "Remember to vote for your favourite packages!"
@@ -232,7 +235,7 @@ msgstr "免责声明"
 msgid ""
 "AUR packages are user produced content. Any use of the provided files is at "
 "your own risk."
-msgstr "AUR 包为用户产生的内容。使用它们造成的后果自负。"
+msgstr "AUR 包是用户创作的内容。使用它们造成的后果自负。"
 
 #: html/home.php
 msgid "Learn more..."
@@ -240,7 +243,7 @@ msgstr "了解更多..."
 
 #: html/home.php
 msgid "Support"
-msgstr "支持"
+msgstr "帮助"
 
 #: html/home.php
 msgid "Package Requests"
@@ -261,7 +264,7 @@ msgstr "弃置请求"
 msgid ""
 "Request a package to be disowned, e.g. when the maintainer is inactive and "
 "the package has been flagged out-of-date for a long time."
-msgstr "请求标记这个软件包为无主的，比如维护者不活跃而且这个软件包已经被标记为过时很久了。"
+msgstr "请求弃置一个软件包，比如当维护者不活跃且软件包已过期很久时。"
 
 #: html/home.php
 msgid "Deletion Request"
@@ -289,7 +292,7 @@ msgstr "请求一个软件包被合并到另一个中。在一个包需要被重
 msgid ""
 "If you want to discuss a request, you can use the %saur-requests%s mailing "
 "list. However, please do not use that list to file requests."
-msgstr "如果你想讨论一个请求，你可以在 %saur-requests%s 邮件列表上发送消息。然而，不要在那里发送请求。"
+msgstr "如果您想讨论请求，可以使用 %saur-requests%s 邮件列表。但请不要用它发送请求。"
 
 #: html/home.php
 msgid "Submitting Packages"
@@ -330,7 +333,7 @@ msgid ""
 "our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface"
 " %sonly%s. To report packaging bugs contact the package maintainer or leave "
 "a comment on the appropriate package page."
-msgstr "如果你在 AUR web 页面中发现了一个 Bug，请提交到我们的 %sBug 追踪系统%s。请%s仅仅%s使用追踪系统报告 AUR 自身的 Bug。如果想要报告打包方面的 Bug，请联系相应的包维护者，或者在相应的软件包页面中留下一条评论。"
+msgstr "如果您在 AUR web 页面发现 Bug，请提交到我们的 %sBug 追踪系统%s。追踪系统 %s只能%s 用来报告 AUR web 页面的 Bug。如果想报告打包方面的 Bug，请联系相应的包维护者，或者在相应的软件包页面留下评论。"
 
 #: html/home.php
 msgid "Package Search"
@@ -379,7 +382,7 @@ msgstr "输入账户信息"
 
 #: html/login.php
 msgid "User name or primary email address"
-msgstr ""
+msgstr "用户名或主邮件地址"
 
 #: html/login.php template/account_delete.php template/account_edit_form.php
 msgid "Password"
@@ -397,7 +400,7 @@ msgstr "找回密码"
 #, php-format
 msgid ""
 "HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
-msgstr "HTTP 登录已被禁用，请使用%s切换到HTTPS%s。"
+msgstr "HTTP 登录已被禁用，想登录请 %s切换到HTTPS%s。"
 
 #: html/packages.php template/pkg_search_form.php
 msgid "Search Criteria"
@@ -427,7 +430,7 @@ msgstr "密码至少要 %s 个字符。"
 
 #: html/passreset.php
 msgid "Invalid e-mail."
-msgstr "电子邮箱不正确。"
+msgstr "邮箱无效。"
 
 #: html/passreset.php
 msgid "Password Reset"
@@ -435,15 +438,15 @@ msgstr "密码重置"
 
 #: html/passreset.php
 msgid "Check your e-mail for the confirmation link."
-msgstr "请进入您的邮箱查看确认邮件。"
+msgstr "请进入您的邮箱查看确认链接。"
 
 #: html/passreset.php
 msgid "Your password has been reset successfully."
-msgstr "密码已经成功重置。"
+msgstr "您的密码已经成功重置。"
 
 #: html/passreset.php
 msgid "Confirm your user name or primary e-mail address:"
-msgstr ""
+msgstr "确认用户名或主邮件地址："
 
 #: html/passreset.php
 msgid "Enter your new password:"
@@ -462,11 +465,11 @@ msgstr "继续"
 msgid ""
 "If you have forgotten the user name and the primary e-mail address you used "
 "to register, please send a message to the %saur-general%s mailing list."
-msgstr ""
+msgstr "如果您忘记了注册账号时使用的用户名和邮件地址，请向 %saur-general%s 邮件列表寻求帮助。"
 
 #: html/passreset.php
 msgid "Enter your user name or your primary e-mail address:"
-msgstr ""
+msgstr "请输入用户名或主邮箱："
 
 #: html/pkgbase.php
 msgid "Package Bases"
@@ -478,6 +481,12 @@ msgid ""
 "checkbox."
 msgstr "选中的软件包未被弃置，请检查确认复选框。"
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr ""
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "找不到合并投票与评论的目标包。"
@@ -505,11 +514,11 @@ msgstr "删除软件包"
 msgid ""
 "Use this form to delete the package base %s%s%s and the following packages "
 "from the AUR: "
-msgstr "使用这个表单将包基础 %s%s%s 和以下包从 AUR 中移除："
+msgstr "使用这个表单将包基础 %s%s%s 和以下包从 AUR 中移除： "
 
 #: html/pkgdel.php
 msgid "Deletion of a package is permanent. "
-msgstr "删除软件包是一个永久性的操作"
+msgstr "删除软件包是永久性的操作。 "
 
 #: html/pkgdel.php html/pkgmerge.php
 msgid "Select the checkbox to confirm action."
@@ -536,29 +545,29 @@ msgstr "弃置软件包"
 msgid ""
 "Use this form to disown the package base %s%s%s which includes the following"
 " packages: "
-msgstr "使用这个表格来弃置包基础 %s%s%s，其中包括下列软件包："
+msgstr "使用这个表格来弃置包基础 %s%s%s，其中包括下列软件包： "
 
 #: html/pkgdisown.php
 msgid ""
 "By selecting the checkbox, you confirm that you want to no longer be a "
 "package co-maintainer."
-msgstr "通过选中复选框，您将确认您不愿成为这个包的共同维护者。"
+msgstr "选中复选框以确认您不再是这个包的共同维护者。"
 
 #: html/pkgdisown.php
 #, php-format
 msgid ""
 "By selecting the checkbox, you confirm that you want to disown the package "
 "and transfer ownership to %s%s%s."
-msgstr "通过选中复选框，您将确认您将弃置这个包并将其所有权转移给 %s%s%s。"
+msgstr "选中复选框以确认您想弃置这个包并将其所有权转移给 %s%s%s。"
 
 #: html/pkgdisown.php
 msgid ""
 "By selecting the checkbox, you confirm that you want to disown the package."
-msgstr "通过选中复选框，您将确认您将弃置这个包。"
+msgstr "选中复选框以确认您想弃置这个包。"
 
 #: html/pkgdisown.php
 msgid "Confirm to disown the package"
-msgstr "继续以弃置包"
+msgstr "确认弃置这个包"
 
 #: html/pkgdisown.php
 msgid "Disown"
@@ -576,12 +585,20 @@ msgstr "标记评论"
 msgid "Flag Package Out-Of-Date"
 msgstr "将软件包标记为过期"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr ""
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
 "Use this form to flag the package base %s%s%s and the following packages "
 "out-of-date: "
-msgstr "使用这个表单将包基础 %s%s%s 和以下包标记为已过期 ："
+msgstr "使用这个表单将包基础 %s%s%s 和以下包标记为已过期 ： "
 
 #: html/pkgflag.php
 #, php-format
@@ -620,19 +637,19 @@ msgstr "合并软件包"
 #: html/pkgmerge.php
 #, php-format
 msgid "Use this form to merge the package base %s%s%s into another package. "
-msgstr "使用这个表单将包基础 %s%s%s 合并到另一个包。"
+msgstr "使用这个表单将包基础 %s%s%s 合并到另一个包。 "
 
 #: html/pkgmerge.php
 msgid "The following packages will be deleted: "
-msgstr "下面这些软件包将被删除："
+msgstr "下面这些软件包将被删除： "
 
 #: html/pkgmerge.php
 msgid "Once the package has been merged it cannot be reversed. "
-msgstr "一旦包被合并，这个操作将是不可逆的。"
+msgstr "一旦包被合并，这个操作将是不可逆的。 "
 
 #: html/pkgmerge.php
 msgid "Enter the package name you wish to merge the package into. "
-msgstr "请输入合并的目标包名。"
+msgstr "请输入合并的目标包名。 "
 
 #: html/pkgmerge.php
 msgid "Merge into:"
@@ -730,7 +747,7 @@ msgstr "您已经在这个提议上投票了。"
 
 #: html/tu.php
 msgid "Vote ID not valid."
-msgstr "非法的投票标识"
+msgstr "非法的投票标识。"
 
 #: html/tu.php template/tu_list.php
 msgid "Current Votes"
@@ -756,7 +773,7 @@ msgstr "缺少用户标识"
 
 #: lib/acctfuncs.inc.php
 msgid "The username is invalid."
-msgstr "用户名需要符合以下条件："
+msgstr "用户名无效。"
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -769,23 +786,23 @@ msgstr "开头和结尾是数字/英文字母"
 
 #: lib/acctfuncs.inc.php
 msgid "Can contain only one period, underscore or hyphen."
-msgstr "最多包含一个“.”，“_”，或“-”"
+msgstr "最多包含一个“.”，“_”或“-”。"
 
 #: lib/acctfuncs.inc.php
 msgid "Please confirm your new password."
-msgstr ""
+msgstr "请确认新密码。"
 
 #: lib/acctfuncs.inc.php
 msgid "The email address is invalid."
-msgstr "错误的 Email 地址。"
+msgstr "邮件地址无效"
 
 #: lib/acctfuncs.inc.php
 msgid "The backup email address is invalid."
-msgstr ""
+msgstr "备用邮件地址无效。"
 
 #: lib/acctfuncs.inc.php
 msgid "The home page is invalid, please specify the full HTTP(s) URL."
-msgstr "首页无效，请指定完整的 HTTP(s) URL。"
+msgstr "主页无效，请指定完整的 HTTP(s) URL。"
 
 #: lib/acctfuncs.inc.php
 msgid "The PGP key fingerprint is invalid."
@@ -793,7 +810,7 @@ msgstr "PGP 密钥指纹无效。"
 
 #: lib/acctfuncs.inc.php
 msgid "The SSH public key is invalid."
-msgstr "此 SSH 公钥无效。"
+msgstr "SSH 公钥无效。"
 
 #: lib/acctfuncs.inc.php
 msgid "Cannot increase account permissions."
@@ -824,15 +841,15 @@ msgstr "SSH 公钥 %s%s%s 已被使用。"
 
 #: lib/acctfuncs.inc.php
 msgid "The CAPTCHA is missing."
-msgstr ""
+msgstr "验证码未输入。"
 
 #: lib/acctfuncs.inc.php
 msgid "This CAPTCHA has expired. Please try again."
-msgstr ""
+msgstr "验证码已过期，请重试。"
 
 #: lib/acctfuncs.inc.php
 msgid "The entered CAPTCHA answer is invalid."
-msgstr ""
+msgstr "输入的验证码无效。"
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -846,11 +863,11 @@ msgstr "帐户 %s%s%s 创建成功。"
 
 #: lib/acctfuncs.inc.php
 msgid "A password reset key has been sent to your e-mail address."
-msgstr "一个密码重置密钥已经发送到你的电子邮箱。"
+msgstr "密码重置密钥已经发送到您的邮箱。"
 
 #: lib/acctfuncs.inc.php
 msgid "Click on the Login link above to use your account."
-msgstr "点击上方的登录链接以使用你的帐号。"
+msgstr "点击上方的登录链接以使用您的帐号。"
 
 #: lib/acctfuncs.inc.php
 #, php-format
@@ -872,13 +889,17 @@ msgstr "登录表单目前对您所使用的 IP 地址禁用，原因可能是
 msgid "Account suspended"
 msgstr "帐号被停用"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr ""
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
 "Your password has been reset. If you just created a new account, please use "
 "the link from the confirmation email to set an initial password. Otherwise, "
 "please request a reset key on the %sPassword Reset%s page."
-msgstr "你的密码已经成功被重置。如果你刚刚创建了一个新账户，请使用确认邮件中的链接来设置一个初始密码。否则，请在 %s重置密码%s 页面申请一个重置密码密钥。"
+msgstr "您的密码已经成功重置。如果您刚刚创建了新账户，请使用确认邮件中的链接来设置初始密码。否则，请在 %s重置密码%s 页面申请重置密钥。"
 
 #: lib/acctfuncs.inc.php
 msgid "Bad username or password."
@@ -907,7 +928,7 @@ msgstr "缺少软件包基础 ID 或软件包名。"
 
 #: lib/aurjson.class.php lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to edit this comment."
-msgstr "你没有权限编辑评论。"
+msgstr "您没有权限编辑这条评论。"
 
 #: lib/aurjson.class.php
 msgid "Comment does not exist."
@@ -935,11 +956,11 @@ msgstr "不能同时锁定 5 条以上的评论。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to pin this comment."
-msgstr "你没有权限锁定这条评论。"
+msgstr "您没有权限锁定这条评论。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to unpin this comment."
-msgstr "你没有权限解锁这条评论。"
+msgstr "您没有权限解锁这条评论。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been pinned."
@@ -957,6 +978,30 @@ msgstr "获取软件包详情时发生错误。"
 msgid "Package details could not be found."
 msgstr "无法找到软件包的详细信息。"
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr ""
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "您需要登录后才能标记软件包。"
@@ -993,18 +1038,30 @@ msgstr "您没有删除软件包的权限。"
 msgid "You did not select any packages to delete."
 msgstr "您没有选择要删除的软件包。"
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
-msgstr "选中的软件包已经被删除。"
+msgstr "选中的软件包已被删除。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can adopt packages."
-msgstr "登录后才能接管软件包"
+msgstr "您需要登录后才能接管软件包。"
+
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr ""
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "您需要登录后才能弃置软件包。"
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr ""
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "您没有选择要接管的软件包。"
@@ -1057,7 +1114,7 @@ msgstr "您将不再收到 %s 的评论通知。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to undelete this comment."
-msgstr "你没有权限恢复这条评论。"
+msgstr "您没有权限恢复这条评论。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "Comment has been undeleted."
@@ -1077,7 +1134,7 @@ msgstr "评论已编辑。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to edit the keywords of this package base."
-msgstr "你没有权限编辑这个软件包基础的关键词。"
+msgstr "您没有权限编辑这个软件包基础的关键词。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The package base keywords have been updated."
@@ -1085,12 +1142,12 @@ msgstr "软件包基础的关键词已被更新。"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "You are not allowed to manage co-maintainers of this package base."
-msgstr "你没有权限管理这个软件包基础的共同管理者。"
+msgstr "您没有权限管理这个软件包基础的共同维护者。"
 
 #: lib/pkgbasefuncs.inc.php
 #, php-format
 msgid "Invalid user name: %s"
-msgstr "非法用户名：%s"
+msgstr "用户名无效：%s"
 
 #: lib/pkgbasefuncs.inc.php
 msgid "The package base co-maintainers have been updated."
@@ -1111,7 +1168,7 @@ msgstr "登录之后才能提交软件包需求。"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid name: only lowercase letters are allowed."
-msgstr "无效的名称: 只允许小写字母。"
+msgstr "名称无效: 只允许小写字母。"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "The comment field must not be empty."
@@ -1119,7 +1176,7 @@ msgstr "评论内容不能为空。"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid request type."
-msgstr "无效的请求类型。"
+msgstr "请求类型无效。"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Added request successfully."
@@ -1127,7 +1184,7 @@ msgstr "请求提交成功。"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Invalid reason."
-msgstr "无效的理由。"
+msgstr "理由无效。"
 
 #: lib/pkgreqfuncs.inc.php
 msgid "Only TUs and developers can close requests."
@@ -1140,12 +1197,12 @@ msgstr "请求关闭成功。"
 #: template/account_delete.php
 #, php-format
 msgid "You can use this form to permanently delete the AUR account %s."
-msgstr "你可以使用这个表单来彻底删除 AUR 帐号 %s。"
+msgstr "您可以使用这个表单永久删除 AUR 帐号 %s。"
 
 #: template/account_delete.php
 #, php-format
 msgid "%sWARNING%s: This action cannot be undone."
-msgstr "%s警告%s：这个操作无法被撤销"
+msgstr "%s警告%s：这个操作无法撤销。"
 
 #: template/account_delete.php
 msgid "Confirm deletion"
@@ -1245,22 +1302,22 @@ msgstr "编辑此用户的帐号"
 
 #: template/account_details.php
 msgid "List this user's comments"
-msgstr ""
+msgstr "显示此用户的评论"
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s if you want to permanently delete this account."
-msgstr "如果你想要彻底删除这个帐号，请点击%s这里%s。"
+msgstr "如果你想永久删除这个帐号，请点击 %s这里%s。"
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s for user details."
-msgstr "点击 %s这里%s 访问用户详情页面"
+msgstr "点击 %s这里%s 查看用户详情。"
 
 #: template/account_edit_form.php
 #, php-format
 msgid "Click %shere%s to list the comments made by this account."
-msgstr ""
+msgstr "点击 %s这里%s 列出当前用户的所有评论。"
 
 #: template/account_edit_form.php
 msgid "required"
@@ -1303,30 +1360,30 @@ msgid ""
 "If you do not hide your email address, it is visible to all registered AUR "
 "users. If you hide your email address, it is visible to members of the Arch "
 "Linux staff only."
-msgstr ""
+msgstr "如果你不隐藏你的邮件地址，该地址将会对所有已注册的AUR用户可见。如果你隐藏你的邮件地址，该地址仅有Arch Linux工作人员可见。"
 
 #: template/account_edit_form.php
 msgid "Backup Email Address"
-msgstr ""
+msgstr "备用邮件地址"
 
 #: template/account_edit_form.php
 msgid ""
 "Optionally provide a secondary email address that can be used to restore "
 "your account in case you lose access to your primary email address."
-msgstr ""
+msgstr "选择性的提供的备用的邮件地址。该邮件地址将在你的主要邮件地址不可用时用于恢复你的帐号。"
 
 #: template/account_edit_form.php
 msgid ""
 "Password reset links are always sent to both your primary and your backup "
 "email address."
-msgstr ""
+msgstr "密码重置链接会同时发送给你的主要邮件地址和备用邮件地址。"
 
 #: template/account_edit_form.php
 #, php-format
 msgid ""
 "Your backup email address is always only visible to members of the Arch "
 "Linux staff, independent of the %s setting."
-msgstr ""
+msgstr "你的备用邮件地址将只对Arch Linux的工作人员可见。与%s设置无关。"
 
 #: template/account_edit_form.php
 msgid "Language"
@@ -1340,7 +1397,7 @@ msgstr "时区"
 msgid ""
 "If you want to change the password, enter a new password and confirm the new"
 " password by entering it again."
-msgstr ""
+msgstr "如果您想修改密码，请输入新密码并再次输入以确认。"
 
 #: template/account_edit_form.php
 msgid "Re-type password"
@@ -1350,7 +1407,7 @@ msgstr "确认密码"
 msgid ""
 "The following information is only required if you want to submit packages to"
 " the Arch User Repository."
-msgstr "仅仅当你想要向 AUR 提交软件包时才需要填写以下信息。"
+msgstr "仅当你想向 AUR 提交软件包时才需要填写以下信息。"
 
 #: template/account_edit_form.php
 msgid "SSH Public Key"
@@ -1374,21 +1431,21 @@ msgstr "所有权更改提醒"
 
 #: template/account_edit_form.php
 msgid "To confirm the profile changes, please enter your current password:"
-msgstr ""
+msgstr "请输入您当前的密码以确认更改："
 
 #: template/account_edit_form.php
 msgid "Your current password"
-msgstr ""
+msgstr "当前密码"
 
 #: template/account_edit_form.php
 msgid ""
 "To protect the AUR against automated account creation, we kindly ask you to "
 "provide the output of the following command:"
-msgstr ""
+msgstr "为了防止AUR遭受自动注册手段的侵扰。请您提供以下命令的输出："
 
 #: template/account_edit_form.php
 msgid "Answer"
-msgstr ""
+msgstr "回答"
 
 #: template/account_edit_form.php template/pkgbase_details.php
 #: template/pkg_details.php
@@ -1435,7 +1492,7 @@ msgstr "没有更多的结果供显示。"
 #, php-format
 msgid ""
 "Use this form to add co-maintainers for %s%s%s (one user name per line):"
-msgstr "使用这个表单来添加 %s%s%s 的共同维护者（一个用户名一行）："
+msgstr "使用这个表单以添加 %s%s%s 的共同维护者（一个用户名一行）："
 
 #: template/comaintainers_form.php
 msgid "Users"
@@ -1467,11 +1524,11 @@ msgstr "返回详情"
 #: template/footer.php
 #, php-format
 msgid "Copyright %s 2004-%d aurweb Development Team."
-msgstr "版权所有 %s 2004-%d aurweb 开发组"
+msgstr "版权所有 %s 2004-%d aurweb 开发组。"
 
 #: template/header.php
 msgid " My Account"
-msgstr "我的帐户"
+msgstr " 我的帐户"
 
 #: template/pkgbase_actions.php
 msgid "Package Actions"
@@ -1542,7 +1599,7 @@ msgstr "包基础详情"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "Git Clone URL"
-msgstr "Git 克隆地址"
+msgstr "Git Clone URL"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "read-only"
@@ -1550,7 +1607,7 @@ msgstr "只读"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "click to copy"
-msgstr ""
+msgstr "点击复制"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
@@ -1560,7 +1617,7 @@ msgstr "关键字"
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php
 msgid "Submitter"
-msgstr "提交人"
+msgstr "提交者"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php template/pkg_search_results.php
@@ -1569,7 +1626,7 @@ msgstr "维护者"
 
 #: template/pkgbase_details.php template/pkg_details.php
 msgid "Last Packager"
-msgstr "最近一次打包者"
+msgstr "最后打包者"
 
 #: template/pkgbase_details.php template/pkg_details.php
 #: template/pkg_search_form.php template/pkg_search_results.php
@@ -1602,12 +1659,12 @@ msgstr "添加评论"
 msgid ""
 "Git commit identifiers referencing commits in the AUR package repository and"
 " URLs are converted to links automatically."
-msgstr ""
+msgstr "在AUR软件包仓库内，Git提交和识别符将会被自动转换为URL。"
 
 #: template/pkg_comment_form.php
 #, php-format
 msgid "%sMarkdown syntax%s is partially supported."
-msgstr ""
+msgstr "部分支持%sMarkdown语法%s"
 
 #: template/pkg_comments.php
 msgid "Pinned Comments"
@@ -1615,11 +1672,11 @@ msgstr "已锁定评论"
 
 #: template/pkg_comments.php
 msgid "Latest Comments"
-msgstr "最新的评论"
+msgstr "最新评论"
 
 #: template/pkg_comments.php
 msgid "Comments for"
-msgstr ""
+msgstr "评论"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1634,7 +1691,7 @@ msgstr "在 %s 发表的匿名评论"
 #: template/pkg_comments.php
 #, php-format
 msgid "Commented on package %s on %s"
-msgstr ""
+msgstr "在软件包%s的%s评论"
 
 #: template/pkg_comments.php
 #, php-format
@@ -1714,15 +1771,15 @@ msgstr "取代"
 
 #: template/pkg_details.php
 msgid "Dependencies"
-msgstr "依赖于:"
+msgstr "依赖"
 
 #: template/pkg_details.php
 msgid "Required by"
-msgstr "被需要:"
+msgstr "被需要"
 
 #: template/pkg_details.php
 msgid "Sources"
-msgstr "源代码:"
+msgstr "源代码"
 
 #: template/pkgreq_close_form.php
 #, php-format
@@ -2162,7 +2219,7 @@ msgstr "AUR 软件包更新：{pkgbase}"
 #: scripts/notify.py
 #, python-brace-format
 msgid "{user} [1] pushed a new commit to {pkgbase} [2]."
-msgstr "用户 {user} [1] 在软件包 {pkgbase} [2] 上传了新的提交："
+msgstr "用户 {user} [1] 在软件包 {pkgbase} [2] 上传了新的提交。"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2216,7 +2273,7 @@ msgid ""
 "\n"
 "-- \n"
 "If you no longer wish receive notifications about the new package, please go to [3] and click \"{label}\"."
-msgstr ""
+msgstr "用户 {user} [1] 将原软件包 {old} [2] 并入新软件包 {new} [3]。\n\n--\n若您不愿再收到关于新软件包的通知，请到此软件包页面 [3] 并点击 \"{label}\"。"
 
 #: scripts/notify.py
 #, python-brace-format
@@ -2237,3 +2294,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "请记得为提案 {id} [1] 投票，投票时段将于48小时内结束。"
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr ""
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr ""
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr ""
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr ""
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr ""
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr ""
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5226940a..e7399a19 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the AURWEB package.
 # 
 # Translators:
-# byStarTW (pan93412) <pan93412@gmail.com>, 2018
+# pan93412 <pan93412@gmail.com>, 2018
 # 黃柏諺 <s8321414@gmail.com>, 2014-2017
-# 黃柏諺 <s8321414@gmail.com>, 2020
+# 黃柏諺 <s8321414@gmail.com>, 2020-2022
 msgid ""
 msgstr ""
 "Project-Id-Version: aurweb\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
 "POT-Creation-Date: 2020-01-31 09:29+0100\n"
-"PO-Revision-Date: 2020-02-01 03:21+0000\n"
-"Last-Translator: 黃柏諺 <s8321414@gmail.com>\n"
+"PO-Revision-Date: 2022-01-18 17:18+0000\n"
+"Last-Translator: Kevin Morris <kevr@0cost.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/lfleischer/aurweb/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -473,6 +473,12 @@ msgid ""
 "checkbox."
 msgstr "選取的套件未被棄置，請檢查確認的核取方塊。"
 
+#: aurweb/routers/packages.py
+msgid ""
+"The selected packages have not been adopted, check the confirmation "
+"checkbox."
+msgstr "選定的軟體包尚未被認領，請勾選確認核取方塊。"
+
 #: html/pkgbase.php lib/pkgreqfuncs.inc.php
 msgid "Cannot find package to merge votes and comments into."
 msgstr "找不到合併投票與評論的目標套件。"
@@ -571,6 +577,14 @@ msgstr "標記評論"
 msgid "Flag Package Out-Of-Date"
 msgstr "將套件標記為過期"
 
+#: templates/packages/flag.html
+msgid ""
+"This seems to be a VCS package. Please do %snot%s flag it out-of-date if the"
+" package version in the AUR does not match the most recent commit. Flagging "
+"this package should only be done if the sources moved or changes in the "
+"PKGBUILD are required because of recent upstream changes."
+msgstr "這似乎是 VCS 軟體包。請%s不要%s因為 AUR 中的軟體包版本與最新的 commit 不相符就將其標記為過期。僅當來源移動或是因為最新的上游變更而需要變更 PKGBUILD 時才標記此軟體包。"
+
 #: html/pkgflag.php
 #, php-format
 msgid ""
@@ -867,6 +881,10 @@ msgstr "登入表單在您目前所使用的 IP 位址被停用，可能是因
 msgid "Account suspended"
 msgstr "帳號被暫停"
 
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to suspend accounts."
+msgstr "您無權暫停帳號。"
+
 #: lib/acctfuncs.inc.php
 #, php-format
 msgid ""
@@ -952,6 +970,30 @@ msgstr "擷取套件細節時發生錯誤。"
 msgid "Package details could not be found."
 msgstr "找不到套件的詳細資訊。"
 
+#: aurweb/routers/auth.py
+msgid "Bad Referer header."
+msgstr "錯誤的 Referer 標頭。"
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages to be notified about."
+msgstr "您沒有選取任何要被通知的軟體包。"
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been enabled."
+msgstr "選定的軟體包通知已啟用。"
+
+#: aurweb/routers/packages.py
+msgid "You did not select any packages for notification removal."
+msgstr "您沒有選取任何要刪除通知的軟體包。"
+
+#: aurweb/routers/packages.py
+msgid "A package you selected does not have notifications enabled."
+msgstr "您選取的軟體包並未啟用通知。"
+
+#: aurweb/routers/packages.py
+msgid "The selected packages' notifications have been removed."
+msgstr "選定的軟體包通知已移除。"
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can flag packages."
 msgstr "您必須先登入才能標記套件。"
@@ -988,6 +1030,10 @@ msgstr "您沒有權限刪除套件。"
 msgid "You did not select any packages to delete."
 msgstr "您沒有選取任何要刪除的套件。"
 
+#: aurweb/routers/packages.py
+msgid "One of the packages you selected does not exist."
+msgstr "您選定的其中一個軟體包不存在。"
+
 #: lib/pkgbasefuncs.inc.php
 msgid "The selected packages have been deleted."
 msgstr "選取的套件已刪除。"
@@ -996,10 +1042,18 @@ msgstr "選取的套件已刪除。"
 msgid "You must be logged in before you can adopt packages."
 msgstr "您必須先登入才能接管套件。"
 
+#: aurweb/routers/package.py
+msgid "You are not allowed to adopt one of the packages you selected."
+msgstr "您不得認領您選取的其中一個軟體包。"
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You must be logged in before you can disown packages."
 msgstr "您必須先登入才能棄置套件。"
 
+#: aurweb/routers/packages.py
+msgid "You are not allowed to disown one of the packages you selected."
+msgstr "您不能取消擁有您選定的其中一個軟體包。"
+
 #: lib/pkgbasefuncs.inc.php
 msgid "You did not select any packages to adopt."
 msgstr "您沒有選擇任何要接管的套件。"
@@ -2232,3 +2286,48 @@ msgid ""
 "Please remember to cast your vote on proposal {id} [1]. The voting period "
 "ends in less than 48 hours."
 msgstr "請記得在第 {id} [1] 號建議投下你的投票，投票期限即將在 48 個小時內結束。"
+
+#: aurweb/routers/accounts.py
+msgid "Invalid account type provided."
+msgstr "提供了無效的帳號類型。"
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change account types."
+msgstr "您無權變更帳號類型。"
+
+#: aurweb/routers/accounts.py
+msgid "You do not have permission to change this user's account type to %s."
+msgstr "您無權變更此使用者的帳號類型至 %s。"
+
+#: aurweb/packages/requests.py
+msgid "No due existing orphan requests to accept for %s."
+msgstr "沒有要接受的 %s 到期既有孤立請求。"
+
+#: aurweb/asgi.py
+msgid "Internal Server Error"
+msgstr "內部伺服器錯誤"
+
+#: templates/errors/500.html
+msgid "A fatal error has occurred."
+msgstr "發生了嚴重錯誤。"
+
+#: templates/errors/500.html
+msgid ""
+"Details have been logged and will be reviewed by the postmaster posthaste. "
+"We apologize for any inconvenience this may have caused."
+msgstr "已記錄詳細資訊，並將會由 postmaster posthaste 審閱。我們對造成如此不便深感抱歉。"
+
+#: aurweb/scripts/notify.py
+msgid "AUR Server Error"
+msgstr "AUR 伺服器錯誤"
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+#: templates/packages/disown.html
+msgid "Related package request closure comments..."
+msgstr ""
+
+#: templates/pkgbase/merge.html templates/packages/delete.html
+msgid ""
+"This action will close any pending package requests related to it. If "
+"%sComments%s are omitted, a closure comment will be autogenerated."
+msgstr ""

From d7c19ee6ce6a46ce8a58ab496ab91494c36657de Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 10:42:33 -0800
Subject: [PATCH 841/844] upgrade: bump to v6.0.0

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/config.py b/aurweb/config.py
index 86f8ddf7..3f84f3d6 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -6,7 +6,7 @@ from typing import Any
 # Publicly visible version of aurweb. This is used to display
 # aurweb versioning in the footer and must be maintained.
 # Todo: Make this dynamic/automated.
-AURWEB_VERSION = "v5.0.0"
+AURWEB_VERSION = "v6.0.0"
 
 _parser = None
 

From 57bc9b6b7307b097a3008b8b0f8e055303dbce09 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 10:55:52 -0800
Subject: [PATCH 842/844] fix(footer.html): update version git log link to
 gitlab

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/footer.html b/templates/partials/footer.html
index dde03c96..3103699f 100644
--- a/templates/partials/footer.html
+++ b/templates/partials/footer.html
@@ -1,6 +1,6 @@
 <div id="footer">
     <p>
-        aurweb <a href="https://git.archlinux.org/aurweb.git/log/?h={{ config.AURWEB_VERSION }}">{{ config.AURWEB_VERSION }}</a>
+        aurweb <a href="https://gitlab.archlinux.org/archlinux/aurweb/-/commits/{{ config.AURWEB_VERSION }}">{{ config.AURWEB_VERSION }}</a>
         {% if commit_hash %}
             -
             {% if commit_url %}

From 18b18bf66780202bfe938c70ef8d503bceda52e2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 11:01:12 -0800
Subject: [PATCH 843/844] fix: remove trailing slash from package search form
 action

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 templates/partials/packages/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/packages/search.html b/templates/partials/packages/search.html
index bb6fdb50..33bc6132 100644
--- a/templates/partials/packages/search.html
+++ b/templates/partials/packages/search.html
@@ -1,6 +1,6 @@
 <div id="pkglist-search" class="box filter-criteria">
     <h2>{% trans %}Search Criteria{% endtrans %}</h2>
-    <form action='/packages/' method='get'>
+    <form action='/packages' method='get'>
         <p><input type='hidden' name='O' value='0'/></p>
 
         <fieldset>

From 8c665d165101f32c1833b00a3d82dc46fe330be9 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 18 Jan 2022 11:04:07 -0800
Subject: [PATCH 844/844] upgrade: bump to v6.0.1

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurweb/config.py b/aurweb/config.py
index 3f84f3d6..9ab9ae45 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -6,7 +6,7 @@ from typing import Any
 # Publicly visible version of aurweb. This is used to display
 # aurweb versioning in the footer and must be maintained.
 # Todo: Make this dynamic/automated.
-AURWEB_VERSION = "v6.0.0"
+AURWEB_VERSION = "v6.0.1"
 
 _parser = None